Improve code

xpenatan · Jan 17, 2024 · 41bb6cd · 41bb6cd
1 parent aa478c6
commit 41bb6cd
Show file tree

Hide file tree

Showing 14 changed files with 336 additions and 332 deletions.
diff --git a/examples/basic/assets/data/script.lua b/examples/basic/assets/data/script.lua
@@ -2,7 +2,11 @@ ShapeRenderer = java.import("com.badlogic.gdx.graphics.glutils.ShapeRenderer")
 
 renderer = ShapeRenderer.new()
 
-renderer.begin()
+renderer:begin()
+
+print(ShapeRenderer)
+print(renderer)
+
 
 -- renderer:begin(50)
 

diff --git a/examples/basic/core/src/main/java/lua/example/basic/BasicExample.java b/examples/basic/core/src/main/java/lua/example/basic/BasicExample.java
@@ -10,7 +10,7 @@
 import imgui.extension.textedit.LanguageDefinition;
 import imgui.extension.textedit.TextEditor;
 import imgui.idl.helper.IDLString;
-import lua.ErrorStatus;
+import lua.LuaErrorStatus;
 import lua.Lua;
 import lua.LuaState;
 import lua.example.basic.imgui.ImGuiRenderer;
@@ -70,7 +70,7 @@ public void update() {
                 luaError = true;
             }
             else {
-                ErrorStatus status = lua.callFunction(0, 0, 0);
+                LuaErrorStatus status = lua.callFunction(0, 0, 0);
                 if(!status.isValid()) {
                     String errorText = status.getError();
                     System.err.println(errorText);
@@ -97,10 +97,11 @@ void renderEditText() {
     }
 
     public void buildScript(String scriptCode) {
-        ErrorStatus status = lua.buildScript(scriptCode);
+        LuaErrorStatus status = lua.buildScript(scriptCode);
         long pointer = lua.getLuaState().lua_topointer(-1);
 //        String s = lua.dumpTable("ShapeRenderer");
-//        String s = lua.dumpTable("Vector2");
+        String ShapeRenderer = lua.dumpTable("ShapeRenderer");
+        String renderer = lua.dumpTable("renderer");
         luaError = false;
         if(!status.isValid()) {
             String errorText = status.getError();

diff --git a/lua/lua-build/src/main/cpp/cpp-source/custom/LuaCustom.h b/lua/lua-build/src/main/cpp/cpp-source/custom/LuaCustom.h
@@ -314,8 +314,6 @@ class LuaState {
             tableStr.append(space + " " + keyStr + " = " + valueStr + "\n");
 
             if (lua_istable(L, -1)) {
-                indent++;
-
                 int count = 0;
                 for (int i = 0; i < vector.size(); i++) {
                     std::string value = vector[i];
@@ -327,7 +325,7 @@ class LuaState {
                 std::string stack = dumpStack();
 
                 if (count < 2) {
-                    tableStr += dumpTable(vector, indent);
+                    tableStr += dumpTable(vector, indent + 1);
                 }
             }
             lua_pop(L, 1);

diff --git a/lua/lua-core/src/main/java/lua/Lua.java b/lua/lua-core/src/main/java/lua/Lua.java
@@ -1,23 +1,26 @@
 package lua;
 
 import com.badlogic.gdx.utils.IntMap;
+import java.util.HashMap;
 import lua.idl.helper.IDLString;
+import lua.register.DefaultImportFunction;
+import lua.register.ImportListener;
 
 public class Lua {
 
     LuaState luaState;
 
-    LuaImport luaImport;
+    private final HashMap<String, ImportListener> importMap;
 
     public IntMap<Object> luaJavaInstances;
 
     public Lua() {
+        importMap = new HashMap<>();
         luaState = new LuaState();
         luaState.createContext();
         luaJavaInstances = new IntMap<>();
 
-        luaImport = new LuaImport();
-        luaImport.register(this);
+        register(this);
     }
 
     public void dispose() {
@@ -58,8 +61,8 @@ public String dumpStack() {
         return dumpStack(luaState);
     }
 
-    public ErrorStatus buildScript(String script) {
-        ErrorStatus status = ErrorStatus.get();
+    public LuaErrorStatus buildScript(String script) {
+        LuaErrorStatus status = LuaErrorStatus.get();
         luaState.luaL_loadstring(script);
         status.code = luaState.lua_pcall(0, 0, 0);
         status.error = "";
@@ -73,8 +76,8 @@ public ErrorStatus buildScript(String script) {
     /**
      * Call function
      */
-    public ErrorStatus callFunction(int nargs, int nresults, int msgh) {
-        ErrorStatus status = ErrorStatus.get();
+    public LuaErrorStatus callFunction(int nargs, int nresults, int msgh) {
+        LuaErrorStatus status = LuaErrorStatus.get();
         status.code = luaState.lua_pcall(nargs, nresults, msgh);
         status.error = "";
         if(!status.isValid()) {
@@ -84,10 +87,6 @@ public ErrorStatus callFunction(int nargs, int nresults, int msgh) {
         return status;
     }
 
-    public LuaImport getLuaImport() {
-        return luaImport;
-    }
-
     void addObjectInstance(int key, Object object) {
         luaJavaInstances.put(object.hashCode(), object);
     }
@@ -97,6 +96,34 @@ boolean removeObjectInstance(int hash) {
         return remove != null;
     }
 
+    public void addImportListener(String key, ImportListener importListener) {
+        importMap.put(key, importListener);
+    }
+
+    public void removeImportListener(String key) {
+        importMap.remove(key);
+    }
+
+    void register(Lua lua) {
+        LuaFunction function = new DefaultImportFunction() {
+            @Override
+            public int onImport(LuaState luaState) {
+                String importParam = luaState.lua_tostring(-1).c_str();
+                ImportListener importListener = importMap.get(importParam);
+                if(importListener != null) {
+                    luaState.lua_pop(-1);
+                    return importListener.onImport(luaState);
+                }
+                else {
+                    luaState.luaL_error("Import param is not registered: " + importParam);
+                }
+                return 0;
+            }
+        };
+        LuaLibrary.addLibrary(lua, "java.import", function);
+    }
+
+
     /**
      * Return the table log on top of the stack
      */

diff --git a/...a-core/src/main/java/lua/ErrorStatus.java → ...ore/src/main/java/lua/LuaErrorStatus.java b/...a-core/src/main/java/lua/ErrorStatus.java → ...ore/src/main/java/lua/LuaErrorStatus.java
@@ -1,10 +1,10 @@
 package lua;
 
-public class ErrorStatus {
-    private ErrorStatus() {}
+public class LuaErrorStatus {
+    private LuaErrorStatus() {}
 
-    static ErrorStatus errorStatus = new ErrorStatus();
-    public static ErrorStatus get() { errorStatus.reset(); return errorStatus; }
+    static LuaErrorStatus errorStatus = new LuaErrorStatus();
+    public static LuaErrorStatus get() { errorStatus.reset(); return errorStatus; }
 
     int code;
     String error;
@@ -25,4 +25,4 @@ void reset() {
         code = 0;
         error = "";
     }
-}
+}
diff --git a/lua/lua-core/src/main/java/lua/LuaImport.java b/lua/lua-core/src/main/java/lua/LuaImport.java