classes now work properly.

Author: NoSharp

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

@@ -77,6 +77,8 @@ public String getCurrentResult() {
     }
 
     public void handleEnterContext(ParserRuleContext context){
+        StackTraceElement[] cause = Thread.currentThread().getStackTrace();
+        System.out.println(cause[2]);
         this.listenerManager.listeners.forEach((LuaPPListener listener)->{
 
             listener.handleEnterContext(context);

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

@@ -23,7 +23,9 @@ public boolean isClassGetSet(ParseTree context){
     public boolean isClassConstructor(ParseTree context){
         return ((ParserRuleContext)context).getRuleIndex() == luappParser.RULE_constructor;
     }
-
+    public boolean isClassName(ParseTree context){
+        return ((ParserRuleContext)context).getRuleIndex() == luappParser.RULE_classname;
+    }
 
     @Override
     public void onSetManager() {
@@ -41,21 +43,27 @@ public void onEnterContext(ParserRuleContext enterContext) {
         for (ParseTree child : enterContext.children) {
             if(child instanceof TerminalNodeImpl) continue;
             if(isClassFunction(child)){
-                System.out.println("Class function");
+                this.listenerManager
+                        .GetInstangeByTarget(luappParser.RULE_classfunction)
+                        .handleEnterContext((ParserRuleContext)child);
             }else if(isClassConstructor(child)){
                 System.out.println("Constructor!");
                 this.listenerManager
                         .GetInstangeByTarget(luappParser.RULE_constructor)
                         .handleEnterContext((ParserRuleContext)child);
             }else if(isClassGetSet(child)){
-                System.out.println("Get/Set");
+                this.listenerManager
+                        .GetInstangeByTarget(luappParser.RULE_classfunction)
+                        .handleEnterContext((ParserRuleContext)child);
+            }else if(isClassName(child)){
+
             }
         }
 
     }
 
     @Override
     public void onExitContext(ParserRuleContext exitContext) {
-
+        this.getLuaPP().currentClass = "";
     }
 }

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

@@ -1,6 +1,7 @@
 package org.luapp.language.handlers;
 
 import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
 import org.luapp.language.generator.luappParser;
 import org.luapp.language.listeners.LuaPPListener;
 
@@ -17,7 +18,11 @@ public void onSetManager() {
 
     @Override
     public void onEnterContext(ParserRuleContext enterContext) {
-
+        ParseTree name = enterContext.getChild(1);
+        ParseTree body = enterContext.getChild(2);
+        System.out.println(name);
+        this.addToLuaPPResult("function " + this.getLuaPP().currentClass
+            + ":" + name.getText() + this.getLuaPP().getRawFromContext((ParserRuleContext)body));
     }
 
     @Override

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

@@ -17,11 +17,16 @@ public void onSetManager() {
 
     @Override
     public void onEnterContext(ParserRuleContext enterContext) {
+//        StackTraceElement[] cause = Thread.currentThread().getStackTrace();
+//        System.out.println(cause[2]);
+        System.out.println("Classname: " + enterContext.getText());
         this.getLuaPP().currentClass = enterContext.getText();
+        String currentClass = enterContext.getText();
+        this.addToLuaPPResult(currentClass +  " = {}\n" + currentClass + ".__index = " + currentClass);
     }
 
     @Override
     public void onExitContext(ParserRuleContext exitContext) {
-        this.getLuaPP().currentClass = "";
+
     }
 }

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

@@ -29,6 +29,9 @@ public boolean isParentClass(ParserRuleContext context){
         return false;
     }
 
+    public boolean isClassName(ParseTree context){
+        return ((ParserRuleContext)context).getRuleIndex() == luappParser.RULE_classname;
+    }
 
 
     public boolean isChildIgnored(ParserRuleContext context){
@@ -52,6 +55,10 @@ public boolean isChildIgnored(ParserRuleContext context){
         return false;
     }
 
+    /**
+     * This will handle all default geneartion.
+     * @param enterContext The actual context.
+     */
     @Override
     public void onEnterContext(ParserRuleContext enterContext) {
 
@@ -60,6 +67,7 @@ public void onEnterContext(ParserRuleContext enterContext) {
                 this.listenerManager.GetInstangeByTarget(luappParser.RULE_classbody).handleEnterContext(enterContext);
                 return;
             }
+
         }
 
         if(enterContext.parent instanceof luappParser.ClassbodyContext){
@@ -68,7 +76,7 @@ public void onEnterContext(ParserRuleContext enterContext) {
         }
 
         if(this.isParentClass(enterContext)) {
-            System.out.println("Parent is the class!");
+            System.out.println("Parent is a class!");
             return;
         }
 

src/main/java/org/luapp/language/listeners/LuaPPListener.java

@@ -39,14 +39,15 @@ public void handleEnterContext(ParserRuleContext context){
     }
 
     public void handleExitContext(ParserRuleContext context){
-        if (isCorrectContext(context)) onEnterContext(context);
+        if (isCorrectContext(context)) onExitContext(context);
     }
 
     public Luapp getLuaPP(){
         return Main.luaPPInstance;
     }
 
     public void addToLuaPPResult(String result){
+
         this.getLuaPP().currentResult += "\n" + result;
     }
 

src/main/java/org/luapp/language/listeners/MasterLuaPPListener.java

@@ -40,7 +40,7 @@ public void enterStat(luappParser.StatContext ctx) {
 
     @Override
     public void exitStat(luappParser.StatContext ctx) {
-        Main.luaPPInstance.handleEnterContext(ctx);
+        Main.luaPPInstance.handleExitContext(ctx);
     }
 
     @Override

src/main/java/org/luapp/language/test.lpp

@@ -1,5 +1,11 @@
-class animal
+class cat extends animal
     constructor(name)
         self.name = name
     end
+
+    function isCat()
+        return true
+    end
 end
+
+print("hello world?")

src/main/java/org/luapp/language/test.lua

@@ -1,17 +1,29 @@
 --[[
 Written by nosharp (https://nosharp.cc),
 tom.bat (tomdotbat.dev),
-sammy milton (smilton.dev)
+samuel milton (smilton.dev)
 ]]--
-class animal
-    constructor(name)
-        self.name = name
-    end
+cat = {}
+cat.__index = cat
+function cat:new(name)
+ 	local self = {}
+	setmetatable(self, cat)
+
+	self.name = name
+	return self
 end
+function cat:isCat()
+        return true
+    end
 self.name = name
-self.name = name
-class animal
+class cat extends animal
     constructor(name)
         self.name = name
     end
-end
+
+    function isCat()
+        return true
+    end
+end
+print("hello world?")
+print("hello world?")