Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

code cleanup, merge Lua.h and LuaUtil.h

Browse Source
This commit is contained in:
Emil Tin 2012-12-28 22:05:28 +01:00
parent 09e331a76b
commit 28f0782b17
5 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Extractor/LuaUtil.h
View File

@ -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_ */

2
Extractor/ScriptingEnvironment.cpp
View File

@ -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) {

1
Extractor/ScriptingEnvironment.h
View File

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

34
Util/Lua.h → Util/LuaUtil.h
View File

@ -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>
bool lua_function_exists(lua_State* lua_state, const char* name)
{
using namespace luabind;
object g = globals(lua_state);
object func = g[name];
return func && type(func) == LUA_TFUNCTION;
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)
{
luabind::object g = luabind::globals(lua_state);
luabind::object func = g[name];
return func && (luabind::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 folder = profilePath.parent_path().string();
const std::string luaCode = "package.path = \"" + folder + "/?.lua;\" .. package.path";
luaL_dostring( myLuaState, luaCode.c_str() );
}
}
#endif /* LUA_UTIL_ */
#endif /* LUAUTIL_H_ */

2
createHierarchy.cpp
View File

@ -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;