X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flisp%2Fparser.cpp;h=6eb17da808943b4f5b7b1cbc5e7af1fe58f65968;hb=eb9172b9d625b0c333d7ad406433d5d14129a2e6;hp=53f6469605bc61c3a0cd097b19ce8ea10a3bd6aa;hpb=a8057c3d1726484928a3091fdd5c7a3d810f5f63;p=supertux.git diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp index 53f646960..6eb17da80 100644 --- a/src/lisp/parser.cpp +++ b/src/lisp/parser.cpp @@ -68,19 +68,19 @@ static std::string dirname(const std::string& filename) } const Lisp* -Parser::parse(const std::string& filename) +Parser::parse(const std::string& filename_) { - IFileStreambuf ins(filename); + IFileStreambuf ins(filename_); std::istream in(&ins); if(!in.good()) { std::stringstream msg; - msg << "Parser problem: Couldn't open file '" << filename << "'."; + msg << "Parser problem: Couldn't open file '" << filename_ << "'."; throw std::runtime_error(msg.str()); } if(dictionary_manager) { - std::string rel_dir = dirname (filename); + std::string rel_dir = dirname (filename_); for(char** i = searchpath; *i != NULL; i++) { std::string abs_dir = std::string (*i) + PHYSFS_getDirSeparator () + rel_dir; @@ -89,7 +89,7 @@ Parser::parse(const std::string& filename) dictionary = & (dictionary_manager->get_dictionary()); } - return parse(in, filename); + return parse(in, filename_); } const Lisp*