replacing list and map with vlist and vmap

16 files changed, 30 insertions, 30 deletions

diff --git a/test/binary1.lm b/test/binary1.lm
index 13dba232..e2cb4a09 100644
--- a/test/binary1.lm
+++ b/test/binary1.lm
@@ -116,7 +116,7 @@ def count
 # end
 #
 
-CL: vlist<int>
+CL: list<int>
 
 int start_list( count: int )
 {
@@ -442,7 +442,7 @@ int print_RR_A( s: start )
 }
 
 alias name_map
-	vmap<int, name>
+	map<int, name>
 
 int print_name( n: name, m: name_map )
 {
@@ -490,19 +490,19 @@ int print_all_names( s: start )
 end # binary
 
 Binary: binary = new binary()
-Binary->CL = new vlist<int>()
+Binary->CL = new list<int>()
 
-int top( L: vlist<int> )
+int top( L: list<int> )
 {
 	return L->top
 }
 
-int pop( L: vlist<int> )
+int pop( L: list<int> )
 {
 	return L->pop()
 }
 
-int push( L: vlist<int>, Int: int )
+int push( L: list<int>, Int: int )
 {
 	L->push( Int )
 }
diff --git a/test/generate1.lm b/test/generate1.lm
index e7936a6f..2ea4c77f 100644
--- a/test/generate1.lm
+++ b/test/generate1.lm
@@ -3,7 +3,7 @@ context generate
 	rl ident_char /[a-zA-Z_]/
 
 	# List used as a stack of indentations.
-	IndentStack: vlist<int>
+	IndentStack: list<int>
 
 	# Has a newline been sent for this '\n' .. whitespace match. 
 	newline_sent: int
@@ -562,7 +562,7 @@ int print_primary_subscriptions_and_slicings( Start: generate::start )
 Generate: generate = new generate()
 
 # List used as a stack of indentations.
-Generate->IndentStack = new vlist<int>()
+Generate->IndentStack = new list<int>()
 Generate->IndentStack->push( 0 )
 
 # Has a newline been sent for this '\n' .. whitespace match. 
diff --git a/test/generate2.lm b/test/generate2.lm
index 32260003..7a2e0f71 100644
--- a/test/generate2.lm
+++ b/test/generate2.lm
@@ -12,7 +12,7 @@ context generate
 		return OI
 	}
 
-	OpenStack: vlist<open_item> 
+	OpenStack: list<open_item> 
 
 	lex
 		token stray_close //
@@ -200,7 +200,7 @@ end # generate
 
 Generate: generate = new generate()
 
-Generate->OpenStack = new vlist<generate::open_item>()
+Generate->OpenStack = new list<generate::open_item>()
 Sentinal: generate::open_item = new_open_item( '** SENTINAL **', 1 )
 Generate->OpenStack->push( Sentinal )
 
diff --git a/test/list1.lm b/test/list1.lm
index b51e0fe1..e3c0519b 100644
--- a/test/list1.lm
+++ b/test/list1.lm
@@ -21,7 +21,7 @@ struct start_el
 	B3: start
 end
 
-L: vlist<start_el> = new vlist<start_el>()
+L: list<start_el> = new list<start_el>()
 
 E: start_el = new start_el()
 E->S = S
diff --git a/test/list2.lm b/test/list2.lm
index 761012f3..f5c7654b 100644
--- a/test/list2.lm
+++ b/test/list2.lm
@@ -1,5 +1,5 @@
 
