Changeset 149 for branches/easy compiler/USourceExecutor.pas

Timestamp:

Jan 18, 2018, 1:30:58 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Now arrays of string and integer are supported and executed correctly by executor.
• Added: IfNotEqual command.

File:

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

branches/easy compiler/USourceExecutor.pas

@@ -17 +17 @@
     Variable: TSourceVariable;
     Value: TSourceValue;
+
     destructor Destroy; override;
   end;
@@ -49 +50 @@
     procedure ExecuteBreak(CommandBreak: TCommandBreak);
     procedure ExecuteIfEqual(IfEqual: TCommandIfEqual);
+    procedure ExecuteIfNotEqual(IfNotEqual: TCommandIfNotEqual);
     procedure ExecuteRepeat(CommandRepeat: TCommandRepeat);
     function ReadValueReference(Reference: TSourceReference): TSourceValue;
-    function ReadVarReference(Reference: TSourceReference): TSourceVariable;
+    function ReadVarReference(Reference: TSourceReference): TSourceValue;
   public
     constructor Create;
@@ -141 +143 @@
 end;
 
-function TSourceExecutor.ReadVarReference(Reference: TSourceReference): TSourceVariable;
+function TSourceExecutor.ReadVarReference(Reference: TSourceReference): TSourceValue;
 var
   ArrayIndex: TSourceValue;
+  Variable: TSourceVariable;
+  ExecutorVar: TExecutorVariable;
+  I: Integer;
 begin
   Result := nil;
   if Reference is TSourceReferenceVariable then begin
-    Result := TSourceReferenceVariable(Reference).Variable;
+    Variable := TSourceReferenceVariable(Reference).Variable;
+  end else
+  if Reference is TSourceReferenceArray then begin
+    Variable := TSourceReferenceArray(Reference).ArrayRef;
+  end else
+  raise Exception.Create('Unsupported reference');
+
+  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;
+  if Reference is TSourceReferenceVariable then begin
+    Result := ExecutorVar.Value;
   end else
   if Reference is TSourceReferenceArray then begin
@@ -153 +173 @@
     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');
+    I := TSourceValueInteger(ArrayIndex).Value;
+    while TSourceValueArray(ExecutorVar.Value).Items.Count < (I + 1) do begin
+      TSourceValueArray(ExecutorVar.Value).Items.Add(TSourceTypeArray(TSourceReferenceArray(Reference).ArrayRef.ValueType).ItemType.GetValueType.Create);
+    end;
+    Result := TSourceValue(TSourceValueArray(ExecutorVar.Value).Items[I]);
+  end else
+  raise Exception.Create('Unsupported reference');
 end;
 
 procedure TSourceExecutor.ExecuteAssign(CommandAssign: TCommandFunctionCall);
 var
-  Variable: TSourceVariable;
-  Value: TSourceValue;
-  ExecutorVar: TExecutorVariable;
+  Dest: TSourceValue;
+  Source: TSourceValue;
 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);
+    Dest := ReadVarReference(TSourceReference(Parameters[0]));
+    Source := ReadValueReference(TSourceReference(Parameters[1]));
+    Dest.Assign(Source);
   end;
 end;
@@ -230 +246 @@
 end;
 
+procedure TSourceExecutor.ExecuteIfNotEqual(IfNotEqual: TCommandIfNotEqual);
+var
+  Value1: TSourceValue;
+  Value2: TSourceValue;
+begin
+  Value1 := ReadValueReference(IfNotEqual.Reference1);
+  Value2 := ReadValueReference(IfNotEqual.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;
+
 procedure TSourceExecutor.ExecuteRepeat(CommandRepeat: TCommandRepeat);
 var
@@ -251 +285 @@
   Text: string;
   IntValue: Integer;
+  Dest: TSourceValue;
 begin
   if Command is TCommandFunctionCall then
@@ -276 +311 @@
     if Name = 'inputln' then begin
       if Assigned(FOnInput) then begin
-        Variable := ReadVarReference(TSourceReference(Parameters[0]));
-        ExecutorVar := Variables.Search(Variable);
-        if ExecutorVar.Value is TSourceValueString then begin
-          TSourceValueString(ExecutorVar.Value).Value := FOnInput;
-          FOnOutput(TSourceValueString(ExecutorVar.Value).Value + LineEnding);
+        Value := ReadVarReference(TSourceReference(Parameters[0]));
+        if Value is TSourceValueString then begin
+          TSourceValueString(Value).Value := FOnInput;
+          FOnOutput(TSourceValueString(Value).Value + LineEnding);
         end else
-        if ExecutorVar.Value is TSourceValueInteger then begin
+        if Value is TSourceValueInteger then begin
           Text := FOnInput;
           if TryStrToInt(Text, IntValue) then
-            TSourceValueInteger(ExecutorVar.Value).Value := IntValue
-            else TSourceValueInteger(ExecutorVar.Value).Value := 0;
-          FOnOutput(IntToStr(TSourceValueInteger(ExecutorVar.Value).Value) + LineEnding);
+            TSourceValueInteger(Value).Value := IntValue
+            else TSourceValueInteger(Value).Value := 0;
+          FOnOutput(IntToStr(TSourceValueInteger(Value).Value) + LineEnding);
         end else
         raise Exception.Create('Unsupported value type');
@@ -296 +330 @@
     end else
     if Name = 'increment' then begin
-      Variable := ReadVarReference(TSourceReference(Parameters[0]));
+      Dest := ReadVarReference(TSourceReference(Parameters[0]));
       Value := ReadValueReference(TSourceReference(Parameters[1]));
-      ExecutorVar := Variables.Search(Variable);
-      if not Assigned(ExecutorVar) then raise Exception.Create('Variable not found');
-      if (ExecutorVar.Value is TSourceValueInteger) and (Value is TSourceValueInteger) then
-        Inc(TSourceValueInteger(ExecutorVar.Value).Value, TSourceValueInteger(Value).Value)
+      if (Dest is TSourceValueInteger) and (Value is TSourceValueInteger) then
+        Inc(TSourceValueInteger(Dest).Value, TSourceValueInteger(Value).Value)
       else raise Exception.Create('Wrong type for increment');
     end else
     if Name = 'decrement' then begin
-      Variable := ReadVarReference(TSourceReference(Parameters[0]));
+      Dest := ReadVarReference(TSourceReference(Parameters[0]));
       Value := ReadValueReference(TSourceReference(Parameters[1]));
-      ExecutorVar := Variables.Search(Variable);
-      if not Assigned(ExecutorVar) then raise Exception.Create('Variable not found');
-      if (ExecutorVar.Value is TSourceValueInteger) and (Value is TSourceValueInteger) then
-        Dec(TSourceValueInteger(ExecutorVar.Value).Value, TSourceValueInteger(Value).Value)
+      if (Dest is TSourceValueInteger) and (Value is TSourceValueInteger) then
+        Dec(TSourceValueInteger(Dest).Value, TSourceValueInteger(Value).Value)
       else raise Exception.Create('Wrong type for increment');
     end else
@@ -324 +354 @@
     ExecuteIfEqual(TCommandIfEqual(Command));
   end else
+  if Command is TCommandIfNotEqual then begin
+    ExecuteIfNotEqual(TCommandIfNotEqual(Command));
+  end else
   if Command is TCommandRepeat then begin
     ExecuteRepeat(Command as TCommandRepeat);