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: mark options parsers as const #25065

Closed
wants to merge 1 commit into from
Closed

src: mark options parsers as const #25065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/node_options-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ auto OptionsParser<Options>::Convert(
template <typename Options>
template <typename ChildOptions>
void OptionsParser<Options>::Insert(
OptionsParser<ChildOptions>* child_options_parser,
const OptionsParser<ChildOptions>* child_options_parser,
ChildOptions* (Options::* get_child)()) {
aliases_.insert(child_options_parser->aliases_.begin(),
child_options_parser->aliases_.end());
Expand Down Expand Up @@ -274,7 +274,7 @@ void OptionsParser<Options>::Parse(
std::vector<std::string>* const v8_args,
Options* const options,
OptionEnvvarSettings required_env_settings,
std::vector<std::string>* const errors) {
std::vector<std::string>* const errors) const {
ArgsInfo args(orig_args, exec_args);

// The first entry is the process name. Make sure it ends up in the V8 argv,
Expand Down
8 changes: 4 additions & 4 deletions src/node_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ DebugOptionsParser::DebugOptionsParser() {
}

#if HAVE_INSPECTOR
DebugOptionsParser DebugOptionsParser::instance;
const DebugOptionsParser DebugOptionsParser::instance;
#endif // HAVE_INSPECTOR

EnvironmentOptionsParser::EnvironmentOptionsParser() {
Expand Down Expand Up @@ -218,7 +218,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
#endif // HAVE_INSPECTOR
}

EnvironmentOptionsParser EnvironmentOptionsParser::instance;
const EnvironmentOptionsParser EnvironmentOptionsParser::instance;

PerIsolateOptionsParser::PerIsolateOptionsParser() {
AddOption("--track-heap-objects",
Expand All @@ -241,7 +241,7 @@ PerIsolateOptionsParser::PerIsolateOptionsParser() {
&PerIsolateOptions::get_per_env_options);
}

PerIsolateOptionsParser PerIsolateOptionsParser::instance;
const PerIsolateOptionsParser PerIsolateOptionsParser::instance;

PerProcessOptionsParser::PerProcessOptionsParser() {
AddOption("--title",
Expand Down Expand Up @@ -345,7 +345,7 @@ PerProcessOptionsParser::PerProcessOptionsParser() {
&PerProcessOptions::get_per_isolate_options);
}

PerProcessOptionsParser PerProcessOptionsParser::instance;
const PerProcessOptionsParser PerProcessOptionsParser::instance;

inline std::string RemoveBrackets(const std::string& host) {
if (!host.empty() && host.front() == '[' && host.back() == ']')
Expand Down
12 changes: 6 additions & 6 deletions src/node_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class OptionsParser {
// a method that yields the target options type from this parser's options
// type.
template <typename ChildOptions>
void Insert(OptionsParser<ChildOptions>* child_options_parser,
void Insert(const OptionsParser<ChildOptions>* child_options_parser,
ChildOptions* (Options::* get_child)());

// Parse a sequence of options into an options struct, a list of
Expand All @@ -300,7 +300,7 @@ class OptionsParser {
std::vector<std::string>* const v8_args,
Options* const options,
OptionEnvvarSettings required_env_settings,
std::vector<std::string>* const errors);
std::vector<std::string>* const errors) const;

private:
// We support the wide variety of different option types by remembering
Expand Down Expand Up @@ -391,28 +391,28 @@ class DebugOptionsParser : public OptionsParser<DebugOptions> {
public:
DebugOptionsParser();

static DebugOptionsParser instance;
static const DebugOptionsParser instance;
};

class EnvironmentOptionsParser : public OptionsParser<EnvironmentOptions> {
public:
EnvironmentOptionsParser();

static EnvironmentOptionsParser instance;
static const EnvironmentOptionsParser instance;
};

class PerIsolateOptionsParser : public OptionsParser<PerIsolateOptions> {
public:
PerIsolateOptionsParser();

static PerIsolateOptionsParser instance;
static const PerIsolateOptionsParser instance;
};

class PerProcessOptionsParser : public OptionsParser<PerProcessOptions> {
public:
PerProcessOptionsParser();

static PerProcessOptionsParser instance;
static const PerProcessOptionsParser instance;
};

} // namespace options_parser
Expand Down