diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-09-14 15:56:43 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-14 18:48:16 +0200 |
| commit | 5fe8e6629e09ce44c6835d1b8f3a36bc3d69f131 (patch) | |
| tree | daf3564fe43f6585d3287b6c2f559f2beb7d478b /src/main/java/com/google/devtools/build/lib/util | |
| parent | 28d3d2a96e95b2e26e6f864a52177864b0fa8e01 (diff) | |
Consolidate the "unparsed" option value tracking.
In preparation for linking the parsed and unparsed values of options, consolidate and standardize our representation of the flag values as we received them (what is meant by "unparsed" values in this case). This was being done separately in ParseOptionResult, which, with extra context added, is being folded into UnparsedOptionValueDescription. We now track how an option was provided and where it came from for all option parsing.
RELNOTES: None.
PiperOrigin-RevId: 168682082
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/util')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java b/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java index ab4872aa08..56f4d961be 100644 --- a/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java +++ b/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java @@ -43,7 +43,7 @@ public final class OptionsUtils { if (result.length() != 0) { result.append(' '); } - String value = option.getUnparsedValue(); + String value = option.getUnconvertedValue(); if (option.isBooleanOption()) { boolean isEnabled = false; try { @@ -51,9 +51,11 @@ public final class OptionsUtils { } catch (OptionsParsingException e) { throw new RuntimeException("Unexpected parsing exception", e); } - result.append(isEnabled ? "--" : "--no").append(option.getName()); + result + .append(isEnabled ? "--" : "--no") + .append(option.getOptionDefinition().getOptionName()); } else { - result.append("--").append(option.getName()); + result.append("--").append(option.getOptionDefinition().getOptionName()); if (value != null) { // Can be null for Void options. result.append("=").append(ShellEscaper.escapeString(value)); } @@ -80,7 +82,7 @@ public final class OptionsUtils { if (option.isHidden()) { continue; } - String value = option.getUnparsedValue(); + String value = option.getUnconvertedValue(); if (option.isBooleanOption()) { boolean isEnabled = false; try { @@ -88,9 +90,9 @@ public final class OptionsUtils { } catch (OptionsParsingException e) { throw new RuntimeException("Unexpected parsing exception", e); } - builder.add((isEnabled ? "--" : "--no") + option.getName()); + builder.add((isEnabled ? "--" : "--no") + option.getOptionDefinition().getOptionName()); } else { - String optionString = "--" + option.getName(); + String optionString = "--" + option.getOptionDefinition().getOptionName(); if (value != null) { // Can be null for Void options. optionString += "=" + value; } |