-#include <stdexcept>
-#include <sstream>
-#include "parser.hpp"
-#include "lexer.hpp"
-#include "debug.hpp"
+/** @file parser.cpp
+ *
+ * Implementation of GiNaC's parser. */
+
+/*
+ * GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) 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 General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "parser.h"
+#include "lexer.h"
+#include "debug.h"
#include "mul.h"
#include "constant.h"
+#include "function.h"
-namespace GiNaC
-{
+#include <sstream>
+#include <stdexcept>
+
+namespace GiNaC {
/// identifier_expr: identifier | identifier '(' expression* ')'
ex parser::parse_identifier_expr()
Parse_error_("no function \"" << name << "\" with " <<
args.size() << " arguments");
}
- ex ret = reader->second(args);
+ ex ret = GiNaC::function((unsigned)reader->second, args);
return ret;
}
scanner->switch_input(&input);
get_next_tok();
ex ret = parse_expression();
+ // parse_expression() stops if it encounters an unknown token.
+ // This is not a bug: since the parser is recursive checking
+ // whether the next token is valid is responsibility of the caller.
+ // Hence make sure nothing is left in the stream:
+ if (token != lexer::token_type::eof)
+ Parse_error("expected EOF");
+
return ret;
}