diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg index ec6052fe5..1d75ccb34 100644 --- a/Lib/lua/luarun.swg +++ b/Lib/lua/luarun.swg @@ -379,8 +379,6 @@ SWIGINTERN int SWIG_Lua_set_immutable(lua_State *L) } #ifdef SWIG_LUA_ELUA_EMULATE -//#define report(...) printf(__VA_ARGS__) // TODO: REMOVE -#define report(...) // TODO : REMOVE SWIGRUNTIME void SWIG_Lua_NewPointerObj(lua_State *L,void *ptr,swig_type_info *type, int own); SWIGRUNTIME void SWIG_Lua_NewPackedObj(lua_State *L,void *ptr,size_t size,swig_type_info *type); @@ -405,30 +403,20 @@ SWIGINTERN void SWIG_Lua_elua_emulate_register(lua_State *L, const swig_elua_ent int i; int table_parsed = 0; int pairs_start = lua_gettop(L); - static int tabs_count = 0; // TODO: REMOVE for(i = 0;table[i].key.type != LUA_TNIL || table[i].value.type != LUA_TNIL;i++) { - /* TODO: REMOVE */ - int j = 0; - for(j=0;jkey.type) { case LUA_TSTRING: lua_pushstring(L,entry->key.key.strkey); - report(" %s :", entry->key.key.strkey); // TODO: REMOVE if(strcmp(entry->key.key.strkey, SWIG_LUA_ELUA_EMUL_METATABLE_KEY) == 0) is_metatable = 1; break; case LUA_TNUMBER: lua_pushnumber(L,entry->key.key.numkey); - report(" %f :", (double)(entry->key.key.numkey)); // TODO: REMOVE break; case LUA_TNIL: - report(" nil :"); // TODO: REMOVE lua_pushnil(L); break; default: @@ -437,39 +425,27 @@ SWIGINTERN void SWIG_Lua_elua_emulate_register(lua_State *L, const swig_elua_ent switch(entry->value.type) { case LUA_TSTRING: lua_pushstring(L,entry->value.value.string); - report(" %s", entry->value.value.string); // TODO: REMOVE break; case LUA_TNUMBER: lua_pushnumber(L,entry->value.value.number); - report(" %f", (double)(entry->value.value.number)); // TODO: REMOVE break; case LUA_TFUNCTION: - report(" %p", (void*)(entry->value.value.function)); // TODO: REMOVE lua_pushcfunction(L,entry->value.value.function); break; case LUA_TTABLE: - /* TODO: REMOVE */ - report(" table"); - tabs_count++; - /* END OF REMOVE */ lua_rawgetp(L,parsed_tables_array, entry->value.value.table); table_parsed = !lua_isnil(L,-1); if(!table_parsed) { lua_pop(L,1); /*remove nil */ - report("\n"); // TODO: REMOVE lua_newtable(L); SWIG_Lua_elua_emulate_register(L,entry->value.value.table); - } else { - report(" already parsed"); // TODO: REMOVE - } + } if(is_metatable) { - report(" (registering metatable)"); // TODO: REMOVE assert(lua_istable(L,-1)); lua_pushvalue(L,-1); lua_setmetatable(L,target_table); } - tabs_count--; /*TODO: REMOVE*/ break; case LUA_TUSERDATA: if(entry->value.value.userdata.member) @@ -481,7 +457,6 @@ SWIGINTERN void SWIG_Lua_elua_emulate_register(lua_State *L, const swig_elua_ent *(entry->value.value.userdata.ptype),0); break; case LUA_TNIL: - report(" nil"); // TODO: REMOVE lua_pushnil(L); break; default: @@ -489,7 +464,6 @@ SWIGINTERN void SWIG_Lua_elua_emulate_register(lua_State *L, const swig_elua_ent } assert(lua_gettop(L) == pairs_start + 2); lua_rawset(L,target_table); - report("\n"); // TODO: REMOVE } lua_pop(L,1); /* Removing parsed tables storage */ assert(lua_gettop(L) == target_table); @@ -501,7 +475,6 @@ SWIGINTERN void SWIG_Lua_elua_emulate_register_clear(lua_State *L) lua_rawsetp(L, LUA_REGISTRYINDEX, &swig_lua_elua_emulate_unique_key); } -/* TODO: REMOVE */ SWIGINTERN void SWIG_Lua_get_class_registry(lua_State *L); SWIGINTERN int SWIG_Lua_emulate_elua_getmetatable(lua_State *L) @@ -519,7 +492,6 @@ SWIGINTERN int SWIG_Lua_emulate_elua_getmetatable(lua_State *L) /*if it is a table, then emulate elua behaviour - check for __metatable attribute of a table*/ assert(lua_gettop(L) == 2); if(lua_istable(L,-2)) { - printf("getmetatable: elua emulation part\n"); // TODO: REMOVE lua_pop(L,1); /*remove the nil*/ lua_getfield(L,-1, SWIG_LUA_ELUA_EMUL_METATABLE_KEY); } @@ -533,7 +505,6 @@ fail: SWIGINTERN void SWIG_Lua_emulate_elua_swap_getmetatable(lua_State *L) { - int begin = lua_gettop(L); // TODO: REMOVE SWIG_Lua_get_class_registry(L); lua_pushglobaltable(L); lua_pushstring(L,"lua_getmetatable"); @@ -544,7 +515,6 @@ SWIGINTERN void SWIG_Lua_emulate_elua_swap_getmetatable(lua_State *L) lua_pushcfunction(L, SWIG_Lua_emulate_elua_getmetatable); lua_rawset(L,-3); lua_pop(L,2); - assert(lua_gettop(L) == begin); // TODO: REMOVE } /* END OF REMOVE */ @@ -619,7 +589,6 @@ SWIGINTERN int SWIG_Lua_namespace_set(lua_State *L) } lua_pop(L,1); /* remove the value .set table */ lua_pop(L,1); /* remote metatable */ - assert(lua_gettop(L) == 3); // TODO: REMOVE lua_rawset(L,-3); return 0; } @@ -805,7 +774,6 @@ SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info *swig_type, i lua_setmetatable(L,subcall_first_arg); /* Set new metatable */ assert(lua_gettop(L) == subcall_last_arg); result = func(L, base_swig_type,subcall_first_arg, ret); /* Forward call */ - if(ret) assert(lua_gettop(L) == subcall_last_arg + *ret); // TODO: REMOVE if(result != SWIG_ERROR) { break; } @@ -817,7 +785,6 @@ SWIGINTERN int SWIG_Lua_iterate_bases(lua_State *L, swig_type_info *swig_type, i const int to_remove = subcall_last_arg - last_arg; for(j=0;jfqname); for(i=0;clss->base_names[i];i++) @@ -1191,7 +1129,6 @@ SWIGINTERN int SWIG_Lua_class_squash_bases(lua_State *L, swig_lua_class *clss) SWIG_Lua_class_squash_base(L, clss->bases[i]); } lua_pop(L,1); /*tidy stack*/ - assert(lua_gettop(L) == begin); // TODO: REMOVE } #endif @@ -1263,7 +1200,6 @@ SWIGINTERN void SWIG_Lua_add_class_instance_details(lua_State *L,swig_lua_class */ if(clss->metatable) { for(i=0;clss->metatable[i].name;i++) { - assert(clss->metatable[i].func != 0); // TODO: REMOVE SWIG_Lua_add_function(L,clss->metatable[i].name,clss->metatable[i].func); } } @@ -1332,7 +1268,6 @@ SWIGINTERN void SWIG_Lua_class_register_instance(lua_State *L,swig_lua_class *c * It would get us all special methods: __getitem, __add etc. * This would set .fn, .type, and other .xxx incorrectly, but we will overwrite it right away */ - int squash_begin = lua_gettop(L); // TODO:REMOVE int new_metatable_index = lua_absindex(L,-1); for(i=0;clss->bases[i];i++) { @@ -1341,7 +1276,6 @@ SWIGINTERN void SWIG_Lua_class_register_instance(lua_State *L,swig_lua_class *c SWIG_Lua_merge_tables_by_index(L,new_metatable_index, base_metatable); lua_pop(L,1); } - assert(lua_gettop(L) == squash_begin); // TODO: REMOVE /* And now we will overwrite all incorrectly set data */ #endif /* add string of class name called ".type" */ diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index e25376aaa..2f06b8668 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -486,8 +486,6 @@ public: } } wrapname = Swig_name_wrapper(mrename); - //Printf(stdout, "luaname %s, symname %s mrename %s wrapname %s\n\tscope %s\n", - // Getattr(n, "lua:name"), symname, mrename, wrapname, luaScope ); // TODO: REMOVE registerMethod(n, wrapname, luaScope); } @@ -901,10 +899,6 @@ public: // Remember C name of the wrapping function Setattr(n, "wrap:name", wname); - /* TODO: REMOVE - if (functionWrapperRegisterNow()) { // emit normal fns & static fns - registerMethod(n); - }*/ if (current[CONSTRUCTOR]) { if (constructor_name != 0) Delete(constructor_name); @@ -965,8 +959,6 @@ public: getName = Swig_name_wrapper(getName); if (setName) setName = Swig_name_wrapper(setName); - //Printf(stdout, "luaname %s, symname %s mrename %s getName %s\n\tscope %s\n\tassignable %d\n", - // Getattr(n, "lua:name"), symname, mrename, getName, luaScope, assignable ); // TODO: REMOVE registerVariable(luaScope, n, getName, setName); } @@ -1017,8 +1009,6 @@ public: current[VARIABLE] = true; // let SWIG generate the wrappers int result = Language::variableWrapper(n); - // TODO: REMOVE - //registerVariable(luaCurrentSymbolNSpace(), n, "varget:wrap:name", "varset:wrap:name"); // It is impossible to use registerVariable, because sym:name of the Node is currently // in an undefined state - the callees of this function may have modified it. @@ -1087,7 +1077,6 @@ public: } if ((tm = Swig_typemap_lookup("consttab", n, name, 0))) { - //Printf(stdout, "tm v1: %s\n", tm); // TODO:REMOVE Replaceall(tm, "$source", value); Replaceall(tm, "$target", lua_name); Replaceall(tm, "$value", value); @@ -1116,7 +1105,6 @@ public: lua_name_v2 = Swig_name_member(0, proxy_class_name, lua_name); iname_v2 = Swig_name_member(0, proxy_class_name, iname); n_v2 = Copy(n); - //Printf( stdout, "target name v2: %s, symname v2 %s\n", lua_name_v2.ptr(), iname_v2.ptr());// TODO:REMOVE if (!luaAddSymbol(iname_v2, n, getNSpace())) { Swig_restore(n); return SWIG_ERROR; @@ -1125,7 +1113,6 @@ public: Setattr(n_v2, "sym:name", lua_name_v2); tm_v2 = Swig_typemap_lookup("consttab", n_v2, name, 0); if (tm_v2) { - //Printf(stdout, "tm v2: %s\n", tm_v2.ptr()); // TODO:REMOVE Replaceall(tm_v2, "$source", value); Replaceall(tm_v2, "$target", lua_name_v2); Replaceall(tm_v2, "$value", value); @@ -1472,7 +1459,6 @@ public: Printf(f_wrappers, ", %s, %s, &%s", s_methods_tab_name, s_attr_tab_name, Getattr(static_cls, "cname")); if (!eluac_ltr) { - assert(Getattr(instance_cls, "metatable:name")); // TODO: REMOVE Printf(f_wrappers, ", %s", Getattr(instance_cls,"metatable:name")); } else @@ -1513,7 +1499,6 @@ public: current[MEMBER_FUNC] = true; Language::memberfunctionHandler(n); - //Printf( stdout, "add member function: %s to %s\n", symname, luaCurrentSymbolNSpace());// TODO: REMOVE registerMethod(n); current[MEMBER_FUNC] = false; return SWIG_OK; @@ -1668,7 +1653,6 @@ public: // not the C++ name. This is because an earlier version used such a scheme for static function // name generation and we have to maintain backward compatibility. String *v2_name = Swig_name_member(NIL, proxy_class_name, lua_name); - //Printf( stdout, "Name %s, class %s, compt. name %s\n", lua_name, proxy_class_name, v2_name ); // TODO: REMOVE if (!GetFlag(n, "wrappedasconstant")) { Setattr(n, "lua:name", v2_name); // Registering static var in the class parent nspace @@ -1900,8 +1884,6 @@ public: Printf(metatable_tab, "const LUA_REG_TYPE "); else Printf(metatable_tab, "static swig_lua_method "); - assert(metatable_tab); // TODO: REMOVE - assert(metatable_tab_name); // TODO: REMOVE Printv(metatable_tab, metatable_tab_name, "[]", NIL); Printv(metatable_tab_decl, metatable_tab, ";", NIL); Printv(metatable_tab, " = {\n", NIL); @@ -1925,7 +1907,6 @@ public: String *item = Getitem(components, i); Printv(parent_path, item, NIL); } - //Printf(stdout, "Registering %s. User name %s. C-name %s, Parent is %s\n", mangled_name, name, cname, parent_path); // TODO: REMOVE Hash *parent = getCArraysHash(parent_path, true); String *namespaces_tab = Getattr(parent, "namespaces"); Printv(namespaces_tab, "&", cname, ",\n", NIL); @@ -1982,12 +1963,10 @@ public: } String *methods_tab = Getattr(carrays_hash, "methods"); String *metatable_tab_name = Getattr(carrays_hash, "metatable:name"); - assert(methods_tab); // TODO: REMOVE if (elua_ltr || eluac_ltr) { if (v2_compatibility) Printv(methods_tab, tab4, "{LSTRKEY(\"const\"), LROVAL(", const_tab_name, ")},\n", NIL); if (elua_ltr) { - assert(metatable_tab_name); // TODO: REMOVE Printv(methods_tab, tab4, "{LSTRKEY(\"__metatable\"), LROVAL(", metatable_tab_name, ")},\n", NIL); }