Changeset 211 for branches/interpreter2/USource.pas

Timestamp:

Apr 22, 2020, 9:00:02 AM (5 years ago)

Author:

chronos

Message:

• Added: Executor support for Break and Continue statements.

File:

• branches/interpreter2/USource.pas (modified) (10 diffs)

branches/interpreter2/USource.pas

@@ -34 +34 @@
     function GetFieldsCount: Integer; virtual;
   public
+    Parent: TSourceNode;
     function GetField(Index: Integer): TField; virtual;
     procedure GetValue(Index: Integer; out Value); virtual;
@@ -54 +55 @@
   TSourceNodes = class(TSourceNode)
   private
+    Parent: TSourceNode;
     function GetCount: Integer;
     function GetItem(Index: Integer): TObject;
@@ -316 +318 @@
   end;
 
+  TLoop = class(TCommand)
+    DoBreak: Boolean;
+    DoContinue: Boolean;
+  end;
+
   { TWhileDo }
 
-  TWhileDo = class(TCommand)
+  TWhileDo = class(TLoop)
   private
     function GetFieldsCount: Integer; override;
@@ -333 +340 @@
   { TRepeatUntil }
 
-  TRepeatUntil = class(TCommand)
+  TRepeatUntil = class(TLoop)
   private
     function GetFieldsCount: Integer; override;
@@ -354 +361 @@
   { TForToDo }
 
-  TForToDo = class(TCommand)
+  TForToDo = class(TLoop)
   private
     function GetFieldsCount: Integer; override;
@@ -375 +382 @@
     function GetFieldsCount: Integer; override;
   public
-    Parent: TBlock;
+    ParentBlock: TBlock;
     Variables: TVariables;
     Constants: TConstants;
@@ -1234 +1241 @@
 begin
   Result := Types.SearchByName(Name);
-  if not Assigned(Result) and Assigned(Parent) then
-    Result := Parent.Types.SearchByName(Name);
+  if not Assigned(Result) and Assigned(ParentBlock) then
+    Result := ParentBlock.Types.SearchByName(Name);
 end;
 
@@ -1241 +1248 @@
 begin
   Result := Constants.SearchByName(Name);
-  if not Assigned(Result) and Assigned(Parent) then
-    Result := Parent.Constants.SearchByName(Name);
+  if not Assigned(Result) and Assigned(ParentBlock) then
+    Result := ParentBlock.Constants.SearchByName(Name);
 end;
 
@@ -1248 +1255 @@
 begin
   Result := Variables.SearchByName(Name);
-  if not Assigned(Result) and Assigned(Parent) then
-    Result := Parent.Variables.SearchByName(Name);
+  if not Assigned(Result) and Assigned(ParentBlock) then
+    Result := ParentBlock.Variables.SearchByName(Name);
 end;
 
@@ -1255 +1262 @@
 begin
   Result := Functions.SearchByName(Name);
-  if not Assigned(Result) and Assigned(Parent) then
-    Result := Parent.Functions.SearchByName(Name);
+  if not Assigned(Result) and Assigned(ParentBlock) then
+    Result := ParentBlock.Functions.SearchByName(Name);
 end;