From 377e9d77025161a61dd30a31458144edbb896b31 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 15 Sep 2016 20:55:58 +0200
Subject: [PATCH] throw out of the VM on errors

---
 src/cs_vm.cc  | 29 +++++++++++------------------
 tools/repl.cc |  6 +++++-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/cs_vm.cc b/src/cs_vm.cc
index 4e5b7e22..8f037a61 100644
--- a/src/cs_vm.cc
+++ b/src/cs_vm.cc
@@ -238,9 +238,7 @@ static inline void force_arg(CsValue &v, int type) {
     }
 }
 
-static ostd::Uint32 *skipcode(
-    ostd::Uint32 *code, CsValue *result = nullptr
-) {
+static ostd::Uint32 *skipcode(ostd::Uint32 *code) {
     int depth = 0;
     for (;;) {
         ostd::Uint32 op = *code++;
@@ -270,9 +268,6 @@ static ostd::Uint32 *skipcode(
             case CsCodeExit | CsRetInt:
             case CsCodeExit | CsRetFloat:
                 if (depth <= 0) {
-                    if (result) {
-                        force_arg(*result, op & CsCodeRetMask);
-                    }
                     return code;
                 }
                 --depth;
@@ -503,7 +498,7 @@ static thread_local int rundepth = 0;
 static inline CsAlias *cs_get_lookup_id(CsState &cs, ostd::Uint32 op) {
     CsIdent *id = cs.p_state->identmap[op >> 8];
     if (id->get_flags() & CsIdfUnknown) {
-        cs_debug_code(cs, "unknown alias lookup: %s", id->get_name());
+        throw CsErrorException(cs, "unknown alias lookup: %s", id->get_name());
     }
     return static_cast<CsAlias *>(id);
 }
@@ -554,15 +549,13 @@ static inline int cs_get_lookupu_type(
                 return CsIdUnknown;
         }
     }
-    cs_debug_code(cs, "unknown alias lookup: %s", arg.get_strr());
-    return CsIdUnknown;
+    throw CsErrorException(cs, "unknown alias lookup: %s", arg.get_strr());
 }
 
 static ostd::Uint32 *runcode(CsState &cs, ostd::Uint32 *code, CsValue &result) {
     result.set_null();
     if (rundepth >= MaxRunDepth) {
-        cs_debug_code(cs, "exceeded recursion limit");
-        return skipcode(code, &result);
+        throw CsErrorException(cs, "exceeded recursion limit");
     }
     ++rundepth;
     int numargs = 0;
@@ -1423,10 +1416,10 @@ static ostd::Uint32 *runcode(CsState &cs, ostd::Uint32 *code, CsValue &result) {
                 CsIdent *id = cs.p_state->identmap[op >> 13];
                 int callargs = (op >> 8) & 0x1F, offset = numargs - callargs;
                 if (id->get_flags() & CsIdfUnknown) {
-                    cs_debug_code(cs, "unknown command: %s", id->get_name());
-                    numargs = offset;
                     force_arg(result, op & CsCodeRetMask);
-                    continue;
+                    throw CsErrorException(
+                        cs, "unknown command: %s", id->get_name()
+                    );
                 }
                 cs_call_alias(
                     cs, static_cast<CsAlias *>(id), args, result, callargs,
@@ -1476,11 +1469,11 @@ noid:
                     if (cs_check_num(idarg.get_strr())) {
                         goto litval;
                     }
-                    cs_debug_code(cs, "unknown command: %s", idarg.get_strr());
                     result.force_null();
-                    numargs = offset - 1;
                     force_arg(result, op & CsCodeRetMask);
-                    continue;
+                    throw CsErrorException(
+                        cs, "unknown command: %s", idarg.get_strr()
+                    );
                 }
                 result.force_null();
                 switch (id->get_type_raw()) {
@@ -1608,7 +1601,7 @@ void CsState::run(CsIdent *id, CsValueRange args, CsValue &ret) {
     ret.set_null();
     ++rundepth;
     if (rundepth > MaxRunDepth) {
-        cs_debug_code(*this, "exceeded recursion limit");
+        throw CsErrorException(*this, "exceeded recursion limit");
     } else if (id) {
         switch (id->get_type()) {
             default:
diff --git a/tools/repl.cc b/tools/repl.cc
index 67328e0e..edccd27d 100644
--- a/tools/repl.cc
+++ b/tools/repl.cc
@@ -207,13 +207,17 @@ static bool do_call(CsState &cs, ostd::ConstCharRange line, bool file = false) {
         scs = nullptr;
         ostd::ConstCharRange terr = e.what();
         auto col = ostd::find(terr, ':');
+        bool is_lnum = false;
         if (!col.empty()) {
+            is_lnum = ostd::find_if(
+                ostd::slice_until(terr, col), [](auto c) { return !isdigit(c); }
+            ).empty();
             terr = col + 2;
         }
         if (!file && ((terr == "missing \"]\"") || (terr == "missing \")\""))) {
             return true;
         }
-        cs.get_out().writeln(col.empty() ? "stdin: " : "stdin:", e.what());
+        cs.get_out().writeln(!is_lnum ? "stdin: " : "stdin:", e.what());
         if (e.get_stack().get()) {
             cscript::util::print_stack(cs.get_out().iter(), e.get_stack());
             cs.get_out().write('\n');