feat: parser fixes, jvm code refactoring

Author: levkopo

backend/common/src/main/java/com/github/kayjamlang/backend/tree/KayJamExpressionVisitor.java

@@ -1,7 +1,7 @@
 package com.github.kayjamlang.backend.tree;
 
 import com.github.kayjamlang.core.KayJamFile;
-import com.github.kayjamlang.core.containers.FunctionContainer;
+import com.github.kayjamlang.core.statements.FunctionStatement;
 import com.github.kayjamlang.core.expressions.*;
 import com.github.kayjamlang.core.expressions.loops.*;
 
@@ -45,15 +45,12 @@ public T visit(Expression expression) {
             return visitForExpression((ForExpression) expression);
         }else if(expression instanceof WhileExpression) {
             return visitWhileExpression((WhileExpression) expression);
-        }else if(expression instanceof FunctionContainer) {
-            return visitFunctionContainer((FunctionContainer) expression);
         }
 
 
         throw new IllegalStateException("Not implemented yet: "+expression.getClass().getSimpleName());
     }
 
-    public abstract T visitKayJamFile(KayJamFile file);
     public abstract T visitAccessExpression(AccessExpression expression);
     public abstract T visitArrayExpression(ArrayExpression expression);
     public abstract T visitAssertNullExpression(AssertNullExpression expression);
@@ -73,6 +70,4 @@ public T visit(Expression expression) {
     public abstract T visitVariableLinkExpression(VariableLinkExpression expression);
     public abstract T visitForExpression(ForExpression expression);
     public abstract T visitWhileExpression(WhileExpression expression);
-
-    public abstract T visitFunctionContainer(FunctionContainer expression);
 }

backend/common/src/main/java/com/github/kayjamlang/backend/tree/KayJamFileTree.java

@@ -3,7 +3,7 @@
 import com.github.kayjamlang.backend.utils.FileUtils;
 import com.github.kayjamlang.core.KayJamFile;
 import com.github.kayjamlang.core.KayJamLexer;
-import com.github.kayjamlang.core.KayJamParser;
+import com.github.kayjamlang.core.parser.KayJamParser;
 import com.github.kayjamlang.core.exceptions.KayJamLexerException;
 import com.github.kayjamlang.core.exceptions.KayJamParserException;
 

backend/jvm/src/main/java/com/github/kayjamlang/backend/jvm/JVMBackendCompiler.java

@@ -3,6 +3,7 @@
 import com.github.kayjamlang.backend.IBackendOptions;
 import com.github.kayjamlang.backend.IBackendCompiler;
 import com.github.kayjamlang.backend.IOptions;
+import com.github.kayjamlang.backend.jvm.generators.JVMCodeGenerator;
 import com.github.kayjamlang.backend.tree.KayJamFileTree;
 import com.github.kayjamlang.core.KayJamFile;
 import com.github.kayjamlang.core.exceptions.KayJamLexerException;
@@ -25,23 +26,22 @@ public IBackendOptions createOptionsClass() {
 
     @Override
     public void compile(IOptions options) throws KayJamLexerException, KayJamParserException, IOException {
+        JVMCodeGenerator codeGenerator = new JVMCodeGenerator();
         List<KayJamFile> files = KayJamFileTree.loadFilesFromPath(options.getInputDir().toPath());
         for (KayJamFile file : files) {
-            JVMKayJamExpressionVisitor visitor = new JVMKayJamExpressionVisitor();
-            visitor.visitKayJamFile(file);
-            for (Map.Entry<String, ClassWriter> entry : visitor.getClasses().entrySet()) {
+            for (Map.Entry<String, byte[]> entry : codeGenerator.generate(file).entrySet()) {
                 File outputFile = getFile(options, entry);
 
                 if (outputFile.createNewFile()) {
                     FileOutputStream fos = new FileOutputStream(outputFile);
-                    fos.write(entry.getValue().toByteArray());
+                    fos.write(entry.getValue());
                     fos.close();
                 }
             }
         }
     }
 
-    private static File getFile(IOptions options, Map.Entry<String, ClassWriter> entry) throws IOException {
+    private static File getFile(IOptions options, Map.Entry<String, byte[]> entry) throws IOException {
         File outputFile = new File(options.getOutputDir(), "./" + entry.getKey() + ".class");
         if (outputFile.exists()) {
             if (!outputFile.delete()) {