jdk-sandbox: comparison src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java

equal deleted inserted replaced

-:db09f53aba91
+:04d8d293e458
 /*
-* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 package com.sun.tools.javac.main;
 import java.io.FileWriter;
 import java.io.PrintWriter;
+import java.lang.module.ModuleDescriptor;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.Collator;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import javax.lang.model.SourceVersion;
+import jdk.internal.misc.VM;
 import com.sun.tools.doclint.DocLint;
 import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.jvm.Profile;
 import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.platform.PlatformProvider;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import com.sun.tools.javac.util.Assert;
-import com.sun.tools.javac.util.JDK9Wrappers;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Log.PrefixKind;
 import com.sun.tools.javac.util.Log.WriterKind;
 import com.sun.tools.javac.util.Options;
 import com.sun.tools.javac.util.StringUtils;
 @Override
 public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
 if (arg.isEmpty()) {
 throw helper.newInvalidValueException("err.no.value.for.option", option);
 } else {
+// use official parser if available
 try {
-Class.forName(JDK9Wrappers.ModuleDescriptor.Version.CLASSNAME);
+ModuleDescriptor.Version.parse(arg);
-// use official parser if available
+} catch (IllegalArgumentException e) {
-try {
+throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
-JDK9Wrappers.ModuleDescriptor.Version.parse(arg);
-} catch (IllegalArgumentException e) {
-throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
-}
-} catch (ClassNotFoundException ex) {
-// fall-back to simplistic rules when running on older platform
-if (!(arg.charAt(0) >= '0' && arg.charAt(0) <= '9') ||
-arg.endsWith("-") ||
-arg.endsWith("+")) {
-throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
-}
 }
 }
 super.process(helper, option, arg);
 }
 },
 INHERIT_RUNTIME_ENVIRONMENT("--inherit-runtime-environment", "opt.inherit_runtime_environment",
 HIDDEN, BASIC) {
 @Override
 public void process(OptionHelper helper, String option) throws InvalidValueException {
-try {
+String[] runtimeArgs = VM.getRuntimeArguments();
-Class.forName(JDK9Wrappers.VMHelper.CLASSNAME);
+for (String arg : runtimeArgs) {
-String[] runtimeArgs = JDK9Wrappers.VMHelper.getRuntimeArguments();
+// Handle any supported runtime options; ignore all others.
-for (String arg : runtimeArgs) {
+// The runtime arguments always use the single token form, e.g. "--name=value".
-// Handle any supported runtime options; ignore all others.
+for (Option o : getSupportedRuntimeOptions()) {
-// The runtime arguments always use the single token form, e.g. "--name=value".
+if (o.matches(arg)) {
-for (Option o : getSupportedRuntimeOptions()) {
+switch (o) {
-if (o.matches(arg)) {
+case ADD_MODULES:
-switch (o) {
+int eq = arg.indexOf('=');
-case ADD_MODULES:
+Assert.check(eq > 0, () -> ("invalid runtime option:" + arg));
-int eq = arg.indexOf('=');
+// --add-modules=ALL-DEFAULT is not supported at compile-time
-Assert.check(eq > 0, () -> ("invalid runtime option:" + arg));
+// so remove it from list, and only process the rest
-// --add-modules=ALL-DEFAULT is not supported at compile-time
+// if the set is non-empty.
-// so remove it from list, and only process the rest
+// Note that --add-modules=ALL-DEFAULT is automatically added
-// if the set is non-empty.
+// by the standard javac launcher.
-// Note that --add-modules=ALL-DEFAULT is automatically added
+String mods = Arrays.stream(arg.substring(eq + 1).split(","))
-// by the standard javac launcher.
+.filter(s -> !s.isEmpty() && !s.equals("ALL-DEFAULT"))
-String mods = Arrays.stream(arg.substring(eq + 1).split(","))
+.collect(Collectors.joining(","));
-.filter(s -> !s.isEmpty() && !s.equals("ALL-DEFAULT"))
+if (!mods.isEmpty()) {
-.collect(Collectors.joining(","));
+String updatedArg = arg.substring(0, eq + 1) + mods;
-if (!mods.isEmpty()) {
+o.handleOption(helper, updatedArg, Collections.emptyIterator());
-String updatedArg = arg.substring(0, eq + 1) + mods;
+}
-o.handleOption(helper, updatedArg, Collections.emptyIterator());
+break;
-}
+default:
-break;
+o.handleOption(helper, arg, Collections.emptyIterator());
-default:
+break;
-o.handleOption(helper, arg, Collections.emptyIterator());
-break;
-}
-break;
 }
+break;
 }
 }
-} catch (ClassNotFoundException | SecurityException e) {
-throw helper.newInvalidValueException("err.cannot.access.runtime.env");
 }
 }
 private Option[] getSupportedRuntimeOptions() {
 Option[] supportedRuntimeOptions = {

changeset 48433	04d8d293e458
parent 48236	31febb3f66f7
child 48543	7067fe4e054e