Merge pull request #16 from jdrem/states-out-of-order-#15

Allow states to be out of order. #15
jdrem · Dec 6, 2019 · 16cb511 · 16cb511
2 parents 7c61b5d + 2404cf5
commit 16cb511
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 2 deletions.
diff --git a/src/main/java/net/remgant/tools/parser/Parser.java b/src/main/java/net/remgant/tools/parser/Parser.java
@@ -53,10 +53,17 @@ static class State {
 
     protected void addState(int state, Predicate<Token> predicate, int nextState, ParserAction action) {
         if (stateList.size() < state + 1) {
+            if (stateList.size() < state + 1)
+                for (int i=0; i<state + 1; i++)
+                    stateList.add(null);
             List<State> list = new ArrayList<>();
-            stateList.add(state, list);
+            stateList.set(state, list);
         }
         List<State> list = stateList.get(state);
+        if (list == null) {
+            list = new ArrayList<>();
+            stateList.set(state, list);
+        }
         list.add(new State(state, predicate, nextState, action));
     }
 
@@ -67,8 +74,10 @@ protected Parser() {
         init();
     }
 
-    protected void printStateDiagram(@SuppressWarnings("SameParameterValue") PrintStream out) {
+    public void printStateDiagram(@SuppressWarnings("SameParameterValue") PrintStream out) {
         for (List<State> l : stateList) {
+            if (l == null)
+                continue;
             for (State s : l) {
                 String ts;
                 if (Token.tokenMap.containsKey(s.predicate))

diff --git a/src/test/java/net/remgant/tools/parser/test/OutOfSeqStateTest.java b/src/test/java/net/remgant/tools/parser/test/OutOfSeqStateTest.java
@@ -0,0 +1,54 @@
+package net.remgant.tools.parser.test;
+
+import net.remgant.tools.parser.Parser;
+import net.remgant.tools.parser.ParserException;
+import net.remgant.tools.parser.ParserResult;
+import net.remgant.tools.parser.Token;
+import org.junit.Test;
+
+import java.util.Collections;
+
+public class OutOfSeqStateTest {
+    @Test
+    public void testSkipStates() throws ParserException {
+        Parser parser = new Parser() {
+            @Override
+            protected void init() {
+                addState(0, Token.MATCH_ANY, 1, null);
+                addState(1, Token.MATCH_ANY, 100, null);
+                addState(100, Token.MATCH_ANY, 999, null);
+                terminalStates = Collections.singleton(999);
+            }
+
+            @Override
+            public ParserResult parse(String source) throws ParserException {
+                init();
+                return super.parse(source);
+            }
+        };
+        parser.parse("a b c");
+        parser.printStateDiagram(System.out);
+    }
+
+    @Test
+    public void testOutOfOrderStates() throws ParserException {
+        Parser parser = new Parser() {
+            @Override
+            protected void init() {
+                addState(0, Token.MATCH_ANY, 1, null);
+                addState(2, Token.MATCH_ANY, 3, null);
+                addState(1, Token.MATCH_ANY, 2, null);
+                addState(3, Token.MATCH_ANY, 999, null);
+                terminalStates = Collections.singleton(999);
+            }
+
+            @Override
+            public ParserResult parse(String source) throws ParserException {
+                init();
+                return super.parse(source);
+            }
+        };
+
+        parser.parse("a b c d");
+    }
+}