Changeset 108 for branches/interpreter/interpreter4/Execute.pas

Timestamp:

Jul 26, 2017, 11:35:26 PM (7 years ago)

Author:

chronos

Message:

*Modified: Better parsing of variable reference.

File:

• branches/interpreter/interpreter4/Execute.pas (modified) (5 diffs)

branches/interpreter/interpreter4/Execute.pas

@@ -8 +8 @@
 type
   TVariableValue = record
-    VarRef: PVariable;
+    VarRef: PVariableRef;
     BaseType: TBaseType;
     case Integer of
@@ -254 +254 @@
 begin
   case GetValue.ReadType of
-    rtVariable: AssignVariable(Value, ExecutionContextCurrent^.VariableValues.GetByName(GetValue.Variable^.Name));
+    rtVariable: AssignVariable(Value, ExecutionContextCurrent^.VariableValues.GetByName(GetValue.VariableRef^.Variable^.Name));
     //rtConstant: Value := ExecutionContextCurrent^.VariableValues.GetByName(GetValue.Variable^.Name);
     rtExpression: ExecuteExpression(GetValue.Expression, Value);
@@ -352 +352 @@
     Param := @Execution^.Parameters.Items[I];
     if (Param.ReadType = rtVariable) then
-      AssignVariable(ExecutionContextCurrent^.VariableValues.GetByName(Param.Variable.Name), DestVar)
+      AssignVariable(ExecutionContextCurrent^.VariableValues.GetByName(Param.VariableRef^.Variable^.Name), DestVar)
     else ShowError('Function var parameter can be only variable');
   end;
@@ -362 +362 @@
   SrcVariable: TVariableValue;
 begin
-  DestVariable := ExecutionContextCurrent^.VariableValues.GetByName(Assignment^.Destination^.Name);
-  WriteLn('Assignment to ' + Assignment^.Destination^.Name);
+  DestVariable := ExecutionContextCurrent^.VariableValues.GetByName(Assignment^.Destination^.Variable^.Name);
+  WriteLn('Assignment to ' + Assignment^.Destination^.Variable^.Name);
   FillChar(SrcVariable, SizeOf(TVariableValue), 0);
   ExecuteGetValue(@Assignment^.Source, @SrcVariable);
@@ -395 +395 @@
 begin
   I := 0;
-  while (I < Length(Items)) and (Items[I].VarRef^.Name <> Name) do Inc(I);
+  while (I < Length(Items)) and (Items[I].VarRef^.Variable^.Name <> Name) do Inc(I);
   if I < Length(Items) then Result := @Items[I]
     else Result := nil;