-new M: vmap<str, str>()
+new M: map<str, str>()
 
 for AE: argv_el in argv {
 	print "[AE->value]
diff --git a/test/list3.lm b/test/list3.lm
index fd477595..4284fd95 100644
--- a/test/list3.lm
+++ b/test/list3.lm
@@ -1,6 +1,6 @@
 
 
-new L: vlist<str>()
+new L: list<str>()
 
 L->push_tail( "dear" )
 L->push_tail( "friend" )
diff --git a/test/list4.lm b/test/list4.lm
index a7cb9dbb..64eff726 100644
--- a/test/list4.lm
+++ b/test/list4.lm
@@ -1,5 +1,5 @@
 
-new L: vlist<str>()
+new L: list<str>()
 
 L->push_tail( "dear" )
 L->push_tail( "friend" )
diff --git a/test/lookup1.lm b/test/lookup1.lm
index eac83f77..18c2b01f 100644
--- a/test/lookup1.lm
+++ b/test/lookup1.lm
@@ -1,19 +1,19 @@
 
 context lookup
 	alias list_lang_object
-		vlist<lang_object>
+		list<lang_object>
 
 	alias list_declaration_data
-		vlist<declaration_data>
+		list<declaration_data>
 
 	alias list_declarator_data
-		vlist<declarator_data>
+		list<declarator_data>
 
 	alias list_int
-		vlist<int>
+		list<int>
 	
 	alias map_list_lang_object
-		vmap<str, list_lang_object>
+		map<str, list_lang_object>
 	
 	#
 	# Data types for global data.
diff --git a/test/map1.lm b/test/map1.lm
index 205ab8fc..8d3b111b 100644
--- a/test/map1.lm
+++ b/test/map1.lm
@@ -1,5 +1,5 @@
 
-new M: vmap<str, str>()
+new M: map<str, str>()
 
 AE: argv_el = argv->head
 while AE {
diff --git a/test/map2.lm b/test/map2.lm
index a381fefe..8fec8c83 100644
--- a/test/map2.lm
+++ b/test/map2.lm
@@ -1,4 +1,4 @@
-new M: vmap<str, str>()
+new M: map<str, str>()
 
 M->insert( "hello",  "friend" )
 M->insert( "one--",  "num1" )
diff --git a/test/map3.lm b/test/map3.lm
index 15c2023c..ca6ff3d4 100644
--- a/test/map3.lm
+++ b/test/map3.lm
@@ -1,5 +1,5 @@
 
-new M: vmap<str, int>()
+new M: map<str, int>()
 
 M->insert( "one--", 1 )
 M->insert( "two--", 2 )
diff --git a/test/map4.lm b/test/map4.lm
index d057ed6c..0327b4d2 100644
--- a/test/map4.lm
+++ b/test/map4.lm
@@ -1,5 +1,5 @@
 
-new M: vmap<int, str>()
+new M: map<int, str>()
 
 M->insert( 0, "hello" )
 M->insert( 1, "one" )
diff --git a/test/map5.lm b/test/map5.lm
index d3ad99b5..fd26aa72 100644
--- a/test/map5.lm
+++ b/test/map5.lm
@@ -1,5 +1,5 @@
 
-new StrMap: vmap<str, str>()
+new StrMap: map<str, str>()
 StrMap->insert( "hello ", "there" ) 
 StrMap->insert( "friend", "how"   ) 
 StrMap->insert( "are   ", "you"   ) 
diff --git a/test/undolist1.lm b/test/undolist1.lm
index c9760eb0..8ee9310a 100644
--- a/test/undolist1.lm
+++ b/test/undolist1.lm
@@ -7,7 +7,7 @@ context undo
 		token id /[a-zA-Z_]+/
 	end
 
-	List: vlist<item>
+	List: list<item>
 
 	def item 
 		[id]
@@ -34,7 +34,7 @@ context undo
 end
 
 Undo: undo = new undo()
-Undo->List = new vlist<undo::item>()
+Undo->List = new list<undo::item>()
 
 parse Input: undo::start(Undo)[ stdin ]
 print( Input )
diff --git a/test/undomap1.lm b/test/undomap1.lm
index 1b1544c5..e1974400 100644
--- a/test/undomap1.lm
+++ b/test/undomap1.lm
@@ -7,7 +7,7 @@ context undo
 		token id /[a-zA-Z_]+/
 	end
 
-	Map: vmap<item, item>
+	Map: map<item, item>
 
 	def item 
 		[id]
@@ -33,7 +33,7 @@ context undo
 end
 
 Undo: undo = new undo()
-Undo->Map = new vmap<undo::item, undo::item>()
+Undo->Map = new map<undo::item, undo::item>()
 
 parse Input: undo::start(Undo)[ stdin ]
 print( Input )
diff --git a/test/undomap2.lm b/test/undomap2.lm
index b853e235..a260655c 100644
--- a/test/undomap2.lm
+++ b/test/undomap2.lm
@@ -7,7 +7,7 @@ context undo
 		token id /[a-zA-Z_]+/
 	end
 
-	Map: vmap<item, item>
+	Map: map<item, item>
 
 	def item 
 		[id]
@@ -39,7 +39,7 @@ context undo
 end
 
 Undo: undo = new undo()
-Undo->Map = new vmap<undo::item, undo::item>()
+Undo->Map = new map<undo::item, undo::item>()
 
 cons I: undo::item "a"
 Undo->Map->insert( I, I )