wxlua-commit

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

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

Modified Files:
	genwxbind.lua 
Log Message:
cleanup output
fix use of wxUSE_FATAL_EXCEPTIONS


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** genwxbind.lua	9 Jun 2006 03:24:49 -0000	1.72
--- genwxbind.lua	9 Jun 2006 22:51:30 -0000	1.73
***************
*** 2896,2901 ****
                  local luaname = member.AltName or member.Name -- for %rename
                  if pos then
                      namespace = string.sub(dataType, 0, pos - 1)
!                     luaname = namespace.."_"..luaname -- wxFile::read -> wxFile_read
                      namespace = namespace.."::"
                  end
--- 2896,2907 ----
                  local luaname = member.AltName or member.Name -- for %rename
                  if pos then
+                     -- search for last ::, eg. ns1::ns2::enumName -> ns1::ns2 is namespace
+                     while pos do
+                         local p = string.find(dataType, "::", 1, pos)
+                         if p then pos = p end
+                     end
+ 
                      namespace = string.sub(dataType, 0, pos - 1)
!                     luaname = MakeVar(namespace).."_"..luaname -- wxFile::read -> wxFile_read
                      namespace = namespace.."::"
                  end
***************
*** 3927,3942 ****
      -- Object Include List
      -- ------------------------------------------------------------------------
      for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classIncludeBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
              for idx, classIncludeBinding in pairs_sort(classIncludeBindingList) do
!                 table.insert(fileData, classIncludeBinding.Include)
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 3933,3961 ----
      -- Object Include List
      -- ------------------------------------------------------------------------
