[Wxlua-commit] wxLua/bindings genwxbind.lua,1.16,1.17

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	genwxbind.lua 
Log Message:
allow using the cached data type files for other bindings


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** genwxbind.lua	10 Jan 2006 04:58:06 -0000	1.16
--- genwxbind.lua	19 Jan 2006 04:49:11 -0000	1.17
***************
*** 3453,3457 ****
  
      table.insert(fileData, "// ---------------------------------------------------------\n")
!     table.insert(fileData, "// "..hook_namespace..".h\n")
      table.insert(fileData, "// headers and tag for wxLua binding\n")
      table.insert(fileData, "//  \n")
--- 3453,3457 ----
  
      table.insert(fileData, "// ---------------------------------------------------------\n")
!     table.insert(fileData, "// "..hook_cpp_namespace..".h\n")
      table.insert(fileData, "// headers and tag for wxLua binding\n")
      table.insert(fileData, "//  \n")
***************
*** 3462,3467 ****
      table.insert(fileData, "// ---------------------------------------------------------\n")
      table.insert(fileData, "\n\n\n")
!     table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_namespace.."_H__\n")
!     table.insert(fileData, "#define __HOOK_WXLUA_"..hook_namespace.."_H__\n\n")
  
      table.insert(fileData, "#include \"wxlua/include/internal.h\"\n\n")
--- 3462,3467 ----
      table.insert(fileData, "// ---------------------------------------------------------\n")
      table.insert(fileData, "\n\n\n")
!     table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n")
!     table.insert(fileData, "#define __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n")
  
      table.insert(fileData, "#include \"wxlua/include/internal.h\"\n\n")
***************
*** 3485,3495 ****
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// binds "..hook_namespace.." to wxLua\n")
!     table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L);\n")
      table.insert(fileData, "\n\n")
  
      if hook_bind_condition then
          table.insert(fileData, "#else\n\n")
!         table.insert(fileData, "#define bind_"..hook_namespace.."(L)\n\n")
          table.insert(fileData, "#endif // "..hook_bind_condition.."\n\n")
      end
--- 3485,3495 ----
      table.insert(fileData, "\n\n")
  
!     table.insert(fileData, "// binds "..hook_cpp_namespace.." to wxLua\n")
!     table.insert(fileData, "bool bind_"..hook_cpp_namespace.."(lua_State* L);\n")
      table.insert(fileData, "\n\n")
  
      if hook_bind_condition then
          table.insert(fileData, "#else\n\n")
!         table.insert(fileData, "#define bind_"..hook_cpp_namespace.."(L)\n\n")
          table.insert(fileData, "#endif // "..hook_bind_condition.."\n\n")
      end
***************
*** 3592,3596 ****
  
      table.insert(fileData, "\n\n")
!     table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_namespace.."_H__\n\n")
  
      return fileData
--- 3592,3596 ----
  
      table.insert(fileData, "\n\n")
!     table.insert(fileData, "#endif // __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n")
  
      return fileData
***************
*** 3649,3653 ****
      table.insert(fileData, ""..hook_binding_class.."::"..hook_binding_class.."() : wxLuaBinding()\n")
      table.insert(fileData, "{\n")
!     table.insert(fileData, "    nameSpace = wxT(\""..hook_namespace.."\");\n")
      table.insert(fileData, "    pfGetClassList = "..hook_class_fn..";\n")
      table.insert(fileData, "    pfGetDefineList = "..hook_define_fn..";\n")
--- 3649,3653 ----
      table.insert(fileData, ""..hook_binding_class.."::"..hook_binding_class.."() : wxLuaBinding()\n")
      table.insert(fileData, "{\n")
!     table.insert(fileData, "    nameSpace = wxT(\""..hook_lua_namespace.."\");\n")
      table.insert(fileData, "    pfGetClassList = "..hook_class_fn..";\n")
      table.insert(fileData, "    pfGetDefineList = "..hook_define_fn..";\n")
***************
*** 3671,3676 ****
      table.insert(fileData, "\n")
  
!     table.insert(fileData, "// bind "..hook_namespace.." functions to lua interpreter\n")
!     table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L)\n")
      table.insert(fileData, "{\n")
      table.insert(fileData, "    wxLuaState wxlState(L);\n")
--- 3671,3676 ----
      table.insert(fileData, "\n")
  
