Fix several critical bugs

Author: alumik

src/main/java/cn/alumik/parsetree/ParseTreeApp.java

@@ -12,12 +12,12 @@ public class ParseTreeApp {
     public static void main(String[] args) {
         final Config config = new Config("config.yml");
         try {
-            final Lexer lexer = new Lexer(config);
             final Parser parser = new Parser(config);
+            final Lexer lexer = new Lexer(config, parser);
 
             final Scanner scanner = new Scanner(System.in);
             final ParseTree parseTree = parser.parse(lexer.lex(scanner.next()));
-            parseTree.draw("out/parse-tree.png");
+            parseTree.draw("out/parse_tree.png");
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/cn/alumik/parsetree/lexer/Lexer.java

@@ -5,6 +5,7 @@
 import cn.alumik.parsetree.lexer.fsm.DFA;
 import cn.alumik.parsetree.lexer.fsm.FSMState;
 import cn.alumik.parsetree.lexer.fsm.NFA;
+import cn.alumik.parsetree.parser.Parser;
 import cn.alumik.parsetree.symbol.TerminalSymbol;
 import cn.alumik.parsetree.util.Config;
 
@@ -14,14 +15,17 @@ public class Lexer {
 
     private final Config mConfig;
 
+    private final Parser mParser;
+
     private DFA mDfa;
 
     private Map<String, String> mAcceptingRules = new LinkedHashMap<>();
 
     private Set<String> mIgnoredSymbols = new HashSet<>();
 
-    public Lexer(Config config) throws AnalysisException, ParsingException {
+    public Lexer(Config config, Parser parser) throws AnalysisException, ParsingException {
         mConfig = config;
+        mParser = parser;
         initAcceptingRules();
         initDFA();
     }
@@ -38,11 +42,7 @@ public void setAcceptingRule(Map<String, String> acceptingRules) {
         mAcceptingRules = acceptingRules;
     }
 
-    public Set<String> getIgnoredSymbols() {
-        return mIgnoredSymbols;
-    }
-
-    public List<TerminalSymbol> lex(String input) throws ParsingException {
+    public List<TerminalSymbol> lex(String input) throws ParsingException, AnalysisException {
         final List<TerminalSymbol> lexResult = new ArrayList<>();
         final StringBuilder stringBuilder = new StringBuilder(input);
         while (stringBuilder.length() != 0) {
@@ -53,7 +53,9 @@ public List<TerminalSymbol> lex(String input) throws ParsingException {
             if (!mIgnoredSymbols.contains(result.getKey())) {
                 final String value = stringBuilder.substring(0, result.getValue());
                 System.out.println(result.getKey() + ": " + value);
-                final TerminalSymbol terminalSymbol = new TerminalSymbol(value);
+                final TerminalSymbol terminalSymbol = new TerminalSymbol(
+                        mParser.getGrammar().getSymbolPool().getTerminalSymbol(result.getKey()));
+                terminalSymbol.setValue(value);
                 lexResult.add(terminalSymbol);
             }
             stringBuilder.delete(0, result.getValue());

src/main/java/cn/alumik/parsetree/parser/Grammar.java

@@ -15,7 +15,7 @@ public class Grammar {
 
     private AbstractNonterminalSymbol mStartSymbol;
 
-    final private SymbolPool mSymbolPool;
+    private final SymbolPool mSymbolPool;
 
     private List<Production> mProductions;
 

src/main/java/cn/alumik/parsetree/parser/ParseTree.java

@@ -1,8 +1,7 @@
 package cn.alumik.parsetree.parser;
 
 import cn.alumik.parsetree.util.IDGen;
-import guru.nidi.graphviz.attribute.Color;
-import guru.nidi.graphviz.attribute.Label;
+import guru.nidi.graphviz.attribute.*;
 import guru.nidi.graphviz.engine.Format;
 import guru.nidi.graphviz.engine.Graphviz;
 import guru.nidi.graphviz.engine.GraphvizV8Engine;
@@ -39,10 +38,14 @@ private MutableGraph getGraph() {
         while (!nodeQueue.isEmpty()) {
             final ParseTreeNode currentNode = nodeQueue.poll();
             final MutableNode currentGraphNode = mutNode(currentNode.getId())
-                    .add(Label.of(currentNode.getSymbol().getValue()));
+                    .add(Label.of(currentNode.getSymbol().getAbstractSymbol().getName()));
             graphNodes.add(currentGraphNode);
             if (currentNode.getChildren().isEmpty()) {
-                currentGraphNode.add(Color.BLUE);
+                final MutableNode valueNode = mutNode(currentNode.getId() + currentNode.getSymbol().getValue())
+                        .add(Label.of(currentNode.getSymbol().getValue())).add(Shape.BOX).add(Color.BLUE);
+                graphNodes.add(valueNode);
+                currentGraphNode.addLink(currentGraphNode.linkTo(valueNode)
+                        .add(Style.DASHED).add(Color.BLUE).add(Arrow.NONE));
             } else {
                 for (final ParseTreeNode nextNode : currentNode.getChildren()) {
                     nodeQueue.add(nextNode);

src/main/java/cn/alumik/parsetree/parser/Parser.java

@@ -80,7 +80,8 @@ public ParseTree parse(List<TerminalSymbol> terminalSymbols) throws AnalysisExce
 
     private void initTerminalSymbolList(List<TerminalSymbol> terminalSymbols) throws AnalysisException {
         for (final TerminalSymbol terminalSymbol : terminalSymbols) {
-            terminalSymbol.setAbstractSymbol(mGrammar.getSymbolPool().getTerminalSymbol(terminalSymbol.getValue()));
+            terminalSymbol.setAbstractSymbol(
+                    mGrammar.getSymbolPool().getTerminalSymbol(terminalSymbol.getAbstractSymbol().getName()));
         }
     }
 }

src/main/java/cn/alumik/parsetree/symbol/AbstractSymbol.java

@@ -29,7 +29,7 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return (getType() == TERMINAL ? "Terminal Symbol: " : "Nonterminal Symbol: ") + mName;
+        return (getType() == TERMINAL ? "Terminal symbol: " : "Nonterminal symbol: ") + mName;
     }
 
     @Override

src/main/java/cn/alumik/parsetree/symbol/NonterminalSymbol.java

@@ -6,8 +6,4 @@ public NonterminalSymbol(AbstractNonterminalSymbol abstractNonterminalSymbol) {
         super(abstractNonterminalSymbol.getName());
         setAbstractSymbol(abstractNonterminalSymbol);
     }
-
-    public NonterminalSymbol(String value) {
-        super(value);
-    }
 }

src/main/java/cn/alumik/parsetree/symbol/Symbol.java

@@ -4,7 +4,7 @@ public class Symbol {
 
     private AbstractSymbol mAbstractSymbol;
 
-    final private String mValue;
+    private String mValue;
 
     public Symbol(String value) {
         mValue = value;
@@ -22,6 +22,10 @@ public String getValue() {
         return mValue;
     }
 
+    public void setValue(String value) {
+        mValue = value;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Symbol) {

src/main/java/cn/alumik/parsetree/util/Config.java

@@ -8,7 +8,7 @@
 
 public class Config {
 
-    final private ConfigSource mConfigSource;
+    private final ConfigSource mConfigSource;
 
     public Config(String path) {
         final Yaml yaml = new Yaml(new Constructor(ConfigSource.class));

src/main/resources/config.yml

@@ -7,16 +7,16 @@ nonterminalSymbols:
   ? S
 terminalSymbols:
   # name: regex
-  a: a
-  b: b
+  α: a
+  β: b
 ignoredSymbols:
 startSymbol: S
 productions:
   # - left part -> right part
-  - S -> C b B A
-  - A -> A a b
-  - A -> a b
+  - S -> C β B A
+  - A -> A α β
+  - A -> α β
   - B -> C
-  - B -> D b
-  - C -> a
-  - D -> a
+  - B -> D β
+  - C -> α
+  - D -> α