From 4e671188a3ccaa387ab98a73fb2ee569478a3a72 Mon Sep 17 00:00:00 2001
From: Nicolas Noble <nnoble@blizzard.com>
Date: Wed, 24 Jul 2013 14:23:47 -0700
Subject: Better exception handling support for Lua.
---
src/Dalos-cli.cc | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/Dalos-cli.cc b/src/Dalos-cli.cc
index 89069bf..dd0a4a8 100644
--- a/src/Dalos-cli.cc
+++ b/src/Dalos-cli.cc
@@ -74,16 +74,14 @@ void MainTask::Do() {
IO<Input> file(new Input(argv[optind++]));
LuaExecFile luaExecFile(file);
luaExecFile.exec(luaMainTask);
- if (luaExecFile.gotError())
- return;
+ luaExecFile.throwError();
}
for (auto & exec : execs) {
todo = true;
LuaExecString luaExecString(exec);
luaExecString.exec(luaMainTask);
- if (luaExecString.gotError())
- return;
+ luaExecString.throwError();
}
if (!todo && !interactive)
@@ -105,5 +103,6 @@ void MainTask::Do() {
LuaExecString luaExecString(line_read);
luaExecString.exec(luaMainTask);
+ luaExecString.throwError();
}
}
--
cgit v1.2.3