Changeset 12 in default

Timestamp:

10/22/10 15:45:35 (14 years ago)

Author:

zeiss

Message:

 

Location:

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

Files:

• ui/formatter/EbnfFormatterVisitor.java (modified) (9 diffs)
• visitor/EbnfVisitor.java (modified) (4 diffs)

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

@@ -3 +3 @@
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-
-import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Import;
 
 import de.ugoe.cs.swe.bnftools.ebnf.Atom;
@@ -13 +11 @@
 import de.ugoe.cs.swe.bnftools.ebnf.GroupedSequence;
 import de.ugoe.cs.swe.bnftools.ebnf.HookCombinator;
+import de.ugoe.cs.swe.bnftools.ebnf.Import;
 import de.ugoe.cs.swe.bnftools.ebnf.MergeRule;
 import de.ugoe.cs.swe.bnftools.ebnf.OptionalSequence;
@@ -29 +28 @@
         private FormatterConfig config;
 
+        int ruleCounter = 0;
+        
         public EbnfFormatterVisitor(EObject rootNode, FormatterConfig config) {
                 super(rootNode);
@@ -67 +68 @@
 
         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))
+                if (!isLastElement())
                         buf.append(" ");
         }
@@ -106 +105 @@
 
         protected void visitBefore(Import node) {
+                buf.append("import \"" + node.getImportURI() + "\";\n");
         }
 
@@ -118 +118 @@
 
         protected void visitBefore(OptionalSequence node) {
+                buf.append("[");
         }
 
         protected void visitAfter(OptionalSequence node) {
+                buf.append("]");
         }
 
         protected void visitBefore(RepeatedSequence node) {
+                buf.append("{");
         }
 
         protected void visitAfter(RepeatedSequence node) {
+                buf.append("}");
+                if (node.isMorethanonce())
+                        buf.append("+");
         }
 
         protected void visitBefore(Rule node) {
+                if (ruleCounter == 0)
+                        buf.append("\n");
+                
+                ruleCounter++;
                 if (node.getRulenumber() > 0)
                         buf.append(node.getRulenumber() + ". ");
@@ -147 +157 @@
 
         protected void visitBefore(RuleReference node) {
+                buf.append(node.getRuleref().getName());
         }
 
@@ -162 +173 @@
 
         protected void visitAfter(SingleDefinition node) {
+                if (!isLastElement())
+                        buf.append(" | ");
+                
         }
 
@@ -168 +182 @@
                         buf.append("\"" + node.getLiteral() + "\"");
                 else if (node.getColon() != null)
-                        buf.append(" " + node.getColon());
+                        buf.append("\"\"\"");
         }
 

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

@@ -1 +1 @@
 package de.ugoe.cs.swe.bnftools.visitor;
 
+import java.util.Stack;
+
 import org.eclipse.emf.ecore.EObject;
-
-import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Import;
 
 import de.ugoe.cs.swe.bnftools.ebnf.Atom;
@@ -12 +12 @@
 import de.ugoe.cs.swe.bnftools.ebnf.GroupedSequence;
 import de.ugoe.cs.swe.bnftools.ebnf.HookCombinator;
+import de.ugoe.cs.swe.bnftools.ebnf.Import;
 import de.ugoe.cs.swe.bnftools.ebnf.MergeRule;
 import de.ugoe.cs.swe.bnftools.ebnf.OptionalSequence;
@@ -26 +27 @@
         
         protected EObject rootNode = null;
-
+        protected Stack<Boolean> lastElementStack = new Stack<Boolean>();
+        
         public EbnfVisitor() {
         }
@@ -46 +48 @@
 
         private void acceptInner(EObject node) {
+                Boolean lastElement = false;
+                if (node.eContents().size() == 0)
+                        lastElement = true;
+                lastElementStack.push(lastElement);             
                 for (int i=0; i < node.eContents().size(); i++) {
                         EObject currentNode = (EObject) node.eContents().get(i);
+                        if (i == node.eContents().size()-1) {
+                                lastElement = true;
+                                lastElementStack.pop();
+                                lastElementStack.push(lastElement);
+                        }
                         dispatcherBefore(currentNode);
                         acceptInner(currentNode);
                         dispatcherAfter(currentNode);
                 }
+                lastElementStack.pop();
+        }
+        
+        protected boolean isLastElement() {
+                return lastElementStack.peek();
         }