Fixed the way that nested caught exceptions are rethrown, and how value

expressions are displayed when errors are found in them.

1 files changed, 3 insertions, 2 deletions

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	   = "<stream>";
-  ptr	   = parser->parse(in, flags);
+  ptr	   = parser->parse(in, flags, original_string);
   compiled = false;
 }