[Wxlua-commit] wxLua/bindings genwxbind.lua,1.175,1.176

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

Update of /cvsroot/wxlua/wxLua/bindings
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11491/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Add op_deref() for dereferencing a pointer to an object, i.e. *ptr == obj.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** genwxbind.lua	30 Oct 2008 04:14:25 -0000	1.175
--- genwxbind.lua	31 Oct 2008 05:25:08 -0000	1.176
***************
*** 109,113 ****
  
  -- ---------------------------------------------------------------------------
! -- Sort the table and return it as an numerically indexed table array
  -- ---------------------------------------------------------------------------
  function TableSort(atable, comp_func)
--- 109,113 ----
  
  -- ---------------------------------------------------------------------------
! -- Sort the table keys and return it as an numerically indexed table array
  -- ---------------------------------------------------------------------------
  function TableSort(atable, comp_func)
***************
*** 257,267 ****
  
      -- win32 data types
!     AllocDataType("HANDLE",             "number", false)
!     AllocDataType("DWORD64",            "number", true)
!     AllocDataType("DWORD",              "number", true)
!     AllocDataType("PVOID",              "number", true)
!     AllocDataType("LPCVOID",            "number", true)
!     AllocDataType("LPVOID",             "number", true)
!     AllocDataType("LPDWORD",            "number", true)
  
      -- "fake" data types that we handle in some more complicated way
--- 257,267 ----
  
      -- win32 data types
!     --AllocDataType("HANDLE",             "number", false)
!     --AllocDataType("DWORD64",            "number", true)
!     --AllocDataType("DWORD",              "number", true)
!     --AllocDataType("PVOID",              "number", true)
!     --AllocDataType("LPCVOID",            "number", true)
!     --AllocDataType("LPVOID",             "number", true)
!     --AllocDataType("LPDWORD",            "number", true)
  
      -- "fake" data types that we handle in some more complicated way
***************
*** 270,274 ****
      AllocDataType("wxString",              "special", true)
      --AllocDataType("wxArrayString",         "special", true) -- special, but we only convert input, not output
!     --AllocDataType("wxSortedArrayString",         "special", true) -- special, but we only convert input, not output
      --AllocDataType("wxArrayInt",            "special", true) -- special, but we only convert input, not output
      AllocDataType("IntArray_FromLuaTable", "special", true)
--- 270,274 ----
      AllocDataType("wxString",              "special", true)
      --AllocDataType("wxArrayString",         "special", true) -- special, but we only convert input, not output
!     --AllocDataType("wxSortedArrayString",   "special", true) -- special, but we only convert input, not output
      --AllocDataType("wxArrayInt",            "special", true) -- special, but we only convert input, not output
      AllocDataType("IntArray_FromLuaTable", "special", true)
***************
*** 286,289 ****
--- 286,290 ----
      functionAttribTable["virtual"] = true
      functionAttribTable["inline"]  = true
+     functionAttribTable["friend"]  = true
  end
  
***************
*** 521,525 ****
  -- ---------------------------------------------------------------------------
  function FileDataIsStringData(filename, strData)
!     local file_handle = io.open(filename)
      if not file_handle then return false end -- ok if it doesn't exist
  
--- 522,526 ----
  -- ---------------------------------------------------------------------------
  function FileDataIsStringData(filename, strData)
!     local file_handle = io.open(filename, "rb")
      if not file_handle then return false end -- ok if it doesn't exist
  
***************
*** 576,580 ****
          local n = 1
          for v in string.gmatch(condition, "%d+") do
!             ver[n] = tonumber(v); n = n + 1
          end
          assert(#ver == 3, "%wxchkver_x_y_z conditions has too many version numbers. '"..condition.."'")
--- 577,582 ----
          local n = 1
          for v in string.gmatch(condition, "%d+") do
!             ver[n] = tonumber(v);
!             n = n + 1
          end
          assert(#ver == 3, "%wxchkver_x_y_z conditions has too many version numbers. '"..condition.."'")
***************
*** 1129,1134 ****
  
      bindingOperatorTable["+"]  = "op_add"
!     bindingOperatorTable["-"]  = "op_sub" -- also op_neg if unary -
!     bindingOperatorTable["*"]  = "op_mul"
      bindingOperatorTable["/"]  = "op_div"
      bindingOperatorTable["%"]  = "op_mod"
--- 1131,1136 ----
  
      bindingOperatorTable["+"]  = "op_add"
!     bindingOperatorTable["-"]  = "op_sub"  -- also op_neg if unary -
!     bindingOperatorTable["*"]  = "op_mul"  -- also op_deref if no args
      bindingOperatorTable["/"]  = "op_div"
      bindingOperatorTable["%"]  = "op_mod"
***************
*** 3223,3226 ****
--- 3225,3231 ----
                      member.Name = "op_predec"
                      member.Params = {}
+                 elseif (member["%operator"] == "*") and (#member.Params == 0) then
+                     member.Name = "op_deref"
+                     member.Params = {}
                  end