Menu
▾
▴
[Wxlua-commit] wxLua/bindings genwxbind.lua,1.179,1.180
|
From: John L. <jr...@us...> - 2009-05-19 03:21:02
|
Update of /cvsroot/wxlua/wxLua/bindings In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15045/wxLua/bindings Modified Files: genwxbind.lua Log Message: Do not export parts of the bindings that are only used internally. Declare them as extern within the cpp file of the binding. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.179 retrieving revision 1.180 diff -C2 -d -r1.179 -r1.180 *** genwxbind.lua 14 May 2009 05:06:21 -0000 1.179 --- genwxbind.lua 19 May 2009 03:20:53 -0000 1.180 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 26 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. --- 18,22 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 27 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 4025,4038 **** -- Figure out if we really need to have member enums for the class ! local enumArrayName = MakeVar(parseObject.Name).."_enums" ! local enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! local ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" ! local ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" ! if enumClassBindingTable[MakeVar(parseObject.Name)] == nil then ! enumArrayName = "g_wxluanumberArray_None" ! enumArrayCountName = 0 ! ExternEnumDeclaration = "" ! ExternEnumCountDeclaration = "" end --- 4025,4038 ---- -- Figure out if we really need to have member enums for the class ! local enumArrayName = "g_wxluanumberArray_None" ! local enumArrayCountName = 0 ! local ExternEnumDeclaration = "" ! local ExternEnumCountDeclaration = "" ! if enumClassBindingTable[MakeVar(parseObject.Name)] ~= nil then ! enumArrayName = MakeVar(parseObject.Name).."_enums" ! enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" ! ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" end *************** *** 4043,4048 **** { ExternDeclaration = "extern "..MakeImpExpData("int").." wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ! ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ExternEnumDeclaration = ExternEnumDeclaration, ExternEnumCountDeclaration = ExternEnumCountDeclaration, --- 4043,4050 ---- { ExternDeclaration = "extern "..MakeImpExpData("int").." wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ! --ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ! --ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", ! ExternMethodDeclaration = "extern wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ! ExternMethodCountDeclaration = "extern int "..MakeVar(parseObject.Name).."_methodCount;\n", ExternEnumDeclaration = ExternEnumDeclaration, ExternEnumCountDeclaration = ExternEnumCountDeclaration, *************** *** 4316,4333 **** end - --[[ - table.insert(fileData, "\n") - - table.insert(fileData, "// ---------------------------------------------------------------------------\n") - table.insert(fileData, "// Functions to access wxLuaBindXXX structs\n") - table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") - - table.insert(fileData, "extern wxLuaBindClass *"..hook_cpp_class_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindNumber *"..hook_cpp_define_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindString *"..hook_cpp_string_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindEvent *"..hook_cpp_event_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindObject *"..hook_cpp_object_funcname.."(size_t &count);\n") - table.insert(fileData, "extern wxLuaBindMethod *"..hook_cpp_function_funcname.."(size_t &count);\n\n") - ]] -- ------------------------------------------------------------------------ -- Class Tag Declaration - sorted by condition for the C++ compiler --- 4318,4321 ---- *************** *** 4348,4357 **** for idx, classTypeBinding in pairs_sort(classTypeBindingList) do table.insert(fileData, indent..classTypeBinding.ExternDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) ! if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then ! table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) ! end end --- 4336,4345 ---- for idx, classTypeBinding in pairs_sort(classTypeBindingList) do table.insert(fileData, indent..classTypeBinding.ExternDeclaration) ! --table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) ! --table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) ! --if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then ! -- table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) ! -- table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) ! --end end *************** *** 4489,4492 **** --- 4477,4517 ---- end + + -- ------------------------------------------------------------------------ + -- Class Tag Declaration - sorted by condition for the C++ compiler + -- ------------------------------------------------------------------------ + + table.insert(fileData, "// ---------------------------------------------------------------------------\n") + table.insert(fileData, "// Lua Tag Method Values and Tables for each Class\n") + table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") + + for condition, classTypeBindingList in pairs_sort(classTypeBindingTable) do + local indent = "" + + if HasCondition(condition) then + indent = " " + table.insert(fileData, "#if "..condition.."\n") + end + + for idx, classTypeBinding in pairs_sort(classTypeBindingList) do + --table.insert(fileData, indent..classTypeBinding.ExternDeclaration) + table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) + table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) + if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then + table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) + table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) + end + end + + if HasCondition(condition) then + table.insert(fileData, "#endif // "..condition.."\n\n") + else + table.insert(fileData, "\n") + end + end + + table.insert(fileData, "\n") + + table.insert(fileData, "\n\n") |
