more object semantics fixes and test case updates

6 files changed, 17 insertions, 9 deletions

diff --git a/test/accumbt2.lm b/test/accumbt2.lm
index 9ae03be2..b730eebe 100644
--- a/test/accumbt2.lm
+++ b/test/accumbt2.lm
@@ -38,7 +38,7 @@ end # accum_bt
 AccumBt: accum_bt = new accum_bt
 AccumBt->OneParser = new parser<accum_bt::one>
 
-parse Two: accum_bt::two(deref AccumBt)[ stdin ]
+parse Two: accum_bt::two(AccumBt)[ stdin ]
 
 send AccumBt->OneParser ['\n'] eos
 
diff --git a/test/argv1.lm b/test/argv1.lm
index 7c218edb..431a7746 100644
--- a/test/argv1.lm
+++ b/test/argv1.lm
@@ -1,6 +1,12 @@
-print_xml( argv0 deref argv )
+print_xml( argv0 )
+
+A: argv_el = argv->head
+while ( A ) {
+	print_xml( A->value )
+	A = A->next
+}
 print( '\n' )
 ##### ARGS #####
 a b c 1 2 3
 ##### EXP #####
-<str>./working/argv1</str><__list0><str>a</str><str>b</str><str>c</str><str>1</str><str>2</str><str>3</str></__list0>
+<str>./working/argv1</str><str>a</str><str>b</str><str>c</str><str>1</str><str>2</str><str>3</str>
diff --git a/test/argv2.lm b/test/argv2.lm
index ed168cc3..93d24c3f 100644
--- a/test/argv2.lm
+++ b/test/argv2.lm
@@ -40,9 +40,11 @@ def args
 ArgParser: parser<args> = new parser<args>
 
 # Parse the args and extract the result into Args.
-ArgV: list<str> = argv
-for A: str in ArgV
-	send ArgParser [A '\0']
+A: argv_el = argv->head
+while ( A ) {
+	send ArgParser [A->value '\0']
+	A = A->next
+}
 Args: args = ArgParser->finish()
 
 # Process the args.
diff --git a/test/context1.lm b/test/context1.lm
index 2a6d718a..47ac3760 100644
--- a/test/context1.lm
+++ b/test/context1.lm
@@ -28,7 +28,7 @@ context ctx
 end # ctx
 
 CTX: ctx = new ctx
-parse Input: ctx::start( deref CTX ) [ stdin ]
+parse Input: ctx::start( CTX ) [ stdin ]
 print( Input )
 
 ##### IN #####
diff --git a/test/context2.lm b/test/context2.lm
index a975d717..cbc2302d 100644
--- a/test/context2.lm
+++ b/test/context2.lm
@@ -91,7 +91,7 @@ end # ruby_here
 
 CTX: ruby_here = new ruby_here
 
-parse S: ruby_here::start( deref CTX ) [ stdin ]
+parse S: ruby_here::start( CTX ) [ stdin ]
 print_xml(S)
 print('\n')
 ##### IN #####
diff --git a/test/context3.lm b/test/context3.lm
index 36875ded..53c99622 100644
--- a/test/context3.lm
+++ b/test/context3.lm
@@ -36,7 +36,7 @@ context ctx
 end # ctx
 
 CTX: ctx = new ctx
-parse Input: ctx::start( deref CTX ) [stdin]
+parse Input: ctx::start( CTX ) [stdin]
 print( Input )
 
 ##### IN #####