Changeset 5

Timestamp:

Oct 4, 2007, 3:53:57 PM (17 years ago)

Author:

george

Message:

Doladění gramatiky pro načítání EBNF.

Files:

• P0.grm (deleted)
• Program.pas (deleted)
• UMainForm.pas (modified) (12 diffs)
• grammer (added)
• grammer.grm (deleted)
• grammer/Delphi5.grm (added)
• grammer/PS.grm (added)
• grammer/Pascal.grm (added)
• grammer/Pl0.grm (added)
• grammer/test.grm (added)

UMainForm.pas

@@ -6 +6 @@
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ComCtrls;
+
+const
+  DefaultGrammerFileName: string = 'grammer/test.grm';
 
 type
@@ -203 +206 @@
       AddRule(Digit, False, False);
       AddRule(AlphabeticCharacter, False, False);
+      AddTerminal('_', False, False);
     end;
     Rules.Add(AlphaNumericCharacter);
@@ -235 +239 @@
 
     Concatenation := TGrammerRule.Create;
+    Separation := TGrammerRule.Create;
 
     OptionBlock := TGrammerRule.Create;
@@ -242 +247 @@
       AddTerminal('[', False, False);
       AddRule(WhiteSpace, True, True);
-      AddRule(Concatenation, False, False);
+      AddRule(Separation, False, False);
       AddRule(WhiteSpace, True, True);
       AddTerminal(']', False, False);
@@ -254 +259 @@
       AddTerminal('{', False, False);
       AddRule(WhiteSpace, True, True);
-      AddRule(Concatenation, False, False);
+      AddRule(Separation, False, False);
       AddRule(WhiteSpace, True, True);
       AddTerminal('}', False, False);
@@ -266 +271 @@
       AddTerminal('(', False, False);
       AddRule(WhiteSpace, True, True);
-      AddRule(Concatenation, False, False);
+      AddRule(Separation, False, False);
       AddRule(WhiteSpace, True, True);
       AddTerminal(')', False, False);
@@ -297 +302 @@
       RuleType := rtSequence;
       AddRule(WhiteSpace, False, True);
-      AddRule(Expression, False, False);
+      AddRule(Expression, True, False);
     end;
     Rules.Add(ConcatenationBlock);
@@ -320 +325 @@
     Rules.Add(SeparationBlock);
 
-    Separation := TGrammerRule.Create;
     with Separation do begin
       Name := 'Separation';
@@ -359 +363 @@
 
   SourceProgram := TProgram.Create;
-  Memo1.Lines.LoadFromFile('P0.grm');
+  Memo1.Lines.LoadFromFile(DefaultGrammerFileName);
   SourceCode := '';;
 //  with Memo1.Lines do
@@ -483 +487 @@
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
-  Memo1.Lines.SaveToFile('Program.pas');
+  Memo1.Lines.SaveToFile(DefaultGrammerFileName);
 
   Grammer.Free;
@@ -588 +592 @@
   UseRule: TGrammerRule;
   ExpectedCharacters: string;
+  Level: Integer;
 begin
   SetLength(Path.Items, Length(Path.Items) + 1);
@@ -605 +610 @@
       ClearProcessed;
       UseRule.GetPossibleCharacters(Path, Scope, UseIndex, UseCharIndex);
-      C := 0;
-      while (C < Length(Scope.Items)) and
-        (Scope.Items[C].Character <> Text[I]) do Inc(C);
+      C := Length(Scope.Items);
+      Level := 0; //High(Integer);
+      for II := High(Scope.Items) downto 0 do begin
+        if (Scope.Items[II].Character = Text[I]) and (Level < Length(Scope.Items[II].RulePath.Items))
+        then begin
+          C := II;
+          Level := Length(Scope.Items[II].RulePath.Items);
+        end;
+      end;
       if C < Length(Scope.Items) then begin
         Path.Assign(Scope.Items[C].RulePath);