parser: improve error reporting a little bit.

[ginac.git] / ginac / parser / debug.hpp

diff --git a/ginac/parser/debug.hpp b/ginac/parser/debug.hpp
index a43cc7ade4d86c4d9b05907d08083fcde2a04998..5221580d47a87939694d8f1f4c274bc91c67f176 100644 (file)
--- a/ginac/parser/debug.hpp
+++ b/ginac/parser/debug.hpp
@@ -20,6 +20,19 @@ do { \
        throw exception(err.str()); \
 } while (0)
 
        throw exception(err.str()); \
 } while (0)
 

+#define Parse_error_(message) \
+do { \
+       std::ostringstream err; \
+       err << "GiNaC: parse error at line " << scanner->line_num << \
+               ", column " << scanner->column << ": "; \
+       err << message << std::endl; \
+       err << '[' << __PRETTY_FUNCTION__ << "(" << __FILE__ << ':' << __LINE__ << ")]" << std::endl; \
+       throw parse_error(err.str(), scanner->line_num, scanner->column); \
+} while (0)
+
+#define Parse_error(message) \
+       Parse_error_(message << ", got: " << scanner->tok2str(token))
+

 #define bug(message) bail_out(std::logic_error, message)
 
 #define dout(condition, message) \
 #define bug(message) bail_out(std::logic_error, message)
 
 #define dout(condition, message) \