diff options
| author | Adrian Thurston <thurston@colm.net> | 2019-09-08 20:50:12 -0600 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2019-09-08 20:50:12 -0600 |
| commit | a90aad94da641125a47de44a3f7552df8d861bee (patch) | |
| tree | 243b8259f0f1338af21b1666cf4fd9b7be5f81b7 /src/compiler.h | |
| parent | cf1179fca1bf8c3454730918f149c17c13f49cdc (diff) | |
| download | colm-a90aad94da641125a47de44a3f7552df8d861bee.tar.gz | |
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.
Diffstat (limited to 'src/compiler.h')
| -rw-r--r-- | src/compiler.h | 6 |
1 files changed, 3 insertions, 3 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, |