Menu
▾
▴
[Wxlua-commit] wxLua/bindings genwxbind.lua,1.9,1.10
|
From: John L. <jr...@us...> - 2005-11-29 05:45:17
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21610/wxLua/bindings Modified Files: genwxbind.lua Log Message: Makefile - lib order is important cleanup in lconsole, wxlua app all static int s_wxXXX lua tags now s_wxluatag_wxXXX to make them easier to find functions to get the structs with the bindings are prepended with wxLuaXXX DECLARE/IMPLEMENT_CLASS replaced with either XXX_ABSTRACT/DYNAMIC_CLASS window ids for the stacktree now ID_WXLUA_XXX Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** genwxbind.lua 28 Nov 2005 06:05:08 -0000 1.9 --- genwxbind.lua 29 Nov 2005 05:45:09 -0000 1.10 *************** *** 2431,2435 **** table.insert(codeList, " // get this\n") end ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *) wxlState.getuserdatatype(1, s_"..MakeClassVar(parseObject.Name)..");\n") if memberType == "wxString" then --- 2431,2435 ---- table.insert(codeList, " // get this\n") end ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *) wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") if memberType == "wxString" then *************** *** 2444,2450 **** -- if string.find(member.Name, "::") then ! -- table.insert(codeList, " wxlState.pushuserdatatype(s_"..MakeClassVar(memberType)..", "..member.Name..");\n") -- else ! table.insert(codeList, " wxlState.pushuserdatatype(s_"..MakeClassVar(memberType)..", &self->"..member.Name..");\n") -- end elseif not intrinsic then --- 2444,2450 ---- -- if string.find(member.Name, "::") then ! -- table.insert(codeList, " wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", "..member.Name..");\n") -- else ! table.insert(codeList, " wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", &self->"..member.Name..");\n") -- end elseif not intrinsic then *************** *** 2453,2457 **** end ! table.insert(codeList, " wxlState.pushuserdatatype(s_"..MakeClassVar(memberType)..", self->"..member.Name..");\n") elseif type == "BOOL" or type == "bool" then if (comment) then --- 2453,2457 ---- end ! table.insert(codeList, " wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", self->"..member.Name..");\n") elseif type == "BOOL" or type == "bool" then if (comment) then *************** *** 2511,2520 **** table.insert(codeList, " // get the data type value\n") end ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_"..MakeClassVar(memberType).." );\n") elseif not intrinsic then if (comment) then table.insert(codeList, " // get the data type value\n") end ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_"..MakeClassVar(memberType).." );\n") elseif memberType == "BOOL" or memberType == "bool" then if (comment) then --- 2511,2520 ---- table.insert(codeList, " // get the data type value\n") end ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType).." );\n") elseif not intrinsic then if (comment) then table.insert(codeList, " // get the data type value\n") end ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxlState.getuserdatatype(2, s_wxluatag_"..MakeClassVar(memberType).." );\n") elseif memberType == "BOOL" or memberType == "bool" then if (comment) then *************** *** 2531,2535 **** table.insert(codeList, " // get this\n") end ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_"..MakeClassVar(parseObject.Name)..");\n") if not intrinsic and (not memberPtr or memberPtr == "&") then --- 2531,2535 ---- table.insert(codeList, " // get this\n") end ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") if not intrinsic and (not memberPtr or memberPtr == "&") then *************** *** 2647,2651 **** local objectBinding = { ! Map = " { &"..member.Name..", 0, \""..member.Name.."\", &s_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } --- 2647,2651 ---- local objectBinding = { ! Map = " { &"..member.Name..", 0, \""..member.Name.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } *************** *** 2659,2663 **** local objectTagBinding = { ! ExternDeclaration = "extern int s_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 2659,2663 ---- local objectTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 2683,2687 **** local pointerBinding = { ! Map = " { 0, (const void **) &"..member.Name..", \""..member.Name.."\", &s_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } --- 2683,2687 ---- local pointerBinding = { ! Map = " { 0, (const void **) &"..member.Name..", \""..member.Name.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } *************** *** 2695,2699 **** local objectTagBinding = { ! ExternDeclaration = "extern int s_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 2695,2699 ---- local objectTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 2719,2723 **** local eventBinding = { ! Map = " { &"..member.Name..", \""..member.Name.."\", &s_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } --- 2719,2723 ---- local eventBinding = { ! Map = " { &"..member.Name..", \""..member.Name.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } *************** *** 2731,2735 **** local eventTagBinding = { ! ExternDeclaration = "extern int s_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 2731,2735 ---- local eventTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 2822,2826 **** declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " elseif not intrinsic then ! argItem = "("..argTypeWithAttrib..") wxlState.getuserdatatype("..argNum..", s_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..") wxlState.ttouserdata("..argNum..")" --- 2822,2826 ---- declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " elseif not intrinsic then ! argItem = "("..argTypeWithAttrib..") wxlState.getuserdatatype("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..") wxlState.ttouserdata("..argNum..")" *************** *** 2849,2853 **** if not intrinsic then ! argItem = "("..argTypeWithAttrib..")wxlState.getuserdatatype("..argNum..", s_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlState.ttouserdata("..argNum..")" --- 2849,2853 ---- if not intrinsic then ! argItem = "("..argTypeWithAttrib..")wxlState.getuserdatatype("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlState.ttouserdata("..argNum..")" *************** *** 2857,2861 **** if not intrinsic then argTypeWithAttrib = argTypeWithAttrib.." **" ! argItem = "("..argTypeWithAttrib..")wxlState.getuserdatatype("..argNum..", s_"..MakeClassVar(argType)..")" else argTypeWithAttrib = argTypeWithAttrib.." *" --- 2857,2861 ---- if not intrinsic then argTypeWithAttrib = argTypeWithAttrib.." **" ! argItem = "("..argTypeWithAttrib..")wxlState.getuserdatatype("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else argTypeWithAttrib = argTypeWithAttrib.." *" *************** *** 2879,2883 **** argTypeWithAttrib = argTypeWithAttrib.." *" if not intrinsic then ! argItem = "("..argTypeWithAttrib..")wxlState.getuserdatatype("..argNum..", s_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlState.ttouserdata("..argNum..")" --- 2879,2883 ---- argTypeWithAttrib = argTypeWithAttrib.." *" if not intrinsic then ! argItem = "("..argTypeWithAttrib..")wxlState.getuserdatatype("..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlState.ttouserdata("..argNum..")" *************** *** 3133,3137 **** table.insert(codeList, " // push the constructed class pointer\n") end ! table.insert(codeList, " wxlState.pushuserdatatype(s_"..MakeClassVar(parseObject.Name)..", returns );\n") table.insert(codeList, "\n return 1;\n") --- 3133,3137 ---- table.insert(codeList, " // push the constructed class pointer\n") end ! table.insert(codeList, " wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(parseObject.Name)..", returns );\n") table.insert(codeList, "\n return 1;\n") *************** *** 3148,3152 **** end ! table.insert(codeList, " "..parseObject.Name.." * self = ( "..parseObject.Name.." * )wxlState.getuserdatatype(1, s_"..MakeClassVar(parseObject.Name).." );\n") -- static member function? --- 3148,3152 ---- end ! table.insert(codeList, " "..parseObject.Name.." * self = ( "..parseObject.Name.." * )wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name).." );\n") -- static member function? *************** *** 3211,3215 **** table.insert(codeList, " // push the result datatype\n") end ! table.insert(codeList, " wxlState.pushuserdatatype(s_"..MakeClassVar(memberType)..", returns );\n") elseif member.DataType == "BOOL" or member.DataType == "bool" then if (comment) then --- 3211,3215 ---- table.insert(codeList, " // push the result datatype\n") end ! table.insert(codeList, " wxlState.pushuserdatatype(s_wxluatag_"..MakeClassVar(memberType)..", returns );\n") elseif member.DataType == "BOOL" or member.DataType == "bool" then if (comment) then *************** *** 3288,3292 **** local classTagBinding = { ! ExternDeclaration = "extern int s_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ExternMethodCountDeclaration = "extern int "..MakeVar(parseObject.Name).."_methodCount;\n", --- 3288,3292 ---- local classTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ExternMethodCountDeclaration = "extern int "..MakeVar(parseObject.Name).."_methodCount;\n", *************** *** 3304,3308 **** decl = decl.."// Lua MetaTable Tag for Class\n" end ! decl = decl.."int s_"..MakeClassVar(parseObject.Name).." = -1;\n" interface.objectData[o].TagDeclaration = decl --- 3304,3308 ---- decl = decl.."// Lua MetaTable Tag for Class\n" end ! decl = decl.."int s_wxluatag_"..MakeClassVar(parseObject.Name).." = -1;\n" interface.objectData[o].TagDeclaration = decl *************** *** 3322,3326 **** local classBinding = { ! Map = " { \""..MakeVar(parseObject.Name).."\", "..MakeVar(parseObject.Name).."_methods, "..MakeVar(parseObject.Name).."_methodCount, -1, "..classinfo..", &s_"..MakeClassVar(parseObject.Name)..", "..MakeVar(baseclass).." }, \n", Condition = classcondition } --- 3322,3326 ---- local classBinding = { ! Map = " { \""..MakeVar(parseObject.Name).."\", "..MakeVar(parseObject.Name).."_methods, "..MakeVar(parseObject.Name).."_methodCount, -1, "..classinfo..", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..MakeVar(baseclass).." }, \n", Condition = classcondition } *************** *** 3337,3341 **** table.insert(codeList, "static int LUACALL "..MakeVar(parseObject.Name).."_destructor(lua_State *L)\n{\n") table.insert(codeList, " wxLuaState wxlState(L);\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_"..MakeClassVar(parseObject.Name)..");\n") if (comment) then --- 3337,3341 ---- table.insert(codeList, "static int LUACALL "..MakeVar(parseObject.Name).."_destructor(lua_State *L)\n{\n") table.insert(codeList, " wxLuaState wxlState(L);\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") if (comment) then *************** *** 3365,3369 **** table.insert(codeList, "static int LUACALL "..MakeVar(parseObject.Name).."_Delete(lua_State *L)\n{\n") table.insert(codeList, " wxLuaState wxlState(L);\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_"..MakeClassVar(parseObject.Name)..");\n") if (comment) then --- 3365,3369 ---- table.insert(codeList, "static int LUACALL "..MakeVar(parseObject.Name).."_Delete(lua_State *L)\n{\n") table.insert(codeList, " wxLuaState wxlState(L);\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.getuserdatatype(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") if (comment) then *************** *** 3615,3620 **** table.insert(fileData, "IMPLEMENT_CLASS("..hook_binding_class..", wxLuaBinding)\n") table.insert(fileData, "\n") ! table.insert(fileData, ""..hook_binding_class.."::"..hook_binding_class.."()\n") ! table.insert(fileData, " : wxLuaBinding()\n") table.insert(fileData, "{\n") table.insert(fileData, " nameSpace = wxT(\""..hook_namespace.."\");\n") --- 3615,3619 ---- table.insert(fileData, "IMPLEMENT_CLASS("..hook_binding_class..", wxLuaBinding)\n") table.insert(fileData, "\n") ! table.insert(fileData, ""..hook_binding_class.."::"..hook_binding_class.."() : wxLuaBinding()\n") table.insert(fileData, "{\n") table.insert(fileData, " nameSpace = wxT(\""..hook_namespace.."\");\n") *************** *** 3642,3656 **** table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L)\n") table.insert(fileData, "{\n") ! table.insert(fileData, " wxLuaState wxLS(L);\n"); ! table.insert(fileData, " wxCHECK_MSG(wxLS.Ok(), false, wxT(\"Invalid wxLuaState\"));\n"); table.insert(fileData, "\n"); ! table.insert(fileData, " wxASSERT(!wxLS.GetLuaStateRefData()->m_typesRegistered);\n"); ! table.insert(fileData, " wxASSERT(!wxLS.GetLuaBinding(wxT(\""..hook_namespace.."\")));\n"); table.insert(fileData, "\n"); table.insert(fileData, " // ignore binding request when we already have "..hook_namespace.." registered\n"); ! table.insert(fileData, " if (wxLS.GetLuaBinding(wxT(\""..hook_namespace.."\")))\n"); table.insert(fileData, " return false;\n"); table.insert(fileData, "\n"); ! table.insert(fileData, " wxLS.GetLuaStateRefData()->m_bindings.Append(new "..hook_binding_class.."());\n"); table.insert(fileData, "\n"); table.insert(fileData, " return true;\n"); --- 3641,3655 ---- table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L)\n") table.insert(fileData, "{\n") ! table.insert(fileData, " wxLuaState wxlState(L);\n"); ! table.insert(fileData, " wxCHECK_MSG(wxlState.Ok(), false, wxT(\"Invalid wxLuaState\"));\n"); table.insert(fileData, "\n"); ! table.insert(fileData, " wxASSERT(!wxlState.GetLuaStateRefData()->m_typesRegistered);\n"); ! table.insert(fileData, " wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")));\n"); table.insert(fileData, "\n"); table.insert(fileData, " // ignore binding request when we already have "..hook_namespace.." registered\n"); ! table.insert(fileData, " if (wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")))\n"); table.insert(fileData, " return false;\n"); table.insert(fileData, "\n"); ! table.insert(fileData, " wxlState.GetLuaStateRefData()->m_bindings.Append(new "..hook_binding_class.."());\n"); table.insert(fileData, "\n"); table.insert(fileData, " return true;\n"); *************** *** 3716,3719 **** --- 3715,3732 ---- table.insert(fileData, "}\n\n") + -- create a instance of the hook binding class to initialize it + table.insert(fileData, "\n\n") + + table.insert(fileData, "class "..hook_binding_class.."Init\n") + table.insert(fileData, "{\n") + table.insert(fileData, "public:\n") + table.insert(fileData, " "..hook_binding_class.."Init()\n") + table.insert(fileData, " {\n") + table.insert(fileData, " m_binding.GetBindingsList()->Append(&m_binding);\n") + table.insert(fileData, " }\n") + table.insert(fileData, " "..hook_binding_class.." m_binding;\n") + table.insert(fileData, "};\n\n") + table.insert(fileData, hook_binding_class.."Init s_"..hook_binding_class.."Init;\n\n") + return fileData end |
