Changeset 136 for branches/generator/UBuilder.pas

Timestamp:

Dec 26, 2017, 6:59:40 PM (7 years ago)

Author:

chronos

Message:

• Added: Support for whitespaces in And rule.
• Added: Terminals can be specified as escaped strings with slash.

File:

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

branches/generator/UBuilder.pas

@@ -18 +18 @@
     function Indent(Count: Integer): string;
     function GetItemString(Item: TRuleItem; Required: Boolean; IndentLevel: Integer): string;
-    function StringText(Text: string): string;
+    function StringText(const Text: string; Escaped: Boolean): string;
     procedure BuildMain(FileName: string);
     procedure BuildParser(FileName: string);
@@ -46 +46 @@
   case Item.RuleItemType of
     ritTerminal: Result := 'Expect(''' +
-      StringText(Item.Terminal) + ''', ' + BooleanText[Required] + ')';
-    ritNonTerminal: Result := 'Parse' + Item.NonTerminal.Name + '(' + BooleanText[Required] + ')';
+      StringText(Item.Terminal, Item.EscapedStrings) + ''', Required and ' + BooleanText[Required] + ')';
+    ritNonTerminal: Result := 'Parse' + Item.NonTerminal.Name + '(Required and ' + BooleanText[Required] + ')';
     ritTerminalRange: Result := 'ExpectRange(''' +
-      StringText(Item.TerminalFrom) + ''', ''' +
-      StringText(Item.TerminalTo) + ''', ' + BooleanText[Required] + ')';
+      StringText(Item.TerminalFrom, Item.EscapedStrings) + ''', ''' +
+      StringText(Item.TerminalTo, Item.EscapedStrings) + ''', Required and ' + BooleanText[Required] + ')';
     ritSubItems: begin
       LocalFunctions := LocalFunctions + 'function ParseSubitems' + IntToStr(LocalFunctionIndex) + '(Required: Boolean = False): Boolean;' + LineEnding;
-      LocalFunctions := LocalFunctions + 'var' + LineEnding + '  OldPosition: Integer;' + LineEnding;
+      LocalFunctions := LocalFunctions + 'var' + LineEnding;
+      LocalFunctions := LocalFunctions + '  OldPosition: TPosition;' + LineEnding;
       LocalFunctions := LocalFunctions + 'begin' + LineEnding;
       LocalFunctions := LocalFunctions + '  Result := True;' + LineEnding;
@@ -59 +60 @@
       LocalFunctions := LocalFunctions + 'end;' + LineEnding + LineEnding;
 
-      Result := Result + 'ParseSubitems' + IntToStr(LocalFunctionIndex) + '(' + BooleanText[Required] + ')';
+      Result := Result + 'ParseSubitems' + IntToStr(LocalFunctionIndex) + '(Required and ' + BooleanText[Required] + ')';
       Inc(LocalFunctionIndex);
     end;
@@ -65 +66 @@
 end;
 
-function TBuilder.StringText(Text: string): string;
-begin
-  Result := StringReplace(Text, '''', '''''', [rfReplaceAll]);
+function TBuilder.StringText(const Text: string; Escaped: Boolean): string;
+begin
+  Result := Text;
+  Result := StringReplace(Result, '''', '''''', [rfReplaceAll]);
+  if Escaped then begin
+    Result := StringReplace(Result, '\n', '''#10''', [rfReplaceAll]);
+    Result := StringReplace(Result, '\r', '''#13''', [rfReplaceAll]);
+    Result := StringReplace(Result, '\t', '''#9''', [rfReplaceAll]);
+    Result := StringReplace(Result, '\\', '\', [rfReplaceAll]);
+  end;
 end;
 
@@ -215 +223 @@
       end;
       rtAnd: begin
+        if Assigned(Items.Grammer.WhiteSpaceRule) and Items.WithWhiteSpeaces
+        and (I > 0) then begin
+          Line := Line + Indent(IndentLevel) + 'repeat' + LineEnding;
+          Inc(IndentLevel);
+          Line := Line + Indent(IndentLevel) + 'if not Parse' +
+            Items.Grammer.WhiteSpaceRule.Name + '(False)' +
+            ' then Break;' + LineEnding;
+          Dec(IndentLevel);
+          Line := Line + Indent(IndentLevel) + 'until False;' + LineEnding;
+        end;
+
         if not Item.Optional then
           Line := Line + Indent(IndentLevel) + 'Result := Result and ';
@@ -245 +264 @@
     rtOr: begin
       Result := Result + Indent(IndentLevel) + 'else begin' + LineEnding;
-      Result := Result + Indent(IndentLevel) + '  Error(''Unexpected token'');' + LineEnding;
+      Result := Result + Indent(IndentLevel) + '  if Required then Error(''Unexpected token'');' + LineEnding;
       Result := Result + Indent(IndentLevel) + '  Result := False;' + LineEnding;
       Result := Result + Indent(IndentLevel) + 'end;' + LineEnding;
@@ -360 +379 @@
     for Item in Items do begin
       case Item.RuleItemType of
-        ritTerminal: Result := Result + '(Value = ''' + StringText(Item.Terminal) + ''')';
+        ritTerminal: Result := Result + '(Value = ''' + StringText(Item.Terminal, Item.EscapedStrings) + ''')';
         ritNonTerminal: Result := Result + 'Is' + Item.NonTerminalName + '(Value)';
-        ritTerminalRange: Result := Result + '((Value > ''' + StringText(Item.TerminalFrom) + ''') and (Value < ''' + StringText(Item.TerminalTo) + '''))';
+        ritTerminalRange: Result := Result + '((Value > ''' + StringText(Item.TerminalFrom, Item.EscapedStrings) + ''') and (Value < ''' + StringText(Item.TerminalTo, Item.EscapedStrings) + '''))';
         ritSubItems: Result := Result + '(' + BuildTokenizerItems(SourceFile, Item.SubItems) + ')';
       end;