Changeset 99 for branches/interpreter/Execute3.pas

Timestamp:

Feb 6, 2017, 12:11:54 AM (8 years ago)

Author:

chronos

Message:

• Modified: Better parsing of expression and commands.

File:

• branches/interpreter/Execute3.pas (modified) (4 diffs)

branches/interpreter/Execute3.pas

@@ -5 +5 @@
 uses
   Source3;
+
+type
+  TVariableValue = record
+    BaseType: TBaseType;
+    case Integer of
+      0: (ValueChar: Char);
+      1: (ValueInteger: Integer);
+      2: (ValueString: ShortString);
+      3: (ValueBoolean: Boolean);
+  end;
+  PVariableValue = ^TVariableValue;
+
+  TVariableValues = record
+    Items: array of TVariableValue;
+  end;
+
+  { TExecutionContext }
+
+  TExecutionContext = record
+    VariableValues: TVariableValues;
+    procedure LoadFromVariables(Variables: PVariables);
+  end;
+  PExecutionContext = ^TExecutionContext;
+
+  { TExecutionContexts }
+
+  TExecutionContexts = record
+    Items: array of TExecutionContext;
+    function Last: PExecutionContext;
+    procedure Add;
+    procedure RemoveLast;
+  end;
+
+var
+  ExecutionContexts: TExecutionContexts;
 
 procedure ExecuteProgram(ProgramCode: PProgramCode);
@@ -43 +78 @@
   I: Integer;
 begin
+  ExecutionContexts.Add;
+  ExecutionContexts.Last^.LoadFromVariables(@Execution^.Func^.Variables);
 {  Execution^.Func^.Variables.Add(VariableCreate('Result', Execution^.Func^.ReturnType));
   for I := 0 to Length(Execution^.Func^.Parameters.Items) - 1 do begin
@@ -53 +90 @@
 }
   ExecuteBeginEnd(@Execution^.Func^.BeginEnd);
+  ExecutionContexts.RemoveLast;
 end;
 
 procedure ExecuteAssignment(Assignment: PAssignment);
+var
+  DestVariable: PVariableValue;
 begin
-  case Assignment^.Destination^.DataType^.BaseType of
-    btBoolean: Assignment^.Destination.ValueBoolean := ExecuteExpressionBoolean(@Assignment^.Source);
+  DestVariable := @ExecutionContexts.Last^.VariableValues.Items[Assignment^.Destination^.Index];
+  case DestVariable^.BaseType of
+    btBoolean: DestVariable^.ValueBoolean := ExecuteExpressionBoolean(@Assignment^.Source);
     //btChar: Assignment^.Destination.ValueBoolean := ExecuteExpressionChar(@Assignment^.Source);
     //btString: Assignment^.Destination.ValueBoolean := ExecuteExpressionString(@Assignment^.Source);
@@ -78 +119 @@
 procedure ExecuteProgram(ProgramCode: PProgramCode);
 begin
+  SetLength(ExecutionContexts.Items, 1);
+  ExecutionContexts.Last^.LoadFromVariables(@ProgramCode^.Variables);
   ExecuteBeginEnd(@ProgramCode^.BeginEnd);
+end;
+
+{ TExecutionContext }
+
+procedure TExecutionContext.LoadFromVariables(Variables: PVariables);
+var
+  I: Integer;
+begin
+  SetLength(VariableValues.Items, Length(Variables.Items));
+  for I := 0 to Length(Variables.Items) - 1 do begin
+    VariableValues.Items[I].BaseType := Variables.Items[I].DataType.BaseType;
+  end;
+end;
+
+{ TExecutionContexts }
+
+function TExecutionContexts.Last: PExecutionContext;
+begin
+  Result := @ExecutionContexts.Items[Length(ExecutionContexts.Items) - 1];
+end;
+
+procedure TExecutionContexts.Add;
+begin
+  SetLength(Items, Length(Items) + 1);
+end;
+
+procedure TExecutionContexts.RemoveLast;
+begin
+  SetLength(Items, Length(Items) - 1);
 end;