🐐 VSQVE change

tests.py

@@ -284,13 +284,13 @@ assignment_tests = [
                  Designa(ID("x"), BinOp(ID("x"), BinOp(Numeral("II"), Numeral("III"), "SYMBOL_PLUS"), "SYMBOL_PLUS")),
                  ExpressionStatement(ID("x"))]),
     ValInt(6)),
-  # AVGE inside a loop (DONICVM range is exclusive of upper bound: I VSQVE III = [1, 2])
+  # AVGE inside a loop (DONICVM range is inclusive: I VSQVE III = [1, 2, 3])
   ("DESIGNA s VT NVLLVS\nDONICVM i VT I VSQVE III FACE {\ns AVGE i\n}\ns",
     Program([], [Designa(ID("s"), Nullus()),
                  PerStatement(DataRangeArray(Numeral("I"), Numeral("III")), ID("i"),
                    [Designa(ID("s"), BinOp(ID("s"), ID("i"), "SYMBOL_PLUS"))]),
                  ExpressionStatement(ID("s"))]),
-    ValInt(3)),
+    ValInt(6)),
 ]
 
 class TestAssignment(unittest.TestCase):
@@ -470,7 +470,7 @@ control_tests = [
   # DONICVM range loop
   ("DONICVM i VT I VSQVE V FACE { DICE(i) }",
     Program([], [PerStatement(DataRangeArray(Numeral("I"), Numeral("V")), ID("i"), [ExpressionStatement(BuiltIn("DICE", [ID("i")]))])]),
-    ValStr("IV"), "I\nII\nIII\nIV\n"),
+    ValStr("V"), "I\nII\nIII\nIV\nV\n"),
 ]
 
 class TestControl(unittest.TestCase):
@@ -1191,10 +1191,10 @@ class TestFunctionEdge(unittest.TestCase):
 # --- Loop edge cases ---
 
 loop_edge_tests = [
-  # range(3, 3) is empty — body never runs, program returns ValNul
+  # [III VSQVE III] = [3] — single iteration
   ("DONICVM i VT III VSQVE III FACE { DICE(i) }",
     Program([], [PerStatement(DataRangeArray(Numeral("III"), Numeral("III")), ID("i"), [ExpressionStatement(BuiltIn("DICE", [ID("i")]))])]),
-    ValNul(), ""),
+    ValStr("III"), "III\n"),
   # empty array — body never runs
   ("PER i IN [] FACE { DICE(i) }",
     Program([], [PerStatement(DataArray([]), ID("i"), [ExpressionStatement(BuiltIn("DICE", [ID("i")]))])]),
@@ -1278,7 +1278,7 @@ loop_edge_tests = [
       ExpressionStatement(ID("cnt")),
     ]),
     ValInt(3), ""),
