Add method to register libraries

exlunaproject · Apr 1, 2014 · 384a31b · 384a31b
1 parent 4d2f34e
commit 384a31b
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ PS: A way to make a Lua file to provide itself as JS can be found under `\exampl
 
 ```html
 <?lua@client?><!-- Serve the VM first-->
-<script>
+<script type="text/javascript">
 function myalert(L) {
  var str = C.luaL_checkstring(L, 1);
  window.alert(str);
@@ -146,6 +146,36 @@ myalert('Hello World from Lua!')
 ?>
 ```
 
+#### Adding a Library #
+
+```html
+<?lua@client?><!-- Serve the VM first-->
+<script type="text/javascript">
+  var MyLib = {
+   alert: function(L) {
+    var str = C.luaL_checkstring(L, 1);
+    window.alert(str);
+    return 0;
+   },
+   upper: function(L) {
+    var str = C.luaL_checkstring(L, 1);
+    C.lua_pushstring(L,str.toUpperCase());
+    return 1;
+   }
+  }
+  
+  var MyLibFuncs = [
+   ["alert", MyLib.alert],
+   ["upper", MyLib.upper]
+  ];
+  LuaCS.addLibrary("test", MyLibFuncs);
+</script>
+<?lua@client
+  msg = test.upper('It works!')
+  test.alert(msg)
+?>
+```
+
 #### Script Tag: An Alternative Way #
 
 ```html

diff --git a/examples/addlibrary.html b/examples/addlibrary.html
@@ -0,0 +1,37 @@
+<html>
+<head>
+<title>Lua@Client - Add Library</title>
+</head>
+<body onload="LuaCS.runScripts()">
+
+    <script src="../js/lib/lua5.1.5.min.js"></script>
+    <script src="../js/latclient.js"></script>
+    <script src="../js/js-lua.js"></script>
+
+    <script>
+    var MyLib = {
+     alert: function(L) {
+      var str = C.luaL_checkstring(L, 1);
+      window.alert(str);
+      return 0;
+     },
+     upper: function(L) {
+      var str = C.luaL_checkstring(L, 1);
+      C.lua_pushstring(L,str.toUpperCase());
+      return 1;
+     }
+    }
+
+    var MyLibFuncs = [
+     ["alert", MyLib.alert],
+     ["upper", MyLib.upper]
+    ];
+    LuaCS.addLibrary("test", MyLibFuncs);
+    </script>
+
+    <script language="lua">
+     msg = test.upper('It works!')
+     test.alert(msg)
+    </script>
+</body>
+</html>
diff --git a/js/latclient.js b/js/latclient.js
@@ -10,6 +10,12 @@
 var C = Lua5_1.C;
 var L = C.lua_open();
 
+// Adds the missing luaL_register
+// C.luaL_register = F("luaL_register", void_t, [lua_State, const_char_ptr_t, luaL_Reg]);
+if (!C.luaL_register) {
+ C.luaL_register = Module.cwrap("luaL_register", null, ["number", "string", "number"]);
+}
+
 var LuaCS =
 {
  settings : {
@@ -31,6 +37,18 @@ var LuaCS =
   C.lua_pushcfunction(L,Lua5_1.Runtime.addFunction(func));
   C.lua_setglobal(L, func_name);
  },
+ addLibrary : function(libname,funcs) {
+  C.luaL_register(L,libname,null);
+  if (funcs != undefined) {
+   for (i=0;i<funcs.length;i++) {
+    var f = funcs[i];
+    if (f[0] != null) {
+     C.lua_pushcfunction(L,Lua5_1.Runtime.addFunction(f[1]));
+     C.lua_setfield(L, -2, f[0]);
+    }
+   }
+  }
+ },
  runLua : function(L,script) {
   if (C.luaL_dostring(L, script) !== 0)
   {

diff --git a/lua/latclient.lua b/lua/latclient.lua
@@ -1,5 +1,5 @@
 --[[
-Lua@Client 0.1.5
+Lua@Client 0.1.6
 Lua Pages Template Preprocessor Extension and Script Provider
 Copyright (c) 2014 Felipe Daragon