Changeset 11 in default for trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui

Timestamp:

10/22/10 14:53:37 (14 years ago)

Author:

zeiss

Message:

 

Location:

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

Files:

• EbnfFormatterVisitor.java (modified) (2 diffs)
• FormatterProcessor.java (modified) (1 diff)

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

@@ -1 +1 @@
 package de.ugoe.cs.swe.bnftools.ui.formatter;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
@@ -45 +46 @@
         // -----------------------------------------------------------------------------
 
-        protected void visit(EtsiBnf node) {
+        protected void visitBefore(EtsiBnf node) {
                 buf.append("grammar " + node.getName());
                 if (node.getType() != null)
                         buf.append(node.getType());
                 buf.append(";");
+                buf.append("\n\n");
         }
 
-        protected void visit(Atom node) {
+        protected void visitAfter(EtsiBnf node) {
         }
 
-        protected void visit(DefinitionList node) {
+        protected void visitBefore(Atom node) {
         }
 
-        protected void visit(ExtRule node) {
+        protected void visitAfter(Atom node) {
         }
 
-        protected void visit(GlobalCombinator node) {
+        protected void visitBefore(Term node) {
         }
 
-        protected void visit(GroupedSequence node) {
+        protected void visitAfter(Term node) {
+                SingleDefinition parent = (SingleDefinition) node.eContainer();
+                int index = parent.getTerms().indexOf(node);
+                if ((parent.getTerms().size() > 0) && (index < parent.getTerms().size()-1))
+                        buf.append(" ");
         }
 
-        protected void visit(HookCombinator node) {
+        protected void visitBefore(DefinitionList node) {
         }
 
-        protected void visit(Import node) {
+        protected void visitAfter(DefinitionList node) {
         }
 
-        protected void visit(MergeRule node) {
+        protected void visitBefore(ExtRule node) {
         }
 
-        protected void visit(OptionalSequence node) {
+        protected void visitAfter(ExtRule node) {
         }
 
-        protected void visit(RepeatedSequence node) {
+        protected void visitBefore(GlobalCombinator node) {
         }
 
-        protected void visit(Rule node) {
+        protected void visitAfter(GlobalCombinator node) {
         }
 
-        protected void visit(RuleCombinator node) {
+        protected void visitBefore(GroupedSequence node) {
+                buf.append("(");
         }
 
-        protected void visit(RuleReference node) {
+        protected void visitAfter(GroupedSequence node) {
+                buf.append(")");
         }
 
-        protected void visit(SectionHeading node) {
+        protected void visitBefore(HookCombinator node) {
         }
 
-        protected void visit(SingleDefinition node) {
+        protected void visitAfter(HookCombinator node) {
         }
 
-        protected void visit(StringRule node) {
+        protected void visitBefore(Import node) {
         }
 
-        protected void visit(Term node) {
+        protected void visitAfter(Import node) {
         }
 
+        protected void visitBefore(MergeRule node) {
+        }
+
+        protected void visitAfter(MergeRule node) {
+        }
+
+        protected void visitBefore(OptionalSequence node) {
+        }
+
+        protected void visitAfter(OptionalSequence node) {
+        }
+
+        protected void visitBefore(RepeatedSequence node) {
+        }
+
+        protected void visitAfter(RepeatedSequence node) {
+        }
+
+        protected void visitBefore(Rule node) {
+                if (node.getRulenumber() > 0)
+                        buf.append(node.getRulenumber() + ". ");
+                
+                buf.append(node.getName() + " ::= ");
+        }
+
+        protected void visitAfter(Rule node) {
+                buf.append(";\n");
+        }
+
+        protected void visitBefore(RuleCombinator node) {
+        }
+
+        protected void visitAfter(RuleCombinator node) {
+        }
+
+        protected void visitBefore(RuleReference node) {
+        }
+
+        protected void visitAfter(RuleReference node) {
+        }
+
+        protected void visitBefore(SectionHeading node) {
+        }
+
+        protected void visitAfter(SectionHeading node) {
+        }
+
+        protected void visitBefore(SingleDefinition node) {
+        }
+
+        protected void visitAfter(SingleDefinition node) {
+        }
+
+        protected void visitBefore(StringRule node) {
+                if (node.getLiteral() != null)
+                        buf.append("\"" + node.getLiteral() + "\"");
+                else if (node.getColon() != null)
+                        buf.append(" " + node.getColon());
+        }
+
+        protected void visitAfter(StringRule node) {
+        }
+
+        
+        
 }

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

@@ -104 +104 @@
                 
                 FormatterConfig config = new FormatterConfig();
-                EbnfFormatterVisitor visitor = new EbnfFormatterVisitor(rootNode.getElement(), config);
-                visitor.accept();
+                EbnfFormatterVisitor visitor = new EbnfFormatterVisitor(config);
+                visitor.accept(rootNode.getElement());
                 
                 ReplaceEdit replaceEdit = new ReplaceEdit(0, document.getLength(), visitor.getBuf().toString());