+ 
+     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
+     table.insert(fileData, "// Includes\n")
+     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
+ 
      for condition, classIncludeBindingList in pairs_sort(classIncludeBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classIncludeBindingList then
!             local has_condition = condition ~= "1"
!             local indent = ""
! 
!             if has_condition then
!                 indent = "    "
!                 table.insert(fileData, "#if "..condition.."\n")
!             else
!                 print("Condition '"..condition.."'")
              end
  
              for idx, classIncludeBinding in pairs_sort(classIncludeBindingList) do
!                 table.insert(fileData, indent..classIncludeBinding.Include)
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 3948,3964 ****
      -- Class Tag Declaration
      -- ------------------------------------------------------------------------
      table.insert(fileData, "// Lua Tag Method Values for each Class\n")
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
              for idx, classTagBinding in pairs_sort(classTagBindingList) do
!                 table.insert(fileData, classTagBinding.ExternDeclaration)
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 3967,3993 ----
      -- Class Tag Declaration
      -- ------------------------------------------------------------------------
+ 
+     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
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then
!             local has_condition = condition ~= "1"
!             local indent = ""
! 
!             if has_condition then
!                 indent = "    "
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
              for idx, classTagBinding in pairs_sort(classTagBindingList) do
!                 table.insert(fileData, indent..classTagBinding.ExternDeclaration)
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 3970,3987 ****
      -- Class Method Table Declaration
      -- ------------------------------------------------------------------------
!     table.insert(fileData, "// Method Table\n")
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
              for idx, classTagBinding in pairs_sort(classTagBindingList) do
!                 table.insert(fileData, classTagBinding.ExternMethodDeclaration)
!                 table.insert(fileData, classTagBinding.ExternMethodCountDeclaration)
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 3999,4026 ----
      -- Class Method Table Declaration
      -- ------------------------------------------------------------------------
! 
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
!     table.insert(fileData, "// Method Tables\n")
!     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
! 
      for condition, classTagBindingList in pairs_sort(classTagBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and classTagBindingList then
!             local has_condition = condition ~= "1"
!             local indent = ""
! 
!             if has_condition then
!                 indent = "    "
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
              for idx, classTagBinding in pairs_sort(classTagBindingList) do
!                 table.insert(fileData, indent..classTagBinding.ExternMethodDeclaration)
!                 table.insert(fileData, indent..classTagBinding.ExternMethodCountDeclaration)
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 3993,4015 ****
      -- Encapsulation Declarations
      -- ------------------------------------------------------------------------
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and encapsulationBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
              for idx, encapsulationBinding in pairs_sort(encapsulationBindingList) do
                  if encapsulationBinding and encapsulationBinding.Declaration then
!                     table.insert(fileData, encapsulationBinding.Declaration)
                  end
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
      end
  
!     table.insert(fileData, "\n\n")
      table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n")
  
--- 4032,4065 ----
      -- Encapsulation Declarations
      -- ------------------------------------------------------------------------
+ 
+     table.insert(fileData, "// ----------------------------------------------------------------------------\n")
+     table.insert(fileData, "// Encapsulation Declarations\n")
+     table.insert(fileData, "// ----------------------------------------------------------------------------\n\n")
+ 
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and encapsulationBindingList then
!             local has_condition = condition ~= "1"
!             local indent = ""
! 
!             if has_condition then
!                 indent = "    "
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
              for idx, encapsulationBinding in pairs_sort(encapsulationBindingList) do
                  if encapsulationBinding and encapsulationBinding.Declaration then
!                     table.insert(fileData, indent..encapsulationBinding.Declaration)
                  end
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
      end
  
!     table.insert(fileData, "\n")
      table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n")
  
***************
*** 4059,4062 ****
--- 4109,4117 ----
      -- GetClassList
      -- ------------------------------------------------------------------------
+ 
+     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")
      table.insert(fileData, "    static WXLUACLASS classList[] =\n    {\n")
***************
*** 4064,4068 ****
      for condition, classBindingList in pairs_sort(classBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and classBindingList then
!             if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
--- 4119,4125 ----
      for condition, classBindingList in pairs_sort(classBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and classBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
***************
*** 4072,4077 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4129,4134 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
              end
          end
***************
*** 4182,4186 ****
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and encapsulationBindingList then
!             if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
--- 4239,4245 ----
      for condition, encapsulationBindingList in pairs_sort(encapsulationBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and encapsulationBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
***************
*** 4192,4197 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4251,4256 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
              end
          end
***************
*** 4221,4230 ****
      table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
  
      for condition, defineBindingList in pairs_sort(defineBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
--- 4280,4291 ----
      table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, defineBindingList in pairs_sort(defineBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
***************
*** 4233,4238 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4294,4301 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 4241,4250 ****
      table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %enum\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
  
      for condition, enumBindingList in pairs_sort(enumBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and enumBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
--- 4304,4315 ----
      table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %enum\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, enumBindingList in pairs_sort(enumBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and enumBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
***************
*** 4253,4258 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4318,4325 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 4277,4286 ****
      table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define %string\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n")
  
      for condition, stringBindingList in pairs_sort(stringBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and stringBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
--- 4344,4355 ----
      table.insert(fileData, "        // --------------------------------------------------------------------\n")
      table.insert(fileData, "        // %define %string\n")
!     table.insert(fileData, "        // --------------------------------------------------------------------\n\n")
  
      for condition, stringBindingList in pairs_sort(stringBindingTable) do
          if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and stringBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
***************
*** 4289,4294 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4358,4365 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 4322,4326 ****
      for condition, objectBindingList in pairs_sort(objectBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and objectBindingList then
!             if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
--- 4393,4399 ----
      for condition, objectBindingList in pairs_sort(objectBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and objectBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
***************
*** 4330,4335 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4403,4410 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 4338,4342 ****
      for condition, pointerBindingList in pairs_sort(pointerBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and pointerBindingList then
!             if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
--- 4413,4419 ----
      for condition, pointerBindingList in pairs_sort(pointerBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and pointerBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
***************
*** 4346,4351 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4423,4430 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 4379,4384 ****
      for condition, eventBindingList in pairs_sort(eventBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and eventBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
--- 4458,4465 ----
      for condition, eventBindingList in pairs_sort(eventBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and eventBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
***************
*** 4387,4392 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4468,4475 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n")
              end
          end
***************
*** 4414,4428 ****
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
              end
  
              table.insert(fileData, "\n")
  
-             --local bindCount = table.getn(functionBindingList)
-             --for i=1,bindCount do
              for i, functionBinding in pairs_sort(functionBindingList) do
                  if functionBinding.Method then
- 
                      local lineCount = table.getn(functionBinding.Method)
                      for line=1, lineCount do
--- 4497,4510 ----
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
!                 table.insert(fileData, "#if "..condition.."\n")
              end
  
              table.insert(fileData, "\n")
  
              for i, functionBinding in pairs_sort(functionBindingList) do
                  if functionBinding.Method then
                      local lineCount = table.getn(functionBinding.Method)
                      for line=1, lineCount do
***************
*** 4432,4439 ****
              end
  
!             table.insert(fileData, "\n\n")
! 
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4514,4521 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
!             else
!                 table.insert(fileData, "\n\n")
              end
          end
***************
*** 4443,4446 ****
--- 4525,4533 ----
      -- GetBuiltinList
      -- ------------------------------------------------------------------------
+ 
+     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")
      table.insert(fileData, "    static WXLUAMETHOD functionList[] =\n    {\n")
***************
*** 4448,4452 ****
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then
!             if condition ~= "1" then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
--- 4535,4541 ----
      for condition, functionBindingList in pairs_sort(functionBindingTable) do
          if condition ~= nil and condition ~= "n" and condition ~= "" and functionBindingList then
!             local has_condition = condition ~= "1"
! 
!             if has_condition then
                  table.insert(fileData, "\n#if "..condition.."\n")
              end
***************
*** 4456,4461 ****
              end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
--- 4545,4550 ----
              end
  
!             if has_condition then
!                 table.insert(fileData, "#endif // "..condition.."\n\n")
              end
          end
***************
*** 4525,4529 ****
  
                      if (condition ~= "1") and (condition ~= object.Condition) then
!                         table.insert(fileData, "#endif\n\n")
                      end
                  end
--- 4614,4618 ----
  
                      if (condition ~= "1") and (condition ~= object.Condition) then
!                         table.insert(fileData, "#endif // "..condition.."\n\n")
                      end
                  end
***************
*** 4573,4577 ****
  
                                  if (condition ~= "1") and (condition ~= object.Condition) then
!                                     table.insert(fileData, "#endif\n\n")
                                  end
                              end
--- 4662,4666 ----
  
                                  if (condition ~= "1") and (condition ~= object.Condition) then
!                                     table.insert(fileData, "#endif // "..condition.."\n\n")
                                  end
                              end
***************
*** 4586,4592 ****
                      end
  
!                         if overload_condition ~= "" then
!                             table.insert(fileData, "#endif\n\n")
!                         end
  
                  end
--- 4675,4681 ----
                      end
  
!                     if overload_condition ~= "" then
!                         table.insert(fileData, "#endif  // "..overload_condition.."\n\n")
!                     end
  
                  end
***************
*** 4616,4620 ****
  
                      if (condition ~= "1") and (condition ~= object.Condition) then
!                         table.insert(fileData, "#endif\n\n")
                      end
                  end
--- 4705,4709 ----
  
                      if (condition ~= "1") and (condition ~= object.Condition) then
!                         table.insert(fileData, "#endif  // "..condition.."\n\n")
                      end
                  end
***************
*** 4631,4635 ****
  
              if object.Condition then
!                 table.insert(fileData, "#endif\n")
              end
  
--- 4720,4724 ----
  
              if object.Condition then
!                 table.insert(fileData, "#endif  // "..object.Condition.."\n")
              end