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

-:508c01999047
+:b66d15dfd001
 package com.sun.tools.javac.main;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Options;
 import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Collection;
 /**
 * TODO: describe com.sun.tools.javac.main.JavacOption
 *
 * <p><b>This is NOT part of any API supported by Sun Microsystems.
 */
 public interface JavacOption {
 OptionKind getKind();
-/** Does this option take a (separate) operand? */
+/** Does this option take a (separate) operand?
+*  @return true if this option takes a separate operand
+*/
 boolean hasArg();
 /** Does argument string match option pattern?
-*  @param arg        The command line argument string.
+*  @param arg   the command line argument string
+*  @return true if {@code arg} matches this option
 */
 boolean matches(String arg);
-/** Process the option (with arg). Return true if error detected.
+/** Process an option with an argument.
+*  @param options the accumulated set of analyzed options
+*  @param option  the option to be processed
+*  @param arg     the arg for the option to be processed
+*  @return true if an error was detected
 */
 boolean process(Options options, String option, String arg);
-/** Process the option (without arg). Return true if error detected.
+/** Process the option with no argument.
+*  @param options the accumulated set of analyzed options
+*  @param option  the option to be processed
+*  @return true if an error was detected
 */
 boolean process(Options options, String option);
 OptionName getName();
 NORMAL,
 EXTENDED,
 HIDDEN,
 }
+enum ChoiceKind {
+ONEOF,
+ANYOF
+}
 /** This class represents an option recognized by the main program
 */
 static class Option implements JavacOption {
 /** Option string.
 String descrKey;
 /** Suffix option (-foo=bar or -foo:bar)
 */
 boolean hasSuffix;
+/** The kind of choices for this option, if any.
+*/
+ChoiceKind choiceKind;
+/** The choices for this option, if any.
+*/
+Collection<String> choices;
 Option(OptionName name, String argsNameKey, String descrKey) {
 this.name = name;
 this.argsNameKey = argsNameKey;
 this.descrKey = descrKey;
 char lastChar = name.optionName.charAt(name.optionName.length()-1);
 hasSuffix = lastChar == ':' || lastChar == '=';
 }
 Option(OptionName name, String descrKey) {
 this(name, null, descrKey);
 }
+Option(OptionName name, String descrKey, ChoiceKind choiceKind, String... choices) {
+this(name, descrKey, choiceKind, Arrays.asList(choices));
+}
+Option(OptionName name, String descrKey, ChoiceKind choiceKind, Collection<String> choices) {
+this(name, null, descrKey);
+if (choiceKind == null || choices == null)
+throw new NullPointerException();
+this.choiceKind = choiceKind;
+this.choices = choices;
+}
+@Override
 public String toString() {
 return name.optionName;
 }
-/** Does this option take a (separate) operand?
-*/
 public boolean hasArg() {
 return argsNameKey != null && !hasSuffix;
 }
-/** Does argument string match option pattern?
+public boolean matches(String option) {
-*  @param arg        The command line argument string.
+if (!hasSuffix)
-*/
+return option.equals(name.optionName);
-public boolean matches(String arg) {
-return hasSuffix ? arg.startsWith(name.optionName) : arg.equals(name.optionName);
+if (!option.startsWith(name.optionName))
+return false;
+if (choices != null) {
+String arg = option.substring(name.optionName.length());
+if (choiceKind == ChoiceKind.ONEOF)
+return choices.contains(arg);
+else {
+for (String a: arg.split(",+")) {
+if (!choices.contains(a))
+return false;
+}
+}
+}
+return true;
 }
 /** Print a line of documentation describing this option, if standard.
+* @param out the stream to which to write the documentation
 */
 void help(PrintWriter out) {
 String s = "  " + helpSynopsis();
 out.print(s);
-for (int j = s.length(); j < 29; j++) out.print(" ");
+for (int j = Math.min(s.length(), 28); j < 29; j++) out.print(" ");
 Log.printLines(out, Main.getLocalizedString(descrKey));
 }
 String helpSynopsis() {
-return name +
+StringBuilder sb = new StringBuilder();
-(argsNameKey == null ? "" :
+sb.append(name);
-((hasSuffix ? "" : " ") +
+if (argsNameKey == null) {
-Main.getLocalizedString(argsNameKey)));
+if (choices != null) {
+String sep = "{";
+for (String c: choices) {
+sb.append(sep);
+sb.append(c);
+sep = ",";
+}
+sb.append("}");
+}
+} else {
+if (!hasSuffix)
+sb.append(" ");
+sb.append(Main.getLocalizedString(argsNameKey));
+}
+return sb.toString();
 }
 /** Print a line of documentation describing this option, if non-standard.
+*  @param out the stream to which to write the documentation
 */
 void xhelp(PrintWriter out) {}
 /** Process the option (with arg). Return true if error detected.
 */
 public boolean process(Options options, String option, String arg) {
-if (options != null)
+if (options != null) {
+if (choices != null) {
+if (choiceKind == ChoiceKind.ONEOF) {
+// some clients like to see just one of option+choice set
+for (String c: choices)
+options.remove(option + c);
+String opt = option + arg;
+options.put(opt, opt);
+// some clients like to see option (without trailing ":")
+// set to arg
+String nm = option.substring(0, option.length() - 1);
+options.put(nm, arg);
+} else {
+// set option+word for each word in arg
+for (String a: arg.split(",+")) {
+String opt = option + a;
+options.put(opt, opt);
+}
+}
+}
 options.put(option, arg);
+}
 return false;
 }
 /** Process the option (without arg). Return true if error detected.
 */
 super(name, argsNameKey, descrKey);
 }
 XOption(OptionName name, String descrKey) {
 this(name, null, descrKey);
 }
+XOption(OptionName name, String descrKey, ChoiceKind kind, String... choices) {
+super(name, descrKey, kind, choices);
+}
+XOption(OptionName name, String descrKey, ChoiceKind kind, Collection<String> choices) {
+super(name, descrKey, kind, choices);
+}
+@Override
 void help(PrintWriter out) {}
+@Override
 void xhelp(PrintWriter out) { super.help(out); }
+@Override
 public OptionKind getKind() { return OptionKind.EXTENDED; }
 };
 /** A hidden (implementor) option
 */
 super(name, null, null);
 }
 HiddenOption(OptionName name, String argsNameKey) {
 super(name, argsNameKey, null);
 }
+@Override
 void help(PrintWriter out) {}
+@Override
 void xhelp(PrintWriter out) {}
+@Override
 public OptionKind getKind() { return OptionKind.HIDDEN; }
 };
 }

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

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

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