merging aapl src dirs: added CmpStr and CmpString to colm/aapl

CmpStr is defined in colm/*.h so we need to also move it aside when we add it to aapl.

With this commit there are no more diffs between the aapl src dirs, with the
exception of a three files added to the aapl-repos package. Will use this as
the definitive version.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/compiler.h b/src/compiler.h
index ac4a67e6..1b03504f 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -118,7 +118,7 @@ struct LelDefListEl { Production *prev, *next; };
 typedef Vector< LangEl* > LangElVect;
 typedef Vector< ProdEl* > FactorVect;
 
-typedef AvlMap<String, long, CmpStr> StringMap;
+typedef AvlMap<String, long, ColmCmpStr> StringMap;
 typedef AvlMapEl<String, long> StringMapEl;
 
 enum PredType { 
@@ -488,7 +488,7 @@ struct TokenRegion;
 
 /* tree_t of instantiated names. */
 typedef BstMapEl<String, NameInst*> NameMapEl;
-typedef BstMap<String, NameInst*, CmpStr> NameMap;
+typedef BstMap<String, NameInst*, ColmCmpStr> NameMap;
 typedef Vector<NameInst*> NameVect;
 typedef BstSet<NameInst*> NameSet;
 
@@ -1104,7 +1104,7 @@ void errorStateLabels( const NameSet &locations );
 
 struct ColmParser;
 
-typedef AvlMap<String, ColmParser *, CmpStr> ParserDict;
+typedef AvlMap<String, ColmParser *, ColmCmpStr> ParserDict;
 typedef AvlMapEl<String, ColmParser *> ParserDictEl;
 
 LangEl *declareLangEl( Compiler *pd, Namespace *nspace,
diff --git a/src/cstring.h b/src/cstring.h
index e2fc64e9..3c285153 100644
--- a/src/cstring.h
+++ b/src/cstring.h
@@ -852,7 +852,7 @@ template<class T> struct CmpStrTmpl
 	}
 };
 
-typedef CmpStrTmpl<char> CmpStr;
+typedef CmpStrTmpl<char> ColmCmpStr;
 
 #ifdef AAPL_NAMESPACE
 }
diff --git a/src/parser.h b/src/parser.h
index 97f2ede0..aafa3f2b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -184,7 +184,7 @@ struct BaseParser
 
 	virtual void go( long activeRealm ) = 0;
 
-	BstSet<String, CmpStr> genericElDefined;
+	BstSet<String, ColmCmpStr> genericElDefined;
 
 	NamespaceQual *emptyNspaceQual()
 	{
diff --git a/src/parsetree.h b/src/parsetree.h
index 4bf657d7..eea94454 100644
--- a/src/parsetree.h
+++ b/src/parsetree.h
@@ -285,7 +285,7 @@ void prepareLitString( String &result, bool &caseInsensitive,
 
 std::ostream &operator<<(std::ostream &out, const Token &token );
 
-typedef AvlMap< String, TokenInstance*, CmpStr > LiteralDict;
+typedef AvlMap< String, TokenInstance*, ColmCmpStr > LiteralDict;
 typedef AvlMapEl< String, TokenInstance* > LiteralDictEl;
 
 /* Store the value and type of a priority augmentation. */
@@ -316,7 +316,7 @@ struct LexDefinition
 };
 
 typedef Vector<String> StringVect;
-typedef CmpTable<String, CmpStr> CmpStrVect;
+typedef CmpTable<String, ColmCmpStr> CmpStrVect;
 
 struct NamespaceQual
 {
@@ -623,7 +623,7 @@ struct TypeMapEl
 };
 
 /* Symbol Map. */
-typedef AvlTree< TypeMapEl, String, CmpStr > TypeMap;
+typedef AvlTree< TypeMapEl, String, ColmCmpStr > TypeMap;
 
 typedef Vector<TokenRegion*> RegionVect;
 
@@ -793,7 +793,7 @@ struct GraphDictEl
 	InputLoc loc;
 };
 
-typedef AvlTree<GraphDictEl, String, CmpStr> GraphDict;
+typedef AvlTree<GraphDictEl, String, ColmCmpStr> GraphDict;
 typedef DList<GraphDictEl> GraphList;
 
 struct TypeAlias
@@ -817,10 +817,10 @@ struct TypeAlias
 
 typedef DList<TypeAlias> TypeAliasList;
 
-typedef AvlMap<String, ObjectField*, CmpStr> FieldMap;
+typedef AvlMap<String, ObjectField*, ColmCmpStr> FieldMap;
 typedef AvlMapEl<String, ObjectField*> FieldMapEl;
 
-typedef AvlMap<String, ObjectMethod*, CmpStr> MethodMap;
+typedef AvlMap<String, ObjectMethod*, ColmCmpStr> MethodMap;
 typedef AvlMapEl<String, ObjectMethod*> MethodMapEl;
 
 /* tree_t of name scopes for an object def. All of the object fields inside this