Merge pull request #3 from CompilerProgramming/dev

Various cleanups and refactoring

Author: dibyendumajumdar

README.md

@@ -30,10 +30,14 @@ The project is under development and subject to change. At this point in time, w
 
 ## How can you contribute?
 
-Obviously firstly any contributions that improve the implementation and/or fix bugs are welcome. I am not keen on language extensions at this stage, but eventually
-we will be extending the language to explore more advanced features.
+The project is educational, with a focus on exploring various compiler algorithms and data structures.
+Clarity and simplicity is preferred over a coding style that attempts to do micro optimizations.
 
-I am also interested in creating implementations of this project in C++, Go, Rust, Swift, D, C, etc. If you are interested in working on such a 
+Contributions that improve the quality of the implementation, add test cases / documentation or fix bugs, are very welcome. 
+I am not keen on language extensions at this stage, but eventually we will be extending the language to explore more 
+advanced features.
+
+I am also interested in porting this project to C++, Go, Rust, Swift, D, C, etc. If you are interested in working on such a 
 port please contact me via [Discussions](https://github.com/orgs/CompilerProgramming/discussions).
 
 ## Community Discussions

optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/BytecodeCompiler.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import com.compilerprogramming.ezlang.types.Register;
 

…gramming/ezlang/bytecode/BasicBlock.java …gramming/ezlang/compiler/BasicBlock.javaoptvm/src/main/java/com/compilerprogramming/ezlang/bytecode/BasicBlock.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/BasicBlock.java optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/BasicBlock.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/BasicBlock.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import com.compilerprogramming.ezlang.exceptions.CompilerException;
 import com.compilerprogramming.ezlang.parser.AST;
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class BytecodeFunction {
+public class CompiledFunction {
 
     public BasicBlock entry;
     public BasicBlock exit;
@@ -41,7 +41,7 @@ public class BytecodeFunction {
      */
     private List<Operand> virtualStack = new ArrayList<>();
 
-    public BytecodeFunction(Symbol.FunctionTypeSymbol functionSymbol) {
+    public CompiledFunction(Symbol.FunctionTypeSymbol functionSymbol) {
         AST.FuncDecl funcDecl = (AST.FuncDecl) functionSymbol.functionDecl;
         setVirtualRegisters(funcDecl.scope);
         this.numLocalRegs = this.nextReg; // Before assigning temps

…ng/ezlang/bytecode/BytecodeFunction.java …ng/ezlang/compiler/CompiledFunction.javaoptvm/src/main/java/com/compilerprogramming/ezlang/bytecode/BytecodeFunction.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/CompiledFunction.java optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/BytecodeFunction.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/CompiledFunction.java

@@ -0,0 +1,45 @@
+package com.compilerprogramming.ezlang.compiler;
+
+import com.compilerprogramming.ezlang.lexer.Lexer;
+import com.compilerprogramming.ezlang.parser.Parser;
+import com.compilerprogramming.ezlang.semantic.SemaAssignTypes;
+import com.compilerprogramming.ezlang.semantic.SemaDefineTypes;
+import com.compilerprogramming.ezlang.types.Symbol;
+import com.compilerprogramming.ezlang.types.Type;
+import com.compilerprogramming.ezlang.types.TypeDictionary;
+
+import java.util.BitSet;
+
+public class Compiler {
+
+    private void compile(TypeDictionary typeDictionary) {
+        for (Symbol symbol: typeDictionary.getLocalSymbols()) {
+            if (symbol instanceof Symbol.FunctionTypeSymbol functionSymbol) {
+                Type.TypeFunction functionType = (Type.TypeFunction) functionSymbol.type;
+                functionType.code = new CompiledFunction(functionSymbol);
+            }
+        }
+    }
+    public TypeDictionary compileSrc(String src) {
+        Parser parser = new Parser();
+        var program = parser.parse(new Lexer(src));
+        var typeDict = new TypeDictionary();
+        var sema = new SemaDefineTypes(typeDict);
+        sema.analyze(program);
+        var sema2 = new SemaAssignTypes(typeDict);
+        sema2.analyze(program);
+        compile(typeDict);
+        return typeDict;
+    }
+    public String dumpIR(TypeDictionary typeDictionary) {
+        StringBuilder sb = new StringBuilder();
+        for (Symbol s: typeDictionary.bindings.values()) {
+            if (s instanceof Symbol.FunctionTypeSymbol f) {
+                var functionBuilder = (CompiledFunction) f.code();
+                BasicBlock.toStr(sb, functionBuilder.entry, new BitSet());
+            }
+        }
+        return sb.toString();
+    }
+
+}

optvm/src/main/java/com/compilerprogramming/ezlang/compiler/Compiler.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import java.util.ArrayList;
 import java.util.Comparator;

…mming/ezlang/bytecode/DominatorTree.java …mming/ezlang/compiler/DominatorTree.javaoptvm/src/main/java/com/compilerprogramming/ezlang/bytecode/DominatorTree.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/DominatorTree.java optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/DominatorTree.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/DominatorTree.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import com.compilerprogramming.ezlang.types.Register;
 import com.compilerprogramming.ezlang.types.Type;

…ramming/ezlang/bytecode/Instruction.java …ramming/ezlang/compiler/Instruction.javaoptvm/src/main/java/com/compilerprogramming/ezlang/bytecode/Instruction.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/Instruction.java optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/Instruction.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/Instruction.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import java.util.*;
 import java.util.stream.Collectors;

…gramming/ezlang/bytecode/LoopFinder.java …gramming/ezlang/compiler/LoopFinder.javaoptvm/src/main/java/com/compilerprogramming/ezlang/bytecode/LoopFinder.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/LoopFinder.java optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/LoopFinder.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/LoopFinder.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import java.util.*;
 

…rogramming/ezlang/bytecode/LoopNest.java …rogramming/ezlang/compiler/LoopNest.javaoptvm/src/main/java/com/compilerprogramming/ezlang/bytecode/LoopNest.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/LoopNest.java optvm/src/main/java/com/compilerprogramming/ezlang/bytecode/LoopNest.java renamed to optvm/src/main/java/com/compilerprogramming/ezlang/compiler/LoopNest.java

@@ -1,4 +1,4 @@
-package com.compilerprogramming.ezlang.bytecode;
+package com.compilerprogramming.ezlang.compiler;
 
 import com.compilerprogramming.ezlang.types.Register;
 import com.compilerprogramming.ezlang.types.Type;