tests: update tests because the parser gets better to parse arbitrary things.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/astutil.nit b/src/astutil.nit
index 7257c3f..5ab245e 100644 (file)
--- a/src/astutil.nit
+++ b/src/astutil.nit
@@ -71,7 +71,7 @@ redef class Prod
        # var ast = (new ToolContext).parse_something(text)
        # assert ast isa AExpr
        # ast.parentize_tokens
-       # assert ast.to_xml.write_to_string == """<ABlockExpr><ACallReassignExpr><TId>y</TId> <APlusAssignOp><TPluseq>+=</TPluseq></APlusAssignOp> <ACallExpr><TId>foo</TId></ACallExpr></ACallReassignExpr></ABlockExpr>"""
+       # assert ast.to_xml.write_to_string == """<ACallReassignExpr><TId>y</TId> <APlusAssignOp><TPluseq>+=</TPluseq></APlusAssignOp> <ACallExpr><TId>foo</TId></ACallExpr></ACallReassignExpr>"""
        # ~~~
        fun to_xml: HTMLTag
        do

diff --git a/tests/sav/test_parser_args7.res b/tests/sav/test_parser_args7.res
index fdfc9f0..04d16f1 100644 (file)
--- a/tests/sav/test_parser_args7.res
+++ b/tests/sav/test_parser_args7.res
@@ -11,19 +11,18 @@
         AListExprs 1,11
 --> AStringExpr 1,1--13
   TString "\"hello world\"" 1,1--13
---> ABlockExpr 1,1--15
-  AForExpr 1,1--15
-    TKwfor "for" 1,1--3
-    TId "i" 1,5
-    ACallExpr 1,10
-      AImplicitSelfExpr 1,10
-      TId "x" 1,10
-      AListExprs 1,10
-    TKwdo "do" 1,12--13
-    ACallExpr 1,15
-      AImplicitSelfExpr 1,15
-      TId "p" 1,15
-      AListExprs 1,15
+--> AForExpr 1,1--15
+  TKwfor "for" 1,1--3
+  TId "i" 1,5
+  ACallExpr 1,10
+    AImplicitSelfExpr 1,10
+    TId "x" 1,10
+    AListExprs 1,10
+  TKwdo "do" 1,12--13
+  ACallExpr 1,15
+    AImplicitSelfExpr 1,15
+    TId "p" 1,15
+    AListExprs 1,15
 --> AModule 1,1--12
   ATopClassdef 1,1--12
     AMethPropdef 1,1--12
@@ -36,21 +35,20 @@
         AImplicitSelfExpr 1,12
         TId "z" 1,12
         AListExprs 1,12
---> ... ... ABlockExpr 1,1--3,3
-  AForExpr 1,1--3,3
-    TKwfor "for" 1,1--3
-    TId "i" 1,5
-    ACallExpr 1,10
-      AImplicitSelfExpr 1,10
-      TId "x" 1,10
-      AListExprs 1,10
-    TKwdo "do" 1,12--13
-    ABlockExpr 2,1--3,3
-      ACallExpr 2,1
-        AImplicitSelfExpr 2,1
-        TId "p" 2,1
-        AListExprs 2,1
-      TKwend "end" 3,1--3
+--> ... ... AForExpr 1,1--3,3
+  TKwfor "for" 1,1--3
+  TId "i" 1,5
+  ACallExpr 1,10
+    AImplicitSelfExpr 1,10
+    TId "x" 1,10
+    AListExprs 1,10
+  TKwdo "do" 1,12--13
+  ABlockExpr 2,1--3,3
+    ACallExpr 2,1
+      AImplicitSelfExpr 2,1
+      TId "p" 2,1
+      AListExprs 2,1
+    TKwend "end" 3,1--3
 --> ... ... ... ... AModule 1,1--5,3
   ATopClassdef 1,1--5,3
     AMethPropdef 1,1--5,3
@@ -77,6 +75,6 @@
         TKwend "end" 5,1--3
 --> ...        \e[0;31mfun\e[0m fun fun fu
        ^: Syntax error: unexpected keyword 'fun'.
--->    \e[0;31m%\e[0m$&^*
-       ^: Syntax error: unexpected operator '%'.
+-->    %\e[0;31m$\e[0m&^*
+        ^: Syntax error: unknown token $.
 --> 
\ No newline at end of file