Fix line number information in error messages

Author: SiebelsTim

Diff for: run.c

@@ -31,23 +31,29 @@ void free_var(Variant var)
     }
 }
 
+static lineno_t get_current_line(Runtime* R) 
+{
+    if (R->function == NULL) {
+        return 0;
+    }
 
-_Noreturn void runtimeerror(char* fmt)
+    return R->function->lineinfo[R->ip - R->function->code];
+}
+
+void runtimeerror(Runtime* R, char* fmt)
 {
-    printf("Runtime Error: ");
-    puts(fmt);
-    abort();
+    printf("Runtime Error: %s:%d\n", fmt, get_current_line(R));
 }
 
-_Noreturn void raise_fatal(Runtime* R, char* fmt, ...)
+void raise_fatal(Runtime* R, char* fmt, ...)
 {
     printf("Fatal Error: ");
     va_list ap;
     va_start(ap, fmt);
     vprintf(fmt, ap);
     va_end(ap);
-    printf(" in %s:%zu\n", R->file, 0L);
-    abort();
+    printf(" in %s:%u\n", R->file, get_current_line(R));
+    R->hasError = true;
 }
 
 
@@ -59,8 +65,10 @@ static Runtime* create_runtime(State* S)
     ret->stacksize = 0;
     ret->stack = calloc(ret->stackcapacity, sizeof(*ret->stack));
     ret->scope = create_scope();
+    ret->hasError = false;
     ret->state = S;
     ret->file = NULL;
+    ret->function = NULL;
 
     return ret;
 }
@@ -297,8 +305,9 @@ static void run_assignmentexpr(Runtime* R, Function* fn)
 
 void run_function(Runtime* R, Function* fn)
 {
+    R->function = fn;
     R->ip = fn->code;
-    while ((size_t)(R->ip - fn->code) < fn->codesize) {
+    while ((size_t)(R->ip - fn->code) < fn->codesize && !R->hasError) {
         Operator op = (Operator) *R->ip++;
         int64_t lint;
         Variant var;
@@ -413,12 +422,14 @@ void run_function(Runtime* R, Function* fn)
                 free_var(var);
                 break;
             case OP_INVALID:
-                runtimeerror("OP_INVALID");
+                runtimeerror(R, "OP_INVALID");
                 break;
             default:
-                runtimeerror("Unexpected OP");
+                runtimeerror(R, "Unexpected OP");
         }
     }
+
+    R->function = NULL;
 }
 
 static void init_builtin_functions(State* S)
@@ -432,7 +443,7 @@ static void init_builtin_functions(State* S)
 void run_file(const char* filepath) {
     FILE* handle = fopen(filepath, "r");
     AST* ast = parse(handle);
-    print_ast(ast,0);
+    // print_ast(ast,0);
 
     Function* fn = create_function();
     State* S = create_state();
@@ -442,7 +453,7 @@ void run_file(const char* filepath) {
 
     Runtime* R = create_runtime(S);
     R->file = strdup(filepath);
-    print_code(fn, "<pseudomain>");
+    // print_code(fn, "<pseudomain>");
     run_function(R, fn);
     destroy_state(S);
     destroy_runtime(R);

Diff for: run.h

@@ -7,8 +7,8 @@
 #include "stack.h"
 
 
-_Noreturn void runtimeerror(char* fmt);
-_Noreturn void raise_fatal(Runtime* R, char*, ...);
+void runtimeerror(Runtime* R, char* fmt);
+void raise_fatal(Runtime* R, char*, ...);
 void run_file(const char*);
 void run_function(Runtime*, Function*);
 Variant cpy_var(Variant var);

Diff for: scope.c

@@ -42,7 +42,7 @@ Variant lookup(Runtime *R, char *str)
 static void try_vars_resize(Scope* scope)
 {
     try_resize(&scope->capacity, scope->size, (void*)&scope->vars,
-               sizeof(*scope->vars), runtimeerror);
+               sizeof(*scope->vars), die);
 }
 
 Variable* set_var(Runtime* R, char* str, Variant var)

Diff for: stack.c

@@ -109,7 +109,7 @@ char* vartostring(Variant var)
             break;
     }
 
-    runtimeerror("Assertion failed: May not reach end of tostring function.");
+    die("Assertion failed: May not reach end of tostring function.");
     return NULL;
 }
 
@@ -142,7 +142,7 @@ int64_t vartolong(Variant var)
             break;
     }
 
-    runtimeerror("tolong for undefined value.");
+    die("tolong for undefined value.");
     return 0;
 }
 
@@ -212,7 +212,7 @@ Variant vartotype(Variant var, VARIANTTYPE type)
             break;
         case TYPE_FUNCTION:
         case TYPE_CFUNCTION:
-            runtimeerror("Cannot convert function");
+            die("Cannot convert function");
             break;
         case TYPE_MAX_VALUE:
             assert(false && "Undefined Type given");

Diff for: stack.h

@@ -3,6 +3,7 @@
 
 #include <inttypes.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <assert.h>
 #include "crossplatform/stdnoreturn.h"
 #include "enum-util.h"
@@ -48,20 +49,25 @@ typedef struct Variable {
 typedef struct Runtime {
     size_t stacksize;
     size_t stackcapacity;
+    Function* function;
     codepoint_t* ip;
     Variant* stack;
     Scope* scope;
     State* state; // non-owning ptr
+    bool hasError;
 
     char* file;
 } Runtime;
 
 
-_Noreturn void runtimeerror(char* fmt);
+static _Noreturn void die(char* msg) {
+    puts(msg);
+    abort();
+}
 static inline void try_stack_resize(Runtime* R)
 {
     try_resize(&R->stackcapacity, R->stacksize, (void*)&R->stack,
-               sizeof(*R->stack), runtimeerror);
+               sizeof(*R->stack), die);
 }
 
 Variant* stackidx(Runtime* R, long idx);

Diff for: tests/funcundefined.expect

@@ -1 +1 @@
-Fatal Error: Call to undefined function this_is_undefined() in ./tests/funcundefined.php:0
+Fatal Error: Call to undefined function this_is_undefined() in ./tests/funcundefined.php:4