Changeset 101 for branches/interpreter/Parser3.pas

Timestamp:

Feb 11, 2017, 4:35:08 PM (8 years ago)

Author:

chronos

Message:

• Modified: Improved interpeter. Better handling of execution of functions and passing value of parameters.

File:

• branches/interpreter/Parser3.pas (modified) (9 diffs)

branches/interpreter/Parser3.pas

@@ -90 +90 @@
     N := N * 10;
     I := I - 1;
+  end;
+end;
+
+function IntToStr(Value: Integer): string;
+begin
+  Result := '';
+  while Value > 0 do begin
+    Result := Chr(Ord('0') + Value mod 10) + Result;
+    Value := Value div 10;
   end;
 end;
@@ -292 +301 @@
     if CheckNext('(') then begin
       Expect('(');
+      SetLength(SubExpression.Items, 0);
       if ParseExpression(@SubExpression) then begin
         SetLength(Expression^.Items, Length(Expression^.Items) + 1);
@@ -316 +326 @@
     // Build expression tree using operator precedence
     for II := 0 to Length(OperatorPrecedence) - 1 do begin
-      I := 1;
+      I := 0;
       while (I < Length(Expression^.Items) - 1) do begin
         if (TExpression(Expression^.Items[I]).NodeType = ntOperator) and
@@ -338 +348 @@
       end;
     end;
+
+   if Length(Expression^.Items) = 1 then begin
+      Expression^.NodeType := Expression^.Items[0].NodeType;
+      Expression^.OperatorType := Expression^.Items[0].OperatorType;
+      Expression^.Value := Expression^.Items[0].Value;
+      // Move subtitem one node up
+      SetLength(Expression^.Items, Length(Expression^.Items[0].Items));
+      I := Length(Expression^.Items) - 1;
+      while I >= 0 do begin
+        Expression^.Items[I] := Expression^.Items[0].Items[I];
+        I := I - 1;
+      end;
+    end else ShowError('Expression error ' + IntToStr(Length(Expression^.Items)));
   end;
 end;
@@ -362 +385 @@
   Value: TConstant;
 begin
+  FillChar(Expression, SizeOf(TExpression), 0);
+  FillChar(FunctionCall, SizeOf(TFunctionCall), 0);
+  FillChar(Value, SizeOf(TConstant), 0);
+
   Result := True;
   if not NoExpression and ParseExpression(@Expression) then begin
@@ -443 +470 @@
   Assignment: TAssignment;
 begin
+  FillChar(IfThenElse, SizeOf(TIfThenElse), 0);
+  FillChar(WhileDo, SizeOf(TWhileDo), 0);
+  FillChar(BeginEnd, SizeOf(TBeginEnd), 0);
+  FillChar(Execution, SizeOf(TExecution), 0);
+  FillChar(Assignment, SizeOf(TAssignment), 0);
+
   Result := True;
   if ParseBeginEnd(@BeginEnd) then begin
@@ -632 +665 @@
 begin
   SetLength(ProgramCode^.Types.Items, 0);
-  ProgramCode^.Types.Add(TypeCreate('string', btInteger));
+  ProgramCode^.Types.Add(TypeCreate('string', btShortString));
   TypeString := ProgramCode^.Types.GetLast;
   ProgramCode^.Types.Add(TypeCreate('Boolean', btBoolean));
@@ -650 +683 @@
   FuncWriteLn := ProgramCode^.Functions.GetLast;
   FuncWriteLn^.Parameters.Add(FunctionParameterCreate('Text', TypeString));
+  FuncWriteLn^.Variables.Add(VariableCreate('Text', TypeString));
   ProgramCode^.Functions.Add(FunctionCreate('Read', nil));
   FuncRead := ProgramCode^.Functions.GetLast;
@@ -657 +691 @@
   FuncLength := ProgramCode^.Functions.GetLast;
   FuncLength^.Parameters.Add(FunctionParameterCreate('Array', TypeArray));
+  FuncLength^.Variables.Add(VariableCreate('Array', TypeArray));
   ProgramCode^.Functions.Add(FunctionCreate('SetLength', nil));
   FuncSetLength := ProgramCode^.Functions.GetLast;
   FuncSetLength^.Parameters.Add(FunctionParameterCreate('Array', TypeArray));
+  FuncSetLength^.Variables.Add(VariableCreate('Array', TypeArray));
   FuncSetLength^.Parameters.Add(FunctionParameterCreate('Count', TypeInteger));
+  FuncSetLength^.Variables.Add(VariableCreate('Count', TypeInteger));
 end;