X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flisp%2Fparser.cpp;h=d108ba014ecbf353ef010dbc3559a1e167283fd3;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=dbed7ac2fe6b79a1fdd95ffdc3619ee1d5287ebe;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp index dbed7ac2f..d108ba014 100644 --- a/src/lisp/parser.cpp +++ b/src/lisp/parser.cpp @@ -71,7 +71,7 @@ Parser::parse(const std::string& filename) dictionary_manager->add_directory(dirname(filename)); dictionary = & (dictionary_manager->get_dictionary()); } - + return parse(in); } @@ -85,11 +85,11 @@ Parser::parse(std::istream& stream) Lisp* result = new Lisp(Lisp::TYPE_CONS); result->v.cons.car = read(); result->v.cons.cdr = 0; - + delete lexer; lexer = 0; - return result; + return result; } Lisp* @@ -111,7 +111,7 @@ Parser::read() } case Lexer::TOKEN_OPEN_PAREN: { result = new Lisp(Lisp::TYPE_CONS); - + token = lexer->getNextToken(); if(token == Lexer::TOKEN_CLOSE_PAREN) { result->v.cons.car = 0; @@ -125,14 +125,14 @@ Parser::read() token = lexer->getNextToken(); if(token != Lexer::TOKEN_STRING) throw std::runtime_error("Expected string after '(_'"); - + result = new Lisp(Lisp::TYPE_STRING); if(dictionary) { std::string translation = dictionary->translate(lexer->getString()); result->v.string = new char[translation.size()+1]; memcpy(result->v.string, translation.c_str(), translation.size()+1); } else { - size_t len = strlen(lexer->getString()) + 1; + size_t len = strlen(lexer->getString()) + 1; result->v.string = new char[len]; memcpy(result->v.string, lexer->getString(), len); }