Changeset 107 for branches

Timestamp:

Jul 18, 2017, 12:53:15 AM (7 years ago)

Author:

chronos

Message:

• Added: Calculate source X,Y position. Show that position in error message.

Location:

branches/interpreter/interpreter4

Files:

• Execute.pas (modified) (1 diff)
• Parser.pas (modified) (23 diffs)
• interpreter.lpi (modified) (1 diff)

branches/interpreter/interpreter4/Execute.pas

@@ -301 +301 @@
   end else
   if Execution^.Func^.Name = 'Read' then begin
-    ExecutionContextCurrent^.VariableValues.GetByName('Output')^.ValueChar := InnerText[InnerTextPos];
-    InnerTextPos := InnerTextPos + 1;
+    ExecutionContextCurrent^.VariableValues.GetByName('Output')^.ValueChar := InnerText[InnerTextPos.Index];
+    InnerTextPos.Index := InnerTextPos.Index + 1;
   end else
   if Execution^.Func^.Name = 'Eof' then begin
     ExecuteBuildInSetResult(Execution, 'Boolean');
-    ExecutionContextCurrent^.VariableValues.GetByName('Result')^.ValueBoolean := InnerTextPos > Length(InnerText);
+    ExecutionContextCurrent^.VariableValues.GetByName('Result')^.ValueBoolean := InnerTextPos.Index > Length(InnerText);
   end else ShowError('Unsupported build-in function.');
 end;

branches/interpreter/interpreter4/Parser.pas

@@ -11 +11 @@
 
 
+type
+  TTextPos = record
+    Index: Integer;
+    X: Integer;
+    Y: Integer;
+    PrevX: Integer;
+    PrevY: Integer;
+  end;
+
 var
   InnerText: string;
-  InnerTextPos: Integer;
+  InnerTextPos: TTextPos;
 
 implementation
@@ -23 +32 @@
 var
   InputText: string;
-  InputTextPos: Integer;
+  InputTextPos: TTextPos;
+  InputTextFileName: string;
   LastTokenType: TTokenType;
 
@@ -110 +120 @@
 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;
+
 procedure ShowError(Text: string);
 begin
-  WriteLn(Text);
-  WriteLn(Copy(InputText, InputTextPos, 50));
+  WriteLn(InputTextFileName + ' (' + IntToStr(InputTextPos.Y) + ',' + IntToStr(InputTextPos.X) + ') ' +  Text);
+  WriteLn(Copy(InputText, InputTextPos.Index, 50));
   Halt;
 end;
@@ -124 +143 @@
 begin
   LastC := #0;
-  InputTextPos := 1;
+  InputTextPos.Index := 1;
+  InputTextPos.X := 1;
+  InputTextPos.Y := 1;
+  InputTextPos.PrevX := 1;
+  InputTextPos.PrevY := 1;
   InputText := '';
-  InnerTextPos := 1;
+  InnerTextPos.Index := 1;
+  InnerTextPos.PrevX := 1;
+  InnerTextPos.PrevY := 1;
   InnerText := '';
   Inner := False;
@@ -147 +172 @@
 function ReadChar: Char;
 begin
-  if InputTextPos >= Length(InputText) then ShowError('Premature end of source');
-  Result := InputText[InputTextPos];
-  InputTextPos := InputTextPos + 1;
+  if InputTextPos.Index >= Length(InputText) then ShowError('Premature end of source');
+  Result := InputText[InputTextPos.Index];
+  InputTextPos.Index := InputTextPos.Index + 1;
+  InputTextPos.PrevX := InputTextPos.X;
+  InputTextPos.PrevY := InputTextPos.Y;
+  InputTextPos.X := InputTextPos.X + 1;
+  if Result = #10 then begin
+    InputTextPos.Y := InputTextPos.Y + 1;
+    InputTextPos.X := 1;
+  end;
+end;
+
+procedure InputTextPosSetPrev;
+begin
+  InputTextPos.X := InputTextPos.PrevX;
+  InputTextPos.Y := InputTextPos.PrevY;
+  InputTextPos.Index := InputTextPos.Index - 1;
 end;
 
@@ -164 +203 @@
     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;
@@ -196 +226 @@
           LastTokenType := ttChar;
         end;
-        InputTextPos := InputTextPos - 1;
+        InputTextPosSetPrev;
         Break;
       end else Result := Result + C;
@@ -230 +260 @@
               LastTokenType := ttComment;
               Continue;
-            end else InputTextPos := InputTextPos - 1;
+            end else InputTextPosSetPrev;
           end;
           Break;
         end else begin
-          InputTextPos := InputTextPos - 1;
+          InputTextPosSetPrev;
           Break;
         end;
@@ -258 +288 @@
 begin
   Result := ReadNextInternal;
-  WriteLn('ReadNext: ' + Result);
+  //WriteLn('ReadNext: ' + Result);
 end;
 
@@ -264 +294 @@
 var
   Next: string;
-  OldPos: Integer;
+  OldPos: TTextPos;
 begin
   OldPos := InputTextPos;
@@ -297 +327 @@
 function ParseVariable(out Variable: PVariable): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   Next: string;
   SelfVariable: PVariable;
@@ -341 +371 @@
       Result := False;
       InputTextPos := OldPos;
+      Break;
     end;
   until False;
@@ -357 +388 @@
 function ParseConstant(out Constant: PConstant): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   Next: string;
 begin
@@ -383 +414 @@
 function ParseOperator(out ExpOperator: TOperator): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   OperatorName: string;
 begin
@@ -400 +431 @@
 function ParseValue(Value: PConstant): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   Text: string;
 begin
@@ -443 +474 @@
   II: Integer;
   FoundOperator: Boolean;
-  OldPos: Integer;
+  OldPos: TTextPos;
   //E: TExpression;
 begin
@@ -598 +629 @@
 function ParseExecution(Execution: PExecution): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   Next: string;
   Func: PFunction;
@@ -776 +807 @@
   VarName: string;
   VarType: PType;
-  OldPos: Integer;
+  OldPos: TTextPos;
   Value: string;
   I: Integer;
@@ -831 +862 @@
   ConstName: string;
   ConstType: PType;
-  OldPos: Integer;
+  OldPos: TTextPos;
   Value: string;
 begin
@@ -1018 +1049 @@
 function ParseTypeSimple(TypeItem: PType): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   Name: string;
   T: PType;
@@ -1037 +1068 @@
 function ParseTypeSimpleForward(TypeItem: PType): Boolean;
 var
-  OldPos: Integer;
+  OldPos: TTextPos;
   Name: string;
 begin
@@ -1207 +1238 @@
   Name: string;
   TypeName: string;
-  OldPos: Integer;
+  OldPos: TTextPos;
   NewType: TType;
 begin
@@ -1237 +1268 @@
 var
   OldInputText: string;
-  OldInputTextPos: Integer;
+  OldInputTextPos: TTextPos;
   UnitFile: Text;
   Directive: TDirective;

branches/interpreter/interpreter4/interpreter.lpi

@@ -116 +116 @@
       <Item4>
         <Name Value="RunError(101)"/>
+        <Enabled Value="False"/>
       </Item4>
       <Item5>
         <Name Value="Unknown"/>
+        <Enabled Value="False"/>
       </Item5>
     </Exceptions>