Fix for-range loop with non-default increment.

Author: lep

Compiler/Lua.hs

@@ -396,7 +396,7 @@ compileStat = \case
         emit $ B.SetLit "$step" reg_step
 
         -- var = var - step
-        emit $ B.Sub reg_start reg_start reg_start
+        emit $ B.Sub reg_start reg_start reg_step
         emit $ B.SetLit "$var" reg_start
 
         -- while true

Main.hs

@@ -161,7 +161,7 @@ processed :: [((String, Set String), Jass.Ast String Jass.Programm)]
 processed = map justProcess runtime
 
 justProcess :: String -> ((String, Set String), Jass.Ast String Jass.Programm)
-justProcess = fromRight (error "justProcess") . CPre.process "lua_"
+justProcess = either (error . errorBundlePretty) id . CPre.process "lua_"
 
 parseFromFile p file = runParser p file . (++"\n") <$> readFile file
 

runtime/Ins.j

@@ -114,3 +114,22 @@ function _init takes nothing returns nothing
     set _Name[_Lambda] = "Lambda"
     set _Name[_Local] = "Local"
 endfunction
+
+function _show takes integer ip returns string
+    local integer ins = _ins[ip]
+    local string s = _Name[ins] + " "
+
+    // ii
+    if ins == _Call or ins == _Set or (ins >=  _JumpT and ins <= _Complement) then
+        set s = s + I2S(_op1[ins]) +" "+I2S(_op2[ins])
+    elseif (ins >= _GTE and ins <= _BXor) or (ins >= _Append and ins <= _GetTable) then
+        set s = s + I2S(_op1[ins]) +" "+I2S(_op2[ins]) +" "+I2S(_op3[ins])
+    elseif ins == _SetLit then // si
+        set s = s + _string[ins] +" "+I2S(_op1[ins])
+    elseif ins == _GetLit or ins == _Lambda or ins == _LitString then // is
+        set s = s + _string[ins] +" "+I2S(_op1[ins])
+    else
+        set s = s + "<...>"
+    endif
+    return s
+endfunction

runtime/Interpreter.j

@@ -886,7 +886,7 @@ function _step takes integer interpreter returns boolean
     set Context#_ip[ctx] = Context#_ip[ctx] + 1
 
     if Builtins#_trace then
-	call Print#_print("Executing instruction ("+I2S(ip)+") "+ Ins#_Name[ins]+" ctx("+I2S(ctx)+")")
+        call Print#_print("Executing instruction ("+I2S(ip)+") "+Ins#_show(ip) )
     endif
 
     set _GlobalIns = ins