jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/main/Option.java

-:c78acf6c2f3e
+:fcf89720ae71
 IMPLICIT("-implicit:", "opt.implicit", STANDARD, BASIC, ONEOF, "none", "class"),
 ENCODING("-encoding", "opt.arg.encoding", "opt.encoding", STANDARD, FILEMANAGER) {
 @Override
 public boolean process(OptionHelper helper, String option, String operand) {
-//            System.err.println("process encoding " + operand);
 return super.process(helper, option, operand);
 }
 },
 log.printNewline();
 return super.process(helper, option);
 }
 },
-A("-A", "opt.arg.key.equals.value", "opt.A", STANDARD, BASIC) {
+A("-A", "opt.arg.key.equals.value", "opt.A", STANDARD, BASIC, true) {
-{ hasSuffix = true; }
 @Override
 public boolean matches(String arg) {
 return arg.startsWith("-A");
 }
 },
 // This option exists only for the purpose of documenting itself.
 // It's actually implemented by the launcher.
 J("-J", "opt.arg.flag", "opt.J", STANDARD, INFO) {
-{ hasSuffix = true; }
 @Override
 public boolean process(OptionHelper helper, String option) {
 throw new AssertionError
 ("the -J flag should be caught by the launcher.");
 }
 },
-// stop after parsing and attributing.
-// new HiddenOption("-attrparseonly"),
-// new Option("-moreinfo",                                      "opt.moreinfo") {
 MOREINFO("-moreinfo", null, HIDDEN, BASIC) {
 @Override
 public boolean process(OptionHelper helper, String option) {
 Type.moreInfo = true;
 return super.process(helper, option);
 }
 },
 // treat warnings as errors
 WERROR("-Werror", "opt.Werror", STANDARD, BASIC),
-//    // use complex inference from context in the position of a method call argument
-//    COMPLEXINFERENCE("-complexinference", null, HIDDEN, BASIC),
-// generare source stubs
-// new HiddenOption("-stubs"),
-// relax some constraints to allow compiling from stubs
-// new HiddenOption("-relax"),
-// output source after translating away inner classes
-// new Option("-printflat",                             "opt.printflat"),
-// new HiddenOption("-printflat"),
-// display scope search details
-// new Option("-printsearch",                           "opt.printsearch"),
-// new HiddenOption("-printsearch"),
 // prompt after each error
 // new Option("-prompt",                                        "opt.prompt"),
 PROMPT("-prompt", null, HIDDEN, BASIC),
 // dump stack on error
 DOE("-doe", null, HIDDEN, BASIC),
 // output source after type erasure
-// new Option("-s",                                     "opt.s"),
 PRINTSOURCE("-printsource", null, HIDDEN, BASIC),
-// output shrouded class files
-// new Option("-scramble",                              "opt.scramble"),
-// new Option("-scrambleall",                           "opt.scrambleall"),
 // display warnings for generic unchecked operations
 WARNUNCHECKED("-warnunchecked", null, HIDDEN, BASIC) {
 @Override
 public boolean process(OptionHelper helper, String option) {
 /* This is a back door to the compiler's option table.
 * -XDx=y sets the option x to the value y.
 * -XDx sets the option x to the value x.
 */
 XD("-XD", null, HIDDEN, BASIC) {
-String s;
 @Override
 public boolean matches(String s) {
-this.s = s;
 return s.startsWith(text);
 }
 @Override
 public boolean process(OptionHelper helper, String option) {
-s = s.substring(text.length());
+option = option.substring(text.length());
-int eq = s.indexOf('=');
+int eq = option.indexOf('=');
-String key = (eq < 0) ? s : s.substring(0, eq);
+String key = (eq < 0) ? option : option.substring(0, eq);
-String value = (eq < 0) ? s : s.substring(eq+1);
+String value = (eq < 0) ? option : option.substring(eq+1);
 helper.put(key, value);
 return false;
 }
 },
 // This option exists only for the purpose of documenting itself.
 // It's actually implemented by the CommandLine class.
 AT("@", "opt.arg.file", "opt.AT", STANDARD, INFO) {
-{ hasSuffix = true; }
 @Override
 public boolean process(OptionHelper helper, String option) {
 throw new AssertionError("the @ flag should be caught by CommandLine.");
 }
 },
 *
 * In apt, the process method adds the candidate class file
 * name to a separate list.
 */
 SOURCEFILE("sourcefile", null, HIDDEN, INFO) {
-String s;
 @Override
 public boolean matches(String s) {
-this.s = s;
 return s.endsWith(".java")  // Java source file
 || SourceVersion.isName(s);   // Legal type name
 }
 @Override
 public boolean process(OptionHelper helper, String option) {
-if (s.endsWith(".java") ) {
+if (option.endsWith(".java") ) {
-File f = new File(s);
+File f = new File(option);
 if (!f.exists()) {
 helper.error("err.file.not.found", f);
 return true;
 }
 if (!f.isFile()) {
 helper.error("err.file.not.file", f);
 return true;
 }
 helper.addFile(f);
-}
+} else {
-else
+helper.addClassName(option);
-helper.addClassName(s);
+}
 return false;
 }
 };
 /** The kind of an Option. This is used by the -help and -X options. */
 */
 final String descrKey;
 /** Suffix option (-foo=bar or -foo:bar)
 */
-boolean hasSuffix;
+final boolean hasSuffix;
 /** The kind of choices for this option, if any.
 */
 final ChoiceKind choiceKind;
 final Map<String,Boolean> choices;
 Option(String text, String descrKey,
 OptionKind kind, OptionGroup group) {
-this(text, null, descrKey, kind, group, null, null);
+this(text, null, descrKey, kind, group, null, null, false);
 }
 Option(String text, String argsNameKey, String descrKey,
 OptionKind kind, OptionGroup group) {
-this(text, argsNameKey, descrKey, kind, group, null, null);
+this(text, argsNameKey, descrKey, kind, group, null, null, false);
+}
+Option(String text, String argsNameKey, String descrKey,
+OptionKind kind, OptionGroup group, boolean doHasSuffix) {
+this(text, argsNameKey, descrKey, kind, group, null, null, doHasSuffix);
 }
 Option(String text, String descrKey,
 OptionKind kind, OptionGroup group,
 ChoiceKind choiceKind, Map<String,Boolean> choices) {
-this(text, null, descrKey, kind, group, choiceKind, choices);
+this(text, null, descrKey, kind, group, choiceKind, choices, false);
 }
 Option(String text, String descrKey,
 OptionKind kind, OptionGroup group,
 ChoiceKind choiceKind, String... choices) {
-this(text, null, descrKey, kind, group, choiceKind, createChoices(choices));
+this(text, null, descrKey, kind, group, choiceKind,
+createChoices(choices), false);
 }
 // where
 private static Map<String,Boolean> createChoices(String... choices) {
 Map<String,Boolean> map = new LinkedHashMap<String,Boolean>();
 for (String c: choices)
 return map;
 }
 private Option(String text, String argsNameKey, String descrKey,
 OptionKind kind, OptionGroup group,
-ChoiceKind choiceKind, Map<String,Boolean> choices) {
+ChoiceKind choiceKind, Map<String,Boolean> choices,
+boolean doHasSuffix) {
 this.text = text;
 this.argsNameKey = argsNameKey;
 this.descrKey = descrKey;
 this.kind = kind;
 this.group = group;
 this.choiceKind = choiceKind;
 this.choices = choices;
 char lastChar = text.charAt(text.length()-1);
-hasSuffix = lastChar == ':' || lastChar == '=';
+this.hasSuffix = doHasSuffix || lastChar == ':' || lastChar == '=';
 }
 public String getText() {
 return text;
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/main/Option.java

src/share/classes/com/sun/tools/javac/main/Option.java