Simplify options implementation

PullRequest: truffleruby/674

Author: chrisseaton

src/launcher/java/org/truffleruby/launcher/CommandLineParser.java

@@ -34,12 +34,12 @@
  */
 package org.truffleruby.launcher;
 
+import org.graalvm.options.OptionDescriptor;
 import org.truffleruby.shared.options.CommandLineOptions;
 import org.truffleruby.shared.options.DefaultExecutionAction;
 import org.truffleruby.shared.options.ExecutionAction;
 import org.truffleruby.shared.options.OptionsCatalog;
 import org.truffleruby.shared.options.ShowHelp;
-import org.truffleruby.shared.options.StringArrayOptionDescription;
 import org.truffleruby.shared.options.Verbosity;
 
 import java.io.File;
@@ -134,7 +134,7 @@ private void processArgv() {
 
                 // Switches without values are stored separately in ARGV_GLOBAL_FLAGS. Otherwise it would not be
                 // possible to determine if the value is suppose to be `true` or `"true"`.
-                final StringArrayOptionDescription optionDescription =
+                final OptionDescriptor optionDescription =
                         value != null ? OptionsCatalog.ARGV_GLOBAL_VALUES : OptionsCatalog.ARGV_GLOBAL_FLAGS;
                 // replace dashes with underscores make it a valid global variable name
                 config.appendOptionValue(optionDescription, key.replace('-', '_'));

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -21,6 +21,7 @@
 import org.truffleruby.shared.options.OptionsCatalog;
 import org.truffleruby.shared.TruffleRuby;
 import org.truffleruby.shared.Metrics;
+import org.truffleruby.shared.options.ShowHelp;
 
 import java.io.IOException;
 import java.io.PrintStream;
@@ -71,7 +72,7 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
             final CommandLineParser argumentCommandLineParser = new CommandLineParser(args, config, true, false);
             argumentCommandLineParser.processArguments();
 
-            if (config.getOption(OptionsCatalog.READ_RUBYOPT)) {
+            if ((boolean) config.getOption(OptionsCatalog.READ_RUBYOPT)) {
                 // Process RUBYOPT
                 final List<String> rubyoptArgs = getArgsFromEnvVariable("RUBYOPT");
                 new CommandLineParser(rubyoptArgs, config, false, true).processArguments();
@@ -260,7 +261,7 @@ private static List<String> getPathListFromEnvVariable(String name) {
     }
 
     private String setRubyLauncher() {
-        if (config.getOption(OptionsCatalog.LAUNCHER).isEmpty()) {
+        if (String.class.cast(config.getOption(OptionsCatalog.LAUNCHER)).isEmpty()) {
             final String launcher = ProcessProperties.getExecutableName();
             config.setOption(OptionsCatalog.LAUNCHER, launcher);
             return launcher;
@@ -269,15 +270,15 @@ private String setRubyLauncher() {
     }
 
     private static void printPreRunInformation(CommandLineOptions config) {
-        if (config.getOption(OptionsCatalog.SHOW_VERSION)) {
+        if ((boolean) config.getOption(OptionsCatalog.SHOW_VERSION)) {
             System.out.println(TruffleRuby.getVersionString(isAOT()));
         }
 
-        if (config.getOption(OptionsCatalog.SHOW_COPYRIGHT)) {
+        if ((boolean) config.getOption(OptionsCatalog.SHOW_COPYRIGHT)) {
             System.out.println(TruffleRuby.RUBY_COPYRIGHT);
         }
 
-        switch (config.getOption(OptionsCatalog.SHOW_HELP)) {
+        switch ((ShowHelp) config.getOption(OptionsCatalog.SHOW_HELP)) {
             case NONE:
                 break;
             case SHORT:

src/main/java/org/truffleruby/RubyContext.java

@@ -21,6 +21,7 @@
 import com.oracle.truffle.api.source.Source;
 
 import com.oracle.truffle.api.source.SourceSection;
+import org.graalvm.options.OptionDescriptor;
 import org.joni.Regex;
 import org.truffleruby.builtins.PrimitiveManager;
 import org.truffleruby.cext.ValueWrapperManager;
@@ -64,9 +65,7 @@
 import org.truffleruby.language.methods.InternalMethod;
 import org.truffleruby.language.objects.shared.SharedObjects;
 import org.truffleruby.options.Options;
-import org.truffleruby.options.OptionsBuilder;
 import org.truffleruby.shared.Metrics;
-import org.truffleruby.shared.options.OptionDescription;
 import org.truffleruby.shared.options.OptionsCatalog;
 import org.truffleruby.parser.TranslatorDriver;
 import org.truffleruby.platform.Platform;
@@ -76,6 +75,7 @@
 import org.truffleruby.platform.linux.LinuxNativeConfiguration;
 import org.truffleruby.platform.solaris.SolarisSparcV9NativeConfiguration;
 import org.truffleruby.shared.TruffleRuby;
+import org.truffleruby.shared.options.RubyOptionTypes;
 import org.truffleruby.stdlib.CoverageManager;
 import org.truffleruby.stdlib.readline.ConsoleHolder;
 
@@ -355,7 +355,7 @@ private boolean compatibleOptions(Options oldOptions, Options newOptions, String
             return false;
         }
 
-        if (!newOptions.CORE_LOAD_PATH.equals(OptionsCatalog.CORE_LOAD_PATH.getDefaultValue())) {
+        if (!newOptions.CORE_LOAD_PATH.equals(OptionsCatalog.CORE_LOAD_PATH_KEY.getDefaultValue())) {
             RubyLanguage.LOGGER.fine(notReusingContext + "--core.load_path is set: " + newOptions.CORE_LOAD_PATH);
             return false; // Should load the specified core files
         }
@@ -387,17 +387,13 @@ private boolean compatibleOptions(Options oldOptions, Options newOptions, String
 
     private Options createOptions(TruffleLanguage.Env env) {
         Metrics.printTime("before-options");
-        final OptionsBuilder optionsBuilder = new OptionsBuilder();
-        optionsBuilder.set(env.getConfig()); // Legacy config - used by unit tests for example
-        optionsBuilder.set(env.getOptions()); // SDK options
-
-        final Options options = optionsBuilder.build(env);
+        final Options options = new Options(env, env.getOptions());
 
         if (options.OPTIONS_LOG && RubyLanguage.LOGGER.isLoggable(Level.CONFIG)) {
-            for (OptionDescription<?> option : OptionsCatalog.allDescriptions()) {
-                assert option.getName().startsWith(TruffleRuby.LANGUAGE_ID);
-                final String xName = option.getName().substring(TruffleRuby.LANGUAGE_ID.length() + 1);
-                RubyLanguage.LOGGER.config("option " + xName + "=" + option.valueToString(options.fromDescription(option)));
+            for (OptionDescriptor descriptor : OptionsCatalog.allDescriptors()) {
+                assert descriptor.getName().startsWith(TruffleRuby.LANGUAGE_ID);
+                final String xName = descriptor.getName().substring(TruffleRuby.LANGUAGE_ID.length() + 1);
+                RubyLanguage.LOGGER.config("option " + xName + "=" + RubyOptionTypes.valueToString(options.fromDescriptor(descriptor)));
             }
         }
 

src/main/java/org/truffleruby/RubyLanguage.java

@@ -26,7 +26,6 @@
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.shared.TruffleRuby;
 import org.truffleruby.shared.Metrics;
-import org.truffleruby.shared.options.OptionDescription;
 import org.truffleruby.shared.options.OptionsCatalog;
 import org.truffleruby.platform.Platform;
 import org.truffleruby.stdlib.CoverageManager;
@@ -190,11 +189,11 @@ protected SourceSection findSourceLocation(RubyContext context, Object value) {
 
     @Override
     protected OptionDescriptors getOptionDescriptors() {
-        final OptionDescription<?>[] allDescriptions = OptionsCatalog.allDescriptions();
+        final OptionDescriptor[] allDescriptions = OptionsCatalog.allDescriptors();
         final List<OptionDescriptor> options = new ArrayList<>(allDescriptions.length);
 
-        for (OptionDescription<?> option : allDescriptions) {
-            options.add(option.toDescriptor());
+        for (OptionDescriptor descriptor : allDescriptions) {
+            options.add(descriptor);
         }
 
         return OptionDescriptors.create(options);

src/main/java/org/truffleruby/aot/ParserCache.java

@@ -31,7 +31,7 @@ public class ParserCache {
 
     static {
         if (TruffleOptions.AOT) {
-            final String defaultCoreLibraryPath = OptionsCatalog.CORE_LOAD_PATH.getDefaultValue();
+            final String defaultCoreLibraryPath = OptionsCatalog.CORE_LOAD_PATH_KEY.getDefaultValue();
             final Map<String, RootParseNode> cache = new HashMap<>();
 
             for (String coreFile : CoreLibrary.CORE_FILES) {

src/main/java/org/truffleruby/language/TruffleBootNodes.java

@@ -17,6 +17,7 @@
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.Source;
+import org.graalvm.options.OptionDescriptor;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
@@ -38,7 +39,6 @@
 import org.truffleruby.parser.RubySource;
 import org.truffleruby.shared.Metrics;
 import org.truffleruby.shared.options.ExecutionAction;
-import org.truffleruby.shared.options.OptionDescription;
 import org.truffleruby.shared.options.OptionsCatalog;
 
 import java.io.IOException;
@@ -338,14 +338,13 @@ public abstract static class GetOptionNode extends CoreMethodArrayArgumentsNode
         @Specialization(guards = "isRubyString(optionName)")
         public Object getOption(DynamicObject optionName) {
             final String optionNameString = StringOperations.getString(optionName);
+            final OptionDescriptor descriptor = OptionsCatalog.fromName("ruby." + optionNameString);
 
-            final OptionDescription<?> description = OptionsCatalog.fromName("ruby." + optionNameString);
-
-            if (description == null) {
+            if (descriptor == null) {
                 throw new RaiseException(getContext(), coreExceptions().nameError("option not defined", nil(), optionNameString, this));
             }
 
-            final Object value = getContext().getOptions().fromDescription(description);
+            final Object value = getContext().getOptions().fromDescriptor(descriptor);
 
             if (value instanceof Boolean || value instanceof Integer) {
                 return value;