5 files changed, 38 insertions, 47 deletions

diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 643d14ae43..bdd8d71c4a 100755
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -25,7 +25,6 @@ FS			(f|F)
 #include "indra.y.hpp"
 #include "lltimer.h"
 #include "indra_constants.h"
-#include "llagentconstants.h"
 #include "lllslconstants.h"
 #include "lluuid.h"
 #include "llassetstorage.h"
diff --git a/indra/lscript/lscript_compile/lscript_bytecode.cpp b/indra/lscript/lscript_compile/lscript_bytecode.cpp
index 95b2f35a94..667e5dafc1 100755
--- a/indra/lscript/lscript_compile/lscript_bytecode.cpp
+++ b/indra/lscript/lscript_compile/lscript_bytecode.cpp
@@ -40,8 +40,8 @@ LLScriptJumpTable::LLScriptJumpTable()
 
 LLScriptJumpTable::~LLScriptJumpTable()
 {
-	mLabelMap.deleteAllData();
-	mJumpMap.deleteAllData();
+	delete_and_clear(mLabelMap);
+	delete_and_clear(mJumpMap);
 }
 
 void LLScriptJumpTable::addLabel(char *name, S32 offset)
@@ -203,17 +203,14 @@ void LLScriptByteCodeChunk::addJump(char *name)
 
 void LLScriptByteCodeChunk::connectJumps()
 {
-	char *jump;
-	S32 offset, jumppos;
-
 	if (mJumpTable)
 	{
-		for (jump = mJumpTable->mJumpMap.getFirstKey();
-			 jump;
-			 jump = mJumpTable->mJumpMap.getNextKey())
+		for(std::map<char *, S32 *>::iterator it = mJumpTable->mJumpMap.begin(), end_it = mJumpTable->mJumpMap.end();
+			it != end_it;
+			++it)
 		{
-			jumppos = *mJumpTable->mJumpMap[jump];
-			offset = *mJumpTable->mLabelMap[jump] - jumppos;
+			S32 jumppos = *it->second;
+			S32 offset = *mJumpTable->mLabelMap[it->first] - jumppos;
 			jumppos = jumppos - 4;
 			integer2bytestream(mCodeChunk, jumppos, offset);
 		}
@@ -308,7 +305,7 @@ void LLScriptScriptCodeChunk::build(LLFILE *efp, LLFILE *bcfp)
 
 		if (fwrite(mCompleteCode, 1, mTotalSize, bcfp) != (size_t)mTotalSize)
 		{
-			llwarns << "Short write" << llendl;
+			LL_WARNS() << "Short write" << LL_ENDL;
 		}
 	}
 	else
diff --git a/indra/lscript/lscript_compile/lscript_bytecode.h b/indra/lscript/lscript_compile/lscript_bytecode.h
index 0933c78b6f..1908bebcb9 100755
--- a/indra/lscript/lscript_compile/lscript_bytecode.h
+++ b/indra/lscript/lscript_compile/lscript_bytecode.h
@@ -29,6 +29,7 @@
 
 #include "lscript_byteconvert.h"
 #include "lscript_scope.h"
+#include <map>
 
 class LLScriptJumpTable
 {
@@ -39,8 +40,8 @@ public:
 	void addLabel(char *name, S32 offset);
 	void addJump(char *name, S32 offset);
 
-	LLMap<char *, S32 *> mLabelMap;
-	LLMap<char *, S32 *> mJumpMap;
+	std::map<char *, S32 *> mLabelMap;
+	std::map<char *, S32 *> mJumpMap;
 };
 
 class LLScriptByteCodeChunk
diff --git a/indra/lscript/lscript_compile/lscript_scope.h b/indra/lscript/lscript_compile/lscript_scope.h
index 5b2a73ad92..ffff91c81b 100755
--- a/indra/lscript/lscript_compile/lscript_scope.h
+++ b/indra/lscript/lscript_compile/lscript_scope.h
@@ -27,8 +27,8 @@
 #ifndef LL_LSCRIPT_SCOPE_H
 #define LL_LSCRIPT_SCOPE_H
 
-#include "string_table.h"
-#include "llmap.h"
+#include <map>
+#include "llstringtable.h"
 #include "lscript_byteformat.h"
 
 typedef enum e_lscript_identifier_type
@@ -301,13 +301,13 @@ public:
 
 	~LLScriptScope()	
 	{
-		mEntryMap.deleteAllData();
+		delete_and_clear(mEntryMap);
 	}
 
 	LLScriptScopeEntry *addEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
 	{
 		const char *name = mSTable->addString(identifier);
-		if (!mEntryMap.checkData(name))
+		if (mEntryMap.find(name) == mEntryMap.end())
 		{
 			if (idtype == LIT_FUNCTION)
 				mEntryMap[name] = new LLScriptScopeEntry(name, idtype, type, mFunctionCount++);
@@ -324,18 +324,10 @@ public:
 		}
 	}
 
-	BOOL checkEntry(const char *identifier)
+	bool checkEntry(const char *identifier)
 	{
 		const char *name = mSTable->addString(identifier);
-		if (mEntryMap.checkData(name))
-		{
-			return TRUE;
-		}
-		else
-		{
-			// identifier already exists at this scope
-			return FALSE;
-		}
+		return mEntryMap.find(name) != mEntryMap.end();
 	}
 
 	LLScriptScopeEntry *findEntry(const char *identifier)
@@ -345,10 +337,11 @@ public:
 
 		while (scope)
 		{
-			if (scope->mEntryMap.checkData(name))
+			entry_map_t::iterator found_it = mEntryMap.find(name);
+			if (found_it != mEntryMap.end())
 			{
 				// cool, we found it at this scope
-				return scope->mEntryMap[name];
+				return found_it->second;
 			}
 			scope = scope->mParentScope;
 		}
@@ -362,24 +355,25 @@ public:
 
 		while (scope)
 		{
-			if (scope->mEntryMap.checkData(name))
+			entry_map_t::iterator found_it = scope->mEntryMap.find(name);
+			if (found_it != scope->mEntryMap.end())
 			{
 				// need to check type, and if type is function we need to check both types
 				if (idtype == LIT_FUNCTION)
 				{
-					if (scope->mEntryMap[name]->mIDType == LIT_FUNCTION)
+					if (found_it->second->mIDType == LIT_FUNCTION)
 					{
-						return scope->mEntryMap[name];
+						return (found_it->second);
 					}
-					else if (scope->mEntryMap[name]->mIDType == LIT_LIBRARY_FUNCTION)
+					else if (found_it->second->mIDType == LIT_LIBRARY_FUNCTION)
 					{
-						return scope->mEntryMap[name];
+						return (found_it->second);
 					}
 				}
-				else if (scope->mEntryMap[name]->mIDType == idtype)
+				else if (found_it->second->mIDType == idtype)
 				{
 					// cool, we found it at this scope
-					return scope->mEntryMap[name];
+					return (found_it->second);
 				}
 			}
 			scope = scope->mParentScope;
@@ -392,11 +386,12 @@ public:
 		mParentScope = scope;
 	}
 
-	LLMap<const char *, LLScriptScopeEntry *>	mEntryMap;
-	LLScriptScope						*mParentScope;
-	LLStringTable						*mSTable;
-	S32									mFunctionCount;
-	S32									mStateCount;
+	typedef std::map<const char *, LLScriptScopeEntry *> entry_map_t;
+	entry_map_t		mEntryMap;
+	LLScriptScope*	mParentScope;
+	LLStringTable*	mSTable;
+	S32				mFunctionCount;
+	S32				mStateCount;
 };
 
 extern LLStringTable *gScopeStringTable;
diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h
index bf29f44518..047c220b17 100755
--- a/indra/lscript/lscript_compile/lscript_tree.h
+++ b/indra/lscript/lscript_compile/lscript_tree.h
@@ -29,7 +29,6 @@
 
 #include "v3math.h"
 #include "llquaternion.h"
-#include "linked_lists.h"
 #include "lscript_error.h"
 #include "lscript_typecheck.h"
 #include "lscript_byteformat.h"
@@ -2304,20 +2303,20 @@ public:
 	LLScriptAllocationManager() {}
 	~LLScriptAllocationManager() 
 	{
-		mAllocationList.deleteAllData();
+		deleteAllocations();
 	}
 
 	void addAllocation(LLScriptFilePosition *ptr)
 	{
-		mAllocationList.addData(ptr);
+		mAllocationList.push_front(ptr);
 	}
 
 	void deleteAllocations()
 	{
-		mAllocationList.deleteAllData();
+		delete_and_clear(mAllocationList);
 	}
 
-	LLLinkedList<LLScriptFilePosition> mAllocationList;
+	std::list<LLScriptFilePosition*> mAllocationList;
 };
 
 extern LLScriptAllocationManager *gAllocationManager;