Constructors now work properly and parent detection

Author: NoSharp

src/main/java/org/luapp/language/Luapp.java

@@ -52,7 +52,7 @@ public void load(){
             File newFile = new File(newPath);
             newFile.createNewFile();
             FileWriter writeFile = new FileWriter(newPath);
-            writeFile.write("--[[\nWritten by nosharp (https://nosharp.cc),\ntom.bat (tomdotbat.dev),\nsammy milton (smilton.dev)\n]]--" + this.currentResult);
+            writeFile.write("--[[\nWritten by nosharp (https://nosharp.cc),\ntom.bat (tomdotbat.dev),\nsamuel milton (smilton.dev)\n]]--" + this.currentResult);
             writeFile.close();
         }catch(IOException ex){
             ex.printStackTrace();

src/main/java/org/luapp/language/handlers/ConstructorHandler.java

@@ -18,27 +18,28 @@ public void onSetManager() {
 
     @Override
     public void onEnterContext(ParserRuleContext enterContext) {
+
         luappParser.ConstructorContext constructorContext = (luappParser.ConstructorContext)enterContext;
         ParseTree funcParams = constructorContext.getChild(2);
         ParseTree funcBody = constructorContext.getChild(4);
         if(funcBody == null || funcParams == null){
             System.out.println("Function Body or Function Parameters are null");
             return;
         }
-
         String params = this.getLuaPP().getRawFromContext((ParserRuleContext)funcParams);
         String body = this.getLuaPP().getRawFromContext((ParserRuleContext) funcBody);
 
         String abstractClass = this.getLuaPP().currentAbstract == null ? "" : this.getLuaPP().currentAbstract;
         String currentClass = this.getLuaPP().currentClass == null ? "" : this.getLuaPP().currentClass;
-
+        System.out.println("Got here?");
         this.addToLuaPPResult("function " + currentClass + ":new(" + params + ")\n " +
-                "local self = {}\n" +
-                "setmetatable(self, " + currentClass +")" +
+                "\tlocal self = {}\n" +
+                "\tsetmetatable(self, " + currentClass +")" +
                 "\n" + (abstractClass.isEmpty() ? "" : ("for k,v in pairs(" + abstractClass + ") do \n" +
                 "        self[k] = v\n" +
-                "    end " +
-                "end")));
+                "    end ")) +
+                "\n\t" + body +
+                "\n\treturn self\nend");
 
     }
 

src/main/java/org/luapp/language/handlers/StatementHandler.java

@@ -15,9 +15,22 @@ public StatementHandler() {
     }
 
     public boolean isParentClass(ParserRuleContext context){
-        return context.getParent().getRuleIndex() == luappParser.RULE_classbody;
+        ParseTree parent = context.parent;
+        for(int i =0; i < 1000000; i++){ // This is because I KNOW someone's gonna have some weird edge cases.
+            ParserRuleContext prc = (ParserRuleContext)parent;
+            if(prc == null) return false;
+            if(prc.parent == null) return false;
+            if(prc.getParent().getRuleIndex() == luappParser.RULE_classbody) {
+                return true;
+            }
+            parent = prc.parent;
+        }
+
+        return false;
     }
 
+
+
     public boolean isChildIgnored(ParserRuleContext context){
 
         for (ParseTree child : context.children) {
@@ -49,13 +62,20 @@ public void onEnterContext(ParserRuleContext enterContext) {
             }
         }
 
+        if(enterContext.parent instanceof luappParser.ClassbodyContext){
+            System.out.println("Parent is class ignoring");
+            return;
+        }
+
         if(this.isParentClass(enterContext)) {
             System.out.println("Parent is the class!");
             return;
         }
+
         if(this.isChildIgnored(enterContext)){
             return;
         }
+
         //System.out.println("NewLine:" + this.getLuaPP().getRawFromContext(enterContext));
         this.addToLuaPPResult(this.getLuaPP().getRawFromContext(enterContext));
     }