fixed a bunch of issues with error messages

halgari · halgari · commit fe9bf9a98e65 · 2015-04-08T20:50:23.000-06:00
diff --git a/pixie/vm/compiler.py b/pixie/vm/compiler.py
@@ -78,7 +78,10 @@ def __init__(self, name, argc, parent_ctx):
         self._max_sp = 0
         self.can_tail_call = False
         self.closed_overs = []
-        self.name = name
+        if parent_ctx:
+            self.name = parent_ctx.name + u"_" + name
+        else:
+            self.name = name
         self.recur_points = []
         self.debug_points = {}
 
diff --git a/pixie/vm/libs/pxic/reader.py b/pixie/vm/libs/pxic/reader.py
@@ -55,7 +55,8 @@ def read_raw_integer(rdr):
     return r_uint(ord(rdr.read()[0]) | (ord(rdr.read()[0]) << 8) | (ord(rdr.read()[0]) << 16) | (ord(rdr.read()[0]) << 24))
 
 def read_raw_string(rdr):
-    return rdr.read_cached_string()
+    s = rdr.read_cached_string()
+    return s
 
 def read_code(rdr):
     sz = read_raw_integer(rdr)
@@ -129,7 +130,6 @@ def read_interpreter_code_info(rdr):
     line_number = read_raw_integer(rdr)
     column_number = read_raw_integer(rdr)
     file = read_raw_string(rdr)
-
     return InterpreterCodeInfo(line, intmask(line_number), intmask(column_number), file)
 
 def read_obj(rdr):
@@ -151,6 +151,7 @@ def read_obj(rdr):
         return symbol(read_raw_string(rdr))
     elif tag == LINE_PROMISE:
         lp = LinePromise()
+        lp._chrs = None
         lp._str = read_raw_string(rdr)
         return lp
     elif tag == MAP:
diff --git a/pixie/vm/libs/pxic/writer.py b/pixie/vm/libs/pxic/writer.py
@@ -231,7 +231,6 @@ def write_namespace(o, wtr):
 
 def write_interpreter_code_info(obj, wtr):
     line, line_number, column_number, file = obj.interpreter_code_info_state()
-
     write_tag(CODE_INFO, wtr)
 
     write_object(line, wtr)
diff --git a/pixie/vm/object.py b/pixie/vm/object.py
@@ -255,3 +255,24 @@ def trace_map(self):
         tm = {keyword(u"type") : keyword(u"pixie")}
         tm[keyword(u"name")] = String(self._name)
         return tm
+
+class ExtraCodeInfo(ErrorInfo):
+    def __init__(self, str):
+        self._str = str
+
+    def __repr__(self):
+        return self._str
+
+    def trace_map(self):
+        import pixie.vm.rt as rt
+        from pixie.vm.keyword import keyword
+
+        tm = {keyword(u"type"): keyword(u"extra"),
+              keyword(u"data"): rt.wrap(self._str)}
+        return tm
+
+
+def add_info(ex, data):
+    assert isinstance(ex, WrappedException)
+    ex._ex._trace.append(ExtraCodeInfo(data))
+    return ex
diff --git a/pixie/vm/stdlib.py b/pixie/vm/stdlib.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from pixie.vm.object import Type, _type_registry, WrappedException, RuntimeException, affirm, InterpreterCodeInfo, istypeinstance, \
-    runtime_error
+    runtime_error, add_info
 from pixie.vm.code import BaseCode, PolymorphicFn, wrap_fn, as_var, defprotocol, extend, Protocol, Var, \
                           list_copy, returns, intern_var
 import pixie.vm.code as code
@@ -506,12 +506,32 @@ def load_reader(rdr):
             form = reader.read(rdr, False)
             if form is reader.eof:
                 return nil
-            compiled = compiler.compile(form)
 
-            if pxic_writer is not None:
-                pxic_writer.write_object(compiled)
+            try:
+                compiled = compiler.compile(form)
+
+            except WrappedException as ex:
+                meta = rt.meta(form)
+                if meta is not nil:
+                    ci = rt.interpreter_code_info(meta)
+                    add_info(ex, ci.__repr__())
+                add_info(ex, u"Compiling: " + rt.name(rt.str(form)))
+                raise ex
+
+            try:
+                if pxic_writer is not None:
+                    pxic_writer.write_object(compiled)
+
+                compiled.invoke([])
+
+            except WrappedException as ex:
+                meta = rt.meta(form)
+                if meta is not nil:
+                    ci = rt.interpreter_code_info(meta)
+                    add_info(ex, ci.__repr__())
+                add_info(ex, u"Running: " + rt.name(rt.str(form)))
+                raise ex
 
-            compiled.invoke([])
 
     if not we_are_translated():
         print "done"
