[Wxlua-commit] wxLua/bindings genwxbind.lua,1.101,1.102

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32575/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Change WXLUACLASS to keep a pointer to the base class's WXLUACLASS not it's tag
for faster lookup.
cleanup of the headers, more comments 


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** genwxbind.lua	23 Feb 2007 04:35:29 -0000	1.101
--- genwxbind.lua	26 Feb 2007 01:57:00 -0000	1.102
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 4 -- Used to verify that the bindings are updated
                            -- This must match modules/wxlua/include/wxldefs.h
  
--- 18,22 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 5 -- Used to verify that the bindings are updated
                            -- This must match modules/wxlua/include/wxldefs.h
  
***************
*** 2942,2946 ****
                  local objectBinding =
                  {
!                     Map = "        { &"..member.Name..", 0, \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n",
                      Condition = fullcondition
                  }
--- 2942,2946 ----
                  local objectBinding =
                  {
!                     Map = "        { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", 0 },\n",
                      Condition = fullcondition
                  }
***************
*** 2974,2978 ****
                  local pointerBinding =
                  {
!                     Map = "        { 0, (const void **) &"..member.Name..", \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n",
                      Condition = fullcondition
                  }
--- 2974,2978 ----
                  local pointerBinding =
                  {
!                     Map = "        { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0, (const void **) &"..member.Name.." },\n",
                      Condition = fullcondition
                  }
***************
*** 3698,3702 ****
              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
              }
--- 3698,3702 ----
              local classBinding =
              {
!                 Map = "    { \""..MakeVar(parseObject.Name).."\", "..MakeVar(parseObject.Name).."_methods, "..MakeVar(parseObject.Name).."_methodCount, "..classinfo..", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..MakeVar(baseclass)..", NULL }, \n",
                  Condition = classcondition
              }
