Changeset 141 for branches/easy compiler/USourceExecutor.pas

Timestamp:

Jan 16, 2018, 2:44:19 PM (7 years ago)

Author:

chronos

Message:

• Added: Support for multiple value types. String and Integer are supported for the start.
• Added: "var" keyword for compile time definition of variable and its type.
• Added: Increment function for integer values.

File:

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

branches/easy compiler/USourceExecutor.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, USourceCode;
+  Classes, SysUtils, USourceCode, Contnrs;
 
 type
   TOutputEvent = procedure (Text: string) of object;
   TInputEvent = function: string of object;
+
+  TExecutorVariable = class
+    Variable: TSourceVariable;
+    Value: TSourceValue;
+  end;
+
+  TExecutorVariables = class(TObjectList)
+    function Search(Variable: TSourceVariable): TExecutorVariable;
+  end;
 
   { TSourceExecutor }
@@ -18 +27 @@
     FOnInput: TInputEvent;
     FOnOutput: TOutputEvent;
-    Variables: TStringList;
+    Variables: TExecutorVariables;
   public
     constructor Create;
@@ -30 +39 @@
 implementation
 
+
+{ TExecutorVariables }
+
+function TExecutorVariables.Search(Variable: TSourceVariable): TExecutorVariable;
+var
+  Item: TExecutorVariable;
+begin
+  Result := nil;
+  for Item in Self do
+  if Item.Variable = Variable then begin
+    Result := Item;
+    Break;
+  end;
+end;
+
 { TSourceExecutor }
 
 constructor TSourceExecutor.Create;
 begin
-  Variables := TStringList.Create;
+  Variables := TExecutorVariables.Create;
 end;
 
@@ -48 +72 @@
   Instruction: TSourceInstruction;
   Variable: TSourceVariable;
+  Value: TSourceValue;
+  ExecutorVar: TExecutorVariable;
 
-function ReadStringReference(Reference: TSourceReference): string;
+function ReadValueReference(Reference: TSourceReference): TSourceValue;
 begin
-  Result := '';
+  Result := nil;
   if Reference is TSourceReferenceConstant then begin
     Result := TSourceReferenceConstant(Reference).Constant.Value;
   end else
   if Reference is TSourceReferenceVariable then begin
-    Result := Variables.Values[TSourceReferenceVariable(Reference).Variable.Name];
+    Result := Variables.Search(TSourceReferenceVariable(Reference).Variable).Value;
   end else raise Exception.Create('Unsupported reference');
 end;
@@ -75 +101 @@
     with TSourceInstructionFunction(Instruction) do begin
       if Name = 'print' then begin
-        if Assigned(FOnOutput) then FOnOutput(ReadStringReference(Parameters[0]));
+        if Assigned(FOnOutput) then begin
+          Value := ReadValueReference(Parameters[0]);
+          if Value is TSourceValueString then
+            FOnOutput(TSourceValueString(Value).Value)
+          else if Value is TSourceValueInteger then
+            FOnOutput(IntToStr(TSourceValueInteger(Value).Value))
+          else raise Exception.Create('Unsupported value type');
+        end;
       end else
       if Name = 'println' then begin
-        if Assigned(FOnOutput) then FOnOutput(ReadStringReference(Parameters[0]) +
-          LineEnding);
+        if Assigned(FOnOutput) then begin
+          Value := ReadValueReference(Parameters[0]);
+          if Value is TSourceValueString then
+            FOnOutput(TSourceValueString(Value).Value + LineEnding)
+          else if Value is TSourceValueInteger then
+            FOnOutput(IntToStr(TSourceValueInteger(Value).Value) + LineEnding)
+          else raise Exception.Create('Unsupported value type');
+        end;
       end else
       if Name = 'inputln' then begin
         if Assigned(FOnInput) then begin
           Variable := ReadVarReference(Parameters[0]);
-          Variables.Values[Variable.Name] := FOnInput;
+          ExecutorVar := Variables.Search(Variable);
+          if ExecutorVar.Value is TSourceValueString then begin
+            TSourceValueString(ExecutorVar.Value).Value := FOnInput;
+            FOnOutput(TSourceValueString(ExecutorVar.Value).Value + LineEnding);
+          end else
+          if ExecutorVar.Value is TSourceValueInteger then begin
+            TSourceValueInteger(ExecutorVar.Value).Value := StrToInt(FOnInput);
+            FOnOutput(IntToStr(TSourceValueInteger(ExecutorVar.Value).Value) + LineEnding);
+          end else
+          raise Exception.Create('Unsupported value type');
         end;
       end else
       if Name = 'assign' then begin
         Variable := ReadVarReference(Parameters[0]);
-        Variables.Values[Variable.Name] := ReadStringReference(Parameters[1]);
-      end else raise Exception.Create('Unsupported function: ' + TSourceInstructionFunction(Instruction).Name);
+        Value := ReadValueReference(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);
+      end else
+      if Name = 'increment' then begin
+        Variable := ReadVarReference(Parameters[0]);
+        Value := ReadValueReference(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)
+        else raise Exception.Create('Wrong type for increment');
+      end else
+      raise Exception.Create('Unsupported function: ' + TSourceInstructionFunction(Instruction).Name);
     end else raise Exception.Create('Unsupported instruction');
     Inc(IP);