[Wxlua-commit] wxLua/bindings genwxbind.lua,1.93,1.94

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

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

Modified Files:
	genwxbind.lua 
Log Message:
cleanup in genwxbind.lua
remove whitespace in generated files


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** genwxbind.lua	17 Dec 2006 07:47:14 -0000	1.93
--- genwxbind.lua	6 Feb 2007 04:17:41 -0000	1.94
***************
*** 55,59 ****
  
  -- ----------------------------------------------------------------------------
! -- helpers for SplitString to make it faster
  -- ----------------------------------------------------------------------------
  
--- 55,59 ----
  
  -- ----------------------------------------------------------------------------
! -- Helpers for SplitString to make it faster
  -- ----------------------------------------------------------------------------
  
***************
*** 68,72 ****
  end
  
! local string_sub  = string.sub -- make local so no table lookup
  local string_len  = string.len
  local string_byte = string.byte
--- 68,73 ----
  end
  
! -- make these string.XXX functions local so there's table lookup
! local string_sub  = string.sub
  local string_len  = string.len
  local string_byte = string.byte
***************
*** 173,177 ****
  
  -- ---------------------------------------------------------------------------
! -- allocate a data type description table (int, double, class...)
  -- ---------------------------------------------------------------------------
  function AllocDataType(name, deftype, is_number, abstract)
--- 174,178 ----
  
  -- ---------------------------------------------------------------------------
! -- Allocate a data type description table (int, double, class...) to dataTypeTable
  -- ---------------------------------------------------------------------------
  function AllocDataType(name, deftype, is_number, abstract)
***************
*** 384,388 ****
  
  -- ---------------------------------------------------------------------------
! -- get base type for a data type that is a typedef
  -- ---------------------------------------------------------------------------
  function GetTypeDef(datatype)
--- 385,389 ----
  
  -- ---------------------------------------------------------------------------
! -- Get base type for a data type that is a typedef
  -- ---------------------------------------------------------------------------
  function GetTypeDef(datatype)
***************
*** 592,596 ****
  
  -- ---------------------------------------------------------------------------
! -- build condition string using condition stack (number indexed lua table)
  -- ---------------------------------------------------------------------------
  function BuildCondition(conditionStack)
--- 593,597 ----
  
  -- ---------------------------------------------------------------------------
! -- Build condition string using condition stack (number indexed lua table)
  -- ---------------------------------------------------------------------------
  function BuildCondition(conditionStack)
***************
*** 614,618 ****
  
  -- ---------------------------------------------------------------------------
! -- add conditions with &&, either input condition may be nil
  -- ---------------------------------------------------------------------------
  function AddCondition(condition1, condition2)
--- 615,619 ----
  
  -- ---------------------------------------------------------------------------
! -- Add conditions with &&, either input condition may be nil
  -- ---------------------------------------------------------------------------
  function AddCondition(condition1, condition2)
***************
*** 731,734 ****
--- 732,736 ----
      preprocConditionTable["wxUSE_CONTROLS"]                = "wxUSE_CONTROLS"
      preprocConditionTable["wxUSE_DATAOBJ"]                 = "wxUSE_DATAOBJ"
+     preprocConditionTable["wxUSE_DATEPICKCTRL"]            = "wxUSE_DATEPICKCTRL"
      preprocConditionTable["wxUSE_DATETIME"]                = "wxUSE_DATETIME"
      preprocConditionTable["wxUSE_DEBUG_CONTEXT"]           = "wxUSE_DEBUG_CONTEXT"
***************
*** 1063,1067 ****
      bindingKeywordTable["%rename"]      = true
      bindingKeywordTable["%class"]       = true
!         -- keywords come after %class tag
          bindingKeywordTable["%delete"]      = true
          bindingKeywordTable["%noclassinfo"] = true
--- 1065,1069 ----
      bindingKeywordTable["%rename"]      = true
      bindingKeywordTable["%class"]       = true
!         -- keywords that come after %class tag
          bindingKeywordTable["%delete"]      = true
          bindingKeywordTable["%noclassinfo"] = true
***************
*** 1089,1093 ****
      bindingKeywordTable["%includefile"] = true
      bindingKeywordTable["%define"]      = true
