Changeset 133 for branches/generator/UBuilder.pas

Timestamp:

Dec 25, 2017, 12:23:39 PM (7 years ago)

Author:

chronos

Message:

• Modified: Generate subitems as local function inside method.

File:

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

branches/generator/UBuilder.pas

@@ -14 +14 @@
   TBuilder = class
   private
+    LocalFunctions: string;
+    LocalFunctionIndex: Integer;
     function GetItemString(Item: TRuleItem; Required: Boolean; IndentLevel: Integer): string;
     function StringText(Text: string): string;
     procedure BuildMain(FileName: string);
     procedure BuildParser(FileName: string);
-    function BuildParserItems(Items: TRuleItems; IndentLevel: Integer): string;
+    function BuildParserItems(Items: TRuleItems; Required: Boolean; IndentLevel: Integer): string;
     procedure BuildSource(FileName: string);
     procedure BuildTokenizer(FileName: string);
@@ -44 +46 @@
       StringText(Item.TerminalTo) + ''', ' + BooleanText[Required] + ')';
     ritSubItems: begin
-      Result := DupeString('  ', IndentLevel) + 'begin' + LineEnding;
-      Result := Result + BuildParserItems(Item.SubItems, IndentLevel + 1);
-      Result := Result + DupeString('  ', IndentLevel) + 'end';
+      LocalFunctions := LocalFunctions + 'function ParseSubitems' + IntToStr(LocalFunctionIndex) + '(Required: Boolean = False): Boolean;' + LineEnding;
+      LocalFunctions := LocalFunctions + 'begin' + LineEnding;
+      LocalFunctions := LocalFunctions + '  Result := True;' + LineEnding;
+      LocalFunctions := LocalFunctions + BuildParserItems(Item.SubItems, Required, 1);
+      LocalFunctions := LocalFunctions + 'end;' + LineEnding + LineEnding;
+
+      Result := Result + 'ParseSubitems' + IntToStr(LocalFunctionIndex) + '(' + BooleanText[Required] + ')';
+      Inc(LocalFunctionIndex);
     end;
   end;
@@ -60 +67 @@
   ParserFile: TStringList;
   Rule: TRule;
+  FunctionBody: string;
 begin
   ParserFile := TStringList.Create;
@@ -137 +145 @@
     Add('end;');
     Add('');
+    LocalFunctionIndex := 1;
+    LocalFunctions := '';
     for Rule in Grammer.Rules do
     if Rule.Level = rlParser then begin
-      Add('function TParser.Parse' + Rule.Name + '(Required: Boolean = False): Boolean;');
-      Add('begin');
-      Add('  Result := True;');
-      Text := Text + BuildParserItems(Rule.Items, 1);
-      Add('end;');
-      Add('');
+      FunctionBody := BuildParserItems(Rule.Items, True, 1);
+      Text := Text + 'function TParser.Parse' + Rule.Name + '(Required: Boolean = False): Boolean;' + LineEnding;
+      Text := Text + LocalFunctions;
+      Text := Text + 'begin' + LineEnding;
+      Text := Text + '  Result := True;' + LineEnding;
+      Text := Text + FunctionBody;
+      Text := Text + 'end;' + LineEnding + LineEnding;
     end;
     Add('');
@@ -153 +164 @@
 end;
 
-function TBuilder.BuildParserItems(Items: TRuleItems; IndentLevel: Integer): string;
+function TBuilder.BuildParserItems(Items: TRuleItems; Required: Boolean; IndentLevel: Integer): string;
 var
   I: Integer;
   Item: TRuleItem;
-  Required: Boolean;
+  ItemRequired: Boolean;
   Line: string;
 begin
@@ -163 +174 @@
   I := 0;
   for Item in Items do begin
-    Required := not Item.Optional;
+    ItemRequired := not Item.Optional and Required;
     Line := '';
     case Items.RuleType of
@@ -173 +184 @@
       end;
       rtAnd: begin
-        if not Item.Optional and not (Item.RuleItemType = ritSubItems) then
+        if not Item.Optional then
           Line := Line + DupeString('  ', IndentLevel) + 'Result := Result and ';
         if Item.Repetitive then begin
           if not Item.Optional then
-            Line := Line + DupeString('  ', IndentLevel) + GetItemString(Item, Required, IndentLevel) + ';' + LineEnding;
+            Line := Line + DupeString('  ', IndentLevel) + GetItemString(Item, ItemRequired, IndentLevel) + ';' + LineEnding;
           Line := Line + DupeString('  ', IndentLevel) + 'repeat' + LineEnding + DupeString('  ', IndentLevel) + 'if not ';
-          Required := False;
+          Inc(IndentLevel);
+          ItemRequired := False;
         end;
-        Line := Line + GetItemString(Item, Required, IndentLevel);
-        if Item.Repetitive then
+        Line := Line + GetItemString(Item, ItemRequired, IndentLevel);
+        if Item.Repetitive then begin
           Line := Line + ' then Break;' + LineEnding +
           DupeString('  ', IndentLevel) + 'until False';
+          Dec(IndentLevel);
+        end;
         Line := Line + ';' + LineEnding +
           DupeString('  ', IndentLevel) + 'if not Result then Exit;';