[Wxlua-commit] wxLua/bindings genwxbind.bat,1.3,1.4 genwxbind.lua,1.21,1.22

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

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

Modified Files:
	genwxbind.bat genwxbind.lua 
Log Message:
make genwxbind.bat for wxstc
nicer fix for empty arrays, fixes previous fix to empty builtin function array compilation error


Index: genwxbind.bat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** genwxbind.bat	2 Feb 2006 15:49:24 -0000	1.3
--- genwxbind.bat	3 Feb 2006 15:59:27 -0000	1.4
***************
*** 6,10 ****
  echo Generating wxWidgets Binding
  %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt
! %LUA% -e"rulesFilename=\"wxwidgets/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt
  echo Done.
  
--- 6,10 ----
  echo Generating wxWidgets Binding
  %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt
! %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt
  echo Done.
  

Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** genwxbind.lua	3 Feb 2006 15:18:04 -0000	1.21
--- genwxbind.lua	3 Feb 2006 15:59:27 -0000	1.22
***************
*** 4120,4150 ****
      -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n")
  
!     if table.getn(builtinBindingTable) == 0 then
!         table.insert(fileData, "    count = 0;\n")
!         table.insert(fileData, "    return NULL;\n")
!     else
!         table.insert(fileData, "    static WXLUAMETHOD builtinList[] =\n    {\n")
! 
!         for condition, builtinBindingList in builtinBindingTable do
!             if condition ~= nil and condition ~= "n" and condition ~= "" and builtinBindingList then
!                 if condition ~= "1" then
!                     table.insert(fileData, "\n#if "..condition.."\n")
!                 end
  
!                 for idx, builtinBinding in builtinBindingList do
!                     table.insert(fileData, builtinBinding.Map)
!                 end
  
!                 if condition ~= "1" then
!                     table.insert(fileData, "#endif\n\n")
!                 end
              end
          end
- 
-         table.insert(fileData, "    };\n")
-         table.insert(fileData, "    count = (sizeof(builtinList)/sizeof(builtinList[0]));\n")
-         table.insert(fileData, "    return builtinList;\n")
      end
      table.insert(fileData, "}\n\n")
  
--- 4120,4145 ----
      -- ///////////////////////////////////////////////////////////////////////
      table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n")
+     table.insert(fileData, "    static WXLUAMETHOD builtinList[] =\n    {\n")
  
!     for condition, builtinBindingList in builtinBindingTable do
!         if condition ~= nil and condition ~= "n" and condition ~= "" and builtinBindingList then
!             if condition ~= "1" then
!                 table.insert(fileData, "\n#if "..condition.."\n")
!             end
  
!             for idx, builtinBinding in builtinBindingList do
!                 table.insert(fileData, builtinBinding.Map)
!             end
  
!             if condition ~= "1" then
!                 table.insert(fileData, "#endif\n\n")
              end
          end
      end
+ 
+     table.insert(fileData, "        { LuaGlobal, 0, 0, 0, 0 }, \n")
+     table.insert(fileData, "    };\n")
+     table.insert(fileData, "    count = (sizeof(builtinList)/sizeof(builtinList[0])) - 1;\n")
+     table.insert(fileData, "    return builtinList;\n")
      table.insert(fileData, "}\n\n")