Changeset 148 for branches/easy compiler/USourceExecutor.pas

Timestamp:

Jan 17, 2018, 5:27:23 PM (7 years ago)

Author:

chronos

Message:

• Added: Unfinished support for variable arrays.

File:

• branches/easy compiler/USourceExecutor.pas (modified) (6 diffs)

branches/easy compiler/USourceExecutor.pas

@@ -44 +44 @@
     RepeatBlocks: TExecutorRepeats;
     SkipNext: Boolean;
+    procedure ExecuteAssign(CommandAssign: TCommandFunctionCall);
     procedure ExecuteBeginEnd(BeginEnd: TCommandBeginEnd);
     procedure ExecuteCommand(Command: TSourceCommand);
     procedure ExecuteBreak(CommandBreak: TCommandBreak);
+    procedure ExecuteIfEqual(IfEqual: TCommandIfEqual);
     procedure ExecuteRepeat(CommandRepeat: TCommandRepeat);
     function ReadValueReference(Reference: TSourceReference): TSourceValue;
@@ -120 +122 @@
 
 function TSourceExecutor.ReadValueReference(Reference: TSourceReference): TSourceValue;
+var
+  ArrayIndex: TSourceValue;
 begin
   Result := nil;
@@ -127 +131 @@
   if Reference is TSourceReferenceVariable then begin
     Result := Variables.Search(TSourceReferenceVariable(Reference).Variable).Value;
-  end else raise Exception.Create('Unsupported reference');
+  end else
+  if Reference is TSourceReferenceArray then begin
+    ArrayIndex := ReadValueReference(TSourceReferenceArray(Reference).Index);
+    if not (ArrayIndex is TSourceValueInteger) then
+      raise Exception.Create('Only integer array index supported');
+    Result := TSourceValue(TSourceValueArray(Variables.Search(TSourceReferenceArray(Reference).ArrayRef).Value).Items[TSourceValueInteger(ArrayIndex).Value]);
+  end else
+  raise Exception.Create('Unsupported reference');
 end;
 
 function TSourceExecutor.ReadVarReference(Reference: TSourceReference): TSourceVariable;
+var
+  ArrayIndex: TSourceValue;
 begin
   Result := nil;
   if Reference is TSourceReferenceVariable then begin
     Result := TSourceReferenceVariable(Reference).Variable;
+  end else
+  if Reference is TSourceReferenceArray then begin
+    ArrayIndex := ReadValueReference(TSourceReferenceArray(Reference).Index);
+    if not (ArrayIndex is TSourceValueInteger) then
+      raise Exception.Create('Only integer array index supported');
+//    Result := TSourceValue(TSourceValueArray(Variables.Search(TSourceReferenceArray(Reference).ArrayRef).Value).Items[TSourceValueInteger(ArrayIndex)]);
+//TODO:    Result := Variables.Search(TSourceReferenceArray(Reference).ArrayRef);
   end else raise Exception.Create('Unsupported reference');
+end;
+
+procedure TSourceExecutor.ExecuteAssign(CommandAssign: TCommandFunctionCall);
+var
+  Variable: TSourceVariable;
+  Value: TSourceValue;
+  ExecutorVar: TExecutorVariable;
+begin
+  with TCommandFunctionCall(CommandAssign) do begin
+    Variable := ReadVarReference(TSourceReference(Parameters[0]));
+    Value := ReadValueReference(TSourceReference(Parameters[1]));
+    ExecutorVar := Variables.Search(Variable);
+    if not Assigned(ExecutorVar) then begin
+      ExecutorVar := TExecutorVariable.Create;
+      ExecutorVar.Variable := Variable;
+      Variables.Add(ExecutorVar);
+      ExecutorVar.Value := Variable.ValueType.GetValueType.Create;
+    end;
+    ExecutorVar.Value.Assign(Value);
+  end;
 end;
 
@@ -170 +210 @@
   end else
   raise Exception.Create('Used break outside repeat loop');
+end;
+
+procedure TSourceExecutor.ExecuteIfEqual(IfEqual: TCommandIfEqual);
+var
+  Value1: TSourceValue;
+  Value2: TSourceValue;
+begin
+  Value1 := ReadValueReference(IfEqual.Reference1);
+  Value2 := ReadValueReference(IfEqual.Reference2);
+  if (Value1 is TSourceValueInteger) and (Value2 is TSourceValueInteger) then begin
+    if TSourceValueInteger(Value1).Value <> TSourceValueInteger(Value2).Value then
+      SkipNext := True;
+  end else
+  if (Value1 is TSourceValueString) and (Value2 is TSourceValueString) then begin
+    if TSourceValueString(Value1).Value <> TSourceValueString(Value2).Value then
+      SkipNext := True;
+  end else
+  raise Exception.Create('Unsupported types for comparison.');
 end;
 
@@ -235 +293 @@
     end else
     if Name = 'assign' then begin
-      Variable := ReadVarReference(TSourceReference(Parameters[0]));
-      Value := ReadValueReference(TSourceReference(Parameters[1]));
-      ExecutorVar := Variables.Search(Variable);
-      if not Assigned(ExecutorVar) then begin
-        ExecutorVar := TExecutorVariable.Create;
-        ExecutorVar.Variable := Variable;
-        Variables.Add(ExecutorVar);
-        ExecutorVar.Value := Variable.ValueType.ValueClass.Create;
-      end;
-      ExecutorVar.Value.Assign(Value);
+      ExecuteAssign(TCommandFunctionCall(Command));
     end else
     if Name = 'increment' then begin
@@ -272 +321 @@
     ExecuteBreak(TCommandBreak(Command));
   end else
-  if Command is TCommandIfZero then begin
-    ExecutorVar := Variables.Search(TCommandIfZero(Command).Variable.Variable);
-    if Assigned(ExecutorVar) then begin
-      if ExecutorVar.Variable.ValueType.Name = 'Integer' then begin
-        if TSourceValueInteger(ExecutorVar.Value).Value <> 0 then SkipNext := True;
-      end else
-      raise Exception.Create('Can compare only integers');
-    end else
-    raise Exception.Create('Variable not found');
+  if Command is TCommandIfEqual then begin
+    ExecuteIfEqual(TCommandIfEqual(Command));
   end else
   if Command is TCommandRepeat then begin