Changeset 17 for branches/Analyzátor gramatiky/UMainForm.pas

Timestamp:

Apr 9, 2009, 11:16:15 AM (16 years ago)

Author:

george

Message:

• Upraveno: Analýza gramatiky .

Location:

branches/Analyzátor gramatiky

Files:

• . (modified) (1 prop)
• UMainForm.pas (modified) (7 diffs)

branches/Analyzátor gramatiky/UMainForm.pas

@@ -5 +5 @@
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ComCtrls, UGrammer;
+  Dialogs, StdCtrls, ComCtrls, UGrammer, UProgram;
 
 const
@@ -56 +56 @@
   SourceProgram.Free;
   SourceProgram := TProgram.Create;
-  Grammer.Parse(Memo1.Text, SourceProgram);
+  SourceProgram.Parse(Grammer, Memo1.Text);
   ShowProgramTree(SourceProgram);
 end;
@@ -71 +71 @@
   PascalProgram.Free;
   PascalProgram := TProgram.Create;
-  PascalGrammer.Parse(Memo2.Text, PascalProgram);
+  PascalProgram.Parse(PascalGrammer, Memo2.Text);
   with PascalProgram.TopItem, PascalGrammer do begin
 //    MergeNonterminal(TGrammerRule(Rules[7]));
@@ -267 +267 @@
       Name := 'ConcatenationBlock';
       RuleType := rtSequence;
-      AddRule(WhiteSpace, True, True);
-      AddRule(Expression, True, False);
+      AddRule(Expression, False, False);
+      AddRule(WhiteSpace, True, True);
     end;
     Rules.Add(ConcatenationBlock);
@@ -285 +285 @@
       Name := 'SeparationBlock';
       RuleType := rtSequence;
-      AddRule(WhiteSpace, True, True);
+      //AddRule(WhiteSpace, True, True);
       AddTerminal('|', False, False);
       AddRule(WhiteSpace, True, True);
@@ -296 +296 @@
       RuleType := rtSequence;
       AddRule(Concatenation, False, False);
-      AddRule(WhiteSpace, True, True);
+      //AddRule(WhiteSpace, True, True);
       AddRule(SeparationBlock, True, True);
     end;
@@ -311 +311 @@
       AddRule(WhiteSpace, True, True);
       AddRule(Separation, False, False);
-      AddRule(WhiteSpace, True, True);
+      //AddRule(WhiteSpace, True, True);
       AddTerminal('.', False, False);
       AddRule(WhiteSpace, True, True);