Changeset 98 for branches/interpreter/Execute3.pas

Timestamp:

Feb 3, 2017, 10:48:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Handling of constant and variables values with different type.

File:

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

branches/interpreter/Execute3.pas

@@ -21 +21 @@
 end;
 
-function ExecuteExpression(Expression: PExpression): Boolean;
+function ExecuteExpressionBoolean(Expression: PExpression): Boolean;
 begin
 
@@ -28 +28 @@
 procedure ExecuteWhileDo(WhileDo: PWhileDo);
 begin
-  if ExecuteExpression(@WhileDo^.Condition) then
+  while ExecuteExpressionBoolean(@WhileDo^.Condition) do
     ExecuteCommand(@WhileDo^.Command);
 end;
@@ -34 +34 @@
 procedure ExecuteIfThenElse(IfThenElse: PIfThenElse);
 begin
-  if ExecuteExpression(@IfThenElse^.Condition) then
+  if ExecuteExpressionBoolean(@IfThenElse^.Condition) then
     ExecuteCommand(@IfThenElse^.DoThen)
     else ExecuteCommand(@IfThenElse^.DoElse);
@@ -40 +40 @@
 
 procedure ExecuteExecution(Execution: PExecution);
+var
+  I: Integer;
 begin
-  // Set parameters
+{  Execution^.Func^.Variables.Add(VariableCreate('Result', Execution^.Func^.ReturnType));
+  for I := 0 to Length(Execution^.Func^.Parameters.Items) - 1 do begin
+    Execution^.Func^.Variables.Add(VariableCreate(Execution^.Func^.Parameters.Items[I].Name,
+      Execution^.Func^.Parameters.Items[I].DataType));
+    case Assignment^.Destination^.DataType^.BaseType of
+      Execution^.Func^.Variables.Items[Length(Execution^.Func^.Variables.Items) - 1].V
+    end;
+  end;
+}
   ExecuteBeginEnd(@Execution^.Func^.BeginEnd);
 end;
@@ -47 +57 @@
 procedure ExecuteAssignment(Assignment: PAssignment);
 begin
-
+  case Assignment^.Destination^.DataType^.BaseType of
+    btBoolean: Assignment^.Destination.ValueBoolean := ExecuteExpressionBoolean(@Assignment^.Source);
+    //btChar: Assignment^.Destination.ValueBoolean := ExecuteExpressionChar(@Assignment^.Source);
+    //btString: Assignment^.Destination.ValueBoolean := ExecuteExpressionString(@Assignment^.Source);
+    //btInteger: Assignment^.Destination.ValueBoolean := ExecuteExpressionInteger(@Assignment^.Source);
+  end;
 end;