Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/Global.java	Fri Jul 03 18:41:58 2015 +0530
     1.2 +++ b/src/jdk/nashorn/internal/objects/Global.java	Mon Jul 06 15:59:55 2015 +0530
     1.3 @@ -1768,38 +1768,10 @@
     1.4          return ScriptFunction.getPrototype(getBuiltinFloat64Array());
     1.5      }
     1.6  
     1.7 -    private ScriptFunction getBuiltinArray() {
     1.8 -        return builtinArray;
     1.9 -    }
    1.10 -
    1.11      ScriptFunction getTypeErrorThrower() {
    1.12          return typeErrorThrower;
    1.13      }
    1.14  
    1.15 -    /**
    1.16 -     * Called from compiled script code to test if builtin has been overridden
    1.17 -     *
    1.18 -     * @return true if builtin array has not been overridden
    1.19 -     */
    1.20 -    public static boolean isBuiltinArray() {
    1.21 -        final Global instance = Global.instance();
    1.22 -        return instance.array == instance.getBuiltinArray();
    1.23 -    }
    1.24 -
    1.25 -    private ScriptFunction getBuiltinBoolean() {
    1.26 -        return builtinBoolean;
    1.27 -    }
    1.28 -
    1.29 -    /**
    1.30 -     * Called from compiled script code to test if builtin has been overridden
    1.31 -     *
    1.32 -     * @return true if builtin boolean has not been overridden
    1.33 -     */
    1.34 -    public static boolean isBuiltinBoolean() {
    1.35 -        final Global instance = Global.instance();
    1.36 -        return instance._boolean == instance.getBuiltinBoolean();
    1.37 -    }
    1.38 -
    1.39      private synchronized ScriptFunction getBuiltinDate() {
    1.40          if (this.builtinDate == null) {
    1.41              this.builtinDate = initConstructorAndSwitchPoint("Date", ScriptFunction.class);
    1.42 @@ -1810,30 +1782,6 @@
    1.43          return this.builtinDate;
    1.44      }
    1.45  
    1.46 -    /**
    1.47 -     * Called from compiled script code to test if builtin has been overridden
    1.48 -     *
    1.49 -     * @return true if builtin date has not been overridden
    1.50 -     */
    1.51 -    public static boolean isBuiltinDate() {
    1.52 -        final Global instance = Global.instance();
    1.53 -        return instance.date == LAZY_SENTINEL || instance.date == instance.getBuiltinDate();
    1.54 -    }
    1.55 -
    1.56 -    private ScriptFunction getBuiltinError() {
    1.57 -        return builtinError;
    1.58 -    }
    1.59 -
    1.60 -    /**
    1.61 -     * Called from compiled script code to test if builtin has been overridden
    1.62 -     *
    1.63 -     * @return true if builtin error has not been overridden
    1.64 -     */
    1.65 -    public static boolean isBuiltinError() {
    1.66 -        final Global instance = Global.instance();
    1.67 -        return instance.error == instance.getBuiltinError();
    1.68 -    }
    1.69 -
    1.70      private synchronized ScriptFunction getBuiltinEvalError() {
    1.71          if (this.builtinEvalError == null) {
    1.72              this.builtinEvalError = initErrorSubtype("EvalError", getErrorPrototype());
    1.73 @@ -1841,31 +1789,11 @@
    1.74          return this.builtinEvalError;
    1.75      }
    1.76  
    1.77 -    /**
    1.78 -     * Called from compiled script code to test if builtin has been overridden
    1.79 -     *
    1.80 -     * @return true if builtin eval error has not been overridden
    1.81 -     */
    1.82 -    public static boolean isBuiltinEvalError() {
    1.83 -        final Global instance = Global.instance();
    1.84 -        return instance.evalError == LAZY_SENTINEL || instance.evalError == instance.getBuiltinEvalError();
    1.85 -    }
    1.86 -
    1.87      private ScriptFunction getBuiltinFunction() {
    1.88          return builtinFunction;
    1.89      }
    1.90  
    1.91      /**
    1.92 -     * Called from compiled script code to test if builtin has been overridden
    1.93 -     *
    1.94 -     * @return true if builtin function has not been overridden
    1.95 -     */
    1.96 -    public static boolean isBuiltinFunction() {
    1.97 -        final Global instance = Global.instance();
    1.98 -        return instance.function == instance.getBuiltinFunction();
    1.99 -    }
   1.100 -
   1.101 -    /**
   1.102       * Get the switchpoint used to check property changes for Function.prototype.apply
   1.103       * @return the switchpoint guarding apply (same as guarding call, and everything else in function)
   1.104       */
   1.105 @@ -1906,16 +1834,6 @@
   1.106          return builtinJSAdapter;
   1.107      }
   1.108  
   1.109 -    /**
   1.110 -     * Called from compiled script code to test if builtin has been overridden
   1.111 -     *
   1.112 -     * @return true if builtin JSAdapter has not been overridden
   1.113 -     */
   1.114 -    public static boolean isBuiltinJSAdapter() {
   1.115 -        final Global instance = Global.instance();
   1.116 -        return instance.jsadapter == LAZY_SENTINEL || instance.jsadapter == instance.getBuiltinJSAdapter();
   1.117 -    }
   1.118 -
   1.119      private synchronized ScriptObject getBuiltinJSON() {
   1.120          if (this.builtinJSON == null) {
   1.121              this.builtinJSON = initConstructorAndSwitchPoint("JSON", ScriptObject.class);
   1.122 @@ -1923,44 +1841,6 @@
   1.123          return this.builtinJSON;
   1.124      }
   1.125  
   1.126 -    /**
   1.127 -     * Called from compiled script code to test if builtin has been overridden
   1.128 -     *
   1.129 -     * @return true if builtin JSON has has not been overridden
   1.130 -     */
   1.131 -    public static boolean isBuiltinJSON() {
   1.132 -        final Global instance = Global.instance();
   1.133 -        return instance.json == LAZY_SENTINEL || instance.json == instance.getBuiltinJSON();
   1.134 -    }
   1.135 -
   1.136 -    private ScriptObject getBuiltinJava() {
   1.137 -        return builtinJava;
   1.138 -    }
   1.139 -
   1.140 -    /**
   1.141 -     * Called from compiled script code to test if builtin has been overridden
   1.142 -     *
   1.143 -     * @return true if builtin Java has not been overridden
   1.144 -     */
   1.145 -    public static boolean isBuiltinJava() {
   1.146 -        final Global instance = Global.instance();
   1.147 -        return instance.java == instance.getBuiltinJava();
   1.148 -    }
   1.149 -
   1.150 -    private ScriptObject getBuiltinJavax() {
   1.151 -        return builtinJavax;
   1.152 -    }
   1.153 -
   1.154 -    /**
   1.155 -     * Called from compiled script code to test if builtin has been overridden
   1.156 -     *
   1.157 -     * @return true if builtin Javax has not been overridden
   1.158 -     */
   1.159 -    public static boolean isBuiltinJavax() {
   1.160 -        final Global instance = Global.instance();
   1.161 -        return instance.javax == instance.getBuiltinJavax();
   1.162 -    }
   1.163 -
   1.164      private synchronized ScriptFunction getBuiltinJavaImporter() {
   1.165          if (this.builtinJavaImporter == null) {
   1.166              this.builtinJavaImporter = initConstructor("JavaImporter", ScriptFunction.class);
   1.167 @@ -1975,68 +1855,6 @@
   1.168          return this.builtinJavaApi;
   1.169      }
   1.170  
   1.171 -    /**
   1.172 -     * Called from compiled script code to test if builtin has been overridden
   1.173 -     *
   1.174 -     * @return true if builtin Java importer has not been overridden
   1.175 -     */
   1.176 -    public static boolean isBuiltinJavaImporter() {
   1.177 -        final Global instance = Global.instance();
   1.178 -        return instance.javaImporter == LAZY_SENTINEL || instance.javaImporter == instance.getBuiltinJavaImporter();
   1.179 -    }
   1.180 -
   1.181 -    /**
   1.182 -     * Called from compiled script code to test if builtin has been overridden
   1.183 -     *
   1.184 -     * @return true if builtin math has not been overridden
   1.185 -     */
   1.186 -    public static boolean isBuiltinMath() {
   1.187 -        final Global instance = Global.instance();
   1.188 -        return instance.math == instance.builtinMath;
   1.189 -    }
   1.190 -
   1.191 -    private ScriptFunction getBuiltinNumber() {
   1.192 -        return builtinNumber;
   1.193 -    }
   1.194 -
   1.195 -    /**
   1.196 -     * Called from compiled script code to test if builtin has been overridden
   1.197 -     *
   1.198 -     * @return true if builtin number has not been overridden
   1.199 -     */
   1.200 -    public static boolean isBuiltinNumber() {
   1.201 -        final Global instance = Global.instance();
   1.202 -        return instance.number == instance.getBuiltinNumber();
   1.203 -    }
   1.204 -
   1.205 -    private ScriptFunction getBuiltinObject() {
   1.206 -        return builtinObject;
   1.207 -    }
   1.208 -
   1.209 -    /**
   1.210 -     * Called from compiled script code to test if builtin has been overridden
   1.211 -     *
   1.212 -     * @return true if builtin object has not been overridden
   1.213 -     */
   1.214 -    public static boolean isBuiltinObject() {
   1.215 -        final Global instance = Global.instance();
   1.216 -        return instance.object == instance.getBuiltinObject();
   1.217 -    }
   1.218 -
   1.219 -    private ScriptObject getBuiltinPackages() {
   1.220 -        return builtinPackages;
   1.221 -    }
   1.222 -
   1.223 -    /**
   1.224 -     * Called from compiled script code to test if builtin has been overridden
   1.225 -     *
   1.226 -     * @return true if builtin package has not been overridden
   1.227 -     */
   1.228 -    public static boolean isBuiltinPackages() {
   1.229 -        final Global instance = Global.instance();
   1.230 -        return instance.packages == instance.getBuiltinPackages();
   1.231 -    }
   1.232 -
   1.233      private synchronized ScriptFunction getBuiltinRangeError() {
   1.234          if (this.builtinRangeError == null) {
   1.235              this.builtinRangeError = initErrorSubtype("RangeError", getErrorPrototype());
   1.236 @@ -2044,30 +1862,6 @@
   1.237          return builtinRangeError;
   1.238      }
   1.239  
   1.240 -    /**
   1.241 -     * Called from compiled script code to test if builtin has been overridden
   1.242 -     *
   1.243 -     * @return true if builtin range error has not been overridden
   1.244 -     */
   1.245 -    public static boolean isBuiltinRangeError() {
   1.246 -        final Global instance = Global.instance();
   1.247 -        return instance.rangeError == LAZY_SENTINEL || instance.rangeError == instance.getBuiltinRangeError();
   1.248 -    }
   1.249 -
   1.250 -    private synchronized ScriptFunction getBuiltinReferenceError() {
   1.251 -        return builtinReferenceError;
   1.252 -    }
   1.253 -
   1.254 -    /**
   1.255 -     * Called from compiled script code to test if builtin has been overridden
   1.256 -     *
   1.257 -     * @return true if builtin reference error has not been overridden
   1.258 -     */
   1.259 -    public static boolean isBuiltinReferenceError() {
   1.260 -        final Global instance = Global.instance();
   1.261 -        return instance.referenceError == instance.getBuiltinReferenceError();
   1.262 -    }
   1.263 -
   1.264      private synchronized ScriptFunction getBuiltinRegExp() {
   1.265          if (this.builtinRegExp == null) {
   1.266              this.builtinRegExp = initConstructorAndSwitchPoint("RegExp", ScriptFunction.class);
   1.267 @@ -2081,58 +1875,6 @@
   1.268          return builtinRegExp;
   1.269      }
   1.270  
   1.271 -    /**
   1.272 -     * Called from compiled script code to test if builtin has been overridden
   1.273 -     *
   1.274 -     * @return true if builtin regexp has not been overridden
   1.275 -     */
   1.276 -    public static boolean isBuiltinRegExp() {
   1.277 -        final Global instance = Global.instance();
   1.278 -        return instance.regexp == LAZY_SENTINEL || instance.regexp == instance.getBuiltinRegExp();
   1.279 -    }
   1.280 -
   1.281 -    private ScriptFunction getBuiltinString() {
   1.282 -        return builtinString;
   1.283 -    }
   1.284 -
   1.285 -    /**
   1.286 -     * Called from compiled script code to test if builtin has been overridden
   1.287 -     *
   1.288 -     * @return true if builtin Java has not been overridden
   1.289 -     */
   1.290 -    public static boolean isBuiltinString() {
   1.291 -        final Global instance = Global.instance();
   1.292 -        return instance.string == instance.getBuiltinString();
   1.293 -    }
   1.294 -
   1.295 -    private ScriptFunction getBuiltinSyntaxError() {
   1.296 -        return builtinSyntaxError;
   1.297 -    }
   1.298 -
   1.299 -    /**
   1.300 -     * Called from compiled script code to test if builtin has been overridden
   1.301 -     *
   1.302 -     * @return true if builtin syntax error has not been overridden
   1.303 -     */
   1.304 -    public static boolean isBuiltinSyntaxError() {
   1.305 -        final Global instance = Global.instance();
   1.306 -        return instance.syntaxError == instance.getBuiltinSyntaxError();
   1.307 -    }
   1.308 -
   1.309 -    private ScriptFunction getBuiltinTypeError() {
   1.310 -        return builtinTypeError;
   1.311 -    }
   1.312 -
   1.313 -    /**
   1.314 -     * Called from compiled script code to test if builtin has been overridden
   1.315 -     *
   1.316 -     * @return true if builtin type error has not been overridden
   1.317 -     */
   1.318 -    public static boolean isBuiltinTypeError() {
   1.319 -        final Global instance = Global.instance();
   1.320 -        return instance.typeError == instance.getBuiltinTypeError();
   1.321 -    }
   1.322 -
   1.323      private synchronized ScriptFunction getBuiltinURIError() {
   1.324          if (this.builtinURIError == null) {
   1.325              this.builtinURIError = initErrorSubtype("URIError", getErrorPrototype());
   1.326 @@ -2140,16 +1882,6 @@
   1.327          return this.builtinURIError;
   1.328      }
   1.329  
   1.330 -    /**
   1.331 -     * Called from compiled script code to test if builtin has been overridden
   1.332 -     *
   1.333 -     * @return true if builtin URI error has not been overridden
   1.334 -     */
   1.335 -    public static boolean isBuiltinURIError() {
   1.336 -        final Global instance = Global.instance();
   1.337 -        return instance.uriError == LAZY_SENTINEL || instance.uriError == instance.getBuiltinURIError();
   1.338 -    }
   1.339 -
   1.340      @Override
   1.341      public String getClassName() {
   1.342          return "global";