add helpers for rest-api

mesut146 · Oct 22, 2021 · c1d78ad · c1d78ad
1 parent 85b4284
commit c1d78ad
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/src/main/java/mesut/parserx/utils/Utils.java b/src/main/java/mesut/parserx/utils/Utils.java
@@ -4,14 +4,17 @@
 import mesut.parserx.parser.AstBuilder;
 
 import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class Utils {
 
-    public static Tree makeTokenLessTree(String grammar) {
+    public static Tree makeTokenLessTree(String grammar, final boolean fromRegex) {
         try {
             final Tree tree = AstBuilder.makeTree(grammar);
             new SimpleTransformer(tree) {
                 int count = 1;
+                Map<String, TokenDecl> newTokens = new HashMap<>();
 
                 @Override
                 public Node transformName(Name node, Node parent) {
@@ -28,11 +31,24 @@ public Node transformName(Name node, Node parent) {
                 public Node transformString(StringNode node, Node parent) {
                     TokenDecl decl = tree.getTokenByValue(node.value);
                     if (decl == null) {
-                        decl = new TokenDecl("T" + count++, node);
-                        tree.addToken(decl);
+                        if (fromRegex) {
+                            return node;
+                        }
+                        else {
+                            decl = new TokenDecl("T" + count++, node);
+                            newTokens.put(decl.name, decl);
+                        }
                     }
                     return decl.ref();
                 }
+
+                @Override
+                public void transformAll() {
+                    super.transformAll();
+                    for (TokenDecl decl : newTokens.values()) {
+                        tree.addToken(decl);
+                    }
+                }
             }.transformAll();
             return tree;
         } catch (Exception e) {

diff --git a/src/test/java/common/Env.java b/src/test/java/common/Env.java
@@ -1,6 +1,9 @@
 package common;
 
+import mesut.parserx.nodes.Node;
+import mesut.parserx.nodes.TokenDecl;
 import mesut.parserx.nodes.Tree;
+import mesut.parserx.regex.RegexFromStr;
 import mesut.parserx.utils.Utils;
 import org.junit.Test;
 
@@ -35,16 +38,20 @@ public static File getResFile(String name) throws IOException {
         return new File(url.getPath());
     }
 
-    public static Tree makeRule(String grammar) {
-        return Utils.makeTokenLessTree(grammar);
-    }
-
     public static Tree tree(String res) throws IOException {
         return Tree.makeTree(getResFile(res));
     }
 
     @Test
     public void tokenLessTest() {
-        System.out.println(Utils.makeTokenLessTree("A: \"asd\" \"a\"*;"));
+        System.out.println(Utils.makeTokenLessTree("A: \"asd\" \"a\"*;", false));
+    }
+
+    @Test
+    public void tokenLessTest2() {
+        Node rhs = RegexFromStr.build("a*b");
+        Tree tree = new Tree();
+        tree.addToken(new TokenDecl("START", rhs));
+        System.out.println(Utils.makeTokenLessTree(tree.toString(), true));
     }
 }
diff --git a/src/test/java/regex/FactorTest.java b/src/test/java/regex/FactorTest.java
@@ -7,14 +7,15 @@
 import mesut.parserx.gen.transform.FactorLoop;
 import mesut.parserx.gen.transform.Recursion;
 import mesut.parserx.nodes.*;
+import mesut.parserx.utils.Utils;
 import org.junit.Ignore;
 import org.junit.Test;
 
 public class FactorTest {
 
     @Test
     public void helper() {
-        Tree tree = Env.makeRule("A: (a | b y)* c | (a | d)+ e | c c;");
+        Tree tree = Utils.makeTokenLessTree("A: (a | b y)* c | (a | d)+ e | c c;", false);
         RuleDecl decl = tree.rules.get(0);
         System.out.println(Helper.firstMap(decl.rhs, tree));
     }