From c158a685a7bad2c4d06b4c160704b6913f5e70bf Mon Sep 17 00:00:00 2001
From: Adrian Thurston <thurston@complang.org>
Date: Sat, 6 Jun 2015 14:15:00 -0400
Subject: some nameing cleanup around list and list el

---
 src/parsetree.cc | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'src/parsetree.cc')

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 )
-- 
cgit v1.2.1