fix test based on diagnostics

components/lox-parse/src/parser.rs

@@ -83,7 +83,8 @@ impl<'me> Parser<'me> {
     //  "print" expression ";" ;
     fn print_stmt(&mut self) -> Option<Stmt> {
         let expr = self.parse_expr()?;
-        self.eat(Token::Semicolon);
+        self.eat(Token::Semicolon)
+            .or_report_error(self, || "expected `;`");
         Some(Stmt::Print(expr))
     }
 

lox_tests/arithmetic.lox

@@ -1,7 +1,7 @@
-1 + 2
+1 + 2;
 
-1 + 2 * 3
+1 + 2 * 3;
 
-1 - 2 / 3
+1 - 2 / 3;
 
-1 + 2 * -3
+1 + 2 * -3;

lox_tests/arithmetic/output

@@ -1,28 +0,0 @@
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/arithmetic.lox:3:1]
-   │
- 3 │ 1 + 2 * 3
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/arithmetic.lox:5:1]
-   │
- 5 │ 1 - 2 / 3
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/arithmetic.lox:7:1]
-   │
- 7 │ 1 + 2 * -3
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/arithmetic.lox:7:10]
-   │
- 7 │ 1 + 2 * -3
-   │          ┬  
-   │          ╰── here
-───╯

lox_tests/arithmetic/token

@@ -1,11 +1,12 @@
 TokenTree {
-    source text: "1 + 2\n\n1 + 2 * 3\n\n1 - 2 / 3\n\n1 + 2 * -3",
+    source text: "1 + 2;\n\n1 + 2 * 3;\n\n1 - 2 / 3;\n\n1 + 2 * -3;",
     tokens: [
         Number(1),
         Whitespace(' '),
         Op(+),
         Whitespace(' '),
         Number(2),
+        Semicolon,
         Whitespace('\n'),
         Whitespace('\n'),
         Number(1),
@@ -17,6 +18,7 @@ TokenTree {
         Op(*),
         Whitespace(' '),
         Number(3),
+        Semicolon,
         Whitespace('\n'),
         Whitespace('\n'),
         Number(1),
@@ -28,6 +30,7 @@ TokenTree {
         Op(/),
         Whitespace(' '),
         Number(3),
+        Semicolon,
         Whitespace('\n'),
         Whitespace('\n'),
         Number(1),
@@ -40,5 +43,6 @@ TokenTree {
         Whitespace(' '),
         Op(-),
         Number(3),
+        Semicolon,
     ],
 }

lox_tests/boolean.lox

@@ -1,4 +1,4 @@
-true
-false
-!true
-!false
+true;
+false;
+!true;
+!false;

lox_tests/boolean/output

@@ -1,28 +0,0 @@
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/boolean.lox:2:1]
-   │
- 2 │ false
-   │ ──┬──  
-   │   ╰──── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/boolean.lox:3:1]
-   │
- 3 │ !true
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/boolean.lox:4:1]
-   │
- 4 │ !false
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/boolean.lox:4:2]
-   │
- 4 │ !false
-   │  ──┬──  
-   │    ╰──── here
-───╯

lox_tests/boolean/token

@@ -1,14 +1,18 @@
 TokenTree {
-    source text: "true\nfalse\n!true\n!false",
+    source text: "true;\nfalse;\n!true;\n!false;",
     tokens: [
         Alphabetic(true),
+        Semicolon,
         Whitespace('\n'),
         Alphabetic(false),
+        Semicolon,
         Whitespace('\n'),
         Op(!),
         Alphabetic(true),
+        Semicolon,
         Whitespace('\n'),
         Op(!),
         Alphabetic(false),
+        Semicolon,
     ],
 }

lox_tests/comparison.lox

@@ -1,4 +1,4 @@
-1 < 2
-1 <= 1
-1 > 2
-1 >= 1
+1 < 2;
+1 <= 1;
+1 > 2;
+1 >= 1;

lox_tests/comparison/output

@@ -1,28 +0,0 @@
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/comparison.lox:2:1]
-   │
- 2 │ 1 <= 1
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/comparison.lox:3:1]
-   │
- 3 │ 1 > 2
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/comparison.lox:4:1]
-   │
- 4 │ 1 >= 1
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/comparison.lox:4:6]
-   │
- 4 │ 1 >= 1
-   │      ┬  
-   │      ╰── here
-───╯

lox_tests/comparison/token

@@ -1,30 +1,34 @@
 TokenTree {
-    source text: "1 < 2\n1 <= 1\n1 > 2\n1 >= 1",
+    source text: "1 < 2;\n1 <= 1;\n1 > 2;\n1 >= 1;",
     tokens: [
         Number(1),
         Whitespace(' '),
         Op(<),
         Whitespace(' '),
         Number(2),
+        Semicolon,
         Whitespace('\n'),
         Number(1),
         Whitespace(' '),
         Op(<),
         Op(=),
         Whitespace(' '),
         Number(1),
+        Semicolon,
         Whitespace('\n'),
         Number(1),
         Whitespace(' '),
         Op(>),
         Whitespace(' '),
         Number(2),
+        Semicolon,
         Whitespace('\n'),
         Number(1),
         Whitespace(' '),
         Op(>),
         Op(=),
         Whitespace(' '),
         Number(1),
+        Semicolon,
     ],
 }

lox_tests/equality.lox

@@ -1,2 +1,2 @@
-1 == 2
-1 != 2
+1 == 2;
+1 != 2;

lox_tests/equality/output

@@ -1,14 +0,0 @@
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/equality.lox:2:1]
-   │
- 2 │ 1 != 2
-   │ ┬  
-   │ ╰── here
-───╯
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/lox/lox_tests/equality.lox:2:6]
-   │
- 2 │ 1 != 2
-   │      ┬  
-   │      ╰── here
-───╯

lox_tests/equality/token

@@ -1,18 +1,20 @@
 TokenTree {
-    source text: "1 == 2\n1 != 2",
+    source text: "1 == 2;\n1 != 2;",
     tokens: [
         Number(1),
         Whitespace(' '),
         Op(=),
         Op(=),
         Whitespace(' '),
         Number(2),
+        Semicolon,
         Whitespace('\n'),
         Number(1),
         Whitespace(' '),
         Op(!),
         Op(=),
         Whitespace(' '),
         Number(2),
+        Semicolon,
     ],
 }

lox_tests/print.lox

@@ -1 +1 @@
-print 1 + 2
+print 1 + 2;

lox_tests/print/token

@@ -1,5 +1,5 @@
 TokenTree {
-    source text: "print 1 + 2",
+    source text: "print 1 + 2;",
     tokens: [
         Alphabetic(print),
         Whitespace(' '),
@@ -8,5 +8,6 @@ TokenTree {
         Op(+),
         Whitespace(' '),
         Number(2),
+        Semicolon,
     ],
 }