Wed, 11 Apr 2012 10:50:11 +0100
7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
Summary: Remove bound checking rules from recursive subtype visitors in Types.java and replace with centralized bound-checking logic
Reviewed-by: jjg, dlsmith
duke@1 | 1 | /* |
ohair@962 | 2 | * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ohair@554 | 7 | * published by the Free Software Foundation. Oracle designates this |
duke@1 | 8 | * particular file as subject to the "Classpath" exception as provided |
ohair@554 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
duke@1 | 10 | * |
duke@1 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | * accompanied this code). |
duke@1 | 16 | * |
duke@1 | 17 | * You should have received a copy of the GNU General Public License version |
duke@1 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | * |
ohair@554 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@554 | 22 | * or visit www.oracle.com if you need additional information or have any |
ohair@554 | 23 | * questions. |
duke@1 | 24 | */ |
duke@1 | 25 | |
duke@1 | 26 | package com.sun.tools.javac.util; |
duke@1 | 27 | |
jjg@700 | 28 | import java.util.*; |
jjg@1157 | 29 | import com.sun.tools.javac.main.Option; |
jjg@1157 | 30 | import static com.sun.tools.javac.main.Option.*; |
duke@1 | 31 | |
duke@1 | 32 | /** A table of all command-line options. |
duke@1 | 33 | * If an option has an argument, the option name is mapped to the argument. |
duke@1 | 34 | * If a set option has no argument, it is mapped to itself. |
duke@1 | 35 | * |
jjg@581 | 36 | * <p><b>This is NOT part of any supported API. |
jjg@581 | 37 | * If you write code that depends on this, you do so at your own risk. |
duke@1 | 38 | * This code and its internal interfaces are subject to change or |
duke@1 | 39 | * deletion without notice.</b> |
duke@1 | 40 | */ |
duke@1 | 41 | public class Options { |
duke@1 | 42 | private static final long serialVersionUID = 0; |
duke@1 | 43 | |
duke@1 | 44 | /** The context key for the options. */ |
duke@1 | 45 | public static final Context.Key<Options> optionsKey = |
duke@1 | 46 | new Context.Key<Options>(); |
duke@1 | 47 | |
duke@1 | 48 | private LinkedHashMap<String,String> values; |
duke@1 | 49 | |
duke@1 | 50 | /** Get the Options instance for this context. */ |
duke@1 | 51 | public static Options instance(Context context) { |
duke@1 | 52 | Options instance = context.get(optionsKey); |
duke@1 | 53 | if (instance == null) |
duke@1 | 54 | instance = new Options(context); |
duke@1 | 55 | return instance; |
duke@1 | 56 | } |
duke@1 | 57 | |
duke@1 | 58 | protected Options(Context context) { |
duke@1 | 59 | // DEBUGGING -- Use LinkedHashMap for reproducability |
duke@1 | 60 | values = new LinkedHashMap<String,String>(); |
duke@1 | 61 | context.put(optionsKey, this); |
duke@1 | 62 | } |
duke@1 | 63 | |
jjg@700 | 64 | /** |
jjg@700 | 65 | * Get the value for an undocumented option. |
jjg@700 | 66 | */ |
duke@1 | 67 | public String get(String name) { |
duke@1 | 68 | return values.get(name); |
duke@1 | 69 | } |
duke@1 | 70 | |
jjg@700 | 71 | /** |
jjg@700 | 72 | * Get the value for an option. |
jjg@700 | 73 | */ |
jjg@1157 | 74 | public String get(Option option) { |
jjg@1157 | 75 | return values.get(option.text); |
duke@1 | 76 | } |
duke@1 | 77 | |
jjg@700 | 78 | /** |
ksrini@923 | 79 | * Get the boolean value for an option, patterned after Boolean.getBoolean, |
ksrini@923 | 80 | * essentially will return true, iff the value exists and is set to "true". |
ksrini@923 | 81 | */ |
ksrini@923 | 82 | public boolean getBoolean(String name) { |
ksrini@923 | 83 | return getBoolean(name, false); |
ksrini@923 | 84 | } |
ksrini@923 | 85 | |
ksrini@923 | 86 | /** |
ksrini@923 | 87 | * Get the boolean with a default value if the option is not set. |
ksrini@923 | 88 | */ |
ksrini@923 | 89 | public boolean getBoolean(String name, boolean defaultValue) { |
ksrini@923 | 90 | String value = get(name); |
ksrini@923 | 91 | return (value == null) ? defaultValue : Boolean.parseBoolean(value); |
ksrini@923 | 92 | } |
ksrini@923 | 93 | |
ksrini@923 | 94 | /** |
jjg@700 | 95 | * Check if the value for an undocumented option has been set. |
jjg@700 | 96 | */ |
jjg@700 | 97 | public boolean isSet(String name) { |
jjg@700 | 98 | return (values.get(name) != null); |
jjg@700 | 99 | } |
jjg@700 | 100 | |
jjg@700 | 101 | /** |
jjg@700 | 102 | * Check if the value for an option has been set. |
jjg@700 | 103 | */ |
jjg@1157 | 104 | public boolean isSet(Option option) { |
jjg@1157 | 105 | return (values.get(option.text) != null); |
jjg@700 | 106 | } |
jjg@700 | 107 | |
jjg@700 | 108 | /** |
jjg@700 | 109 | * Check if the value for a choice option has been set to a specific value. |
jjg@700 | 110 | */ |
jjg@1157 | 111 | public boolean isSet(Option option, String value) { |
jjg@1157 | 112 | return (values.get(option.text + value) != null); |
jjg@700 | 113 | } |
jjg@700 | 114 | |
jjg@700 | 115 | /** |
jjg@700 | 116 | * Check if the value for an undocumented option has not been set. |
jjg@700 | 117 | */ |
jjg@700 | 118 | public boolean isUnset(String name) { |
jjg@700 | 119 | return (values.get(name) == null); |
jjg@700 | 120 | } |
jjg@700 | 121 | |
jjg@700 | 122 | /** |
jjg@700 | 123 | * Check if the value for an option has not been set. |
jjg@700 | 124 | */ |
jjg@1157 | 125 | public boolean isUnset(Option option) { |
jjg@1157 | 126 | return (values.get(option.text) == null); |
jjg@700 | 127 | } |
jjg@700 | 128 | |
jjg@700 | 129 | /** |
jjg@700 | 130 | * Check if the value for a choice option has not been set to a specific value. |
jjg@700 | 131 | */ |
jjg@1157 | 132 | public boolean isUnset(Option option, String value) { |
jjg@1157 | 133 | return (values.get(option.text + value) == null); |
jjg@700 | 134 | } |
jjg@700 | 135 | |
duke@1 | 136 | public void put(String name, String value) { |
duke@1 | 137 | values.put(name, value); |
duke@1 | 138 | } |
duke@1 | 139 | |
jjg@1157 | 140 | public void put(Option option, String value) { |
jjg@1157 | 141 | values.put(option.text, value); |
duke@1 | 142 | } |
duke@1 | 143 | |
duke@1 | 144 | public void putAll(Options options) { |
duke@1 | 145 | values.putAll(options.values); |
duke@1 | 146 | } |
duke@1 | 147 | |
duke@1 | 148 | public void remove(String name) { |
duke@1 | 149 | values.remove(name); |
duke@1 | 150 | } |
duke@1 | 151 | |
duke@1 | 152 | public Set<String> keySet() { |
duke@1 | 153 | return values.keySet(); |
duke@1 | 154 | } |
duke@1 | 155 | |
duke@1 | 156 | public int size() { |
duke@1 | 157 | return values.size(); |
duke@1 | 158 | } |
duke@1 | 159 | |
jjg@1135 | 160 | // light-weight notification mechanism |
jjg@1135 | 161 | |
jjg@1135 | 162 | private List<Runnable> listeners = List.nil(); |
jjg@1135 | 163 | |
jjg@1135 | 164 | public void addListener(Runnable listener) { |
jjg@1135 | 165 | listeners = listeners.prepend(listener); |
jjg@1135 | 166 | } |
jjg@1135 | 167 | |
jjg@1135 | 168 | public void notifyListeners() { |
jjg@1135 | 169 | for (Runnable r: listeners) |
jjg@1135 | 170 | r.run(); |
jjg@1135 | 171 | } |
jjg@1135 | 172 | |
duke@1 | 173 | /** Check for a lint suboption. */ |
duke@1 | 174 | public boolean lint(String s) { |
duke@1 | 175 | // return true if either the specific option is enabled, or |
duke@1 | 176 | // they are all enabled without the specific one being |
duke@1 | 177 | // disabled |
duke@1 | 178 | return |
jjg@700 | 179 | isSet(XLINT_CUSTOM, s) || |
jjg@700 | 180 | (isSet(XLINT) || isSet(XLINT_CUSTOM, "all")) && |
jjg@700 | 181 | isUnset(XLINT_CUSTOM, "-" + s); |
duke@1 | 182 | } |
duke@1 | 183 | } |