From 50ee03e3f0a44197722e6c3e85d1f60c48403576 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 15 Sep 2008 02:36:50 -0400 Subject: Fixed the way that nested caught exceptions are rethrown, and how value expressions are displayed when errors are found in them. --- src/expr.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/expr.cc') diff --git a/src/expr.cc b/src/expr.cc index 73bf2993..99319c9b 100644 --- a/src/expr.cc +++ b/src/expr.cc @@ -96,13 +96,14 @@ void expr_t::parse(const string& _str, const unsigned int flags) compiled = false; } -void expr_t::parse(std::istream& in, const unsigned int flags) +void expr_t::parse(std::istream& in, const unsigned int flags, + const string * original_string) { if (! parser.get()) throw_(parse_error, "Value expression parser not initialized"); str = ""; - ptr = parser->parse(in, flags); + ptr = parser->parse(in, flags, original_string); compiled = false; } -- cgit v1.2.3