-  # DONICVM with CONTINVA: skip value III, count remaining
+  # DONICVM with CONTINVA: skip value III, count remaining (I VSQVE IV = [1,2,3,4], skip 3 → 3 increments)
   ("DESIGNA cnt VT I\nDONICVM i VT I VSQVE IV FACE {\nSI i EST III TVNC { CONTINVA }\nDESIGNA cnt VT cnt + I\n}\ncnt",
     Program([], [
       Designa(ID("cnt"), Numeral("I")),
@@ -1290,7 +1290,7 @@ loop_edge_tests = [
       ),
       ExpressionStatement(ID("cnt")),
     ]),
-    ValInt(3)),
+    ValInt(4)),
   # DVM condition true from start — body never runs
   ("DESIGNA x VT I\nDVM VERITAS FACE {\nDESIGNA x VT x + I\n}\nx",
     Program([], [
@@ -1299,10 +1299,21 @@ loop_edge_tests = [
       ExpressionStatement(ID("x")),
     ]),
     ValInt(1), ""),
-  # single iteration: [I VSQVE II] = [1]
+  # two iterations: [I VSQVE II] = [1, 2]
   ("DONICVM i VT I VSQVE II FACE { DICE(i) }",
     Program([], [PerStatement(DataRangeArray(Numeral("I"), Numeral("II")), ID("i"), [ExpressionStatement(BuiltIn("DICE", [ID("i")]))])]),
+    ValStr("II"), "I\nII\n"),
+  # single iteration: [I VSQVE I] = [1]
+  ("DONICVM i VT I VSQVE I FACE { DICE(i) }",
+    Program([], [PerStatement(DataRangeArray(Numeral("I"), Numeral("I")), ID("i"), [ExpressionStatement(BuiltIn("DICE", [ID("i")]))])]),
     ValStr("I"), "I\n"),
+  # empty range: [V VSQVE I] = []
+  ("DESIGNA x VT NVLLVS\nDONICVM i VT V VSQVE I FACE { DESIGNA x VT x + i }\nx",
+    Program([], [Designa(ID("x"), Nullus()),
+                 PerStatement(DataRangeArray(Numeral("V"), Numeral("I")), ID("i"),
+                   [Designa(ID("x"), BinOp(ID("x"), ID("i"), "SYMBOL_PLUS"))]),
+                 ExpressionStatement(ID("x"))]),
+    ValNul(), ""),
 ]
 
 class TestLoopEdge(unittest.TestCase):
@@ -1427,7 +1438,7 @@ array_index_tests = [
     Program([], [Designa(ID("a"), DataArray([Numeral("X"), Numeral("XX"), Numeral("XXX")])), ExpressionStatement(ArrayIndex(ID("a"), Numeral("II")))]),
     ValInt(20)),  # second element
   # index into range array
-  ("[I VSQVE V][II]", Program([], [ExpressionStatement(ArrayIndex(DataRangeArray(Numeral("I"), Numeral("V")), Numeral("II")))]), ValInt(2)),      # second element of [1,2,3,4]
+  ("[I VSQVE V][II]", Program([], [ExpressionStatement(ArrayIndex(DataRangeArray(Numeral("I"), Numeral("V")), Numeral("II")))]), ValInt(2)),      # second element of [1,2,3,4,5]
   # expression as index
   ("[I, II, III][I + I]",
     Program([], [ExpressionStatement(ArrayIndex(
@@ -1596,15 +1607,15 @@ scope_tests = [
     ]),
     ValInt(100)),
   # DONICVM: counter holds last range value after loop ends
-  # [I VSQVE IV] = [1,2,3]; last value assigned by loop is III=3
+  # [I VSQVE IV] = [1,2,3,4]; last value assigned by loop is IV=4
   ("DONICVM i VT I VSQVE IV FACE { DESIGNA nop VT I }\ni",
     Program([], [
       PerStatement(DataRangeArray(Numeral("I"), Numeral("IV")), ID("i"), [Designa(ID("nop"), Numeral("I"))]),
       ExpressionStatement(ID("i")),
     ]),
-    ValInt(3)),
+    ValInt(4)),
   # DONICVM: reassigning counter inside body doesn't reduce the number of iterations
-  # range [I VSQVE IV] evaluated once; i reset each time; cnt still increments 3 times → 4
+  # range [I VSQVE IV] evaluated once; i reset each time; cnt still increments 4 times → 5
   ("DESIGNA cnt VT I\nDONICVM i VT I VSQVE IV FACE { DESIGNA cnt VT cnt + I\nDESIGNA i VT C }\ncnt",
     Program([], [
       Designa(ID("cnt"), Numeral("I")),
@@ -1614,7 +1625,7 @@ scope_tests = [
       ]),
       ExpressionStatement(ID("cnt")),
     ]),
-    ValInt(4)),
+    ValInt(5)),
   # DONICVM: ERVMPE exits loop early; counter persists at break value
   ("DONICVM i VT I VSQVE X FACE {\nSI i EST III TVNC { ERVMPE }\n}\ni",
     Program([], [