Changeset 13 in default

Timestamp:

10/22/10 16:14:33 (14 years ago)

Author:

zeiss

Message:

 

Location:

trunk

Files:

• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/AbstractEbnfUiModule.java (deleted)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/EbnfExecutableExtensionFactory.java (deleted)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/contentassist (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/contentassist/AbstractEbnfProposalProvider.java (deleted)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/contentassist/antlr (modified) (1 prop)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/contentassist/antlr/EbnfParser.java (deleted)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/contentassist/antlr/internal (deleted)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src-gen/de/ugoe/cs/swe/bnftools/ui/internal (deleted)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java (modified) (7 diffs)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/visitor/EbnfVisitor.java (modified) (5 diffs)
• de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/Ebnf.xtext (modified) (1 diff)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java

@@ -5 +5 @@
 
 import de.ugoe.cs.swe.bnftools.ebnf.Atom;
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.DefinitionList;
+import de.ugoe.cs.swe.bnftools.ebnf.DeltaEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.EtsiBnf;
 import de.ugoe.cs.swe.bnftools.ebnf.ExtRule;
@@ -12 +14 @@
 import de.ugoe.cs.swe.bnftools.ebnf.HookCombinator;
 import de.ugoe.cs.swe.bnftools.ebnf.Import;
+import de.ugoe.cs.swe.bnftools.ebnf.ImportSection;
+import de.ugoe.cs.swe.bnftools.ebnf.MergeEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.MergeRule;
 import de.ugoe.cs.swe.bnftools.ebnf.OptionalSequence;
@@ -28 +32 @@
         private FormatterConfig config;
 
-        int ruleCounter = 0;
-        
         public EbnfFormatterVisitor(EObject rootNode, FormatterConfig config) {
                 super(rootNode);
@@ -52 +54 @@
                         buf.append(node.getType());
                 buf.append(";");
-                buf.append("\n\n");
+                buf.append("\n");
         }
 
@@ -58 +60 @@
         }
 
+        protected void visitBefore(ImportSection node) {
+                buf.append("\n");
+        }
+
+        protected void visitAfter(ImportSection node) {
+                buf.append("\n");
+        }
+
+        protected void visitBefore(BnfEntry node) {
+        }
+
+        protected void visitAfter(BnfEntry node) {
+        }
+        
+        protected void visitBefore(DeltaEntry node) {
+        }
+
+        protected void visitAfter(DeltaEntry node) {
+        }
+        
+        protected void visitBefore(MergeEntry node) {
+        }
+
+        protected void visitAfter(MergeEntry node) {
+        }
+        
         protected void visitBefore(Atom node) {
         }
@@ -136 +164 @@
 
         protected void visitBefore(Rule node) {
-                if (ruleCounter == 0)
-                        buf.append("\n");
-                
-                ruleCounter++;
                 if (node.getRulenumber() > 0)
                         buf.append(node.getRulenumber() + ". ");
@@ -164 +188 @@
 
         protected void visitBefore(SectionHeading node) {
+                if (!buf.substring(buf.length()-2).equals("\n\n"))
+                        buf.append("\n");
+                
+                buf.append(node.getSectionHeader());
         }
 
         protected void visitAfter(SectionHeading node) {
+                buf.append("\n");
         }
 

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/visitor/EbnfVisitor.java

@@ -6 +6 @@
 
 import de.ugoe.cs.swe.bnftools.ebnf.Atom;
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.DefinitionList;
+import de.ugoe.cs.swe.bnftools.ebnf.DeltaEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.EtsiBnf;
 import de.ugoe.cs.swe.bnftools.ebnf.ExtRule;
@@ -13 +15 @@
 import de.ugoe.cs.swe.bnftools.ebnf.HookCombinator;
 import de.ugoe.cs.swe.bnftools.ebnf.Import;
+import de.ugoe.cs.swe.bnftools.ebnf.ImportSection;
+import de.ugoe.cs.swe.bnftools.ebnf.MergeEntry;
 import de.ugoe.cs.swe.bnftools.ebnf.MergeRule;
 import de.ugoe.cs.swe.bnftools.ebnf.OptionalSequence;
@@ -74 +78 @@
                 if (node instanceof EtsiBnf) {
                         visitBefore((EtsiBnf) node);
+                } else if (node instanceof ImportSection) {
+                        visitBefore((ImportSection) node);
+                } else if (node instanceof BnfEntry) {
+                        visitBefore((BnfEntry) node);
+                } else if (node instanceof DeltaEntry) {
+                        visitBefore((DeltaEntry) node);
+                } else if (node instanceof MergeEntry) {
+                        visitBefore((MergeEntry) node);
                 } else if (node instanceof Atom) {
                         visitBefore((Atom) node);
@@ -115 +127 @@
                 if (node instanceof EtsiBnf) {
                         visitAfter((EtsiBnf) node);
+                } else if (node instanceof ImportSection) {
+                        visitAfter((ImportSection) node);
+                } else if (node instanceof BnfEntry) {
+                        visitAfter((BnfEntry) node);
+                } else if (node instanceof DeltaEntry) {
+                        visitAfter((DeltaEntry) node);
+                } else if (node instanceof MergeEntry) {
+                        visitAfter((MergeEntry) node);
                 } else if (node instanceof Atom) {
                         visitAfter((Atom) node);
@@ -158 +178 @@
         }
 
+        protected void visitBefore(ImportSection node) {
+        }
+
+        protected void visitAfter(ImportSection node) {
+        }
+
+        protected void visitBefore(BnfEntry node) {
+        }
+
+        protected void visitAfter(BnfEntry node) {
+        }
+        
+        protected void visitBefore(DeltaEntry node) {
+        }
+
+        protected void visitAfter(DeltaEntry node) {
+        }
+        
+        protected void visitBefore(MergeEntry node) {
+        }
+
+        protected void visitAfter(MergeEntry node) {
+        }
+
         protected void visitBefore(Atom node) {
         }

trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/Ebnf.xtext

@@ -11 +11 @@
         'grammar' name=ID
         (       type='/bnf'? ';' 
-                (imports+=Import)* 
-                (rule+=Rule | sectionheader+=SectionHeading)+ 
+                (importSection=ImportSection)?
+                (bnfEntry+=BnfEntry)+ 
         )
         | 
         (       type='/delta' ';'
-                (imports+=Import)* 
-                (rule+=Rule | sectionheader+=SectionHeading | extRule+=ExtRule)*
+                (importSection=ImportSection)?
+                (deltaEntry+=DeltaEntry)*
         )
         | 
         (       type='/merge' ';' 
-                (imports+=Import)* 
-                (sectionheader+=SectionHeading | mergeRule+=MergeRule)* 
+                (importSection=ImportSection)?
+                (mergeEntry+=MergeEntry)* 
         )
 ;
 
+ImportSection:
+        (imports+=Import)+
+;
+
+BnfEntry:
+        sectionheader=SectionHeading | rule=Rule
+;
+
+DeltaEntry:
+        rule=Rule | sectionheader=SectionHeading | extRule=ExtRule
+;
+
+MergeEntry:
+        sectionheader=SectionHeading | mergeRule=MergeRule
+;
 
 SectionHeading: