Fixed bug with empty path in the end of parsing. Removed empty Javadoc.

svinniks · Jul 27, 2019 · 15ccea9 · 15ccea9
1 parent e3c14f2
commit 15ccea9
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 182 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.github.svinniks</groupId>
     <artifactId>simple-grammar</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 
     <name>Simple grammar parser library</name>
 

diff --git a/src/main/java/simplegrammar/AbstractOptionElement.java b/src/main/java/simplegrammar/AbstractOptionElement.java
@@ -15,10 +15,6 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public abstract class AbstractOptionElement {
 
 }
diff --git a/src/main/java/simplegrammar/ElementStack.java b/src/main/java/simplegrammar/ElementStack.java
@@ -17,10 +17,6 @@
 
 import java.util.Stack;
 
-/**
- *
- * @author s.vinniks
- */
 public class ElementStack extends Stack<AbstractOptionElement> {
 
     public void pushOption(Option option) {

diff --git a/src/main/java/simplegrammar/EmptyElement.java b/src/main/java/simplegrammar/EmptyElement.java
@@ -15,10 +15,6 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public class EmptyElement extends AbstractOptionElement {
 
 }
diff --git a/src/main/java/simplegrammar/Grammar.java b/src/main/java/simplegrammar/Grammar.java
@@ -22,10 +22,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- *
- * @author s.vinniks
- */
 public class Grammar {
 
     private final Map<String, List<Option>> rules;
@@ -158,31 +154,6 @@ private void findExpansionStacks(
         }
 
     }
-
-    private boolean emptyPathExists(List<AbstractOptionElement> optionElements) {
-
-        for (AbstractOptionElement element : optionElements)
-            if (element instanceof OptionToken)
-                return false;
-            else if (element instanceof OptionRule) {
-
-                OptionRule optionRule = (OptionRule)element;
-                boolean emptySubpathExists = false;
-
-                for (Option option : rules.get(optionRule.getName()))
-                    if (emptyPathExists(option.getElements())) {
-                        emptySubpathExists = true;
-                        break;
-                    }
-
-                if (!emptySubpathExists)
-                    return false;
-
-            }
-
-        return true;
-
-    }
 
     public String getRootRuleName() {
         return rootRuleName;
@@ -199,7 +170,29 @@ public SyntaxTreeNode parse(Tokenizer tokens) throws ParseException, GrammarExce
     public SyntaxTreeNode parse(Tokenizer tokens, String rootRoleName) throws GrammarException, ParseException {
         return parse(tokens, rootRoleName,false);
     }
-
+
+    private void outputTrace(ElementStack elementStack, Tokenizer tokens) {
+
+        System.out.println(tokens.peek(1).getName() + ":" + tokens.peek(1).getValue() + " - ");
+
+        for (AbstractOptionElement element : elementStack) {
+
+            if (element instanceof OptionToken) {
+                OptionToken token = (OptionToken)element;
+                System.out.print(token.getName() + ":" + token.getValue());
+            } else if (element instanceof OptionRule) {
+                OptionRule token = (OptionRule)element;
+                System.out.print("{" + token.getName()+"}");
+            } else {
+                System.out.print(element.getClass().getName());
+            }
+            System.out.print("  ");
+        }
+
+        System.out.println();
+
+    }
+
     public SyntaxTreeNode parse(Tokenizer tokens, String rootRuleName, boolean outputTrace) throws GrammarException, ParseException {
 
         checkRule(rootRuleName);
@@ -214,29 +207,10 @@ public SyntaxTreeNode parse(Tokenizer tokens, String rootRuleName, boolean outpu
 
         OptionStack expansionStack = new OptionStack();
 
-        while (!elementStack.empty() && tokens.hasNext()) {
+        while (!elementStack.empty()) {
 
-            if (outputTrace) {
-
-                System.out.println(tokens.peek(1).getName() + ":" + tokens.peek(1).getValue() + " - ");
-
-                for (AbstractOptionElement element : elementStack) {
-
-                    if (element instanceof OptionToken) {
-                        OptionToken token = (OptionToken)element;
-                        System.out.print(token.getName()+":"+token.getValue());
-                    } else if (element instanceof OptionRule) {
-                        OptionRule token = (OptionRule)element;
-                        System.out.print("{" + token.getName()+"}");
-                    } else {
-                        System.out.print(element.getClass().getName());
-                    }
-                    System.out.print("  ");
-                }
-
-                System.out.println(); 
-
-            }
+            if (outputTrace)
+                outputTrace(elementStack, tokens);
 
             AbstractOptionElement element = elementStack.peek();
 
@@ -247,7 +221,7 @@ public SyntaxTreeNode parse(Tokenizer tokens, String rootRuleName, boolean outpu
 
             } else if (element instanceof OptionToken) {
 
-                Token token = tokens.read();
+                Token token = tokens.get();
                 OptionToken optionToken = (OptionToken)element;
 
                 if (optionToken.matches(token)) {
@@ -315,42 +289,19 @@ public SyntaxTreeNode parse(Tokenizer tokens, String rootRuleName, boolean outpu
                                     matchingExpansionStacks
                             );
 
-                        /*System.out.println(token.toString());
-                        System.out.println("------------------------------------------------");
-                        int i = 0;
-                        for (ElementStack stack : matchingElementStacks) {
-                            System.out.print(++i);
-                            System.out.print(' ');
-                            for (AbstractOptionElement e : stack) {
-                                if (e instanceof OptionToken) {
-                                    OptionToken t = (OptionToken)e;
-                                    System.out.print(t.getName()+":"+t.getValue());
-                                } else if (e instanceof OptionRule) {
-                                    OptionRule r = (OptionRule)e;
-                                    System.out.print("{" + r.getName()+"}");
-                                } else {
-                                    System.out.print(e.getClass().getName());
-                                }
-                                System.out.print("  ");
-                            }
-                            System.out.println();
-                        }
-                        
-                        System.out.println();*/
-
-                        if (matchingExpansionStacks.isEmpty())
+                        if (matchingExpansionStacks.size() == 0)
 
                             throw new UnexpectedTokenException(token);
 
-                        else if (matchingExpansionStacks.size() == 1) 
-                            
+                        else if (matchingExpansionStacks.size() == 1)
+
                             while (!matchingExpansionStacks.get(0).empty())
                                 expansionStack.push(matchingExpansionStacks.get(0).pop());
-                        
+
                         else if (token instanceof TokenStreamEnd)
 
-                            throw new ParseException("Unexpected end of the input!");
-                            
+                            throw new UnexpectedTokenException(token);
+
                         else {
 
                             peekDepth++;
@@ -368,12 +319,9 @@ else if (token instanceof TokenStreamEnd)
 
         }
 
-        if (tokens.hasNext())
+        if (!(tokens.get() instanceof TokenStreamEnd))
             throw new UnexpectedTokenException(tokens.peek(1));
 
-        if (!emptyPathExists(elementStack))
-            throw new ParseException("Unexpected end of the input!");
-
         return syntaxTree;
 
     }

diff --git a/src/main/java/simplegrammar/GrammarException.java b/src/main/java/simplegrammar/GrammarException.java
@@ -15,26 +15,13 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public class GrammarException extends Exception {
 
-    /**
-     * Creates a new instance of <code>GrammarException</code> without detail
-     * message.
-     */
     public GrammarException() {
     }
 
-    /**
-     * Constructs an instance of <code>GrammarException</code> with the
-     * specified detail message.
-     *
-     * @param msg the detail message.
-     */
     public GrammarException(String msg) {
         super(msg);
     }
+
 }
diff --git a/src/main/java/simplegrammar/GrammarParseException.java b/src/main/java/simplegrammar/GrammarParseException.java
@@ -15,26 +15,13 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public class GrammarParseException extends Exception {
 
-    /**
-     * Creates a new instance of <code>ParseException</code> without detail
-     * message.
-     */
     public GrammarParseException() {
     }
 
-    /**
-     * Constructs an instance of <code>ParseException</code> with the specified
-     * detail message.
-     *
-     * @param msg the detail message.
-     */
     public GrammarParseException(String msg) {
         super(msg);
     }
+
 }
diff --git a/src/main/java/simplegrammar/MatchingElementStacks.java b/src/main/java/simplegrammar/MatchingElementStacks.java
@@ -19,10 +19,6 @@
 
 import java.util.ArrayList;
 
-/**
- *
- * @author s.vinniks
- */
 public class MatchingElementStacks extends ArrayList<ElementStack> {
 
     private Match bestMatch;

diff --git a/src/main/java/simplegrammar/Option.java b/src/main/java/simplegrammar/Option.java
@@ -18,10 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- *
- * @author s.vinniks
- */
 public class Option {
 
     private final Grammar grammar;

diff --git a/src/main/java/simplegrammar/OptionRule.java b/src/main/java/simplegrammar/OptionRule.java
@@ -15,10 +15,6 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public class OptionRule extends AbstractOptionElement {
 
     private final String name;
@@ -36,7 +32,5 @@ public String getName() {
     public Boolean getOutput() {
         return output;
     }
-
-
-
+
 }
diff --git a/src/main/java/simplegrammar/OptionStack.java b/src/main/java/simplegrammar/OptionStack.java
@@ -17,10 +17,6 @@
 
 import java.util.Stack;
 
-/**
- *
- * @author s.vinniks
- */
 public class OptionStack extends Stack<Option> {
 
 }
diff --git a/src/main/java/simplegrammar/OptionToken.java b/src/main/java/simplegrammar/OptionToken.java
@@ -15,10 +15,6 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public class OptionToken extends AbstractOptionElement {
 
     public static enum Match {NONE, ANY, NAME, VALUE};

diff --git a/src/main/java/simplegrammar/SimpleTokenizer.java b/src/main/java/simplegrammar/SimpleTokenizer.java
@@ -42,11 +42,9 @@ public void addToken(Token token) {
             tokens.add(token);
     }
 
-    public void addAll(Tokenizer tokenizer) throws ParseException {
-
+    public void addAll(Tokenizer tokenizer) {
         while (tokenizer.hasNext())
-            addToken(tokenizer.read());
-
+            addToken(tokenizer.get());
     }
 
     @Override
@@ -60,7 +58,7 @@ protected Token doPeek(int depth) {
     }
 
     @Override
-    protected Token doRead() {
+    protected Token doGet() {
         position++;
         return doPeek(0);
     }

diff --git a/src/main/java/simplegrammar/SyntaxTreeNode.java b/src/main/java/simplegrammar/SyntaxTreeNode.java
@@ -18,10 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- *
- * @author s.vinniks
- */
 public class SyntaxTreeNode {
 
     private final String value;

diff --git a/src/main/java/simplegrammar/SyntaxTreeNodeStack.java b/src/main/java/simplegrammar/SyntaxTreeNodeStack.java
@@ -17,10 +17,6 @@
 
 import java.util.Stack;
 
-/**
- *
- * @author s.vinniks
- */
 public class SyntaxTreeNodeStack extends Stack<SyntaxTreeNode>{
 
     public void push(SyntaxTreeNode node, int count) {

diff --git a/src/main/java/simplegrammar/Token.java b/src/main/java/simplegrammar/Token.java
@@ -15,10 +15,6 @@
 */
 package simplegrammar;
 
-/**
- *
- * @author s.vinniks
- */
 public class Token {
 
     private final String name;