Changeset 135 for branches/generator

Timestamp:

Dec 26, 2017, 4:07:07 PM (7 years ago)

Author:

chronos

Message:

• Added: Track position in source code as Line and Row instead just index.

File:

• branches/generator/UBuilder.pas (modified) (6 diffs)

branches/generator/UBuilder.pas

@@ -85 +85 @@
     Add('');
     Add('uses');
-    Add('  SysUtils, Tokenizer;');
+    Add('  SysUtils, Tokenizer, Types;');
     Add('');
     Add('type');
+    Add('  TPosition = record');
+    Add('    Index: Integer;');
+    Add('    Pos: TPoint;');
+    Add('    procedure Calc(Text: string);');
+    Add('  end;');
+    Add('');
     Add('  TParser = class');
     Add('    Tokenizer: TTokenizer;');
     Add('    Content: string;');
     Add('    FileName: string;');
-    Add('    Position: Integer;');
+    Add('    Position: TPosition;');
     Add('    procedure Error(Text: string);');
     Add('    function Expect(Text: string; Required: Boolean = False): Boolean;');
@@ -106 +112 @@
     Add('implementation');
     Add('');
+    Add('procedure TPosition.Calc(Text: string);');
+    Add('var');
+    Add('  I: Integer;');
+    Add('begin');
+    Add('  for I := 1 to Length(Text) do begin');
+    Add('    Inc(Pos.X);');
+    Add('    Inc(Index);');
+    Add('    if Text[I] = LineEnding then begin');
+    Add('      Pos.X := 1;');
+    Add('      Inc(Pos.Y);');
+    Add('    end;');
+    Add('  end;');
+    Add('end;');
+    Add('');
     Add('constructor TParser.Create;');
     Add('begin');
-    Add('  Position := 1;');
+    Add('  Position.Index := 1;');
+    Add('  Position.Pos := Point(1, 1);');
     Add('  Tokenizer := TTokenizer.Create;');
     Add('end;');
@@ -119 +140 @@
     Add('procedure TParser.Error(Text: string);');
     Add('begin');
-    Add('  WriteLn(FileName + ''('' + IntToStr(Position) + '') Error: '' + Text);');
+    Add('  WriteLn(FileName + ''('' + IntToStr(Position.Pos.X) + '','' + IntToStr(Position.Pos.Y) + '') Error: '' + Text);');
     Add('end;');
     Add('');
@@ -125 +146 @@
     Add('var');
     Add('  ReadText: string;');
-    Add('  StartPos: Integer;');
+    Add('  StartPos: TPosition;');
     Add('begin');
     Add('  StartPos := Position;');
-    Add('  ReadText := Copy(Content, Position, Length(Text));');
-    Add('  Inc(Position, Length(Text));');
+    Add('  ReadText := Copy(Content, Position.Index, Length(Text));');
+    Add('  Position.Calc(Text);');
     Add('  Result := Text = ReadText;');
     Add('  if not Result then begin');
@@ -140 +161 @@
     Add('var');
     Add('  ReadChar: Char;');
-    Add('  StartPos: Integer;');
+    Add('  StartPos: TPosition;');
     Add('begin');
     Add('  StartPos := Position;');
-    Add('  ReadChar := Content[Position];');
-    Add('  Inc(Position, 1);');
+    Add('  ReadChar := Content[Position.Index];');
+    Add('  Position.Calc(Content[Position.Index]);');
     Add('  Result := (ReadChar >= CharFrom) and (ReadChar <= CharTo);');
     Add('  if not Result then begin');
@@ -152 +173 @@
     Add('end;');
     Add('');
-    LocalFunctionIndex := 1;
-    LocalFunctions := '';
     for Rule in Grammer.Rules do
     //if Rule.Level = rlParser then
     begin
+      LocalFunctionIndex := 1;
+      LocalFunctions := '';
       FunctionBody := BuildParserItems(Rule.Items, True, 1);
       Text := Text + 'function TParser.Parse' + Rule.Name + '(Required: Boolean = False): Boolean;' + LineEnding;
       Text := Text + LocalFunctions;
-      Text := Text + 'var' + LineBreak + '  OldPosition: Integer;' + LineEnding;
+      Text := Text + 'var' + LineBreak;
+      Text := Text + '  OldPosition: TPosition;' + LineEnding;
       Text := Text + 'begin' + LineEnding;
       Text := Text + '  Result := True;' + LineEnding;