1 files changed, 13 insertions, 92 deletions

diff --git a/java/com/google/devtools/common/options/OptionsData.java b/java/com/google/devtools/common/options/OptionsData.java
index 5b9a436..63cac24 100644
--- a/java/com/google/devtools/common/options/OptionsData.java
+++ b/java/com/google/devtools/common/options/OptionsData.java
@@ -14,14 +14,12 @@
 
 package com.google.devtools.common.options;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
 import java.util.Map;
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -32,87 +30,26 @@ import javax.annotation.concurrent.Immutable;
 @Immutable
 final class OptionsData extends IsolatedOptionsData {
 
-  /**
-   * Keeps track of all the information needed to calculate expansion flags, whether they come from
-   * a static list or a @{link ExpansionFunction} object.
-   */
-  static class ExpansionData {
-    private final ImmutableList<String> staticExpansion;
-    @Nullable private final ExpansionFunction dynamicExpansions;
-
-    ExpansionData(ImmutableList<String> staticExpansion) {
-      Preconditions.checkArgument(staticExpansion != null);
-      this.staticExpansion = staticExpansion;
-      this.dynamicExpansions = null;
-    }
-
-    ExpansionData(ExpansionFunction dynamicExpansions) {
-      Preconditions.checkArgument(dynamicExpansions != null);
-      this.staticExpansion = EMPTY_EXPANSION;
-      this.dynamicExpansions = dynamicExpansions;
-    }
-
-    ImmutableList<String> getExpansion(ExpansionContext context) throws OptionsParsingException {
-      Preconditions.checkArgument(context != null);
-      if (dynamicExpansions != null) {
-        ImmutableList<String> result = dynamicExpansions.getExpansion(context);
-        if (result == null) {
-          String valueString =
-              context.getUnparsedValue() != null ? context.getUnparsedValue() : "(null)";
-          String name = context.getOptionDefinition().getOptionName();
-          throw new OptionsParsingException(
-              "Error expanding option '"
-                  + name
-                  + "': no expansions defined for value: "
-                  + valueString,
-              name);
-        }
-        return result;
-      } else {
-        return staticExpansion;
-      }
-    }
-
-    boolean isEmpty() {
-      return staticExpansion.isEmpty() && (dynamicExpansions == null);
-    }
-  }
-
-  /**
-   * Mapping from each Option-annotated field with expansion information to the {@link
-   * ExpansionData} needed to caclulate it.
-   */
-  private final ImmutableMap<OptionDefinition, ExpansionData> expansionDataForFields;
+  /** Mapping from each option to the (unparsed) options it expands to, if any. */
+  private final ImmutableMap<OptionDefinition, ImmutableList<String>> evaluatedExpansions;
 
   /** Construct {@link OptionsData} by extending an {@link IsolatedOptionsData} with new info. */
   private OptionsData(
-      IsolatedOptionsData base, Map<OptionDefinition, ExpansionData> expansionDataForFields) {
+      IsolatedOptionsData base, Map<OptionDefinition, ImmutableList<String>> evaluatedExpansions) {
     super(base);
-    this.expansionDataForFields = ImmutableMap.copyOf(expansionDataForFields);
+    this.evaluatedExpansions = ImmutableMap.copyOf(evaluatedExpansions);
   }
 
   private static final ImmutableList<String> EMPTY_EXPANSION = ImmutableList.<String>of();
-  private static final ExpansionData EMPTY_EXPANSION_DATA = new ExpansionData(EMPTY_EXPANSION);
 
   /**
    * Returns the expansion of an options field, regardless of whether it was defined using {@link
    * Option#expansion} or {@link Option#expansionFunction}. If the field is not an expansion option,
    * returns an empty array.
    */
-  public ImmutableList<String> getEvaluatedExpansion(
-      OptionDefinition optionDefinition, @Nullable String unparsedValue)
-      throws OptionsParsingException {
-    ExpansionData expansionData = expansionDataForFields.get(optionDefinition);
-    if (expansionData == null) {
-      return EMPTY_EXPANSION;
-    }
-
-    return expansionData.getExpansion(new ExpansionContext(this, optionDefinition, unparsedValue));
-  }
-
-  ExpansionData getExpansionDataForField(OptionDefinition optionDefinition) {
-    ExpansionData result = expansionDataForFields.get(optionDefinition);
-    return result != null ? result : EMPTY_EXPANSION_DATA;
+  public ImmutableList<String> getEvaluatedExpansion(OptionDefinition optionDefinition) {
+    ImmutableList<String> result = evaluatedExpansions.get(optionDefinition);
+    return result != null ? result : EMPTY_EXPANSION;
   }
 
   /**
@@ -126,8 +63,8 @@ final class OptionsData extends IsolatedOptionsData {
     IsolatedOptionsData isolatedData = IsolatedOptionsData.from(classes);
 
     // All that's left is to compute expansions.
-    ImmutableMap.Builder<OptionDefinition, ExpansionData> expansionDataBuilder =
-        ImmutableMap.<OptionDefinition, ExpansionData>builder();
+    ImmutableMap.Builder<OptionDefinition, ImmutableList<String>> evaluatedExpansionsBuilder =
+        ImmutableMap.builder();
     for (Map.Entry<String, OptionDefinition> entry : isolatedData.getAllOptionDefinitions()) {
       OptionDefinition optionDefinition = entry.getValue();
       // Determine either the hard-coded expansion, or the ExpansionFunction class. The
@@ -136,8 +73,7 @@ final class OptionsData extends IsolatedOptionsData {
       Class<? extends ExpansionFunction> expansionFunctionClass =
           optionDefinition.getExpansionFunction();
       if (constExpansion.length > 0) {
-        expansionDataBuilder.put(
-            optionDefinition, new ExpansionData(ImmutableList.copyOf(constExpansion)));
+        evaluatedExpansionsBuilder.put(optionDefinition, ImmutableList.copyOf(constExpansion));
       } else if (optionDefinition.usesExpansionFunction()) {
         if (Modifier.isAbstract(expansionFunctionClass.getModifiers())) {
           throw new AssertionError(
@@ -153,25 +89,10 @@ final class OptionsData extends IsolatedOptionsData {
           // time it is used.
           throw new AssertionError(e);
         }
-
-        ImmutableList<String> staticExpansion;
-        try {
-          staticExpansion =
-              instance.getExpansion(new ExpansionContext(isolatedData, optionDefinition, null));
-          Preconditions.checkState(
-              staticExpansion != null,
-              "Error calling expansion function for option: %s",
-              optionDefinition.getOptionName());
-          expansionDataBuilder.put(optionDefinition, new ExpansionData(staticExpansion));
-        } catch (ExpansionNeedsValueException e) {
-          // This expansion function needs data that isn't available yet. Save the instance and call
-          // it later.
-          expansionDataBuilder.put(optionDefinition, new ExpansionData(instance));
-        } catch (OptionsParsingException e) {
-          throw new IllegalStateException("Error expanding void expansion function: ", e);
-        }
+        ImmutableList<String> expansion = instance.getExpansion(isolatedData);
+        evaluatedExpansionsBuilder.put(optionDefinition, expansion);
       }
     }
-    return new OptionsData(isolatedData, expansionDataBuilder.build());
+    return new OptionsData(isolatedData, evaluatedExpansionsBuilder.build());
   }
 }