SF.net SVN: bzflag:[20558] trunk/bzflag/src/bzflag

[<tr...@us...>]

Revision: 20558
          http://bzflag.svn.sourceforge.net/bzflag/?rev=20558&view=rev
Author:   trepan
Date:     2009-08-26 15:18:58 +0000 (Wed, 26 Aug 2009)

Log Message:
-----------
* load the hub.lua code with a chunkName

Modified Paths:
--------------
    trunk/bzflag/src/bzflag/HubLink.cxx
    trunk/bzflag/src/bzflag/HubLink.h
    trunk/bzflag/src/bzflag/HubLua.cxx
    trunk/bzflag/src/bzflag/HubLua.h

Modified: trunk/bzflag/src/bzflag/HubLink.cxx
===================================================================
--- trunk/bzflag/src/bzflag/HubLink.cxx	2009-08-26 00:17:59 UTC (rev 20557)
+++ trunk/bzflag/src/bzflag/HubLink.cxx	2009-08-26 15:18:58 UTC (rev 20558)
@@ -12,7 +12,7 @@
 
 #include "common.h"
 
-// implementation header
+// interface header
 #include "HubLink.h"
 
 // system headers
@@ -41,7 +41,7 @@
 
 HubLink* hubLink = NULL;
 
-static const std::string codeFileName = "hub.lua";
+const std::string HubLink::codeFileName = "hub.lua";
 
 
 //============================================================================//

Modified: trunk/bzflag/src/bzflag/HubLink.h
===================================================================
--- trunk/bzflag/src/bzflag/HubLink.h	2009-08-26 00:17:59 UTC (rev 20557)
+++ trunk/bzflag/src/bzflag/HubLink.h	2009-08-26 15:18:58 UTC (rev 20558)
@@ -40,7 +40,9 @@
 
   public:
     static const int defaultPort = 0x425A; // 'BZ' / 16984
+    static const std::string codeFileName;
 
+  public:
     HubLink(const std::string& hostPort,
             const std::string& luaCode = "");
     ~HubLink();

Modified: trunk/bzflag/src/bzflag/HubLua.cxx
===================================================================
--- trunk/bzflag/src/bzflag/HubLua.cxx	2009-08-26 00:17:59 UTC (rev 20557)
+++ trunk/bzflag/src/bzflag/HubLua.cxx	2009-08-26 15:18:58 UTC (rev 20558)
@@ -12,8 +12,8 @@
 
 #include "common.h"
 
-// implementation header
-#include "HubLua.h"
+// interface header
+#include "HubLua.h" // redirects to "HubLink.h"
 
 // system headers
 #include <errno.h>
@@ -57,7 +57,7 @@
 
 
 static void limitMembers(lua_State* L, const char* table,
-                           const std::vector<std::string>& functions)
+                         const std::vector<std::string>& functions)
 {
   lua_newtable(L);
   const int nt = lua_gettop(L); // new table
@@ -118,8 +118,9 @@
     return false;
   }
 
-  if (luaL_loadstring(L, code.c_str()) != 0) {
-    std::string msg= "luaL_loadstring() error: ";
+  const char* chunkName = codeFileName.c_str();
+  if (luaL_loadbuffer(L, code.c_str(), code.size(), chunkName) != 0) {
+    std::string msg= "error: ";
     msg += lua_tostring(L, -1);
     fail(msg);
     return false;
@@ -295,7 +296,7 @@
 
 
 void HubLink::wordComplete(const std::string& line,
-                              std::set<std::string>& matches)
+                           std::set<std::string>& matches)
 {
   if (!pushCallIn("WordComplete", 1)) {
     return;
@@ -912,7 +913,7 @@
 
 //============================================================================//
 
-#undef PACK_TYPE
+#undef  PACK_TYPE
 #define PACK_TYPE(label, type) \
   const type value = luaL_checkint(L, 1); \
   char buf[sizeof(type)]; \
@@ -931,7 +932,7 @@
 int HubLink::PackDouble(lua_State* L) { PACK_TYPE(Double, double)   }
 #undef PACK_TYPE
 
-#undef UNPACK_TYPE
+#undef  UNPACK_TYPE
 #define UNPACK_TYPE(label, type) \
   size_t len; \
   const char* s = luaL_checklstring(L, 1, &len); \

Modified: trunk/bzflag/src/bzflag/HubLua.h
===================================================================
--- trunk/bzflag/src/bzflag/HubLua.h	2009-08-26 00:17:59 UTC (rev 20557)
+++ trunk/bzflag/src/bzflag/HubLua.h	2009-08-26 15:18:58 UTC (rev 20558)
@@ -14,7 +14,7 @@
 #define __HUB_LUA_H__
 
 //
-//  HubLua does not exist as a class, yet.
+// HubLua does not exist as a class, yet.
 //
 #include "HubLink.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.