commit 08335004cfe95048ee06134a3e49b9fb75639139
author Damien George <damien.p.george@gmail.com> Sat Jan 18 23:24:36 2014 +0000
committer Damien George <damien.p.george@gmail.com> Sat Jan 18 23:24:36 2014 +0000
tree 7518a854012938fd70c57b3571a630a142b84f28
parent aefe79880f8c5f66132673ccc9be27d2ca29005b

Add source file name and line number to error messages.

Byte code has a map from byte-code offset to source-code line number,
used to give better error messages.

unix/main.c

diff --git a/unix/main.c b/unix/main.c
index d89f39d..c33a439 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -49,13 +49,14 @@
         return;
     }
 
+    qstr source_name = mp_lexer_source_name(lex);
     mp_lexer_free(lex);
 
     //printf("----------------\n");
-    //parse_node_show(pn, 0);
+    //mp_parse_node_show(pn, 0);
     //printf("----------------\n");
 
-    mp_obj_t module_fun = mp_compile(pn, is_repl);
+    mp_obj_t module_fun = mp_compile(pn, source_name, is_repl);
 
     if (module_fun == mp_const_none) {
         // compile error
@@ -69,7 +70,14 @@
         nlr_pop();
     } else {
         // uncaught exception
-        mp_obj_print((mp_obj_t)nlr.ret_val, PRINT_REPR);
+        mp_obj_t exc = (mp_obj_t)nlr.ret_val;
+        if (MP_OBJ_IS_TYPE(exc, &exception_type)) {
+            qstr file;
+            machine_uint_t line;
+            mp_obj_exception_get_source_info(exc, &file, &line);
+            printf("File \"%s\", line %d\n", qstr_str(file), (int)line);
+        }
+        mp_obj_print(exc, PRINT_REPR);
         printf("\n");
     }
 }