summaryrefslogtreecommitdiff
path: root/src/parsetree.cc
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2015-06-06 14:15:00 -0400
committerAdrian Thurston <thurston@complang.org>2015-06-06 14:15:00 -0400
commitc158a685a7bad2c4d06b4c160704b6913f5e70bf (patch)
tree5df6fc5983a0957b0acd327bf6516ccab69d2d56 /src/parsetree.cc
parent5a5cf0547b01d3c95dfa00b8f36f93a5143e25a7 (diff)
downloadcolm-c158a685a7bad2c4d06b4c160704b6913f5e70bf.tar.gz
some nameing cleanup around list and list el
Diffstat (limited to 'src/parsetree.cc')
-rw-r--r--src/parsetree.cc30
1 files changed, 12 insertions, 18 deletions
diff --git a/src/parsetree.cc b/src/parsetree.cc
index 52b61776..6f6758de 100644
--- a/src/parsetree.cc
+++ b/src/parsetree.cc
@@ -57,24 +57,18 @@ string TypeRef::stringify()
case Iterator:
s = "iterator";
break;
-// case List:
-// s = "list";
-// break;
- case ValueList:
- s = "vlist";
+ case List:
+ s = "list";
break;
-// case ListEl:
-// s = "listel";
-// break;
-// case Map:
-// s = "map";
-// break;
- case ValueMap:
- s = "vmap";
+ case ListPtrs:
+ s = "list_ptrs";
+ break;
+ case Map:
+ s = "map";
+ break;
+ case MapPtrs:
+ s = "map_ptrs";
break;
-// case MapEl:
-// s = "mapel";
-// break;
case Parser:
s = "parser";
break;
@@ -219,12 +213,12 @@ int CmpUniqueGeneric::compare( const UniqueGeneric &ut1, const UniqueGeneric &ut
else {
switch ( ut1.type ) {
case UniqueGeneric::List:
- case UniqueGeneric::ListEl:
+ case UniqueGeneric::ListPtrs:
case UniqueGeneric::Parser:
break;
case UniqueGeneric::Map:
- case UniqueGeneric::MapEl:
+ case UniqueGeneric::MapPtrs:
if ( ut1.key < ut2.key )
return -1;
else if ( ut1.key > ut2.key )