Remove single usage of RubyOptionTypes.parseValue()

Author: eregon

src/launcher/java/org/truffleruby/launcher/CommandLineOptions.java

@@ -81,10 +81,6 @@ public <T> void setOption(OptionDescriptor descriptor, T value) {
         setOptionRaw(descriptor, RubyOptionTypes.valueToString(value));
     }
 
-    public <T> T getOption(OptionDescriptor descriptor) {
-        return RubyOptionTypes.parseValue(descriptor, getOptionRaw(descriptor));
-    }
-
     public <T> void appendOptionValue(OptionDescriptor descriptor, String newValue) {
         final OptionType<?> type = descriptor.getKey().getType();
 
@@ -105,7 +101,7 @@ private void setOptionRaw(OptionDescriptor descriptor, String value) {
         options.put(descriptor.getName(), value);
     }
 
-    private <T> String getOptionRaw(OptionDescriptor descriptor) {
+    public String getOptionRaw(OptionDescriptor descriptor) {
         return options.getOrDefault(
                 descriptor.getName(),
                 RubyOptionTypes.valueToString(descriptor.getKey().getDefaultValue()));

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

@@ -101,7 +101,7 @@ private boolean endOfInterpreterArguments() {
     }
 
     private void processArgv() {
-        boolean argvGlobalsOn = config.getOption(OptionsCatalog.ARGV_GLOBALS);
+        boolean argvGlobalsOn = config.getOptionRaw(OptionsCatalog.ARGV_GLOBALS).equals("true");
         ArrayList<String> arglist = new ArrayList<>();
         for (; argumentIndex < arguments.size(); argumentIndex++) {
             String arg = getCurrentArgument();

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

@@ -376,9 +376,10 @@ private Options createOptions(TruffleLanguage.Env env, LanguageOptions languageO
         if (options.OPTIONS_LOG && RubyLanguage.LOGGER.isLoggable(Level.CONFIG)) {
             for (OptionDescriptor descriptor : OptionsCatalog.allDescriptors()) {
                 assert descriptor.getName().startsWith(TruffleRuby.LANGUAGE_ID);
-                final String xName = descriptor.getName().substring(TruffleRuby.LANGUAGE_ID.length() + 1);
+                final String optionName = descriptor.getName().substring(TruffleRuby.LANGUAGE_ID.length() + 1);
                 RubyLanguage.LOGGER.config(
-                        "option " + xName + "=" + RubyOptionTypes.valueToString(options.fromDescriptor(descriptor)));
+                        "option " + optionName + "=" +
+                                RubyOptionTypes.valueToString(options.fromDescriptor(descriptor)));
             }
         }
 

src/shared/java/org/truffleruby/shared/options/RubyOptionTypes.java

@@ -9,46 +9,9 @@
  */
 package org.truffleruby.shared.options;
 
-import java.util.Collection;
-
-import org.graalvm.options.OptionDescriptor;
 
 public class RubyOptionTypes {
 
-    @SuppressWarnings("unchecked")
-    public static <T> T parseValue(OptionDescriptor descriptor, Object value) {
-        if (value == null) {
-            return (T) descriptor.getKey().getDefaultValue();
-        }
-
-        if (value instanceof String) {
-            try {
-                return (T) descriptor.getKey().getType().convert((String) value);
-            } catch (IllegalArgumentException e) {
-                throw new OptionTypeException(descriptor.getName(), (String) value);
-            }
-        } else if (value instanceof Boolean) {
-            return (T) value;
-        } else if (value instanceof Integer) {
-            return (T) value;
-        } else if (value instanceof Enum<?>) {
-            return (T) value;
-        } else if (value instanceof String[]) {
-            return (T) value;
-        } else if (value instanceof Collection<?>) {
-            final Collection<?> collection = (Collection<?>) value;
-            final String[] strings = new String[collection.size()];
-            int n = 0;
-            for (Object item : collection) {
-                strings[n] = item.toString();
-                n++;
-            }
-            return (T) strings;
-        } else {
-            throw new OptionTypeException(descriptor.getName(), value.toString());
-        }
-    }
-
     public static String valueToString(Object value) {
         if (value == null) {
             return "null";