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/parser.h b/src/parser.h
index a9828c05..1ad80e82 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -92,10 +92,11 @@ public:
     TRACE_DTOR(parser_t);
   }
 
-  ptr_op_t parse(std::istream& in, const flags_t flags = EXPR_PARSE_NORMAL);
+  ptr_op_t parse(std::istream& in, const flags_t flags = EXPR_PARSE_NORMAL,
+		 const string * original_string = NULL);
   ptr_op_t parse(string& str, const flags_t flags = EXPR_PARSE_NORMAL) {
     std::istringstream stream(str);
-    return parse(stream, flags);
+    return parse(stream, flags, &str);
   }
 };