[Tolk] Optional semicolon for the last statement in a block

While semicolons are required between statements to disambiguate sequencing,
the trailing semicolon on the last statement is now optional.
This change is backward-compatible and does not affect existing code.

Author: tolk-vm

tolk-tester/tests/a-tests.tolk

@@ -4,19 +4,19 @@ fun f(a: int, b: int, c: int, d: int, e: int, f: int): (int, int) {
   __expect_type(D, "int");
   __expect_type(D*D, "int");
   __expect_type(calc_phi, "() -> int");
-  return (Dx/D,Dy/D,);
+  return (Dx/D,Dy/D,)
 };;;;
 
 fun calc_phi(): int {
   var n = 1;
-  repeat (70) { n*=10; };
+  repeat (70) { n*=10 };
   var p= 1;
   var `q`=1;
   _=`q`;
   do {
-    (p,q)=(q,p+q);
+    (p,q)=(q,p+q)
   } while (q <= n); //;;
-  return mulDivRound(p, n, q,);
+  return mulDivRound(p, n, q,)
 }
 
 fun calc_sqrt2(): int {
@@ -43,7 +43,7 @@ fun calc_root(m: int,) {
       k+=1;
       (a1, b1, c1) = (a, b, c);
       c+=b;
-      c += b += a;
+      c += b += a
     } while (c <= 0);
     (a, b, c) = (-c1, -b1, -a1);
     (p1, q1) = (k * p1+q1, p1);
@@ -67,12 +67,12 @@ fun ataninv(base: int, q: int): int { // computes base*atan(1/q)
 
 fun calc_pi(): int {
   var base: int = 64;
-  repeat (70) { base *= 10; }
+  repeat (70) { base *= 10 }
   return (ataninv(base << 2, 5) - ataninv(base, 239))~>>4;
 }
 
 fun main(): int {
-  return calc_pi();
+  return calc_pi()
 }
 
 /**

tolk-tester/tests/if-else-tests.tolk

@@ -68,22 +68,22 @@ fun doNothing(): void {}
 
 @method_id(107)
 fun test7() {
-    if (random()) { return doNothing(); }
+    if (random()) { return doNothing() }
     // here we test that no "missing return" error
 }
 
 fun withNoElse(op: int): int {
-    if (op == 123) { return 100; }
-    if (op == 234) { return 200; }
-    if (op == 345) { return 300; }
-    throw 0xFF;
+    if (op == 123) { return 100 }
+    if (op == 234) { return 200 }
+    if (op == 345) { return 300 }
+    throw 0xFF
 }
 
 fun withElse(op: int): int {
-    if (op == 123) { return 100; }
-    else if (op == 234) { return 200; }
-    else if (op == 345) { return 300; }
-    return 0xFF;
+    if (op == 123) { return 100 }
+    else if (op == 234) { return 200 }
+    else if (op == 345) { return 300 }
+    return 0xFF
 }
 
 fun withMatch(op: int): int {
@@ -92,7 +92,7 @@ fun withMatch(op: int): int {
         234 => return 200,
         345 => return 300,
     }
-    throw 0xFF;
+    throw 0xFF
 }
 
 @method_id(108)

tolk-tester/tests/logical-operators.tolk

@@ -13,9 +13,9 @@ fun compileTimeEval1(x: int) {
 
 @method_id(101)
 fun withIfNot(x: int, y: int) {
-    if (!x) { return 10; }
-    else if (!y) { return 20; }
-    return x+y;
+    if (!x) { return 10 }
+    else if (!y) { { return 20 } }
+    return x+y
 }
 
 @method_id(102)

tolk-tester/tests/match-by-expr-tests.tolk

@@ -8,7 +8,7 @@ fun test1(x: int) {
         C2 => 200,
         2 + 1 => 300,
         else => 400
-    };
+    }
 }
 
 @method_id(102)
@@ -19,7 +19,7 @@ fun test2() {
         C2 => 200,
         2 + 1 => 300,
         else => 400
-    };
+    }
 }
 
 fun isGt10(x: int) { return x > 10; }
@@ -34,7 +34,7 @@ fun test3(init: int) {
 
 @method_id(104)
 fun test4(x: int?) {
-    return match(match(x) { null => 0, int => x * 2 }) { 0 => 0, 30 => 30, else => throw 123 };
+    return match(match(x) { null => 0, int => x * 2 }) { 0 => 0, 30 => 30, else => throw 123 }
 }
 
 @method_id(105)
@@ -44,9 +44,9 @@ fun test5(x: int) {
             10/C1 => 10,
             C2*10 => throw 500,
             else => 50
-        };
+        }
     } catch (excCode) {
-        return excCode;
+        return excCode
     }
 }
 
@@ -60,8 +60,8 @@ fun test6(x: coins) {
     }
     var result2 = 0;
     match (x) {
-        ton("0.05") => { result2 = 5; }
-        ton("0.1") => { result2 = 10; }
+        ton("0.05") => { result2 = 5 }
+        ton("0.1") => { result2 = 10 }
     }
     return (result1, result2);
 }
@@ -94,7 +94,7 @@ fun test9(x: int | slice) {
     return match (x) {
         int => match (x) { 10 => 5, else => -1 },
         slice => match (x.loadInt(32)) { -1 => 0, 0 => 0, else => throw 20 }
-    };
+    }
 }
 
 @method_id(110)
@@ -113,7 +113,7 @@ fun test11(x: bool) {
     return match (x) {
         true => false,
         else => !x,
-    };
+    }
 }
 
 

tolk-tester/tests/no-spaces.tolk

@@ -1,13 +1,13 @@
 const int10:int=10;
 
 fun just10(): int { return int10; }
-fun eq(v: int): int { return`v`; }
+fun eq(v: int): int { return`v` }
 
-@method_id(101,) fun `get_-1`  (): int {return-1;}
-@method_id(102,) fun `get_--1` (): int {return--1;}
-@method_id(103,) fun `get_---1`(): int {return---1;}
-@method_id(104,) fun `get_+++1`(): int {return+++1;}
-@method_id(105,) fun `get_+-+1`(): int {return+-+1;}
+@method_id(101,) fun `get_-1`  (): int {return-1}
+@method_id(102,) fun `get_--1` (): int {return--1}
+@method_id(103,) fun `get_---1`(): int {return---1}
+@method_id(104,) fun `get_+++1`(): int {return+++1}
+@method_id(105,) fun `get_+-+1`(): int {return+-+1}
 
 global `some()var`:int;
 
@@ -26,7 +26,7 @@ global `some()var`:int;
     return[
         (just10()-3==just10()-(4)--1)|((2==2)&(eq(eq(10)) -3==just10()--13)),
         ((flags&0xFF)!=0)
-    ];
+    ]
 }
 
 @method_id(113)fun`unary+bitwise-constant`():[int,int,int]{
@@ -48,7 +48,7 @@ fun add3(a: int, b: int, c: int) { return a+b+c; }
 }
 
 fun `load:u32`(mutate self: slice): int {
-    return self.loadUint(32);
+    return self.loadUint(32)
 }
 
 @method_id(116) fun `call_~_via_backticks`():[int,int,int,int] {

tolk-tester/tests/nullable-types.tolk

@@ -3,8 +3,8 @@ type MIntN = int?;
 fun getNullable4(): MIntN { return 4; }
 fun getNullableIntNull(): int? asm "PUSHNULL";
 
-fun eqInt(x: int) { return x; }
-fun eq<T>(x: T) { return x; }
+fun eqInt(x: int) { return x }
+fun eq<T>(x: T) { return x }
 
 fun unwrap<T>(x: T?): T { return x!; }
 fun intOr0(x: int?): int { return null == x ? 0 : x!; }

tolk-tester/tests/smart-cast-tests.tolk

@@ -47,8 +47,8 @@ fun test3(): int {
         return x;
     }
     if (random() > -1) {
-        if (y == null) { return -1; }
-        else { return y; }
+        if (y == null) { return -1 }
+        else { return y }
     }
     return 0;
 }
@@ -344,8 +344,8 @@ fun test33(): int {
 
 fun test34() {
     var (x, y) = (getNullableInt(), getNullableInt());
-    if (random()) { throw (x = 1, y = 2); }
-    else { throw (x = 3, y = (1, getNullableInt()!).1); }
+    if (random()) { throw (x = 1, y = 2) }
+    else { throw (x = 3, y = (1, getNullableInt()!).1) }
     return x + y;
 }
 

tolk-tester/tests/unbalanced-ret.tolk

@@ -4,10 +4,10 @@ fun main(x: int): (int, int) {
         x *= 2;
         y += 1;
         if (x == -10) {
-            return (111, 0);
+            return (111, 0)
         }
     }
-    return (x + 1, y);
+    return (x + 1, y)
 }
 
 @inline
@@ -41,7 +41,7 @@ fun bar2(x: int, y: int): (int, int) {
         y = foo2(y);
         x *= 2;
         if (x == -10) {
-            return (111, y);
+            return (111, y)
         }
     }
     return (x + 1, y);