Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src: add READONLY_STRING_PROPERTY and simplify config #22222

Closed
wants to merge 2 commits into from
Closed

src: add READONLY_STRING_PROPERTY and simplify config #22222

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a645f82
src: add READONLY_STRING_PROPERTY and simplify config
maclover7 Aug 9, 2018
e562279
squash!: fixup @addaleax nits
maclover7 Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 25 additions & 45 deletions src/node_config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ using v8::Value;
True(isolate), ReadOnly).FromJust(); \
} while (0)

#define READONLY_STRING_PROPERTY(obj, str, val) \
do { \
obj->DefineOwnProperty(context, \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s a best practice to parenthesize macro parameters, i.e. use (obj)->DefineOwnProperty(…), even if this is probably not an issue for now :)

FIXED_ONE_BYTE_STRING(isolate, str), \
String::NewFromUtf8( \
isolate, \
val.data(), \
v8::NewStringType::kNormal).ToLocalChecked(), \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tiny nit: 4 spaces for statement continuations

ReadOnly).FromJust(); \
} while (0)


#define READONLY_PROPERTY(obj, name, value) \
do { \
obj->DefineOwnProperty(env->context(), \
Expand Down Expand Up @@ -60,13 +72,7 @@ static void Initialize(Local<Object> target,
READONLY_BOOLEAN_PROPERTY("hasTracing");
#endif

target->DefineOwnProperty(
context,
FIXED_ONE_BYTE_STRING(isolate, "icuDataDir"),
String::NewFromUtf8(isolate,
icu_data_dir.data(),
v8::NewStringType::kNormal).ToLocalChecked(),
ReadOnly).FromJust();
READONLY_STRING_PROPERTY(target, "icuDataDir", icu_data_dir);

#endif // NODE_HAVE_I18N_SUPPORT

Expand All @@ -78,13 +84,7 @@ static void Initialize(Local<Object> target,
if (config_experimental_modules) {
READONLY_BOOLEAN_PROPERTY("experimentalModules");
if (!config_userland_loader.empty()) {
target->DefineOwnProperty(
context,
FIXED_ONE_BYTE_STRING(isolate, "userLoader"),
String::NewFromUtf8(isolate,
config_userland_loader.data(),
v8::NewStringType::kNormal).ToLocalChecked(),
ReadOnly).FromJust();
READONLY_STRING_PROPERTY(target, "userLoader", config_userland_loader);
}
}

Expand All @@ -111,41 +111,21 @@ static void Initialize(Local<Object> target,
Number::New(env->isolate(), 8 * sizeof(intptr_t)));

if (!config_warning_file.empty()) {
target->DefineOwnProperty(
context,
FIXED_ONE_BYTE_STRING(isolate, "warningFile"),
String::NewFromUtf8(isolate,
config_warning_file.data(),
v8::NewStringType::kNormal).ToLocalChecked(),
ReadOnly).FromJust();
READONLY_STRING_PROPERTY(target, "warningFile", config_warning_file);
}

Local<Object> debugOptions = Object::New(isolate);
READONLY_PROPERTY(target, "debugOptions", debugOptions);

READONLY_STRING_PROPERTY(debugOptions, "host", debug_options.host_name());

READONLY_PROPERTY(debugOptions,
"port",
Integer::New(isolate, debug_options.port()));

target->DefineOwnProperty(
context,
FIXED_ONE_BYTE_STRING(isolate, "debugOptions"),
debugOptions, ReadOnly).FromJust();

debugOptions->DefineOwnProperty(
context,
FIXED_ONE_BYTE_STRING(isolate, "host"),
String::NewFromUtf8(isolate,
debug_options.host_name().c_str(),
v8::NewStringType::kNormal).ToLocalChecked(),
ReadOnly).FromJust();

debugOptions->DefineOwnProperty(
context,
env->port_string(),
Integer::New(isolate, debug_options.port()),
ReadOnly).FromJust();

debugOptions->DefineOwnProperty(
context,
FIXED_ONE_BYTE_STRING(isolate, "inspectorEnabled"),
Boolean::New(isolate, debug_options.inspector_enabled()), ReadOnly)
.FromJust();
READONLY_PROPERTY(debugOptions,
"inspectorEnabled",
Boolean::New(isolate, debug_options.inspector_enabled()));
} // InitConfig

} // namespace node
Expand Down