RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:37:46 +00:00
Code Issues Activity Actions

js: Port to Core::Stream

Browse source
This commit is contained in:
Sam Atkins 2022-09-14 15:19:11 +01:00 • committed by Linus Groh
parent f6884235e2
commit 8d7179766a
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Userland/Utilities/js.cpp
View file

@ -12,8 +12,8 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/ConfigFile.h> #include <LibCore/ConfigFile.h>
#include <LibCore/File.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibCore/Stream.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibJS/AST.h> #include <LibJS/AST.h>
#include <LibJS/Bytecode/BasicBlock.h> #include <LibJS/Bytecode/BasicBlock.h>
@ -1271,11 +1271,11 @@ static JS::ThrowCompletionOr<JS::Value> load_ini_impl(JS::VM& vm)
auto& realm = *vm.current_realm(); auto& realm = *vm.current_realm();
auto filename = TRY(vm.argument(0).to_string(vm)); auto filename = TRY(vm.argument(0).to_string(vm));
auto file = Core::File::construct(filename); auto file_or_error = Core::Stream::File::open(filename, Core::Stream::OpenMode::Read);
if (!file->open(Core::OpenMode::ReadOnly)) if (file_or_error.is_error())
return vm.throw_completion<JS::Error>(String::formatted("Failed to open '{}': {}", filename, file->error_string())); return vm.throw_completion<JS::Error>(String::formatted("Failed to open '{}': {}", filename, file_or_error.error()));
auto config_file = MUST(Core::ConfigFile::open(filename, file->fd())); auto config_file = MUST(Core::ConfigFile::open(filename, file_or_error.release_value()));
auto* object = JS::Object::create(realm, realm.intrinsics().object_prototype()); auto* object = JS::Object::create(realm, realm.intrinsics().object_prototype());
for (auto const& group : config_file->groups()) { for (auto const& group : config_file->groups()) {
auto* group_object = JS::Object::create(realm, realm.intrinsics().object_prototype()); auto* group_object = JS::Object::create(realm, realm.intrinsics().object_prototype());
@ -1291,11 +1291,15 @@ static JS::ThrowCompletionOr<JS::Value> load_ini_impl(JS::VM& vm)
static JS::ThrowCompletionOr<JS::Value> load_json_impl(JS::VM& vm) static JS::ThrowCompletionOr<JS::Value> load_json_impl(JS::VM& vm)
{ {
auto filename = TRY(vm.argument(0).to_string(vm)); auto filename = TRY(vm.argument(0).to_string(vm));
auto file = Core::File::construct(filename); auto file_or_error = Core::Stream::File::open(filename, Core::Stream::OpenMode::Read);
if (!file->open(Core::OpenMode::ReadOnly)) if (file_or_error.is_error())
return vm.throw_completion<JS::Error>(String::formatted("Failed to open '{}': {}", filename, file->error_string())); return vm.throw_completion<JS::Error>(String::formatted("Failed to open '{}': {}", filename, file_or_error.error()));
auto file_contents = file->read_all();
auto json = JsonValue::from_string(file_contents); auto file_contents_or_error = file_or_error.value()->read_all();
if (file_contents_or_error.is_error())
return vm.throw_completion<JS::Error>(String::formatted("Failed to read '{}': {}", filename, file_contents_or_error.error()));
auto json = JsonValue::from_string(file_contents_or_error.value());
if (json.is_error()) if (json.is_error())
return vm.throw_completion<JS::SyntaxError>(JS::ErrorType::JsonMalformed); return vm.throw_completion<JS::SyntaxError>(JS::ErrorType::JsonMalformed);
return JS::JSONObject::parse_json_value(vm, json.value()); return JS::JSONObject::parse_json_value(vm, json.value());
@ -1790,8 +1794,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
warnln("Warning: Multiple files supplied, this will concatenate the sources and resolve modules as if it was the first file"); warnln("Warning: Multiple files supplied, this will concatenate the sources and resolve modules as if it was the first file");
for (auto& path : script_paths) { for (auto& path : script_paths) {
auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly)); auto file = TRY(Core::Stream::File::open(path, Core::Stream::OpenMode::Read));
auto file_contents = file->read_all(); auto file_contents = TRY(file->read_all());
auto source = StringView { file_contents }; auto source = StringView { file_contents };
if (Utf8View { file_contents }.validate()) { if (Utf8View { file_contents }.validate()) {