Fixed bug in assigning values to indexed arrays

Author: penavon

VirtualMachine/uIntStack.pas

@@ -29,15 +29,24 @@ procedure create (var stack : TStack; n : integer);
 procedure push (var stack : TStack; value : integer);
 function  pop (var stack : TStack) : integer;
 function  peek (var stack : TStack) : integer;
+function  getCount (var stack : TStack) : integer;
 
 implementation
 
 procedure create (var stack : TStack; n : integer);
 begin
   stack.maxSize := n;
+  stack.stackPtr := -1;
   setLength (stack.data, n);
 end;
 
+
+function getCount (var stack : TStack) : integer;
+begin
+  result := stack.stackPtr + 1;
+end;
+
+
 procedure push (var stack : TStack; value : integer);
 begin
   if stack.stackPtr = stack.maxSize then

VirtualMachine/uVM.pas

@@ -65,6 +65,7 @@   TVM = class(TObject)
 
     symbolTable : TSymbolTable;
     VMStateStack : TStack<TVMState>;
+    //subscriptStack : TStack<integer>;//
     subscriptStack : uIntStack.TStack;     // lightweight integer stack
 
     frameStackTop: integer;
@@ -247,6 +248,7 @@ constructor TVM.Create;
   createStack(MAX_STACK_SIZE);
   createFrameStack(recursionLimit);
   VMStateStack := TStack<TVMState>.Create;
+  // HMS
   //subscriptStack := TStack<integer>.Create;
   uIntStack.create (subscriptStack, uIntStack.MAX_ENTRIES);
 
@@ -263,6 +265,7 @@ destructor TVM.Destroy;
   freeStack;
   freeFrameStack;
   VMStateStack.Free;
+  // HMS
   //subscriptStack.Free;
   inherited;
 end;
@@ -2056,17 +2059,23 @@ procedure TVM.storeIndexableArray(variable: PMachineStackRecord; index: integer;
     raise ERuntimeException.Create('left-hand side must be a array');
 
   //if subscriptStack.Count + 1 < nSubscripts then
-  if subscriptStack.stackPtr + 1 < nSubscripts then
+  if uIntStack.getCount (subscriptStack) + 1 < nSubscripts then
      begin
+     //subscriptStack.Push(index);
      uIntStack.Push(subscriptStack, index);
      push (variable);
      end
   else
      begin
      uIntStack.Push(subscriptStack, index);
-     setLength (idx, subscriptStack.stackPtr);
+     setLength (idx, uIntStack.getCount (subscriptStack));// HMMS subscriptStack.stackPtr);
+
+     //subscriptStack.Push(index);
+     //setLength (idx, subscriptStack.Count);// HMMS subscriptStack.stackPtr);
      // Index backwards since the stack entries are backwards
-     for i := subscriptStack.stackPtr - 1 downto 0 do
+     //for i := subscriptStack.Count - 1 downto 0 do
+     //    idx[i] := subscriptStack.Pop ();
+     for i := uIntStack.getCount (subscriptStack) - 1 downto 0 do
          idx[i] := uIntStack.Pop(subscriptStack);
 
      variable.aValue.setValue (idx, value);
@@ -2272,8 +2281,10 @@ procedure TVM.loadIndexableArray(st: PMachineStackRecord; index: integer; nSubsc
     i : integer;
 begin
   // For an n dimensional array we will collect the subscripts.
-  if subscriptStack.StackPtr + 1 < nSubscripts then
+  // HMSif subscriptStack.Count + 1 < nSubscripts then
+  if uIntStack.getCount (subscriptStack) + 1 < nSubscripts then
      begin
+     //subscriptStack.Push(index);
      uIntStack.Push(subscriptStack, index);
      push (st);
      end
@@ -2288,10 +2299,15 @@ procedure TVM.loadIndexableArray(st: PMachineStackRecord; index: integer; nSubsc
         exit;
         end;
 
+     //subscriptStack.Push(index);
+     //setLength (idx, subscriptStack.Count);
      uIntStack.Push(subscriptStack, index);
-     setLength (idx, subscriptStack.stackPtr);
+     setLength (idx, uIntStack.getCount (subscriptStack));
      // Index backwards since the stack entries are backwards
-     for i := subscriptStack.stackPtr - 1 downto 0 do
+
+     //for i := subscriptStack.Count - 1 downto 0 do
+     //    idx[i] := subscriptStack.Pop();
+     for i := uIntStack.getCount (subscriptStack)  - 1 downto 0 do
          idx[i] := uIntStack.Pop(subscriptStack);
 
      push (st.aValue.getValue (idx));