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

expressions are displayed when errors are found in them.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/parser.cc b/src/parser.cc
index eabcb845..0ee66bba 100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -385,7 +385,8 @@ expr_t::parser_t::parse_value_expr(std::istream& in,
 }
 
 expr_t::ptr_op_t
-expr_t::parser_t::parse(std::istream& in, const flags_t flags)
+expr_t::parser_t::parse(std::istream& in, const flags_t flags,
+			const string * original_string)
 {
   try {
     ptr_op_t top_node = parse_value_expr(in, flags);
@@ -399,11 +400,13 @@ expr_t::parser_t::parse(std::istream& in, const flags_t flags)
     return top_node;
   }
   catch (const std::exception& err) {
-    add_error_context("While parsing value expression:\n");
-#if 0
-    add_error_context(line_context(str, in.tellg() - 1));
-#endif
-    throw err;
+    add_error_context("While parsing value expression:");
+    if (original_string) {
+      istream_pos_type pos = in.tellg();
+      pos -= 1;
+      add_error_context(line_context(*original_string, pos));
+    }
+    throw;
   }
 }