***************
*** 3788,3797 ****
      local fileData = {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and tags for wxLua binding\n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n")
--- 3788,3797 ----
      local fileData = {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and tags for wxLua binding\n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n")
***************
*** 3803,3809 ****
      table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n\n")
  
      table.insert(fileData, "#if WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
      table.insert(fileData, "#   error \"The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings.\"\n")
!     table.insert(fileData, "#endif //WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n\n")
  
      if hook_bind_condition then
--- 3803,3814 ----
      table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n\n")
  
+     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
+     table.insert(fileData, "// Check if the version of binding generator used to create this is older than\n")
+     table.insert(fileData, "//   the current version of the bindings.\n")
+     table.insert(fileData, "//   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'\n")
      table.insert(fileData, "#if WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
      table.insert(fileData, "#   error \"The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings.\"\n")
!     table.insert(fileData, "#endif //WXLUA_BINDING_VERSION > "..WXLUA_BINDING_VERSION.."\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      if hook_bind_condition then
***************
*** 3841,3847 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Includes\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do
--- 3846,3852 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Includes\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do
***************
*** 3870,3876 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
--- 3875,3881 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
***************
*** 3899,3905 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Method Tables\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
--- 3904,3910 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Method Tables\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
***************
*** 3929,3935 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// Encapsulation Declarations\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
--- 3934,3940 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// Encapsulation Declarations\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
***************
*** 3965,3973 ****
  
  function GenerateHookCppFileHeader(fileData)
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated.\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifdef __BORLANDC__\n")
--- 3970,3978 ----
  
  function GenerateHookCppFileHeader(fileData)
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// This file was generated by genwxbind.lua \n")
      table.insert(fileData, "//\n")
      table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated.\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "\n")
      table.insert(fileData, "#ifdef __BORLANDC__\n")
***************
*** 4003,4009 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
--- 4008,4014 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUACLASS* "..hook_cpp_class_funcname.."(size_t &count)\n{\n")
***************
*** 4032,4038 ****
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      if hook_bind_condition then
--- 4037,4043 ----
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_class_funcname.."() is called to register classes\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      if hook_bind_condition then
***************
*** 4148,4154 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_define_funcname.."() is called to register defines and enums\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
--- 4153,4159 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_define_funcname.."() is called to register defines and enums\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
***************
*** 4158,4164 ****
      table.insert(fileData, "    static WXLUADEFINE defineList[] =\n    {\n")
  
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, defineBindingList in pairs_sort(defineBindingTable) do
--- 4163,4169 ----
      table.insert(fileData, "    static WXLUADEFINE defineList[] =\n    {\n")
  
!     table.insert(fileData, "        // -------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define\n")
!     table.insert(fileData, "        // -------------------------------------------------------------------\n\n")
  
      for condition, defineBindingList in pairs_sort(defineBindingTable) do
***************
*** 4178,4184 ****
      end
  
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %enum\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, enumBindingList in pairs_sort(enumBindingTable) do
--- 4183,4189 ----
      end
  
!     table.insert(fileData, "        // -------------------------------------------------------------------\n")
      table.insert(fileData, "        // %enum\n")
!     table.insert(fileData, "        // -------------------------------------------------------------------\n\n")
  
      for condition, enumBindingList in pairs_sort(enumBindingTable) do
***************
*** 4207,4220 ****
      -- GetStringList
      -- ------------------------------------------------------------------------
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
      table.insert(fileData, "// "..hook_cpp_string_funcname.."() is called to register strings\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUASTRING* "..hook_cpp_string_funcname.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUASTRING stringList[] =\n    {\n")
  
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define %string\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, stringBindingList in pairs_sort(stringBindingTable) do
--- 4212,4225 ----
      -- GetStringList
      -- ------------------------------------------------------------------------
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
      table.insert(fileData, "// "..hook_cpp_string_funcname.."() is called to register strings\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUASTRING* "..hook_cpp_string_funcname.."(size_t &count)\n{\n")
      table.insert(fileData, "    static WXLUASTRING stringList[] =\n    {\n")
  
!     table.insert(fileData, "        // -------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define %string\n")
!     table.insert(fileData, "        // -------------------------------------------------------------------\n\n")
  
      for condition, stringBindingList in pairs_sort(stringBindingTable) do
***************
*** 4249,4255 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_object_funcname.."() is called to register object and pointer bindings\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
--- 4254,4260 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_object_funcname.."() is called to register object and pointer bindings\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
***************
*** 4306,4312 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_event_funcname.."() is called to register events\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
--- 4311,4317 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_event_funcname.."() is called to register events\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      -- ------------------------------------------------------------------------
***************
*** 4347,4353 ****
      fileData = fileData or {}
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
--- 4352,4358 ----
      fileData = fileData or {}
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
***************
*** 4381,4387 ****
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUAMETHOD* "..hook_cpp_function_funcname.."(size_t &count)\n{\n")
--- 4386,4392 ----
      -- ------------------------------------------------------------------------
  
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n")
      table.insert(fileData, "// "..hook_cpp_function_funcname.."() is called to register global functions\n")
!     table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
      table.insert(fileData, "WXLUAMETHOD* "..hook_cpp_function_funcname.."(size_t &count)\n{\n")
***************
*** 4439,4446 ****
  
              -- Output Parsed Object
!             table.insert(fileData, "// -------------------------------------------------------------------------------------------------\n")
              table.insert(fileData, "// Bind "..object.DefType.." "..object.Name.."\n")
!             table.insert(fileData, "// -------------------------------------------------------------------------------------------------\n")
!             table.insert(fileData, "\n")
  
              -- Class Tag Declaration
--- 4444,4450 ----
  
              -- Output Parsed Object
!             table.insert(fileData, "// ---------------------------------------------------------------------------\n")
              table.insert(fileData, "// Bind "..object.DefType.." "..object.Name.."\n")
!             table.insert(fileData, "// ---------------------------------------------------------------------------\n\n")
  
              -- Class Tag Declaration