Fix bug with parsing statement after a 'var' decl

Author: whoiswillma

hintegration_results.md

@@ -800,4 +800,23 @@ Expected output:
 No issues
 ```
 
+---
+### test/DinersVar.hny
+
+Average duration: 0.3950159549713135
+
+Expected output:
+```
+#states 9095
+1700 components, 1 bad states
+Non-terminating state
+T0: __init__() [0-5,369-371,1047-1051,769-773,762-767,774,775,1052-1056,1102-1113,1104-1113,1104-1113,1104-1113,1104-1113,1104-1106,1114,1115] { bag: (), forks: [ False, False, False, False, False ], list: (), synch: () }
+T1: diner(0) [1057-1072(choose True),1073-1078,785-788,727-738,789-791,1079-1084,785-788,727-730] { bag: (), forks: [ True, False, False, False, False ], list: (), synch: () }
+T2: diner(1) [1057-1072(choose True),1073-1078,785-788,727-738,789-791,1079-1084,785-788,727-730] { bag: (), forks: [ True, True, False, False, False ], list: (), synch: () }
+T3: diner(2) [1057-1072(choose True),1073-1078,785-788,727-738,789-791,1079-1084,785-788,727-730] { bag: (), forks: [ True, True, True, False, False ], list: (), synch: () }
+T4: diner(3) [1057-1072(choose True),1073-1078,785-788,727-738,789-791,1079-1084,785-788,727-730] { bag: (), forks: [ True, True, True, True, False ], list: (), synch: () }
+T5: diner(4) [1057-1072(choose True),1073-1078,785-788,727-738,789-791,1079-1084,785-788,727-730] { bag: (), forks: [ True, True, True, True, True ], list: (), synch: () }
+
+```
+
 ---

hintegration_test.py

@@ -93,6 +93,7 @@ def __init__(
     TestCase('-msynch=synchS code/trap6.hny'),
     TestCase('code/hw.hny'),
     TestCase('code/abptest.hny'),
+    TestCase('test/DinersVar.hny'),
 ]
 
 

src/harmony/harmony.m4

@@ -4544,14 +4544,16 @@ class StatementRule(Rule):
             (bv, t) = BoundVarRule().parse(t[1:])
             (lexeme, file, line, nextColumn) = t[0]
             self.expect("var statement", lexeme == "=", t[0], "expected '='")
+            t = t[1:]
 
             same_line = []
-            for tok in t[1:]:
+            for tok in t:
                 if tok[2] != line:
                     break
                 same_line.append(tok)
 
-            (ast, t) = TupleRule(set()).parse(same_line)
+            t = t[len(same_line):]
+            (ast, _) = TupleRule(set()).parse(same_line)
             vars.append((bv, ast))
             return (VarAST(token, vars), t)
 

test/DinersVar.hny

@@ -0,0 +1,20 @@
+from synch import Lock, acquire, release
+
+const N = 5
+
+forks = [Lock(),] * N
+
+def diner(which):
+    # let left, right = (which, (which + 1) % N):
+    var left, right = (which, (which + 1) % N)
+    while choose({ False, True }):
+        acquire(?forks[left])
+        acquire(?forks[right])
+        # dine
+        release(?forks[left])
+        release(?forks[right])
+        # think
+
+for i in {0..N-1}:
+    spawn diner(i)
+