xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Web: Improve error handling

This commit is contained in:
Sidi Liang 2025-02-11 13:57:52 +08:00
parent 0077d21330
commit 998fd08353
No known key found for this signature in database
GPG Key ID: 9785F5EECFFA5311
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/nasal_web.cpp
View File

@ -142,16 +142,38 @@ const char* nasal_eval(void* context, const char* code, int show_time) {
return ctx->last_error.c_str(); return ctx->last_error.c_str();
} }
ld.link(parse, false).chkerr(); if (ld.link(parse, false).geterr()) {
ctx->last_error = error_output.str();
std::cout.rdbuf(old_cout);
std::cerr.rdbuf(old_cerr);
std::remove(temp_filename);
return ctx->last_error.c_str();
}
auto opt = std::make_unique<nasal::optimizer>(); auto opt = std::make_unique<nasal::optimizer>();
opt->do_optimization(parse.tree()); opt->do_optimization(parse.tree());
gen.compile(parse, ld, false, true).chkerr();
if (gen.compile(parse, ld, false, true).geterr()) {
ctx->last_error = error_output.str();
std::cout.rdbuf(old_cout);
std::cerr.rdbuf(old_cerr);
std::remove(temp_filename);
return ctx->last_error.c_str();
}
const auto start = show_time ? clk::now() : clk::time_point(); const auto start = show_time ? clk::now() : clk::time_point();
// Create a future for the VM execution // Create a future for the VM execution
auto future = std::async(std::launch::async, [&]() { auto future = std::async(std::launch::async, [&]() {
ctx->vm_instance->run(gen, ld, {}); // Wrap VM execution in try/catch
try {
ctx->vm_instance->run(gen, ld, {});
} catch (const std::exception& e) {
ctx->last_error = e.what();
throw std::runtime_error(ctx->last_error);
} catch (...) {
ctx->last_error = "Unknown error in VM run()";
throw std::runtime_error(ctx->last_error);
}
}); });
// Wait for completion or timeout // Wait for completion or timeout