First series of changes to lua-bindings in order to

[simgrid.git] / src / bindings / lua / lua_host.c

diff --git a/src/bindings/lua/lua_host.c b/src/bindings/lua/lua_host.c
index 3084966..eb3e089 100644 (file)
--- a/src/bindings/lua/lua_host.c
+++ b/src/bindings/lua/lua_host.c
@@ -30,7 +30,7 @@ msg_host_t sglua_check_host(lua_State * L, int index)
   lua_getfield(L, index, "__simgrid_host");
   pi = (msg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME);
   if (pi == NULL)
-    luaL_typerror(L, index, HOST_MODULE_NAME);
+    XBT_ERROR("luaL_checkudata() returned NULL");
   ht = *pi;
   if (!ht)
     luaL_error(L, "null Host");
@@ -188,7 +188,7 @@ static int l_host_destroy(lua_State *L)
   return 0;
 }
 
-static const luaL_reg host_functions[] = {
+static const luaL_Reg host_functions[] = {
   {"get_by_name", l_host_get_by_name},
   {"name", l_host_get_name},
   {"number", l_host_number},
@@ -217,7 +217,7 @@ static int l_host_tostring(lua_State * L)
   return 1;
 }
 
-static const luaL_reg host_meta[] = {
+static const luaL_Reg host_meta[] = {
   {"__tostring", l_host_tostring},
   {0, 0}
 };
@@ -232,24 +232,35 @@ static const luaL_reg host_meta[] = {
 void sglua_register_host_functions(lua_State* L)
 {
   /* create a table simgrid.host and fill it with host functions */
-  luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);
+  lua_newtable(L);
+  luaL_setfuncs(L, host_functions, 0);
+  // Not sure we really need this one here...
+  /*lua_pushvalue(L, -1);*/
+  /*lua_setglobal(L, HOST_MODULE_NAME);*/
+
+  /*luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);*/
                                   /* simgrid.host */
 
   /* create the metatable for host, add it to the Lua registry */
   luaL_newmetatable(L, HOST_MODULE_NAME);
                                   /* simgrid.host mt */
   /* fill the metatable */
-  luaL_openlib(L, NULL, host_meta, 0);
+  luaL_setfuncs(L, host_meta, 0);
+  /*luaL_openlib(L, NULL, host_meta, 0);*/
                                   /* simgrid.host mt */
+  /**
+   * Copy the table and push it onto the stack.
+   * Required for the lua_setfield call below.
+   */
   lua_pushvalue(L, -2);
                                   /* simgrid.host mt simgrid.host */
   /* metatable.__index = simgrid.host
    * we put the host functions inside the host userdata itself:
    * this allows to write my_host:method(args) for
    * simgrid.host.method(my_host, args) */
-  lua_setfield(L, -2, "__index");
+  lua_setfield(L, -1, "__index");
                                   /* simgrid.host mt */
-  lua_pop(L, 2);
+  lua_setmetatable(L, -2);
                                   /* -- */
 }