code cleanup, merge Lua.h and LuaUtil.h

Extractor/LuaUtil.h

@@ -1,35 +0,0 @@
-/*
-    open source routing machine
-    Copyright (C) Dennis Luxen, others 2010
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU AFFERO General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-or see http://www.gnu.org/licenses/agpl.txt.
- */
-
-
-
-#ifndef LUAUTIL_H_
-#define LUAUTIL_H_
-
-#include <iostream>
-
-template<typename T>
-void LUA_print(T number) {
-  std::cout << "[LUA] " << number << std::endl;
-}
-
-
-
-#endif /* LUAUTIL_H_ */

Extractor/ScriptingEnvironment.cpp

@@ -27,7 +27,7 @@ extern "C" {
 #include "ScriptingEnvironment.h"
 #include "../typedefs.h"
 #include "../Util/OpenMPWrapper.h"
-#include "../Util/Lua.h"
+#include "../Util/LuaUtil.h"
 
 ScriptingEnvironment::ScriptingEnvironment() {}
 ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {

Extractor/ScriptingEnvironment.h

@@ -30,7 +30,6 @@ extern "C" {
 
 #include "ExtractionHelperFunctions.h"
 #include "ExtractorStructs.h"
-#include "LuaUtil.h"
 
 #include "../DataStructures/ImportNode.h"
 

Util/LuaUtil.h

@@ -18,27 +18,37 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 or see http://www.gnu.org/licenses/agpl.txt.
  */
 
-#ifndef LUA_UTIL_
-#define LUA_UTIL_
 
+
+#ifndef LUAUTIL_H_
+#define LUAUTIL_H_
+
+#include <iostream>
 #include <string>
 #include <boost/filesystem/convenience.hpp>
 
+template<typename T>
+void LUA_print(T number) {
+  std::cout << "[LUA] " << number << std::endl;
+}
+
+// Check if the lua function <name> is defined
 bool lua_function_exists(lua_State* lua_state, const char* name)
 {
-    using namespace luabind;
+    luabind::object g = luabind::globals(lua_state);
-    object g = globals(lua_state);
+    luabind::object func = g[name];
-    object func = g[name];
+    return func && (luabind::type(func) == LUA_TFUNCTION);
-    return func && type(func) == LUA_TFUNCTION;
 }
 
+// Add the folder contain the script to the lua load path, so script can easily require() other lua scripts inside that folder, or subfolders.
+// See http://lua-users.org/wiki/PackagePath for details on the package.path syntax.
 void luaAddScriptFolderToLoadPath(lua_State* myLuaState, const char* fileName) {
-    //add the folder contain the script to the lua load path, so script can easily require() other lua scripts inside that folder
-    //see http://lua-users.org/wiki/PackagePath for details on the package.path syntax
     const boost::filesystem::path profilePath( fileName );
-    const std::string folder = profilePath.parent_path().c_str();
+    if( !profilePath.parent_path().empty() ) {
-    const std::string luaCode = "package.path = \"" + folder + "/?.lua;\" .. package.path";
+        const std::string folder = profilePath.parent_path().string();
-    luaL_dostring(myLuaState,luaCode.c_str());
+        const std::string luaCode = "package.path = \"" + folder + "/?.lua;\" .. package.path";
+        luaL_dostring( myLuaState, luaCode.c_str() );
+    }
 }
 
-#endif /* LUA_UTIL_ */
+#endif /* LUAUTIL_H_ */

createHierarchy.cpp

@@ -47,7 +47,7 @@ extern "C" {
 #include "Util/InputFileUtil.h"
 #include "Util/GraphLoader.h"
 #include "Util/StringUtil.h"
-#include "Util/Lua.h"
+#include "Util/LuaUtil.h"
 
 using namespace std;