!     table.insert(fileData, "// bind "..hook_cpp_namespace.." functions to lua interpreter\n")
!     table.insert(fileData, "bool bind_"..hook_cpp_namespace.."(lua_State* L)\n")
      table.insert(fileData, "{\n")
      table.insert(fileData, "    wxLuaState wxlState(L);\n")
***************
*** 3678,3685 ****
      table.insert(fileData, "\n")
      table.insert(fileData, "    wxASSERT(!wxlState.GetLuaStateRefData()->m_typesRegistered);\n")
!     table.insert(fileData, "    wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")));\n")
      table.insert(fileData, "\n")
!     table.insert(fileData, "    // ignore binding request when we already have "..hook_namespace.." registered\n")
!     table.insert(fileData, "    if (wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")))\n")
      table.insert(fileData, "        return false;\n")
      table.insert(fileData, "\n")
--- 3678,3685 ----
      table.insert(fileData, "\n")
      table.insert(fileData, "    wxASSERT(!wxlState.GetLuaStateRefData()->m_typesRegistered);\n")
!     table.insert(fileData, "    wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_cpp_namespace.."\")));\n")
      table.insert(fileData, "\n")
!     table.insert(fileData, "    // ignore binding request when we already have "..hook_cpp_namespace.." registered\n")
!     table.insert(fileData, "    if (wxlState.GetLuaBinding(wxT(\""..hook_cpp_namespace.."\")))\n")
      table.insert(fileData, "        return false;\n")
      table.insert(fileData, "\n")
***************
*** 4339,4343 ****
      outfile:write("-- typeDefs\n")
      outfile:write("-- ---------------------------------------------------------\n")
!     outfile:write("typeDefs =\n")
      Serialize(typeDefs)
  
--- 4339,4343 ----
      outfile:write("-- typeDefs\n")
      outfile:write("-- ---------------------------------------------------------\n")
!     outfile:write(hook_cpp_namespace.."typeDefs =\n")
      Serialize(typeDefs)
  
***************
*** 4346,4350 ****
      outfile:write("-- dataTypes\n")
      outfile:write("-- ---------------------------------------------------------\n")
!     outfile:write("dataTypes =\n")
      Serialize(dataTypes)
  
--- 4346,4350 ----
      outfile:write("-- dataTypes\n")
      outfile:write("-- ---------------------------------------------------------\n")
!     outfile:write(hook_cpp_namespace.."dataTypes =\n")
      Serialize(dataTypes)
  
***************
*** 4353,4359 ****
      outfile:write("-- conditions\n")
      outfile:write("-- ---------------------------------------------------------\n")
!     outfile:write("conditions =\n")
      Serialize(conditions)
  
      outfile:write()
      outfile:flush()
--- 4353,4373 ----
      outfile:write("-- conditions\n")
      outfile:write("-- ---------------------------------------------------------\n")
!     outfile:write(hook_cpp_namespace.."conditions =\n")
      Serialize(conditions)
  
+     outfile:write("\n\n\n")
+     outfile:write("-- ---------------------------------------------------------\n")
+     outfile:write("-- Cache the dataTypes\n")
+     outfile:write("-- ---------------------------------------------------------\n")
+     outfile:write("    for k, v in "..hook_cpp_namespace.."typeDefs do\n")
+     outfile:write("        typeDefs[k] = v\n")
+     outfile:write("    end\n")
+     outfile:write("    for k, v in "..hook_cpp_namespace.."dataTypes do\n")
+     outfile:write("        dataTypes[k] = v\n")
+     outfile:write("    end\n")
+     outfile:write("    for k, v in "..hook_cpp_namespace.."conditions do\n")
+     outfile:write("        conditions[k] = v\n")
+     outfile:write("    end\n")
+ 
      outfile:write()
      outfile:flush()
***************
*** 4426,4435 ****
      end
  
!     -- load
!     local dataTypeCacheFilename = "DataTypes.Cache.lua"
!     if FileExists(dataTypeCacheFilename) then
!         local cache = loadfile(dataTypeCacheFilename)
!         cache()
!         print("loaded cache: "..dataTypeCacheFilename)
      end
  
--- 4440,4454 ----
      end
  
!     -- load any cached settings from other wrappers
!     if dataTypeCacheFilenames then
!         for key, filename in dataTypeCacheFilenames do
!             if FileExists(filename) then
!                 local cache = loadfile(filename)
!                 cache() -- run loaded file
!                 print("loaded cache: "..filename)
!             else
!                 print("unable to load cache: "..filename)
!             end
!         end
      end