Commit a02b621
report: simplify option checking
Also update the code for house style.
PR-URL: #25597
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>1 parent c598d98 commit a02b621
1 file changed
Lines changed: 23 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,29 +36,45 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) { | |||
| 36 | 36 | void PerIsolateOptions::CheckOptions(std::vector<std::string>* errors) { | |
| 37 | 37 | per_env->CheckOptions(errors); | |
| 38 | 38 | #ifdef NODE_REPORT | |
| 39 | - if (!report_directory.empty() && !per_env->experimental_report) | ||
| 39 | + if (per_env->experimental_report) | ||
| 40 | + return; | ||
| 41 | + | ||
| 42 | + if (!report_directory.empty()) { | ||
| 40 | 43 | errors->push_back("--diagnostic-report-directory option is valid only when " | |
| 41 | 44 | "--experimental-report is set"); | |
| 42 | - if (!report_filename.empty() && !per_env->experimental_report) | ||
| 45 | + } | ||
| 46 | + | ||
| 47 | + if (!report_filename.empty()) { | ||
| 43 | 48 | errors->push_back("--diagnostic-report-filename option is valid only when " | |
| 44 | 49 | "--experimental-report is set"); | |
| 45 | - if (!report_signal.empty() && !per_env->experimental_report) | ||
| 50 | + } | ||
| 51 | + | ||
| 52 | + if (!report_signal.empty()) { | ||
| 46 | 53 | errors->push_back("--diagnostic-report-signal option is valid only when " | |
| 47 | 54 | "--experimental-report is set"); | |
| 48 | - if (report_on_fatalerror && !per_env->experimental_report) | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + if (report_on_fatalerror) { | ||
| 49 | 58 | errors->push_back( | |
| 50 | 59 | "--diagnostic-report-on-fatalerror option is valid only when " | |
| 51 | 60 | "--experimental-report is set"); | |
| 52 | - if (report_on_signal && !per_env->experimental_report) | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + if (report_on_signal) { | ||
| 53 | 64 | errors->push_back("--diagnostic-report-on-signal option is valid only when " | |
| 54 | 65 | "--experimental-report is set"); | |
| 55 | - if (report_uncaught_exception && !per_env->experimental_report) | ||
| 66 | + } | ||
| 67 | + | ||
| 68 | + if (report_uncaught_exception) { | ||
| 56 | 69 | errors->push_back( | |
| 57 | 70 | "--diagnostic-report-uncaught-exception option is valid only when " | |
| 58 | 71 | "--experimental-report is set"); | |
| 59 | - if (report_verbose && !per_env->experimental_report) | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + if (report_verbose) { | ||
| 60 | 75 | errors->push_back("--diagnostic-report-verbose option is valid only when " | |
| 61 | 76 | "--experimental-report is set"); | |
| 77 | + } | ||
| 62 | 78 | #endif // NODE_REPORT | |
| 63 | 79 | } | |
| 64 | 80 | ||
0 commit comments