mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

js: Handle exceptions thrown during REPL execution

Browse source 
We now print thrown exceptions and clear the interpreter state so it
can continue running instead of refusing to do anything after an
exception has been thrown.

Fixes #1572.
This commit is contained in:
Andreas Kling 2020-04-02 09:54:15 +02:00
parent c683665ca9
commit 8ad890cfa6
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Userland/js.cpp
View file

@ -34,6 +34,7 @@
#include <LibJS/Parser.h>
#include <LibJS/Runtime/Array.h>
#include <LibJS/Runtime/Date.h>
#include <LibJS/Runtime/Error.h>
#include <LibJS/Runtime/Function.h>
#include <LibJS/Runtime/GlobalObject.h>
#include <LibJS/Runtime/Object.h>
@ -132,6 +133,12 @@ static void print_date(const JS::Object& date, HashTable<JS::Object*>&)
printf("\033[34;1mDate %s\033[0m", static_cast<const JS::Date&>(date).string().characters());
}
static void print_error(const JS::Object& object, HashTable<JS::Object*>&)
{
auto& error = static_cast<const JS::Error&>(object);
printf("\033[34;1m[%s]\033[0m: %s", error.name().characters(), error.message().characters());
}
void print_value(JS::Value value, HashTable<JS::Object*>& seen_objects)
{
if (value.is_object()) {
@ -153,6 +160,8 @@ void print_value(JS::Value value, HashTable<JS::Object*>& seen_objects)
return print_function(object, seen_objects);
if (object.is_date())
return print_date(object, seen_objects);
if (object.is_error())
return print_error(object, seen_objects);
return print_object(object, seen_objects);
}
@ -268,9 +277,15 @@ void repl(JS::Interpreter& interpreter)
program->dump(0);
auto result = interpreter.run(*program);
if (interpreter.exception()) {
printf("Exception caught: ");
print(interpreter.exception()->value());
interpreter.clear_exception();
} else {
print(result);
}
}
}
int main(int argc, char** argv)
{