Merge pull request #446 from Rudd-O/truepyerrors

Ensure that parse errors produce useful RuntimeErrors for Python code.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/textual.cc b/src/textual.cc
index ccd87ca0..c97b8b01 100644
--- a/src/textual.cc
+++ b/src/textual.cc
@@ -282,6 +282,10 @@ void instance_t::parse()
 
       std::cerr << _("Error: ") << err.what() << std::endl;
       context.errors++;
+      if (! current_context.empty())
+          context.last = current_context + "\n" + err.what();
+      else
+          context.last = err.what();
     }
   }
 
@@ -1998,7 +2002,8 @@ std::size_t journal_t::read_textual(parse_context_stack_t& context_stack)
   TRACE_FINISH(parsing_total, 1);
 
   if (context_stack.get_current().errors > 0)
-    throw error_count(context_stack.get_current().errors);
+    throw error_count(context_stack.get_current().errors,
+                      context_stack.get_current().last);
 
   return context_stack.get_current().count;
 }