Changeset 211 for branches/interpreter2/UParser.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/UParser.pas (modified) (12 diffs)

branches/interpreter2/UParser.pas

@@ -63 +63 @@
     while not Tokenizer.CheckNext('end', tkKeyword) do begin
       if ParseCommand(Block, Command) then begin
+        Command.Parent := BeginEnd;
         BeginEnd.Commands.Add(Command);
         Tokenizer.Expect(';', tkSpecialSymbol);
@@ -185 +186 @@
     Prog.Block.Free;
     Prog.Block := Block;
+    Block.Parent := Prog;
     Tokenizer.Expect('.', tkSpecialSymbol);
   end else begin
@@ -198 +200 @@
   Result := False;
   Block := TBlock.Create;
-  Block.Parent := ParentBlock;
+  Block.ParentBlock := ParentBlock;
   ParseBlockVar(Block);
   ParseBlockConst(Block);
@@ -205 +207 @@
     Block.BeginEnd.Free;
     Block.BeginEnd := BeginEnd;
+    BeginEnd.Parent := Block;
   end else Block.Free;
 end;
@@ -293 +296 @@
   Variable: TVariable;
   Expression: TExpression;
-begin
+  LastPos: TTokenizerPos;
+begin
+  LastPos := Tokenizer.Pos;
   Result := False;
   Token := Tokenizer.GetNext;
   if Token.Kind = tkIdentifier then begin
-    Result := True;
     Variable := Block.GetVariable(Token.Text);
     if Assigned(Variable) then begin
@@ -308 +312 @@
           Assignment.Expression.Free;
           Assignment.Expression := Expression;
+          Expression.Parent := Assignment;
         end else begin
           Result := False;
@@ -316 +321 @@
     end else Error('Variable ' + Token.Text + ' not defined.');
   end;
+  if not Result then Tokenizer.Pos := LastPos;
 end;
 
@@ -481 +487 @@
         IfThenElse.CommandThen.Free;
         IfThenElse.CommandThen := Command;
+        Command.Parent := IfThenElse;
         if Tokenizer.CheckNext('else', tkKeyword) then begin
           Tokenizer.Expect('else', tkKeyword);
@@ -486 +493 @@
             IfThenElse.CommandElse.Free;
             IfThenElse.CommandElse := Command;
+            Command.Parent := IfThenElse;
           end else Error('Expected command');
         end;
@@ -510 +518 @@
         WhileDo.Command.Free;
         WhileDo.Command := Command;
+        Command.Parent := WhileDo;
       end else Error('Expected command');
     end else Error('Expected expression');
@@ -529 +538 @@
       if ParseCommand(Block, Command) then begin
         RepeatUntil.Commands.Add(Command);
+        Command.Parent := RepeatUntil;
         Tokenizer.Expect(';', tkSpecialSymbol);
       end else begin
@@ -569 +579 @@
             ForToDo.Command.Free;
             ForToDo.Command := Command;
+            Command.Parent := ForToDo;
           end else Error('Expected command.');
         end else Error('Expected expression.');