Changeset 134 for branches

Timestamp:

Dec 26, 2017, 12:28:38 AM (7 years ago)

Author:

chronos

Message:

• Modified: Restore start source position if rule item(s) not matched.

File:

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

branches/generator/UBuilder.pas

@@ -16 +16 @@
     LocalFunctions: string;
     LocalFunctionIndex: Integer;
+    function Indent(Count: Integer): string;
     function GetItemString(Item: TRuleItem; Required: Boolean; IndentLevel: Integer): string;
     function StringText(Text: string): string;
@@ -35 +36 @@
 implementation
 
+function TBuilder.Indent(Count: Integer): string;
+begin
+  Result := DupeString('  ', Count);
+end;
+
 function TBuilder.GetItemString(Item: TRuleItem; Required: Boolean; IndentLevel: Integer): string;
 begin
@@ -47 +53 @@
     ritSubItems: begin
       LocalFunctions := LocalFunctions + 'function ParseSubitems' + IntToStr(LocalFunctionIndex) + '(Required: Boolean = False): Boolean;' + LineEnding;
+      LocalFunctions := LocalFunctions + 'var' + LineEnding + '  OldPosition: Integer;' + LineEnding;
       LocalFunctions := LocalFunctions + 'begin' + LineEnding;
       LocalFunctions := LocalFunctions + '  Result := True;' + LineEnding;
@@ -90 +97 @@
     Add('    function ExpectRange(CharFrom, CharTo: Char; Required: Boolean = False): Boolean;');
     for Rule in Grammer.Rules do
-    if Rule.Level = rlParser then
+    //if Rule.Level = rlParser then
       Add('    function Parse' + Rule.Name + '(Required: Boolean = False): Boolean;');
     Add('    constructor Create;');
@@ -148 +155 @@
     LocalFunctions := '';
     for Rule in Grammer.Rules do
-    if Rule.Level = rlParser then begin
+    //if Rule.Level = rlParser then
+    begin
       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 + 'begin' + LineEnding;
       Text := Text + '  Result := True;' + LineEnding;
@@ -171 +180 @@
   Line: string;
 begin
-  Result := '';
+  Result := Indent(IndentLevel) + 'OldPosition := Position;' + LineEnding;
   I := 0;
   for Item in Items do begin
@@ -178 +187 @@
     case Items.RuleType of
       rtOr: begin
-        Line := Line + DupeString('  ', IndentLevel);
+        Line := Line + Indent(IndentLevel);
         if I > 0 then Line := Line + 'else ';
         Line := Line + 'if ' + GetItemString(Item, False, IndentLevel) +
@@ -185 +194 @@
       rtAnd: begin
         if not Item.Optional then
-          Line := Line + DupeString('  ', IndentLevel) + 'Result := Result and ';
+          Line := Line + Indent(IndentLevel) + 'Result := Result and ';
         if Item.Repetitive then begin
           if not Item.Optional then
-            Line := Line + DupeString('  ', IndentLevel) + GetItemString(Item, ItemRequired, IndentLevel) + ';' + LineEnding;
-          Line := Line + DupeString('  ', IndentLevel) + 'repeat' + LineEnding + DupeString('  ', IndentLevel) + 'if not ';
+            Line := Line + Indent(IndentLevel) + GetItemString(Item, ItemRequired, IndentLevel) + ';' + LineEnding;
+          Line := Line + Indent(IndentLevel) + 'repeat' + LineEnding;
           Inc(IndentLevel);
+          Line := Line + Indent(IndentLevel) + 'if not ';
           ItemRequired := False;
-        end;
+        end else
+          if Item.Optional then Line := Line + Indent(IndentLevel);
         Line := Line + GetItemString(Item, ItemRequired, IndentLevel);
         if Item.Repetitive then begin
+          Dec(IndentLevel);
           Line := Line + ' then Break;' + LineEnding +
-          DupeString('  ', IndentLevel) + 'until False';
-          Dec(IndentLevel);
+            Indent(IndentLevel) + 'until False';
         end;
         Line := Line + ';' + LineEnding +
-          DupeString('  ', IndentLevel) + 'if not Result then Exit;';
+          Indent(IndentLevel) + 'if not Result then begin' + LineEnding +
+          Indent(IndentLevel + 1) + 'Position := OldPosition;' + LineEnding +
+          Indent(IndentLevel + 1) + 'Exit;' + LineEnding +
+          Indent(IndentLevel) + 'end;';
       end;
     end;
@@ -208 +222 @@
   case Items.RuleType of
     rtOr: begin
-      Result := Result + DupeString('  ', IndentLevel) + 'else begin' + LineEnding;
-      Result := Result + DupeString('  ', IndentLevel) + '  Error(''Unexpected token'');' + LineEnding;
-      Result := Result + DupeString('  ', IndentLevel) + '  Result := False;' + LineEnding;
-      Result := Result + DupeString('  ', IndentLevel) + 'end;' + LineEnding;
+      Result := Result + Indent(IndentLevel) + 'else begin' + LineEnding;
+      Result := Result + Indent(IndentLevel) + '  Error(''Unexpected token'');' + LineEnding;
+      Result := Result + Indent(IndentLevel) + '  Result := False;' + LineEnding;
+      Result := Result + Indent(IndentLevel) + 'end;' + LineEnding;
     end;
   end;
@@ -267 +281 @@
   SourceFile: TStringList;
   TypeSectionStarted: Boolean;
+  I: Integer;
 begin
   SourceFile := TStringList.Create;
@@ -281 +296 @@
     TypeSectionStarted := False;
     for Rule in Grammer.Rules do
-    if Rule.CreateSourceNode then begin
+    //if Rule.CreateSourceNode then
+    begin
       if not TypeSectionStarted then begin
         Add('type');
@@ -290 +306 @@
     Add('');
     for Rule in Grammer.Rules do
-    if Rule.CreateSourceNode then begin
+    //if Rule.CreateSourceNode then
+    begin
       Add('  T' + Rule.Name + ' = class');
+      I := 1;
       for Item in Rule.Items do begin
         if Item.RuleItemType = ritNonTerminal then
           if Item.Repetitive then
-          Add('    ' + Item.NonTerminal.Name + ': TFPGObjectList<T' + Item.NonTerminal.Name + '>;')
-          else Add('    ' + Item.NonTerminal.Name + ': T' + Item.NonTerminal.Name + ';');
+          Add('    ' + Item.NonTerminal.Name + IntToStr(I) + ': TFPGObjectList<T' + Item.NonTerminal.Name + '>;')
+          else Add('    ' + Item.NonTerminal.Name + IntToStr(I) + ': T' + Item.NonTerminal.Name + ';');
+        Inc(I);
       end;
       Add('  end;' + LineEnding);