!         bindingKeywordTable["%string"]      = true -- keywords that go with %define
          bindingKeywordTable["%event"]       = true
          bindingKeywordTable["%object"]      = true
--- 1091,1096 ----
      bindingKeywordTable["%includefile"] = true
      bindingKeywordTable["%define"]      = true
!         -- keywords that go with %define
!         bindingKeywordTable["%string"]      = true
          bindingKeywordTable["%event"]       = true
          bindingKeywordTable["%object"]      = true
***************
*** 1242,1251 ****
  -- Load Override Functions
  function ReadOverrideFile(override_file)
!     local inOverride = false
!     local inComment = false
!     local filename = interface_filepath.."/"..override_file
!     local LineNumber = 0
      local OverrideFunc = nil
!     local delimiters = {" ", "\t"}
  
      if not FileExists(filename) then
--- 1245,1254 ----
  -- Load Override Functions
  function ReadOverrideFile(override_file)
!     local inOverride   = false
!     local inComment    = false
!     local filename     = interface_filepath.."/"..override_file
!     local LineNumber   = 0
      local OverrideFunc = nil
!     local delimiters   = {" ", "\t"}
  
      if not FileExists(filename) then
***************
*** 1331,1335 ****
  
  -- ---------------------------------------------------------------------------
! -- load an interface file creating a table {filename, line number, tags, line}
  -- ---------------------------------------------------------------------------
  function ReadInterfaceFile(filename)
--- 1334,1338 ----
  
  -- ---------------------------------------------------------------------------
! -- Load an interface file creating a table {filename, line number, tags, line}
  -- ---------------------------------------------------------------------------
  function ReadInterfaceFile(filename)
***************
*** 1524,1528 ****
  
  -- ---------------------------------------------------------------------------
! -- build DataType Table by adding %classes (and their bases), %structs, and %enums
  -- ---------------------------------------------------------------------------
  function BuildDataTypeTable(interfaceData)
--- 1527,1531 ----
  
  -- ---------------------------------------------------------------------------
! -- Build DataType Table by adding %classes (and their bases), %structs, and %enums
  -- ---------------------------------------------------------------------------
  function BuildDataTypeTable(interfaceData)
***************
*** 4395,4399 ****
  end
  
! 
  function GenerateBindingFileTable(interface)
      local fileData = {}
--- 4398,4404 ----
  end
  
! -- ---------------------------------------------------------------------------
! -- Write Hook file for an interface file
! -- ---------------------------------------------------------------------------
  function GenerateBindingFileTable(interface)
      local fileData = {}
***************
*** 4466,4473 ****
                      for k, v in pairs_sort(OverloadTableList.Map) do
                          local condition = k
!                         if overload_condition ~= "" then overload_condition = overload_condition.."||" end
!                         overload_condition = overload_condition.."("..condition..")"
  
!                         overloadCount = overloadCount + 1 + #v
                      end
  
--- 4471,4480 ----
                      for k, v in pairs_sort(OverloadTableList.Map) do
                          local condition = k
!                         if HasCondition(condition) then
!                             if overload_condition ~= "" then overload_condition = overload_condition.."||" end
!                             overload_condition = overload_condition.."("..condition..")"
  
!                             overloadCount = overloadCount + 1 + #v
!                         end
                      end
  
***************
*** 4491,4495 ****
  
                              if HasCondition(condition) and (condition ~= object.Condition) then
!                                 table.insert(fileData, "#endif // "..condition.."\n\n")
                              end
                          end
--- 4498,4502 ----
  
                              if HasCondition(condition) and (condition ~= object.Condition) then
!                                 table.insert(fileData, "#endif // "..condition.."\n")
                              end
                          end
***************
*** 4506,4514 ****
                          table.insert(fileData, "#endif  // "..overload_condition.."\n\n")
                      end
- 
                  end
              end
  
-             table.insert(fileData, "\n\n")
  
              -- Output Method Map Table
--- 4513,4521 ----
                          table.insert(fileData, "#endif  // "..overload_condition.."\n\n")
                      end
                  end
+ 
+                 table.insert(fileData, "\n\n")
              end
  
  
              -- Output Method Map Table