RENAME;

aidl-to-json/src/main/java/xyz/ignatz/antlr/aidl/AidlToJson.java

@@ -25,17 +25,17 @@ public class AidlToJson
         AidlParser parser = new AidlParser(tokens);
         ParseTree tree = parser.aidl();
         ParseTreeWalker walker = new ParseTreeWalker();
-        AidlLoader loader = new AidlLoader();
-        walker.walk(loader, tree);
+        AidlToJsonListener listener = new AidlToJsonListener();
+        walker.walk(listener, tree);
         OutputStream os = null;
         try {
-            os = new FileOutputStream(new File(args[1] + '\\' + loader.getName() + ".json"), false);
+            os = new FileOutputStream(new File(args[1] + '\\' + listener.getName() + ".json"), false);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
 
         try {
-            os.write(loader.toJson().getBytes());
+            os.write(listener.toJson().getBytes());
         } catch (IOException e) {
             e.printStackTrace();
         }

aidl-to-json/src/main/java/xyz/ignatz/antlr/aidl/recognizer/AidlLoader.java → aidl-to-json/src/main/java/xyz/ignatz/antlr/aidl/recognizer/AidlToJsonListener.java

@@ -4,7 +4,7 @@ import java.util.*;
 
 import xyz.ignatz.utils.MapToJson;
 
-public class AidlLoader extends AidlBaseListener
+public class AidlToJsonListener extends AidlBaseListener
 {
     String name;
     String type;

java-flowchart/src/main/java/xyz/ignatz/antlr/java9/JavaControlFlowGenerator.java → java9-flowchart/src/main/java/xyz/ignatz/antlr/java9/Java9FlowchartGenerator.java

@@ -5,13 +5,13 @@ import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import xyz.ignatz.antlr.java9.recognizer.Java9Lexer;
-import xyz.ignatz.antlr.java9.recognizer.Java9Loader;
+import xyz.ignatz.antlr.java9.recognizer.Java9FlowchartVisitor;
 import xyz.ignatz.antlr.java9.recognizer.Java9Parser;
 
 import java.io.IOException;
 import java.util.Formatter;
 
-public class JavaControlFlowGenerator {
+public class Java9FlowchartGenerator {
     public static void main(String[] args) {
         if (args.length < 2) {
             System.out.println("JavaControlFlowGenerator input_filename output_directory");
@@ -32,7 +32,7 @@ public class JavaControlFlowGenerator {
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         Java9Parser parser = new Java9Parser(tokens);
         ParseTree tree = parser.compilationUnit();
-        Java9Loader loader = new Java9Loader();
+        Java9FlowchartVisitor loader = new Java9FlowchartVisitor();
         loader.visit(tree);
 
     }

java-flowchart/src/main/java/xyz/ignatz/antlr/java9/recognizer/Java9Loader.java → java9-flowchart/src/main/java/xyz/ignatz/antlr/java9/recognizer/Java9FlowchartVisitor.java

@@ -11,10 +11,18 @@ import java.util.Map;
 import xyz.ignatz.antlr.utils.Blocks;
 
 
-public class Java9Loader extends Java9BaseVisitor<Block> {
+public class Java9FlowchartVisitor extends Java9BaseVisitor<Block> {
     Map<String, Block> blocks;
     JavaName name = new JavaName();
 
+    @Override
+    protected Block aggregateResult(Block block, Block next) {
+        if (block == null) return next;
+        if (next == null) return block;
+        block.connect(next);
+        return block;
+    }
+
     @Override
     public Block visitIfThenStatement(Java9Parser.IfThenStatementContext ctx) {
         Block body = visitStatement(ctx.statement());
@@ -106,14 +114,6 @@ public class Java9Loader extends Java9BaseVisitor<Block> {
         return body;
     }
 
-    @Override
-    protected Block aggregateResult(Block block, Block next) {
-        if (block == null) return next;
-        if (next == null) return block;
-        block.connect(next);
-        return block;
-    }
-
     @Override
     public Block visitNormalClassDeclaration(Java9Parser.NormalClassDeclarationContext ctx) {
         name.push('$', ctx.identifier().getText());