Changeset 137 for branches/generator/UBuilder.pas

Timestamp:

Dec 27, 2017, 6:05:11 PM (7 years ago)

Author:

chronos

Message:

• Added: Lookup tables can be defined and their usage set from grammer rules.

File:

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

branches/generator/UBuilder.pas

@@ -163 +163 @@
     Add('    Position := StartPos;');
     Add('    if Required then Error(''Expected "'' + Text + ''" but found "'' + ReadText + ''".'');');
-    Add('  end;');
+    Add('  end else WriteLn(''Expect: '' + Text);');
     Add('end;');
     Add('');
@@ -178 +178 @@
     Add('    Position := StartPos;');
     Add('    if Required then Error(''Expected "'' + CharFrom + ''" to "'' + CharTo + ''" but found "'' + ReadChar + ''".'');');
-    Add('  end;');
+    Add('  end else WriteLn(''ExpectRange: '' + CharFrom + ''..'' + CharTo + '': '' + ReadChar);');
     Add('end;');
     Add('');
@@ -192 +192 @@
       Text := Text + '  OldPosition: TPosition;' + LineEnding;
       Text := Text + 'begin' + LineEnding;
+      //Text := Text + '  WriteLn(''Rule check: ' + Rule.Name + ''');';
       Text := Text + '  Result := True;' + LineEnding;
       Text := Text + FunctionBody;
+      Text := Text + '  if Result then WriteLn(''Rule: ' + Rule.Name + ''');';
       Text := Text + 'end;' + LineEnding + LineEnding;
     end;
@@ -223 +225 @@
       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 ';
@@ -256 +247 @@
           Indent(IndentLevel + 1) + 'Exit;' + LineEnding +
           Indent(IndentLevel) + 'end;';
+
+        // Check white spaces
+        if Assigned(Items.Grammer.WhiteSpaceRule) and Items.WithWhiteSpeaces
+        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;
       end;
     end;
@@ -302 +305 @@
     Add('  CloseFile(SourceFile);');
     if Assigned(Grammer.TopRule) then
-      Add('  Parser.Parse' + Grammer.TopRule.Name + ';');
+      Add('  Parser.Parse' + Grammer.TopRule.Name + '(True);');
     Add('  FreeAndNil(Parser);');
     Add('end;');
@@ -374 +377 @@
 var
   Item: TRuleItem;
+  Line: string;
 begin
   Result := '';
+  Line := '';
   with SourceFile do begin
     for Item in Items do begin
       case Item.RuleItemType of
-        ritTerminal: Result := Result + '(Value = ''' + StringText(Item.Terminal, Item.EscapedStrings) + ''')';
-        ritNonTerminal: Result := Result + 'Is' + Item.NonTerminalName + '(Value)';
-        ritTerminalRange: Result := Result + '((Value > ''' + StringText(Item.TerminalFrom, Item.EscapedStrings) + ''') and (Value < ''' + StringText(Item.TerminalTo, Item.EscapedStrings) + '''))';
-        ritSubItems: Result := Result + '(' + BuildTokenizerItems(SourceFile, Item.SubItems) + ')';
+        ritTerminal: Line := Line + '(Value = ''' + StringText(Item.Terminal, Item.EscapedStrings) + ''')';
+        ritNonTerminal: Line := Line + 'Is' + Item.NonTerminalName + '(Value)';
+        ritTerminalRange: Line := Line + '((Value > ''' + StringText(Item.TerminalFrom, Item.EscapedStrings) + ''') and (Value < ''' + StringText(Item.TerminalTo, Item.EscapedStrings) + '''))';
+        ritSubItems: Line := Line + '(' + BuildTokenizerItems(SourceFile, Item.SubItems) + ')';
       end;
       if Item <> Items[Items.Count - 1] then
-        Result := Result + ' ' + RuleTypeText[Items.RuleType] + ' ';
-    end;
+        Line := Line + ' ' + RuleTypeText[Items.RuleType] + ' ';
+      if Length(Line) > 80 then begin
+        Result := Result + Line + LineEnding;
+        Line := '';
+      end;
+    end;
+    Result := Result + Line;
   end;
 end;