Generate VariableMap

(Might need some more testing)

Author: SilicDev

src/pgdp/minijava/Compiler.java

@@ -0,0 +1,12 @@
+package pgdp.minijava;
+
+public class Compiler {
+    public static void main(String[] args) {
+        compileFromFile("resources/input.java");
+    }
+
+    public static void compileFromFile(String filePath) {
+        SyntaxTreeNode node = Parser.parseFromFile(filePath);
+        String out = Emitter.emit(node);
+    }
+}

src/pgdp/minijava/Emitter.java

@@ -1,6 +1,8 @@
 package pgdp.minijava;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class Emitter {
@@ -9,7 +11,44 @@ private Emitter() {
     }
 
     public static String emit(SyntaxTreeNode node) {
-        return emitCode(node, new HashMap<>());
+        Map<String, Integer> variableMap = generateVariableMap(node, new HashMap<>());
+        return emitCode(node, variableMap);
+    }
+
+    private static Map<String, Integer> generateVariableMap(SyntaxTreeNode node, Map<String, Integer> variableMap) {
+        Map<String, Integer> out = new HashMap<>(variableMap);
+        List<Map<String, Integer>> variableMaps = new ArrayList<>();
+        int freeID = 0;
+        for (int i = 0; i < node.getNumberChildren(); i++) {
+            SyntaxTreeNode child = node.getChild(i);
+            if(child.getType() == SyntaxTreeNode.Type.DECL) {
+                for (int j = 0; j < child.getNumberChildren(); j++) {
+                    SyntaxTreeNode n = child.getChild(j);
+                    if(n.getType() == SyntaxTreeNode.Type.NAME){
+                        if(variableMap.containsKey(n.getValue())) {
+                            throw new IllegalStateException(n.getValue() + " has already been defined in this context");
+                        } else {
+                            out.put(n.getValue(), freeID++);
+                        }
+                    }
+                }
+            } else if(child.getType() == SyntaxTreeNode.Type.NAME) {
+                if(!(variableMap.containsKey(child.getValue()) || out.containsKey(child.getValue()))) {
+                    throw new IllegalStateException(child.getValue() + " hasn't been defined in this context");
+                }
+            } else {
+                variableMaps.add(generateVariableMap(child, out));
+            }
+        }
+        return mergeVariableMaps(out, variableMaps);
+    }
+
+    private static Map<String, Integer> mergeVariableMaps(Map<String, Integer> variableMap, List<Map<String, Integer>> list) {
+        for (Map<String, Integer> map : list) {
+            final int size = variableMap.size();
+            map.forEach(((s, integer) -> {if(!variableMap.containsKey(s)) variableMap.put(s, integer + size);} ));
+        }
+        return variableMap;
     }
 
     private static String emitCode(SyntaxTreeNode node, Map<String, Integer> variableMap) {
@@ -26,6 +65,7 @@ private static String emitCode(SyntaxTreeNode node, Map<String, Integer> variabl
             case STMT -> null;
             case LABEL -> emitLabel(node, variableMap);
             case SYMBOL -> null;
+            case FUNCCALL -> null;
         };
     }
 
@@ -45,8 +85,4 @@ private static String emitLabel(SyntaxTreeNode node, Map<String, Integer> variab
     private static String emitDeclaration(SyntaxTreeNode node, Map<String, Integer> variableMap) {
         return "";
     }
-
-    private static class CodeUnit {
-
-    }
 }

src/pgdp/minijava/Parser.java

@@ -78,9 +78,8 @@ private static int parseStatement(List<Token> tokens, int pos, SyntaxTreeNode ro
             } else if(current.getContentAsString().equals("{")){
                 node.addChild(new SyntaxTreeNode(SyntaxTreeNode.Type.SYMBOL, tokens.get(pos++).getContentAsString()));
                 pos = parseLine(tokens, pos, node);
-                while(!(tokens.get(pos).getTokenType() == TokenType.SEPARATOR && tokens.get(pos).getContentAsString().equals("}"))) {
+                while(pos < tokens.size() && !(tokens.get(pos).getTokenType() == TokenType.SEPARATOR && tokens.get(pos).getContentAsString().equals("}"))) {
                     pos = parseLine(tokens, pos, node);
-                    System.out.println(pos);
                 }
                 node.addChild(new SyntaxTreeNode(SyntaxTreeNode.Type.SYMBOL, tokens.get(pos++).getContentAsString()));
             }
@@ -271,10 +270,6 @@ private static int parseExpression(List<Token> tokens, int pos, SyntaxTreeNode r
         return pos;
     }
 
-    public static void main(String[] args) {
-        Parser.parseFromFile("resources/input.java");
-    }
-
     private final static List<String> types = List.of(
             "int",
             "double",