diff options
| -rw-r--r-- | cmdline.cpp | 7 | ||||
| -rw-r--r-- | parser.cpp | 5 | ||||
| -rw-r--r-- | qbuffers.cpp | 5 |
3 files changed, 17 insertions, 0 deletions
diff --git a/cmdline.cpp b/cmdline.cpp index d8e71ac..5d6700f 100644 --- a/cmdline.cpp +++ b/cmdline.cpp @@ -129,6 +129,13 @@ process_edit_cmd(gchar key) case '\x1B': if (cmdline && cmdline[cmdline_len - 1] == '\x1B') { + if (Goto::skip_label) { + interface.msg(Interface::MSG_ERROR, + "Label \"%s\" not found", + Goto::skip_label); + break; + } + if (quit_requested) { /* FIXME */ exit(EXIT_SUCCESS); @@ -81,8 +81,13 @@ file_execute(const gchar *filename) try { macro_execute(p ? p+1 : macro); + if (Goto::skip_label) + throw State::Error("Label \"%s\" not found", + Goto::skip_label); } catch (...) { g_free(macro); + g_free(Goto::skip_label); + Goto::skip_label = NULL; return false; } g_free(macro); diff --git a/qbuffers.cpp b/qbuffers.cpp index 3c11ab0..e90b505 100644 --- a/qbuffers.cpp +++ b/qbuffers.cpp @@ -164,11 +164,16 @@ QRegister::execute(void) throw (State::Error) try { macro_execute(str); + if (Goto::skip_label) + throw State::Error("Label \"%s\" not found", + Goto::skip_label); } catch (...) { g_free(str); macro_pc = parent_pc; States::current = parent_state; Goto::table = parent_goto_table; + g_free(Goto::skip_label); + Goto::skip_label = NULL; throw; /* forward */ } |