Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build.xml	Thu Sep 12 11:09:22 2013 -0700
     1.2 +++ b/make/build.xml	Tue Sep 17 08:21:42 2013 -0700
     1.3 @@ -230,6 +230,10 @@
     1.4          <compilerarg value="-Xlint:deprecation"/>
     1.5      </javac>
     1.6  
     1.7 +    <copy todir="${build.test.classes.dir}/META-INF/services">
     1.8 +       <fileset dir="${test.src.dir}/META-INF/services/"/>
     1.9 +    </copy>
    1.10 +
    1.11      <!-- tests that check nashorn internals and internal API -->
    1.12      <jar jarfile="${nashorn.internal.tests.jar}">
    1.13        <fileset dir="${build.test.classes.dir}" excludes="**/api/**"/>
    1.14 @@ -238,6 +242,7 @@
    1.15      <!-- tests that check nashorn script engine (jsr-223) API -->
    1.16      <jar jarfile="${nashorn.api.tests.jar}">
    1.17        <fileset dir="${build.test.classes.dir}" includes="**/api/**"/>
    1.18 +      <fileset dir="${build.test.classes.dir}" includes="**/META-INF/**"/>
    1.19      </jar>
    1.20  
    1.21    </target>
    1.22 @@ -264,6 +269,13 @@
    1.23      permission java.util.PropertyPermission "nashorn.test.*", "read";
    1.24  };
    1.25  
    1.26 +grant codeBase "file:/${basedir}/test/script/basic/parser/*" {
    1.27 +    permission java.io.FilePermission "${basedir}/test/script/-", "read";
    1.28 +    permission java.io.FilePermission "$${user.dir}", "read";
    1.29 +    permission java.util.PropertyPermission "user.dir", "read";
    1.30 +    permission java.util.PropertyPermission "nashorn.test.*", "read";
    1.31 +};
    1.32 +
    1.33  grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" {
    1.34      permission java.util.PropertyPermission "java.security.policy", "read";
    1.35  };

     2.1 --- a/src/jdk/nashorn/api/scripting/JSObject.java	Thu Sep 12 11:09:22 2013 -0700
     2.2 +++ b/src/jdk/nashorn/api/scripting/JSObject.java	Tue Sep 17 08:21:42 2013 -0700
     2.3 @@ -25,73 +25,210 @@
     2.4  
     2.5  package jdk.nashorn.api.scripting;
     2.6  
     2.7 +import java.util.Collection;
     2.8 +import java.util.Collections;
     2.9 +import java.util.Set;
    2.10 +
    2.11  /**
    2.12 - * netscape.javascript.JSObject-like interface for nashorn script objects.
    2.13 + * This is the base class for nashorn ScriptObjectMirror class.
    2.14 + *
    2.15 + * This class can also be subclassed by an arbitrary Java class. Nashorn will
    2.16 + * treat objects of such classes just like nashorn script objects. Usual nashorn
    2.17 + * operations like obj[i], obj.foo, obj.func(), delete obj.foo will be glued
    2.18 + * to appropriate method call of this class.
    2.19   */
    2.20  public abstract class JSObject {
    2.21      /**
    2.22 -     * Call a JavaScript function
    2.23 +     * Call this object as a JavaScript function. This is equivalent to
    2.24 +     * 'func.apply(thiz, args)' in JavaScript.
    2.25       *
    2.26 -     * @param functionName name of function
    2.27 +     * @param thiz 'this' object to be passed to the function
    2.28       * @param args arguments to method
    2.29       * @return result of call
    2.30       */
    2.31 -    public abstract Object call(String functionName, Object... args);
    2.32 +    public Object call(Object thiz, Object... args) {
    2.33 +        throw new UnsupportedOperationException("call");
    2.34 +    }
    2.35  
    2.36      /**
    2.37 -     * Call a JavaScript method as a constructor. This is equivalent to
    2.38 -     * calling new obj.Method(arg1, arg2...) in JavaScript.
    2.39 +     * Call this 'constructor' JavaScript function to create a new object.
    2.40 +     * This is equivalent to 'new func(arg1, arg2...)' in JavaScript.
    2.41       *
    2.42 -     * @param functionName name of function
    2.43       * @param args arguments to method
    2.44       * @return result of constructor call
    2.45       */
    2.46 -    public abstract Object newObject(String functionName, Object... args);
    2.47 +    public Object newObject(Object... args) {
    2.48 +        throw new UnsupportedOperationException("newObject");
    2.49 +    }
    2.50  
    2.51      /**
    2.52 -     * Evaluate a JavaScript expression
    2.53 +     * Evaluate a JavaScript expression.
    2.54       *
    2.55       * @param s JavaScript expression to evaluate
    2.56       * @return evaluation result
    2.57       */
    2.58 -    public abstract Object eval(String s);
    2.59 +    public Object eval(String s) {
    2.60 +        throw new UnsupportedOperationException("eval");
    2.61 +    }
    2.62  
    2.63      /**
    2.64 -     * Retrieves a named member of a JavaScript object.
    2.65 +     * Call a JavaScript function member of this object.
    2.66 +     *
    2.67 +     * @param name name of the member function to call
    2.68 +     * @param args arguments to be passed to the member function
    2.69 +     * @return result of call
    2.70 +     */
    2.71 +    public Object callMember(String name, Object... args) {
    2.72 +        throw new UnsupportedOperationException("call");
    2.73 +    }
    2.74 +
    2.75 +    /**
    2.76 +     * Retrieves a named member of this JavaScript object.
    2.77       *
    2.78       * @param name of member
    2.79       * @return member
    2.80       */
    2.81 -    public abstract Object getMember(String name);
    2.82 +    public Object getMember(String name) {
    2.83 +        return null;
    2.84 +    }
    2.85  
    2.86      /**
    2.87 -     * Retrieves an indexed member of a JavaScript object.
    2.88 +     * Retrieves an indexed member of this JavaScript object.
    2.89       *
    2.90 -     * @param index index of member slot
    2.91 +     * @param index index slot to retrieve
    2.92       * @return member
    2.93       */
    2.94 -    public abstract Object getSlot(int index);
    2.95 +    public Object getSlot(int index) {
    2.96 +        return null;
    2.97 +    }
    2.98  
    2.99      /**
   2.100 -     * Remove a named member from a JavaScript object
   2.101 +     * Does this object have a named member?
   2.102       *
   2.103       * @param name name of member
   2.104 +     * @return true if this object has a member of the given name
   2.105       */
   2.106 -    public abstract void removeMember(String name);
   2.107 +    public boolean hasMember(String name) {
   2.108 +        return false;
   2.109 +    }
   2.110  
   2.111      /**
   2.112 -     * Set a named member in a JavaScript object
   2.113 +     * Does this object have a indexed property?
   2.114       *
   2.115 -     * @param name  name of member
   2.116 -     * @param value value of member
   2.117 +     * @param slot index to check
   2.118 +     * @return true if this object has a slot
   2.119       */
   2.120 -    public abstract void setMember(String name, Object value);
   2.121 +    public boolean hasSlot(int slot) {
   2.122 +        return false;
   2.123 +    }
   2.124  
   2.125      /**
   2.126 -     * Set an indexed member in a JavaScript object
   2.127 +     * Remove a named member from this JavaScript object
   2.128       *
   2.129 -     * @param index index of member slot
   2.130 -     * @param value value of member
   2.131 +     * @param name name of the member
   2.132       */
   2.133 -    public abstract void setSlot(int index, Object value);
   2.134 +    public void removeMember(String name) {
   2.135 +    }
   2.136 +
   2.137 +    /**
   2.138 +     * Set a named member in this JavaScript object
   2.139 +     *
   2.140 +     * @param name  name of the member
   2.141 +     * @param value value of the member
   2.142 +     */
   2.143 +    public void setMember(String name, Object value) {
   2.144 +    }
   2.145 +
   2.146 +    /**
   2.147 +     * Set an indexed member in this JavaScript object
   2.148 +     *
   2.149 +     * @param index index of the member slot
   2.150 +     * @param value value of the member
   2.151 +     */
   2.152 +    public void setSlot(int index, Object value) {
   2.153 +    }
   2.154 +
   2.155 +    // property and value iteration
   2.156 +
   2.157 +    /**
   2.158 +     * Returns the set of all property names of this object.
   2.159 +     *
   2.160 +     * @return set of property names
   2.161 +     */
   2.162 +    @SuppressWarnings("unchecked")
   2.163 +    public Set<String> keySet() {
   2.164 +        return Collections.EMPTY_SET;
   2.165 +    }
   2.166 +
   2.167 +    /**
   2.168 +     * Returns the set of all property values of this object.
   2.169 +     *
   2.170 +     * @return set of property values.
   2.171 +     */
   2.172 +    @SuppressWarnings("unchecked")
   2.173 +    public Collection<Object> values() {
   2.174 +        return Collections.EMPTY_SET;
   2.175 +    }
   2.176 +
   2.177 +    // JavaScript instanceof check
   2.178 +
   2.179 +    /**
   2.180 +     * Checking whether the given object is an instance of 'this' object.
   2.181 +     *
   2.182 +     * @param instance instace to check
   2.183 +     * @return true if the given 'instance' is an instance of this 'function' object
   2.184 +     */
   2.185 +    public boolean isInstance(final Object instance) {
   2.186 +        return false;
   2.187 +    }
   2.188 +
   2.189 +    /**
   2.190 +     * Checking whether this object is an instance of the given 'clazz' object.
   2.191 +     *
   2.192 +     * @param clazz clazz to check
   2.193 +     * @return true if this object is an instance of the given 'clazz'
   2.194 +     */
   2.195 +    public boolean isInstanceOf(final Object clazz) {
   2.196 +        if (clazz instanceof JSObject) {
   2.197 +            return ((JSObject)clazz).isInstance(this);
   2.198 +        }
   2.199 +
   2.200 +        return false;
   2.201 +    }
   2.202 +
   2.203 +    /**
   2.204 +     * ECMA [[Class]] property
   2.205 +     *
   2.206 +     * @return ECMA [[Class]] property value of this object
   2.207 +     */
   2.208 +    public String getClassName() {
   2.209 +        return getClass().getName();
   2.210 +    }
   2.211 +
   2.212 +    /**
   2.213 +     * Is this a function object?
   2.214 +     *
   2.215 +     * @return if this mirror wraps a ECMAScript function instance
   2.216 +     */
   2.217 +    public boolean isFunction() {
   2.218 +        return false;
   2.219 +    }
   2.220 +
   2.221 +    /**
   2.222 +     * Is this a 'use strict' function object?
   2.223 +     *
   2.224 +     * @return true if this mirror represents a ECMAScript 'use strict' function
   2.225 +     */
   2.226 +    public boolean isStrictFunction() {
   2.227 +        return false;
   2.228 +    }
   2.229 +
   2.230 +    /**
   2.231 +     * Is this an array object?
   2.232 +     *
   2.233 +     * @return if this mirror wraps a ECMAScript array object
   2.234 +     */
   2.235 +    public boolean isArray() {
   2.236 +        return false;
   2.237 +    }
   2.238  }

     3.1 --- a/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Thu Sep 12 11:09:22 2013 -0700
     3.2 +++ b/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Tue Sep 17 08:21:42 2013 -0700
     3.3 @@ -315,7 +315,7 @@
     3.4              final ScriptObjectMirror mirror = (ScriptObjectMirror)thiz;
     3.5              realSelf = mirror.getScriptObject();
     3.6              realGlobal = mirror.getHomeGlobal();
     3.7 -            if (! realGlobal.isOfContext(nashornContext)) {
     3.8 +            if (! isOfContext(realGlobal, nashornContext)) {
     3.9                  throw new IllegalArgumentException(getMessage("script.object.from.another.engine"));
    3.10              }
    3.11          } else if (thiz instanceof ScriptObject) {
    3.12 @@ -326,7 +326,7 @@
    3.13                  throw new IllegalArgumentException(getMessage("no.current.nashorn.global"));
    3.14              }
    3.15  
    3.16 -            if (! realGlobal.isOfContext(nashornContext)) {
    3.17 +            if (! isOfContext(realGlobal, nashornContext)) {
    3.18                  throw new IllegalArgumentException(getMessage("script.object.from.another.engine"));
    3.19              }
    3.20          }
    3.21 @@ -394,7 +394,7 @@
    3.22      // Retrieve nashorn Global object from a given ScriptObjectMirror
    3.23      private ScriptObject globalFromMirror(final ScriptObjectMirror mirror) {
    3.24          ScriptObject sobj = mirror.getScriptObject();
    3.25 -        if (sobj instanceof GlobalObject && sobj.isOfContext(nashornContext)) {
    3.26 +        if (sobj instanceof GlobalObject && isOfContext(sobj, nashornContext)) {
    3.27              return sobj;
    3.28          }
    3.29  
    3.30 @@ -470,7 +470,7 @@
    3.31          ScriptObjectMirror selfMirror = null;
    3.32          if (selfObject instanceof ScriptObjectMirror) {
    3.33              selfMirror = (ScriptObjectMirror)selfObject;
    3.34 -            if (! selfMirror.getHomeGlobal().isOfContext(nashornContext)) {
    3.35 +            if (! isOfContext(selfMirror.getHomeGlobal(), nashornContext)) {
    3.36                  throw new IllegalArgumentException(getMessage("script.object.from.another.engine"));
    3.37              }
    3.38          } else if (selfObject instanceof ScriptObject) {
    3.39 @@ -481,7 +481,7 @@
    3.40                  throw new IllegalArgumentException(getMessage("no.current.nashorn.global"));
    3.41              }
    3.42  
    3.43 -            if (! oldGlobal.isOfContext(nashornContext)) {
    3.44 +            if (! isOfContext(oldGlobal, nashornContext)) {
    3.45                  throw new IllegalArgumentException(getMessage("script.object.from.another.engine"));
    3.46              }
    3.47  
    3.48 @@ -494,7 +494,7 @@
    3.49  
    3.50          if (selfMirror != null) {
    3.51              try {
    3.52 -                return ScriptObjectMirror.translateUndefined(selfMirror.call(name, args));
    3.53 +                return ScriptObjectMirror.translateUndefined(selfMirror.callMember(name, args));
    3.54              } catch (final Exception e) {
    3.55                  final Throwable cause = e.getCause();
    3.56                  if (cause instanceof NoSuchMethodException) {
    3.57 @@ -617,4 +617,9 @@
    3.58          }
    3.59          return true;
    3.60      }
    3.61 +
    3.62 +    private static boolean isOfContext(final ScriptObject global, final Context context) {
    3.63 +        assert global instanceof GlobalObject: "Not a Global object";
    3.64 +        return ((GlobalObject)global).isOfContext(context);
    3.65 +    }
    3.66  }

     4.1 --- a/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java	Thu Sep 12 11:09:22 2013 -0700
     4.2 +++ b/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java	Tue Sep 17 08:21:42 2013 -0700
     4.3 @@ -42,14 +42,13 @@
     4.4  import java.util.concurrent.Callable;
     4.5  import javax.script.Bindings;
     4.6  import jdk.nashorn.internal.runtime.Context;
     4.7 +import jdk.nashorn.internal.runtime.GlobalObject;
     4.8  import jdk.nashorn.internal.runtime.ScriptFunction;
     4.9  import jdk.nashorn.internal.runtime.ScriptObject;
    4.10  import jdk.nashorn.internal.runtime.ScriptRuntime;
    4.11  
    4.12  /**
    4.13 - * Mirror object that wraps a given ScriptObject instance. User can
    4.14 - * access ScriptObject via the javax.script.Bindings interface or
    4.15 - * netscape.javascript.JSObject interface.
    4.16 + * Mirror object that wraps a given Nashorn Script object.
    4.17   */
    4.18  public final class ScriptObjectMirror extends JSObject implements Bindings {
    4.19      private static AccessControlContext getContextAccCtxt() {
    4.20 @@ -62,6 +61,7 @@
    4.21  
    4.22      private final ScriptObject sobj;
    4.23      private final ScriptObject global;
    4.24 +    private final boolean strict;
    4.25  
    4.26      @Override
    4.27      public boolean equals(final Object other) {
    4.28 @@ -88,8 +88,9 @@
    4.29      }
    4.30  
    4.31      // JSObject methods
    4.32 +
    4.33      @Override
    4.34 -    public Object call(final String functionName, final Object... args) {
    4.35 +    public Object call(final Object thiz, final Object... args) {
    4.36          final ScriptObject oldGlobal = Context.getGlobal();
    4.37          final boolean globalChanged = (oldGlobal != global);
    4.38  
    4.39 @@ -98,15 +99,13 @@
    4.40                  Context.setGlobal(global);
    4.41              }
    4.42  
    4.43 -            final Object val = functionName == null? sobj : sobj.get(functionName);
    4.44 -            if (val instanceof ScriptFunction) {
    4.45 +            if (sobj instanceof ScriptFunction) {
    4.46                  final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
    4.47 -                return wrap(ScriptRuntime.checkAndApply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
    4.48 -            } else if (val instanceof ScriptObjectMirror && ((ScriptObjectMirror)val).isFunction()) {
    4.49 -                return ((ScriptObjectMirror)val).call(null, args);
    4.50 +                final Object self = globalChanged? wrap(thiz, oldGlobal) : thiz;
    4.51 +                return wrap(ScriptRuntime.apply((ScriptFunction)sobj, unwrap(self, global), unwrapArray(modArgs, global)), global);
    4.52              }
    4.53  
    4.54 -            throw new NoSuchMethodException("No such function " + ((functionName != null)? functionName : ""));
    4.55 +            throw new RuntimeException("not a function: " + toString());
    4.56          } catch (final RuntimeException | Error e) {
    4.57              throw e;
    4.58          } catch (final Throwable t) {
    4.59 @@ -119,7 +118,7 @@
    4.60      }
    4.61  
    4.62      @Override
    4.63 -    public Object newObject(final String functionName, final Object... args) {
    4.64 +    public Object newObject(final Object... args) {
    4.65          final ScriptObject oldGlobal = Context.getGlobal();
    4.66          final boolean globalChanged = (oldGlobal != global);
    4.67  
    4.68 @@ -128,15 +127,12 @@
    4.69                  Context.setGlobal(global);
    4.70              }
    4.71  
    4.72 -            final Object val = functionName == null? sobj : sobj.get(functionName);
    4.73 -            if (val instanceof ScriptFunction) {
    4.74 +            if (sobj instanceof ScriptFunction) {
    4.75                  final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
    4.76 -                return wrap(ScriptRuntime.checkAndConstruct((ScriptFunction)val, unwrapArray(modArgs, global)), global);
    4.77 -            } else if (val instanceof ScriptObjectMirror && ((ScriptObjectMirror)val).isFunction()) {
    4.78 -                return ((ScriptObjectMirror)val).newObject(null, args);
    4.79 +                return wrap(ScriptRuntime.construct((ScriptFunction)sobj, unwrapArray(modArgs, global)), global);
    4.80              }
    4.81  
    4.82 -            throw new RuntimeException("not a constructor " + ((functionName != null)? functionName : ""));
    4.83 +            throw new RuntimeException("not a constructor: " + toString());
    4.84          } catch (final RuntimeException | Error e) {
    4.85              throw e;
    4.86          } catch (final Throwable t) {
    4.87 @@ -166,7 +162,39 @@
    4.88      }
    4.89  
    4.90      @Override
    4.91 +    public Object callMember(final String functionName, final Object... args) {
    4.92 +        functionName.getClass(); // null check
    4.93 +        final ScriptObject oldGlobal = Context.getGlobal();
    4.94 +        final boolean globalChanged = (oldGlobal != global);
    4.95 +
    4.96 +        try {
    4.97 +            if (globalChanged) {
    4.98 +                Context.setGlobal(global);
    4.99 +            }
   4.100 +
   4.101 +            final Object val = sobj.get(functionName);
   4.102 +            if (val instanceof ScriptFunction) {
   4.103 +                final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
   4.104 +                return wrap(ScriptRuntime.apply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
   4.105 +            } else if (val instanceof JSObject && ((JSObject)val).isFunction()) {
   4.106 +                return ((JSObject)val).call(sobj, args);
   4.107 +            }
   4.108 +
   4.109 +            throw new NoSuchMethodException("No such function " + functionName);
   4.110 +        } catch (final RuntimeException | Error e) {
   4.111 +            throw e;
   4.112 +        } catch (final Throwable t) {
   4.113 +            throw new RuntimeException(t);
   4.114 +        } finally {
   4.115 +            if (globalChanged) {
   4.116 +                Context.setGlobal(oldGlobal);
   4.117 +            }
   4.118 +        }
   4.119 +    }
   4.120 +
   4.121 +    @Override
   4.122      public Object getMember(final String name) {
   4.123 +        name.getClass();
   4.124          return inGlobal(new Callable<Object>() {
   4.125              @Override public Object call() {
   4.126                  return wrap(sobj.get(name), global);
   4.127 @@ -184,12 +212,33 @@
   4.128      }
   4.129  
   4.130      @Override
   4.131 +    public boolean hasMember(final String name) {
   4.132 +        name.getClass();
   4.133 +        return inGlobal(new Callable<Boolean>() {
   4.134 +            @Override public Boolean call() {
   4.135 +                return sobj.has(name);
   4.136 +            }
   4.137 +        });
   4.138 +    }
   4.139 +
   4.140 +    @Override
   4.141 +    public boolean hasSlot(final int slot) {
   4.142 +        return inGlobal(new Callable<Boolean>() {
   4.143 +            @Override public Boolean call() {
   4.144 +                return sobj.has(slot);
   4.145 +            }
   4.146 +        });
   4.147 +    }
   4.148 +
   4.149 +    @Override
   4.150      public void removeMember(final String name) {
   4.151 +        name.getClass();
   4.152          remove(name);
   4.153      }
   4.154  
   4.155      @Override
   4.156      public void setMember(final String name, final Object value) {
   4.157 +        name.getClass();
   4.158          put(name, value);
   4.159      }
   4.160  
   4.161 @@ -197,19 +246,58 @@
   4.162      public void setSlot(final int index, final Object value) {
   4.163          inGlobal(new Callable<Void>() {
   4.164              @Override public Void call() {
   4.165 -                sobj.set(index, unwrap(value, global), global.isStrictContext());
   4.166 +                sobj.set(index, unwrap(value, global), strict);
   4.167                  return null;
   4.168              }
   4.169          });
   4.170      }
   4.171  
   4.172 +    @Override
   4.173 +    public boolean isInstance(final Object obj) {
   4.174 +        if (! (obj instanceof ScriptObjectMirror)) {
   4.175 +            return false;
   4.176 +        }
   4.177 +
   4.178 +        final ScriptObjectMirror instance = (ScriptObjectMirror)obj;
   4.179 +        // if not belongs to my global scope, return false
   4.180 +        if (global != instance.global) {
   4.181 +            return false;
   4.182 +        }
   4.183 +
   4.184 +        return inGlobal(new Callable<Boolean>() {
   4.185 +            @Override public Boolean call() {
   4.186 +                return sobj.isInstance(instance.sobj);
   4.187 +            }
   4.188 +        });
   4.189 +    }
   4.190 +
   4.191 +    @Override
   4.192 +    public String getClassName() {
   4.193 +        return sobj.getClassName();
   4.194 +    }
   4.195 +
   4.196 +    @Override
   4.197 +    public boolean isFunction() {
   4.198 +        return sobj instanceof ScriptFunction;
   4.199 +    }
   4.200 +
   4.201 +    @Override
   4.202 +    public boolean isStrictFunction() {
   4.203 +        return isFunction() && ((ScriptFunction)sobj).isStrict();
   4.204 +    }
   4.205 +
   4.206 +    @Override
   4.207 +    public boolean isArray() {
   4.208 +        return sobj.isArray();
   4.209 +    }
   4.210 +
   4.211      // javax.script.Bindings methods
   4.212  
   4.213      @Override
   4.214      public void clear() {
   4.215          inGlobal(new Callable<Object>() {
   4.216              @Override public Object call() {
   4.217 -                sobj.clear();
   4.218 +                sobj.clear(strict);
   4.219                  return null;
   4.220              }
   4.221          });
   4.222 @@ -292,7 +380,7 @@
   4.223          return inGlobal(new Callable<Object>() {
   4.224              @Override public Object call() {
   4.225                  final Object modValue = globalChanged? wrap(value, oldGlobal) : value;
   4.226 -                return translateUndefined(wrap(sobj.put(key, unwrap(modValue, global)), global));
   4.227 +                return translateUndefined(wrap(sobj.put(key, unwrap(modValue, global), strict), global));
   4.228              }
   4.229          });
   4.230      }
   4.231 @@ -303,7 +391,6 @@
   4.232          final boolean globalChanged = (oldGlobal != global);
   4.233          inGlobal(new Callable<Object>() {
   4.234              @Override public Object call() {
   4.235 -                final boolean strict = global.isStrictContext();
   4.236                  for (final Map.Entry<? extends String, ? extends Object> entry : map.entrySet()) {
   4.237                      final Object value = entry.getValue();
   4.238                      final Object modValue = globalChanged? wrap(value, oldGlobal) : value;
   4.239 @@ -318,7 +405,7 @@
   4.240      public Object remove(final Object key) {
   4.241          return inGlobal(new Callable<Object>() {
   4.242              @Override public Object call() {
   4.243 -                return wrap(sobj.remove(unwrap(key, global)), global);
   4.244 +                return wrap(sobj.remove(unwrap(key, global), strict), global);
   4.245              }
   4.246          });
   4.247      }
   4.248 @@ -333,7 +420,7 @@
   4.249      public boolean delete(final Object key) {
   4.250          return inGlobal(new Callable<Boolean>() {
   4.251              @Override public Boolean call() {
   4.252 -                return sobj.delete(unwrap(key, global));
   4.253 +                return sobj.delete(unwrap(key, global), strict);
   4.254              }
   4.255          });
   4.256      }
   4.257 @@ -391,15 +478,6 @@
   4.258      }
   4.259  
   4.260      /**
   4.261 -     * ECMA [[Class]] property
   4.262 -     *
   4.263 -     * @return ECMA [[Class]] property value of this object
   4.264 -     */
   4.265 -    public String getClassName() {
   4.266 -        return sobj.getClassName();
   4.267 -    }
   4.268 -
   4.269 -    /**
   4.270       * ECMA 8.12.1 [[GetOwnProperty]] (P)
   4.271       *
   4.272       * @param key property key
   4.273 @@ -505,55 +583,6 @@
   4.274          });
   4.275      }
   4.276  
   4.277 -    // ECMAScript instanceof check
   4.278 -
   4.279 -    /**
   4.280 -     * Checking whether a script object is an instance of another by
   4.281 -     * walking the proto chain
   4.282 -     *
   4.283 -     * @param instance instace to check
   4.284 -     * @return true if 'instance' is an instance of this object
   4.285 -     */
   4.286 -    public boolean isInstance(final ScriptObjectMirror instance) {
   4.287 -        // if not belongs to my global scope, return false
   4.288 -        if (instance == null || global != instance.global) {
   4.289 -            return false;
   4.290 -        }
   4.291 -
   4.292 -        return inGlobal(new Callable<Boolean>() {
   4.293 -            @Override public Boolean call() {
   4.294 -                return sobj.isInstance(instance.sobj);
   4.295 -            }
   4.296 -        });
   4.297 -    }
   4.298 -
   4.299 -    /**
   4.300 -     * is this a function object?
   4.301 -     *
   4.302 -     * @return if this mirror wraps a ECMAScript function instance
   4.303 -     */
   4.304 -    public boolean isFunction() {
   4.305 -        return sobj instanceof ScriptFunction;
   4.306 -    }
   4.307 -
   4.308 -    /**
   4.309 -     * is this a 'use strict' function object?
   4.310 -     *
   4.311 -     * @return true if this mirror represents a ECMAScript 'use strict' function
   4.312 -     */
   4.313 -    public boolean isStrictFunction() {
   4.314 -        return isFunction() && ((ScriptFunction)sobj).isStrict();
   4.315 -    }
   4.316 -
   4.317 -    /**
   4.318 -     * is this an array object?
   4.319 -     *
   4.320 -     * @return if this mirror wraps a ECMAScript array object
   4.321 -     */
   4.322 -    public boolean isArray() {
   4.323 -        return sobj.isArray();
   4.324 -    }
   4.325 -
   4.326      /**
   4.327       * Utility to check if given object is ECMAScript undefined value
   4.328       *
   4.329 @@ -637,10 +666,11 @@
   4.330  
   4.331      ScriptObjectMirror(final ScriptObject sobj, final ScriptObject global) {
   4.332          assert sobj != null : "ScriptObjectMirror on null!";
   4.333 -        assert global != null : "null global for ScriptObjectMirror!";
   4.334 +        assert global instanceof GlobalObject : "global is not a GlobalObject";
   4.335  
   4.336          this.sobj = sobj;
   4.337          this.global = global;
   4.338 +        this.strict = ((GlobalObject)global).isStrictContext();
   4.339      }
   4.340  
   4.341      // accessors for script engine

     5.1 --- a/src/jdk/nashorn/internal/codegen/Attr.java	Thu Sep 12 11:09:22 2013 -0700
     5.2 +++ b/src/jdk/nashorn/internal/codegen/Attr.java	Tue Sep 17 08:21:42 2013 -0700
     5.3 @@ -26,6 +26,7 @@
     5.4  package jdk.nashorn.internal.codegen;
     5.5  
     5.6  import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
     5.7 +import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS_VAR;
     5.8  import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
     5.9  import static jdk.nashorn.internal.codegen.CompilerConstants.EXCEPTION_PREFIX;
    5.10  import static jdk.nashorn.internal.codegen.CompilerConstants.ITERATOR_PREFIX;
    5.11 @@ -172,7 +173,9 @@
    5.12              initCompileConstant(VARARGS, body, IS_PARAM | IS_INTERNAL);
    5.13              if (functionNode.needsArguments()) {
    5.14                  initCompileConstant(ARGUMENTS, body, IS_VAR | IS_INTERNAL | IS_ALWAYS_DEFINED);
    5.15 -                addLocalDef(ARGUMENTS.symbolName());
    5.16 +                final String argumentsName = ARGUMENTS_VAR.symbolName();
    5.17 +                newType(defineSymbol(body, argumentsName, IS_VAR | IS_ALWAYS_DEFINED), Type.typeFor(ARGUMENTS_VAR.type()));
    5.18 +                addLocalDef(argumentsName);
    5.19              }
    5.20          }
    5.21  
    5.22 @@ -491,30 +494,29 @@
    5.23              objectifySymbols(body);
    5.24          }
    5.25  
    5.26 +        List<VarNode> syntheticInitializers = null;
    5.27 +
    5.28          if (body.getFlag(Block.NEEDS_SELF_SYMBOL)) {
    5.29 -            final IdentNode callee = compilerConstant(CALLEE);
    5.30 -            VarNode selfInit =
    5.31 -                new VarNode(
    5.32 -                    newFunctionNode.getLineNumber(),
    5.33 -                    newFunctionNode.getToken(),
    5.34 -                    newFunctionNode.getFinish(),
    5.35 -                    newFunctionNode.getIdent(),
    5.36 -                    callee);
    5.37 +            syntheticInitializers = new ArrayList<>(2);
    5.38 +            LOG.info("Accepting self symbol init for ", newFunctionNode.getName());
    5.39 +            // "var fn = :callee"
    5.40 +            syntheticInitializers.add(createSyntheticInitializer(newFunctionNode.getIdent(), CALLEE, newFunctionNode));
    5.41 +        }
    5.42  
    5.43 -            LOG.info("Accepting self symbol init ", selfInit, " for ", newFunctionNode.getName());
    5.44 +        if(newFunctionNode.needsArguments()) {
    5.45 +            if(syntheticInitializers == null) {
    5.46 +                syntheticInitializers = new ArrayList<>(1);
    5.47 +            }
    5.48 +            // "var arguments = :arguments"
    5.49 +            syntheticInitializers.add(createSyntheticInitializer(createImplicitIdentifier(ARGUMENTS_VAR.symbolName()),
    5.50 +                    ARGUMENTS, newFunctionNode));
    5.51 +        }
    5.52  
    5.53 -            final List<Statement> newStatements = new ArrayList<>();
    5.54 -            assert callee.getSymbol() != null && callee.getSymbol().hasSlot();
    5.55 -
    5.56 -            final IdentNode name       = selfInit.getName();
    5.57 -            final Symbol    nameSymbol = body.getExistingSymbol(name.getName());
    5.58 -
    5.59 -            assert nameSymbol != null;
    5.60 -
    5.61 -            selfInit = selfInit.setName((IdentNode)name.setSymbol(lc, nameSymbol));
    5.62 -
    5.63 -            newStatements.add(selfInit);
    5.64 -            newStatements.addAll(body.getStatements());
    5.65 +        if(syntheticInitializers != null) {
    5.66 +            final List<Statement> stmts = body.getStatements();
    5.67 +            final List<Statement> newStatements = new ArrayList<>(stmts.size() + syntheticInitializers.size());
    5.68 +            newStatements.addAll(syntheticInitializers);
    5.69 +            newStatements.addAll(stmts);
    5.70              newFunctionNode = newFunctionNode.setBody(lc, body.setStatements(lc, newStatements));
    5.71          }
    5.72  
    5.73 @@ -533,6 +535,28 @@
    5.74          return newFunctionNode;
    5.75      }
    5.76  
    5.77 +    /**
    5.78 +     * Creates a synthetic initializer for a variable (a var statement that doesn't occur in the source code). Typically
    5.79 +     * used to create assignmnent of {@code :callee} to the function name symbol in self-referential function
    5.80 +     * expressions as well as for assignment of {@code :arguments} to {@code arguments}.
    5.81 +     *
    5.82 +     * @param name the ident node identifying the variable to initialize
    5.83 +     * @param initConstant the compiler constant it is initialized to
    5.84 +     * @param fn the function node the assignment is for
    5.85 +     * @return a var node with the appropriate assignment
    5.86 +     */
    5.87 +    private VarNode createSyntheticInitializer(final IdentNode name, final CompilerConstants initConstant, final FunctionNode fn) {
    5.88 +        final IdentNode init = compilerConstant(initConstant);
    5.89 +        assert init.getSymbol() != null && init.getSymbol().hasSlot();
    5.90 +
    5.91 +        VarNode synthVar = new VarNode(fn.getLineNumber(), fn.getToken(), fn.getFinish(), name, init);
    5.92 +
    5.93 +        final Symbol nameSymbol = fn.getBody().getExistingSymbol(name.getName());
    5.94 +        assert nameSymbol != null;
    5.95 +
    5.96 +        return synthVar.setName((IdentNode)name.setSymbol(lc, nameSymbol));
    5.97 +    }
    5.98 +
    5.99      @Override
   5.100      public Node leaveCONVERT(final UnaryNode unaryNode) {
   5.101          assert false : "There should be no convert operators in IR during Attribution";
   5.102 @@ -886,10 +910,9 @@
   5.103      @Override
   5.104      public Node leaveDECINC(final UnaryNode unaryNode) {
   5.105          // @see assignOffset
   5.106 -        final UnaryNode newUnaryNode = unaryNode.setRHS(ensureAssignmentSlots(unaryNode.rhs()));
   5.107          final Type type = arithType();
   5.108 -        newType(newUnaryNode.rhs().getSymbol(), type);
   5.109 -        return end(ensureSymbol(type, newUnaryNode));
   5.110 +        newType(unaryNode.rhs().getSymbol(), type);
   5.111 +        return end(ensureSymbol(type, unaryNode));
   5.112      }
   5.113  
   5.114      @Override
   5.115 @@ -975,15 +998,18 @@
   5.116      }
   5.117  
   5.118      private IdentNode compilerConstant(CompilerConstants cc) {
   5.119 -        final FunctionNode functionNode = lc.getCurrentFunction();
   5.120 -        return (IdentNode)
   5.121 -            new IdentNode(
   5.122 -                functionNode.getToken(),
   5.123 -                functionNode.getFinish(),
   5.124 -                cc.symbolName()).
   5.125 -                setSymbol(
   5.126 -                    lc,
   5.127 -                    functionNode.compilerConstant(cc));
   5.128 +        return (IdentNode)createImplicitIdentifier(cc.symbolName()).setSymbol(lc, lc.getCurrentFunction().compilerConstant(cc));
   5.129 +    }
   5.130 +
   5.131 +    /**
   5.132 +     * Creates an ident node for an implicit identifier within the function (one not declared in the script source
   5.133 +     * code). These identifiers are defined with function's token and finish.
   5.134 +     * @param name the name of the identifier
   5.135 +     * @return an ident node representing the implicit identifier.
   5.136 +     */
   5.137 +    private IdentNode createImplicitIdentifier(final String name) {
   5.138 +        final FunctionNode fn = lc.getCurrentFunction();
   5.139 +        return new IdentNode(fn.getToken(), fn.getFinish(), name);
   5.140      }
   5.141  
   5.142      @Override
   5.143 @@ -1575,39 +1601,6 @@
   5.144      }
   5.145  
   5.146      /**
   5.147 -     * In an assignment, recursively make sure that there are slots for
   5.148 -     * everything that has to be laid out as temporary storage, which is the
   5.149 -     * case if we are assign-op:ing a BaseNode subclass. This has to be
   5.150 -     * recursive to handle things like multi dimensional arrays as lhs
   5.151 -     *
   5.152 -     * see NASHORN-258
   5.153 -     *
   5.154 -     * @param assignmentDest the destination node of the assignment, e.g. lhs for binary nodes
   5.155 -     */
   5.156 -    private Expression ensureAssignmentSlots(final Expression assignmentDest) {
   5.157 -        final LexicalContext attrLexicalContext = lc;
   5.158 -        return (Expression)assignmentDest.accept(new NodeVisitor<LexicalContext>(new LexicalContext()) {
   5.159 -            @Override
   5.160 -            public Node leaveIndexNode(final IndexNode indexNode) {
   5.161 -                assert indexNode.getSymbol().isTemp();
   5.162 -                final Expression index = indexNode.getIndex();
   5.163 -                //only temps can be set as needing slots. the others will self resolve
   5.164 -                //it is illegal to take a scope var and force it to be a slot, that breaks
   5.165 -                Symbol indexSymbol = index.getSymbol();
   5.166 -                if (indexSymbol.isTemp() && !indexSymbol.isConstant() && !indexSymbol.hasSlot()) {
   5.167 -                    if(indexSymbol.isShared()) {
   5.168 -                        indexSymbol = temporarySymbols.createUnshared(indexSymbol);
   5.169 -                    }
   5.170 -                    indexSymbol.setNeedsSlot(true);
   5.171 -                    attrLexicalContext.getCurrentBlock().putSymbol(attrLexicalContext, indexSymbol);
   5.172 -                    return indexNode.setIndex(index.setSymbol(attrLexicalContext, indexSymbol));
   5.173 -                }
   5.174 -                return indexNode;
   5.175 -            }
   5.176 -        });
   5.177 -    }
   5.178 -
   5.179 -    /**
   5.180       * Return the type that arithmetic ops should use. Until we have implemented better type
   5.181       * analysis (range based) or overflow checks that are fast enough for int arithmetic,
   5.182       * this is the number type
   5.183 @@ -1704,7 +1697,7 @@
   5.184          newType(lhs.getSymbol(), destType); //may not narrow if dest is already wider than destType
   5.185  //        ensureSymbol(destType, binaryNode); //for OP= nodes, the node can carry a narrower types than its lhs rhs. This is perfectly fine
   5.186  
   5.187 -        return end(ensureSymbol(destType, ensureAssignmentSlots(binaryNode)));
   5.188 +        return end(ensureSymbol(destType, binaryNode));
   5.189      }
   5.190  
   5.191      private Expression ensureSymbol(final Type type, final Expression expr) {

     6.1 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Thu Sep 12 11:09:22 2013 -0700
     6.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Tue Sep 17 08:21:42 2013 -0700
     6.3 @@ -1361,6 +1361,7 @@
     6.4          final List<Expression> values  = new ArrayList<>();
     6.5  
     6.6          boolean hasGettersSetters = false;
     6.7 +        Expression protoNode = null;
     6.8  
     6.9          for (PropertyNode propertyNode: elements) {
    6.10              final Expression   value        = propertyNode.getValue();
    6.11 @@ -1369,6 +1370,9 @@
    6.12  
    6.13              if (value == null) {
    6.14                  hasGettersSetters = true;
    6.15 +            } else if (key.equals(ScriptObject.PROTO_PROPERTY_NAME)) {
    6.16 +                protoNode = value;
    6.17 +                continue;
    6.18              }
    6.19  
    6.20              keys.add(key);
    6.21 @@ -1410,8 +1414,13 @@
    6.22          }
    6.23  
    6.24          method.dup();
    6.25 -        globalObjectPrototype();
    6.26 -        method.invoke(ScriptObject.SET_PROTO);
    6.27 +        if (protoNode != null) {
    6.28 +            load(protoNode);
    6.29 +            method.invoke(ScriptObject.SET_PROTO_CHECK);
    6.30 +        } else {
    6.31 +            globalObjectPrototype();
    6.32 +            method.invoke(ScriptObject.SET_PROTO);
    6.33 +        }
    6.34  
    6.35          if (hasGettersSetters) {
    6.36              for (final PropertyNode propertyNode : elements) {

     7.1 --- a/src/jdk/nashorn/internal/codegen/CompilerConstants.java	Thu Sep 12 11:09:22 2013 -0700
     7.2 +++ b/src/jdk/nashorn/internal/codegen/CompilerConstants.java	Tue Sep 17 08:21:42 2013 -0700
     7.3 @@ -102,8 +102,12 @@
     7.4      /** the varargs variable when necessary */
     7.5      VARARGS(":varargs", Object[].class),
     7.6  
     7.7 -    /** the arguments vector when necessary and the slot */
     7.8 -    ARGUMENTS("arguments", ScriptObject.class, 2),
     7.9 +    /** the arguments variable (visible to function body). Initially set to ARGUMENTS, but can be reassigned by code in
    7.10 +     * the function body.*/
    7.11 +    ARGUMENTS_VAR("arguments", Object.class),
    7.12 +
    7.13 +    /** the internal arguments object, when necessary (not visible to scripts, can't be reassigned). */
    7.14 +    ARGUMENTS(":arguments", ScriptObject.class),
    7.15  
    7.16      /** prefix for iterators for for (x in ...) */
    7.17      ITERATOR_PREFIX(":i", Iterator.class),

     8.1 --- a/src/jdk/nashorn/internal/ir/IdentNode.java	Thu Sep 12 11:09:22 2013 -0700
     8.2 +++ b/src/jdk/nashorn/internal/ir/IdentNode.java	Tue Sep 17 08:21:42 2013 -0700
     8.3 @@ -168,6 +168,7 @@
     8.4       *     return 3;
     8.5       *   }
     8.6       * }
     8.7 +     * </pre>
     8.8       *
     8.9       * @return true if can have callsite type
    8.10       */

     9.1 --- a/src/jdk/nashorn/internal/ir/debug/JSONWriter.java	Thu Sep 12 11:09:22 2013 -0700
     9.2 +++ b/src/jdk/nashorn/internal/ir/debug/JSONWriter.java	Tue Sep 17 08:21:42 2013 -0700
     9.3 @@ -27,6 +27,7 @@
     9.4  
     9.5  import java.util.Arrays;
     9.6  import java.util.List;
     9.7 +import java.util.ArrayList;
     9.8  import jdk.nashorn.internal.codegen.CompilerConstants;
     9.9  import jdk.nashorn.internal.ir.AccessNode;
    9.10  import jdk.nashorn.internal.ir.BinaryNode;
    9.11 @@ -197,10 +198,10 @@
    9.12          comma();
    9.13  
    9.14          final IdentNode label = breakNode.getLabel();
    9.15 +        property("label");
    9.16          if (label != null) {
    9.17 -            property("label", label.getName());
    9.18 +            label.accept(this);
    9.19          } else {
    9.20 -            property("label");
    9.21              nullValue();
    9.22          }
    9.23  
    9.24 @@ -256,13 +257,11 @@
    9.25          comma();
    9.26  
    9.27          final Node guard = catchNode.getExceptionCondition();
    9.28 -        property("guard");
    9.29          if (guard != null) {
    9.30 +            property("guard");
    9.31              guard.accept(this);
    9.32 -        } else {
    9.33 -            nullValue();
    9.34 +            comma();
    9.35          }
    9.36 -        comma();
    9.37  
    9.38          property("body");
    9.39          catchNode.getBody().accept(this);
    9.40 @@ -278,10 +277,10 @@
    9.41          comma();
    9.42  
    9.43          final IdentNode label = continueNode.getLabel();
    9.44 +        property("label");
    9.45          if (label != null) {
    9.46 -            property("label", label.getName());
    9.47 +            label.accept(this);
    9.48          } else {
    9.49 -            property("label");
    9.50              nullValue();
    9.51          }
    9.52  
    9.53 @@ -299,13 +298,20 @@
    9.54  
    9.55      @Override
    9.56      public boolean enterExpressionStatement(final ExpressionStatement expressionStatement) {
    9.57 +        // handle debugger statement
    9.58 +        final Node expression = expressionStatement.getExpression();
    9.59 +        if (expression instanceof RuntimeNode) {
    9.60 +            expression.accept(this);
    9.61 +            return false;
    9.62 +        }
    9.63 +
    9.64          enterDefault(expressionStatement);
    9.65  
    9.66          type("ExpressionStatement");
    9.67          comma();
    9.68  
    9.69          property("expression");
    9.70 -        expressionStatement.getExpression().accept(this);
    9.71 +        expression.accept(this);
    9.72  
    9.73          return leave();
    9.74      }
    9.75 @@ -388,13 +394,14 @@
    9.76  
    9.77      @Override
    9.78      public boolean enterFunctionNode(final FunctionNode functionNode) {
    9.79 +        final boolean program = functionNode.isProgram();
    9.80 +        if (program) {
    9.81 +            return emitProgram(functionNode);
    9.82 +        }
    9.83 +
    9.84          enterDefault(functionNode);
    9.85 -
    9.86 -        final boolean program = functionNode.isProgram();
    9.87          final String name;
    9.88 -        if (program) {
    9.89 -            name = "Program";
    9.90 -        } else if (functionNode.isDeclared()) {
    9.91 +        if (functionNode.isDeclared()) {
    9.92              name = "FunctionDeclaration";
    9.93          } else {
    9.94              name = "FunctionExpression";
    9.95 @@ -402,24 +409,41 @@
    9.96          type(name);
    9.97          comma();
    9.98  
    9.99 -        if (! program) {
   9.100 -            property("id");
   9.101 -            if (functionNode.isAnonymous()) {
   9.102 -                nullValue();
   9.103 -            } else {
   9.104 -                functionNode.getIdent().accept(this);
   9.105 -            }
   9.106 -            comma();
   9.107 +        property("id");
   9.108 +        if (functionNode.isAnonymous()) {
   9.109 +            nullValue();
   9.110 +        } else {
   9.111 +            functionNode.getIdent().accept(this);
   9.112          }
   9.113 +        comma();
   9.114 +
   9.115 +        array("params", functionNode.getParameters());
   9.116 +        comma();
   9.117 +
   9.118 +        arrayStart("defaults");
   9.119 +        arrayEnd();
   9.120 +        comma();
   9.121  
   9.122          property("rest");
   9.123          nullValue();
   9.124          comma();
   9.125  
   9.126 -        if (!program) {
   9.127 -            array("params", functionNode.getParameters());
   9.128 -            comma();
   9.129 -        }
   9.130 +        property("body");
   9.131 +        functionNode.getBody().accept(this);
   9.132 +        comma();
   9.133 +
   9.134 +        property("generator", false);
   9.135 +        comma();
   9.136 +
   9.137 +        property("expression", false);
   9.138 +
   9.139 +        return leave();
   9.140 +    }
   9.141 +
   9.142 +    private boolean emitProgram(final FunctionNode functionNode) {
   9.143 +        enterDefault(functionNode);
   9.144 +        type("Program");
   9.145 +        comma();
   9.146  
   9.147          // body consists of nested functions and statements
   9.148          final List<Statement> stats = functionNode.getBody().getStatements();
   9.149 @@ -730,7 +754,31 @@
   9.150          tryNode.getBody().accept(this);
   9.151          comma();
   9.152  
   9.153 -        array("handlers", tryNode.getCatches());
   9.154 +
   9.155 +        final List<? extends Node> catches = tryNode.getCatches();
   9.156 +        final List<CatchNode> guarded = new ArrayList<>();
   9.157 +        CatchNode unguarded = null;
   9.158 +        if (catches != null) {
   9.159 +            for (Node n : catches) {
   9.160 +                CatchNode cn = (CatchNode)n;
   9.161 +                if (cn.getExceptionCondition() != null) {
   9.162 +                    guarded.add(cn);
   9.163 +                } else {
   9.164 +                    assert unguarded == null: "too many unguarded?";
   9.165 +                    unguarded = cn;
   9.166 +                }
   9.167 +            }
   9.168 +        }
   9.169 +
   9.170 +        array("guardedHandlers", guarded);
   9.171 +        comma();
   9.172 +
   9.173 +        property("handler");
   9.174 +        if (unguarded != null) {
   9.175 +            unguarded.accept(this);
   9.176 +        } else {
   9.177 +            nullValue();
   9.178 +        }
   9.179          comma();
   9.180  
   9.181          property("finalizer");
   9.182 @@ -760,8 +808,8 @@
   9.183  
   9.184              array("arguments", callNode.getArgs());
   9.185          } else {
   9.186 +            final String operator;
   9.187              final boolean prefix;
   9.188 -            final String operator;
   9.189              switch (tokenType) {
   9.190              case INCPOSTFIX:
   9.191                  prefix = false;
   9.192 @@ -780,8 +828,9 @@
   9.193                  prefix = true;
   9.194                  break;
   9.195              default:
   9.196 -                prefix = false;
   9.197 +                prefix = true;
   9.198                  operator = tokenType.getName();
   9.199 +                break;
   9.200              }
   9.201  
   9.202              type(unaryNode.isAssignment()? "UpdateExpression" : "UnaryExpression");
   9.203 @@ -802,6 +851,14 @@
   9.204  
   9.205      @Override
   9.206      public boolean enterVarNode(final VarNode varNode) {
   9.207 +        final Node init = varNode.getInit();
   9.208 +        if (init instanceof FunctionNode && ((FunctionNode)init).isDeclared()) {
   9.209 +            // function declaration - don't emit VariableDeclaration instead
   9.210 +            // just emit FunctionDeclaration using 'init' Node.
   9.211 +            init.accept(this);
   9.212 +            return false;
   9.213 +        }
   9.214 +
   9.215          enterDefault(varNode);
   9.216  
   9.217          type("VariableDeclaration");
   9.218 @@ -816,11 +873,11 @@
   9.219          type("VariableDeclarator");
   9.220          comma();
   9.221  
   9.222 -        property("id", varNode.getName().toString());
   9.223 +        property("id");
   9.224 +        varNode.getName().accept(this);
   9.225          comma();
   9.226  
   9.227          property("init");
   9.228 -        final Node init = varNode.getInit();
   9.229          if (init != null) {
   9.230              init.accept(this);
   9.231          } else {
   9.232 @@ -855,7 +912,7 @@
   9.233              whileNode.getTest().accept(this);
   9.234              comma();
   9.235  
   9.236 -            property("block");
   9.237 +            property("body");
   9.238              whileNode.getBody().accept(this);
   9.239          }
   9.240  
   9.241 @@ -894,23 +951,27 @@
   9.242          return buf.toString();
   9.243      }
   9.244  
   9.245 -    private void property(final String key, final String value) {
   9.246 +    private void property(final String key, final String value, final boolean escape) {
   9.247          buf.append('"');
   9.248          buf.append(key);
   9.249          buf.append("\":");
   9.250          if (value != null) {
   9.251 -            buf.append('"');
   9.252 +            if (escape) buf.append('"');
   9.253              buf.append(value);
   9.254 -            buf.append('"');
   9.255 +            if (escape) buf.append('"');
   9.256          }
   9.257      }
   9.258  
   9.259 +    private void property(final String key, final String value) {
   9.260 +        property(key, value, true);
   9.261 +    }
   9.262 +
   9.263      private void property(final String key, final boolean value) {
   9.264 -        property(key, Boolean.toString(value));
   9.265 +        property(key, Boolean.toString(value), false);
   9.266      }
   9.267  
   9.268      private void property(final String key, final int value) {
   9.269 -        property(key, Integer.toString(value));
   9.270 +        property(key, Integer.toString(value), false);
   9.271      }
   9.272  
   9.273      private void property(final String key) {

    10.1 --- a/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java	Thu Sep 12 11:09:22 2013 -0700
    10.2 +++ b/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java	Tue Sep 17 08:21:42 2013 -0700
    10.3 @@ -565,7 +565,7 @@
    10.4  
    10.5          @Override
    10.6          public MethodHandle asSpreader(final MethodHandle handle, final Class<?> arrayType, final int arrayLength) {
    10.7 -            final MethodHandle mh = super.asCollector(handle, arrayType, arrayLength);
    10.8 +            final MethodHandle mh = super.asSpreader(handle, arrayType, arrayLength);
    10.9              return debug(mh, "asSpreader", handle, arrayType, arrayLength);
   10.10          }
   10.11  

    11.1 --- a/src/jdk/nashorn/internal/objects/Global.java	Thu Sep 12 11:09:22 2013 -0700
    11.2 +++ b/src/jdk/nashorn/internal/objects/Global.java	Tue Sep 17 08:21:42 2013 -0700
    11.3 @@ -412,6 +412,14 @@
    11.4      // initialized by nasgen
    11.5      private static PropertyMap $nasgenmap$;
    11.6  
    11.7 +    // context to which this global belongs to
    11.8 +    private final Context context;
    11.9 +
   11.10 +    @Override
   11.11 +    protected Context getContext() {
   11.12 +        return context;
   11.13 +    }
   11.14 +
   11.15      // performs initialization checks for Global constructor and returns the
   11.16      // PropertyMap, if everything is fine.
   11.17      private static PropertyMap checkAndGetMap(final Context context) {
   11.18 @@ -439,7 +447,7 @@
   11.19       */
   11.20      public Global(final Context context) {
   11.21          super(checkAndGetMap(context));
   11.22 -        this.setContext(context);
   11.23 +        this.context = context;
   11.24          this.setIsScope();
   11.25  
   11.26          final int cacheSize = context.getEnv()._class_cache_size;
   11.27 @@ -482,6 +490,16 @@
   11.28      // GlobalObject interface implementation
   11.29  
   11.30      @Override
   11.31 +    public boolean isOfContext(final Context context) {
   11.32 +        return this.context == context;
   11.33 +    }
   11.34 +
   11.35 +    @Override
   11.36 +    public boolean isStrictContext() {
   11.37 +        return context.getEnv()._strict;
   11.38 +    }
   11.39 +
   11.40 +    @Override
   11.41      public void initBuiltinObjects() {
   11.42          if (this.builtinObject != null) {
   11.43              // already initialized, just return
   11.44 @@ -1765,7 +1783,7 @@
   11.45              // do not fill $ENV if we have a security manager around
   11.46              // Retrieve current state of ENV variables.
   11.47              final ScriptObject env = newObject();
   11.48 -            env.putAll(System.getenv());
   11.49 +            env.putAll(System.getenv(), scriptEnv._strict);
   11.50              addOwnProperty(ScriptingFunctions.ENV_NAME, Attribute.NOT_ENUMERABLE, env);
   11.51          } else {
   11.52              addOwnProperty(ScriptingFunctions.ENV_NAME, Attribute.NOT_ENUMERABLE, UNDEFINED);

    12.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Thu Sep 12 11:09:22 2013 -0700
    12.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Tue Sep 17 08:21:42 2013 -0700
    12.3 @@ -41,7 +41,7 @@
    12.4  import java.util.List;
    12.5  import java.util.concurrent.Callable;
    12.6  
    12.7 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
    12.8 +import jdk.nashorn.api.scripting.JSObject;
    12.9  import jdk.nashorn.internal.objects.annotations.Attribute;
   12.10  import jdk.nashorn.internal.objects.annotations.Constructor;
   12.11  import jdk.nashorn.internal.objects.annotations.Function;
   12.12 @@ -374,7 +374,7 @@
   12.13      public static Object isArray(final Object self, final Object arg) {
   12.14          return isArray(arg) || (arg == Global.instance().getArrayPrototype())
   12.15                  || (arg instanceof NativeRegExpExecResult)
   12.16 -                || (arg instanceof ScriptObjectMirror && ((ScriptObjectMirror)arg).isArray());
   12.17 +                || (arg instanceof JSObject && ((JSObject)arg).isArray());
   12.18      }
   12.19  
   12.20      /**

    13.1 --- a/src/jdk/nashorn/internal/objects/NativeFunction.java	Thu Sep 12 11:09:22 2013 -0700
    13.2 +++ b/src/jdk/nashorn/internal/objects/NativeFunction.java	Tue Sep 17 08:21:42 2013 -0700
    13.3 @@ -30,7 +30,7 @@
    13.4  
    13.5  import java.util.List;
    13.6  
    13.7 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
    13.8 +import jdk.nashorn.api.scripting.JSObject;
    13.9  import jdk.nashorn.internal.objects.annotations.Attribute;
   13.10  import jdk.nashorn.internal.objects.annotations.Constructor;
   13.11  import jdk.nashorn.internal.objects.annotations.Function;
   13.12 @@ -88,7 +88,7 @@
   13.13       */
   13.14      @Function(attributes = Attribute.NOT_ENUMERABLE)
   13.15      public static Object apply(final Object self, final Object thiz, final Object array) {
   13.16 -        if (!(self instanceof ScriptFunction)) {
   13.17 +        if (!(self instanceof ScriptFunction) && !(self instanceof JSObject)) {
   13.18              throw typeError("not.a.function", ScriptRuntime.safeToString(self));
   13.19          }
   13.20  
   13.21 @@ -111,21 +111,27 @@
   13.22              list.toArray(args = new Object[list.size()]);
   13.23          } else if (array == null || array == UNDEFINED) {
   13.24              args = ScriptRuntime.EMPTY_ARRAY;
   13.25 -        } else if (array instanceof ScriptObjectMirror) {
   13.26 -            // look for array-like ScriptObjectMirror object
   13.27 -            final ScriptObjectMirror mirror = (ScriptObjectMirror)array;
   13.28 -            final Object       len  = mirror.containsKey("length")? mirror.getMember("length") : Integer.valueOf(0);
   13.29 +        } else if (array instanceof JSObject) {
   13.30 +            // look for array-like JSObject object
   13.31 +            final JSObject jsObj = (JSObject)array;
   13.32 +            final Object       len  = jsObj.hasMember("length")? jsObj.getMember("length") : Integer.valueOf(0);
   13.33              final int n = (int)JSType.toUint32(len);
   13.34  
   13.35              args = new Object[n];
   13.36              for (int i = 0; i < args.length; i++) {
   13.37 -                args[i] = mirror.containsKey(i)? mirror.getSlot(i) : UNDEFINED;
   13.38 +                args[i] = jsObj.hasSlot(i)? jsObj.getSlot(i) : UNDEFINED;
   13.39              }
   13.40          } else {
   13.41              throw typeError("function.apply.expects.array");
   13.42          }
   13.43  
   13.44 -        return ScriptRuntime.apply((ScriptFunction)self, thiz, args);
   13.45 +        if (self instanceof ScriptFunction) {
   13.46 +            return ScriptRuntime.apply((ScriptFunction)self, thiz, args);
   13.47 +        } else if (self instanceof JSObject) {
   13.48 +            return ((JSObject)self).call(thiz, args);
   13.49 +        }
   13.50 +
   13.51 +        throw new AssertionError("should not reach here");
   13.52      }
   13.53  
   13.54      /**
   13.55 @@ -137,7 +143,7 @@
   13.56       */
   13.57      @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
   13.58      public static Object call(final Object self, final Object... args) {
   13.59 -        if (!(self instanceof ScriptFunction)) {
   13.60 +        if (!(self instanceof ScriptFunction) && !(self instanceof JSObject)) {
   13.61              throw typeError("not.a.function", ScriptRuntime.safeToString(self));
   13.62          }
   13.63  
   13.64 @@ -151,7 +157,13 @@
   13.65              arguments = ScriptRuntime.EMPTY_ARRAY;
   13.66          }
   13.67  
   13.68 -        return ScriptRuntime.apply((ScriptFunction)self, thiz, arguments);
   13.69 +        if (self instanceof ScriptFunction) {
   13.70 +            return ScriptRuntime.apply((ScriptFunction)self, thiz, arguments);
   13.71 +        } else if (self instanceof JSObject) {
   13.72 +            return ((JSObject)self).call(thiz, arguments);
   13.73 +        }
   13.74 +
   13.75 +        throw new AssertionError("should not reach here");
   13.76      }
   13.77  
   13.78      /**

    14.1 --- a/src/jdk/nashorn/internal/objects/NativeJava.java	Thu Sep 12 11:09:22 2013 -0700
    14.2 +++ b/src/jdk/nashorn/internal/objects/NativeJava.java	Tue Sep 17 08:21:42 2013 -0700
    14.3 @@ -34,6 +34,7 @@
    14.4  import java.util.List;
    14.5  import jdk.internal.dynalink.beans.StaticClass;
    14.6  import jdk.internal.dynalink.support.TypeUtilities;
    14.7 +import jdk.nashorn.api.scripting.JSObject;
    14.8  import jdk.nashorn.internal.objects.annotations.Attribute;
    14.9  import jdk.nashorn.internal.objects.annotations.Function;
   14.10  import jdk.nashorn.internal.objects.annotations.ScriptClass;
   14.11 @@ -43,6 +44,7 @@
   14.12  import jdk.nashorn.internal.runtime.ListAdapter;
   14.13  import jdk.nashorn.internal.runtime.PropertyMap;
   14.14  import jdk.nashorn.internal.runtime.ScriptObject;
   14.15 +import jdk.nashorn.internal.runtime.ScriptRuntime;
   14.16  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   14.17  import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
   14.18  
   14.19 @@ -288,7 +290,9 @@
   14.20              return null;
   14.21          }
   14.22  
   14.23 -        Global.checkObject(obj);
   14.24 +        if (!(obj instanceof ScriptObject) && !(obj instanceof JSObject)) {
   14.25 +            throw typeError("not.an.object", ScriptRuntime.safeToString(obj));
   14.26 +        }
   14.27  
   14.28          final Class<?> targetClass;
   14.29          if(objType == UNDEFINED) {
   14.30 @@ -304,11 +308,11 @@
   14.31          }
   14.32  
   14.33          if(targetClass.isArray()) {
   14.34 -            return ((ScriptObject)obj).getArray().asArrayOfType(targetClass.getComponentType());
   14.35 +            return JSType.toJavaArray(obj, targetClass.getComponentType());
   14.36          }
   14.37  
   14.38          if(targetClass == List.class || targetClass == Deque.class) {
   14.39 -            return new ListAdapter((ScriptObject)obj);
   14.40 +            return ListAdapter.create(obj);
   14.41          }
   14.42  
   14.43          throw typeError("unsupported.java.to.type", targetClass.getName());

    15.1 --- a/src/jdk/nashorn/internal/parser/Parser.java	Thu Sep 12 11:09:22 2013 -0700
    15.2 +++ b/src/jdk/nashorn/internal/parser/Parser.java	Tue Sep 17 08:21:42 2013 -0700
    15.3 @@ -25,7 +25,6 @@
    15.4  
    15.5  package jdk.nashorn.internal.parser;
    15.6  
    15.7 -import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
    15.8  import static jdk.nashorn.internal.codegen.CompilerConstants.EVAL;
    15.9  import static jdk.nashorn.internal.codegen.CompilerConstants.FUNCTION_PREFIX;
   15.10  import static jdk.nashorn.internal.codegen.CompilerConstants.RUN_SCRIPT;
   15.11 @@ -115,6 +114,8 @@
   15.12   * Builds the IR.
   15.13   */
   15.14  public class Parser extends AbstractParser {
   15.15 +    private static final String ARGUMENTS_NAME = CompilerConstants.ARGUMENTS_VAR.symbolName();
   15.16 +
   15.17      /** Current script environment. */
   15.18      private final ScriptEnvironment env;
   15.19  
   15.20 @@ -511,13 +512,19 @@
   15.21       * @param ident Referenced property.
   15.22       */
   15.23      private void detectSpecialProperty(final IdentNode ident) {
   15.24 -        final String name = ident.getName();
   15.25 -
   15.26 -        if (ARGUMENTS.symbolName().equals(name)) {
   15.27 +        if (isArguments(ident)) {
   15.28              lc.setFlag(lc.getCurrentFunction(), FunctionNode.USES_ARGUMENTS);
   15.29          }
   15.30      }
   15.31  
   15.32 +    private static boolean isArguments(final String name) {
   15.33 +        return ARGUMENTS_NAME.equals(name);
   15.34 +    }
   15.35 +
   15.36 +    private static boolean isArguments(final IdentNode ident) {
   15.37 +        return isArguments(ident.getName());
   15.38 +    }
   15.39 +
   15.40      /**
   15.41       * Tells whether a IdentNode can be used as L-value of an assignment
   15.42       *
   15.43 @@ -2060,7 +2067,7 @@
   15.44          case FLOATING:
   15.45              return getLiteral();
   15.46          default:
   15.47 -            return getIdentifierName();
   15.48 +            return getIdentifierName().setIsPropertyName();
   15.49          }
   15.50      }
   15.51  
   15.52 @@ -2449,7 +2456,7 @@
   15.53              } else if (env._function_statement == ScriptEnvironment.FunctionStatementBehavior.WARNING) {
   15.54                  warning(JSErrorType.SYNTAX_ERROR, AbstractParser.message("no.func.decl.here.warn"), functionToken);
   15.55              }
   15.56 -            if (ARGUMENTS.symbolName().equals(name.getName())) {
   15.57 +            if (isArguments(name)) {
   15.58                  lc.setFlag(lc.getCurrentFunction(), FunctionNode.DEFINES_ARGUMENTS);
   15.59              }
   15.60          }
   15.61 @@ -2468,7 +2475,7 @@
   15.62                  final IdentNode parameter = parameters.get(i);
   15.63                  String parameterName = parameter.getName();
   15.64  
   15.65 -                if (ARGUMENTS.symbolName().equals(parameterName)) {
   15.66 +                if (isArguments(parameterName)) {
   15.67                      functionNode = functionNode.setFlag(lc, FunctionNode.DEFINES_ARGUMENTS);
   15.68                  }
   15.69  
   15.70 @@ -2486,7 +2493,7 @@
   15.71                  parametersSet.add(parameterName);
   15.72              }
   15.73          } else if (arity == 1) {
   15.74 -            if (ARGUMENTS.symbolName().equals(parameters.get(0).getName())) {
   15.75 +            if (isArguments(parameters.get(0))) {
   15.76                  functionNode = functionNode.setFlag(lc, FunctionNode.DEFINES_ARGUMENTS);
   15.77              }
   15.78          }

    16.1 --- a/src/jdk/nashorn/internal/runtime/Context.java	Thu Sep 12 11:09:22 2013 -0700
    16.2 +++ b/src/jdk/nashorn/internal/runtime/Context.java	Tue Sep 17 08:21:42 2013 -0700
    16.3 @@ -236,6 +236,10 @@
    16.4      private static final ClassLoader myLoader = Context.class.getClassLoader();
    16.5      private static final StructureLoader sharedLoader;
    16.6  
    16.7 +    /*package-private*/ ClassLoader getSharedLoader() {
    16.8 +        return sharedLoader;
    16.9 +    }
   16.10 +
   16.11      private static AccessControlContext createNoPermAccCtxt() {
   16.12          return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, new Permissions()) });
   16.13      }
   16.14 @@ -254,7 +258,7 @@
   16.15          sharedLoader = AccessController.doPrivileged(new PrivilegedAction<StructureLoader>() {
   16.16              @Override
   16.17              public StructureLoader run() {
   16.18 -                return new StructureLoader(myLoader, null);
   16.19 +                return new StructureLoader(myLoader);
   16.20              }
   16.21          }, CREATE_LOADER_ACC_CTXT);
   16.22      }
   16.23 @@ -573,7 +577,7 @@
   16.24          setGlobalTrusted(newGlobal);
   16.25  
   16.26          final Object[] wrapped = args == null? ScriptRuntime.EMPTY_ARRAY :  ScriptObjectMirror.wrapArray(args, oldGlobal);
   16.27 -        newGlobal.put("arguments", ((GlobalObject)newGlobal).wrapAsObject(wrapped));
   16.28 +        newGlobal.put("arguments", ((GlobalObject)newGlobal).wrapAsObject(wrapped), env._strict);
   16.29  
   16.30          try {
   16.31              // wrap objects from newGlobal's world as mirrors - but if result
   16.32 @@ -599,7 +603,7 @@
   16.33       * @throws ClassNotFoundException if structure class cannot be resolved
   16.34       */
   16.35      public static Class<?> forStructureClass(final String fullName) throws ClassNotFoundException {
   16.36 -        if (System.getSecurityManager() != null && !NashornLoader.isStructureClass(fullName)) {
   16.37 +        if (System.getSecurityManager() != null && !StructureLoader.isStructureClass(fullName)) {
   16.38              throw new ClassNotFoundException(fullName);
   16.39          }
   16.40          return Class.forName(fullName, true, sharedLoader);
   16.41 @@ -792,12 +796,11 @@
   16.42      static Context fromClass(final Class<?> clazz) {
   16.43          final ClassLoader loader = clazz.getClassLoader();
   16.44  
   16.45 -        Context context = null;
   16.46 -        if (loader instanceof NashornLoader) {
   16.47 -            context = ((NashornLoader)loader).getContext();
   16.48 +        if (loader instanceof ScriptLoader) {
   16.49 +            return ((ScriptLoader)loader).getContext();
   16.50          }
   16.51  
   16.52 -        return (context != null) ? context : Context.getContextTrusted();
   16.53 +        return Context.getContextTrusted();
   16.54      }
   16.55  
   16.56      private Object evaluateSource(final Source source, final ScriptObject scope, final ScriptObject thiz) {
   16.57 @@ -899,7 +902,7 @@
   16.58               new PrivilegedAction<ScriptLoader>() {
   16.59                  @Override
   16.60                  public ScriptLoader run() {
   16.61 -                    return new ScriptLoader(sharedLoader, Context.this);
   16.62 +                    return new ScriptLoader(appLoader, Context.this);
   16.63                  }
   16.64               }, CREATE_LOADER_ACC_CTXT);
   16.65      }

    17.1 --- a/src/jdk/nashorn/internal/runtime/ECMAErrors.java	Thu Sep 12 11:09:22 2013 -0700
    17.2 +++ b/src/jdk/nashorn/internal/runtime/ECMAErrors.java	Tue Sep 17 08:21:42 2013 -0700
    17.3 @@ -28,7 +28,6 @@
    17.4  import java.text.MessageFormat;
    17.5  import java.util.Locale;
    17.6  import java.util.ResourceBundle;
    17.7 -
    17.8  import jdk.nashorn.api.scripting.NashornException;
    17.9  import jdk.nashorn.internal.scripts.JS;
   17.10  

    18.1 --- a/src/jdk/nashorn/internal/runtime/GlobalObject.java	Thu Sep 12 11:09:22 2013 -0700
    18.2 +++ b/src/jdk/nashorn/internal/runtime/GlobalObject.java	Tue Sep 17 08:21:42 2013 -0700
    18.3 @@ -37,6 +37,18 @@
    18.4  
    18.5  public interface GlobalObject {
    18.6      /**
    18.7 +     * Is this global of the given Context?
    18.8 +     * @return true if this global belongs to the given Context
    18.9 +     */
   18.10 +    public boolean isOfContext(Context context);
   18.11 +
   18.12 +    /**
   18.13 +     * Does this global belong to a strict Context?
   18.14 +     * @return true if this global belongs to a strict Context
   18.15 +     */
   18.16 +    public boolean isStrictContext();
   18.17 +
   18.18 +    /**
   18.19       * Initialize standard builtin objects like "Object", "Array", "Function" etc.
   18.20       * as well as our extension builtin objects like "Java", "JSAdapter" as properties
   18.21       * of the global scope object.

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java	Tue Sep 17 08:21:42 2013 -0700
    19.3 @@ -0,0 +1,56 @@
    19.4 +/*
    19.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    19.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.7 + *
    19.8 + * This code is free software; you can redistribute it and/or modify it
    19.9 + * under the terms of the GNU General Public License version 2 only, as
   19.10 + * published by the Free Software Foundation.  Oracle designates this
   19.11 + * particular file as subject to the "Classpath" exception as provided
   19.12 + * by Oracle in the LICENSE file that accompanied this code.
   19.13 + *
   19.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   19.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   19.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   19.17 + * version 2 for more details (a copy is included in the LICENSE file that
   19.18 + * accompanied this code).
   19.19 + *
   19.20 + * You should have received a copy of the GNU General Public License version
   19.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   19.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   19.23 + *
   19.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.25 + * or visit www.oracle.com if you need additional information or have any
   19.26 + * questions.
   19.27 + */
   19.28 +
   19.29 +package jdk.nashorn.internal.runtime;
   19.30 +
   19.31 +import jdk.nashorn.api.scripting.JSObject;
   19.32 +
   19.33 +/**
   19.34 + * A ListAdapter that can wraps a JSObject.
   19.35 + */
   19.36 +public final class JSObjectListAdapter extends ListAdapter {
   19.37 +    /**
   19.38 +     * Creates a new list wrapper for the specified JSObject.
   19.39 +     * @param obj JSOcript the object to wrap
   19.40 +     */
   19.41 +    public JSObjectListAdapter(final JSObject obj) {
   19.42 +        super(obj);
   19.43 +    }
   19.44 +
   19.45 +    @Override
   19.46 +    public int size() {
   19.47 +        return JSType.toInt32(((JSObject)obj).getMember("length"));
   19.48 +    }
   19.49 +
   19.50 +    @Override
   19.51 +    protected Object getAt(int index) {
   19.52 +        return ((JSObject)obj).getSlot(index);
   19.53 +    }
   19.54 +
   19.55 +    @Override
   19.56 +    protected void setAt(int index, Object element) {
   19.57 +        ((JSObject)obj).setSlot(index, element);
   19.58 +    }
   19.59 +}

    20.1 --- a/src/jdk/nashorn/internal/runtime/JSType.java	Thu Sep 12 11:09:22 2013 -0700
    20.2 +++ b/src/jdk/nashorn/internal/runtime/JSType.java	Tue Sep 17 08:21:42 2013 -0700
    20.3 @@ -28,11 +28,14 @@
    20.4  import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
    20.5  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
    20.6  
    20.7 +import java.lang.invoke.MethodHandle;
    20.8  import java.lang.invoke.MethodHandles;
    20.9 -import java.util.Locale;
   20.10 +import java.lang.reflect.Array;
   20.11  import jdk.internal.dynalink.beans.StaticClass;
   20.12 +import jdk.nashorn.api.scripting.JSObject;
   20.13  import jdk.nashorn.internal.codegen.CompilerConstants.Call;
   20.14  import jdk.nashorn.internal.parser.Lexer;
   20.15 +import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
   20.16  import jdk.nashorn.internal.runtime.linker.Bootstrap;
   20.17  
   20.18  /**
   20.19 @@ -40,25 +43,28 @@
   20.20   */
   20.21  public enum JSType {
   20.22      /** The undefined type */
   20.23 -    UNDEFINED,
   20.24 +    UNDEFINED("undefined"),
   20.25  
   20.26      /** The null type */
   20.27 -    NULL,
   20.28 +    NULL("object"),
   20.29  
   20.30      /** The boolean type */
   20.31 -    BOOLEAN,
   20.32 +    BOOLEAN("boolean"),
   20.33  
   20.34      /** The number type */
   20.35 -    NUMBER,
   20.36 +    NUMBER("number"),
   20.37  
   20.38      /** The string type */
   20.39 -    STRING,
   20.40 +    STRING("string"),
   20.41  
   20.42      /** The object type */
   20.43 -    OBJECT,
   20.44 +    OBJECT("object"),
   20.45  
   20.46      /** The function type */
   20.47 -    FUNCTION;
   20.48 +    FUNCTION("function");
   20.49 +
   20.50 +    /** The type name as returned by ECMAScript "typeof" operator*/
   20.51 +    private final String typeName;
   20.52  
   20.53      /** Max value for an uint32 in JavaScript */
   20.54      public static final long MAX_UINT = 0xFFFF_FFFFL;
   20.55 @@ -110,13 +116,21 @@
   20.56      private static final double INT32_LIMIT = 4294967296.0;
   20.57  
   20.58      /**
   20.59 +     * Constructor
   20.60 +     *
   20.61 +     * @param typeName the type name
   20.62 +     */
   20.63 +    private JSType(final String typeName) {
   20.64 +        this.typeName = typeName;
   20.65 +    }
   20.66 +
   20.67 +    /**
   20.68       * The external type name as returned by ECMAScript "typeof" operator
   20.69       *
   20.70       * @return type name for this type
   20.71       */
   20.72      public final String typeName() {
   20.73 -        // For NULL, "object" has to be returned!
   20.74 -        return ((this == NULL) ? OBJECT : this).name().toLowerCase(Locale.ENGLISH);
   20.75 +        return this.typeName;
   20.76      }
   20.77  
   20.78      /**
   20.79 @@ -127,31 +141,32 @@
   20.80       * @return the JSType for the object
   20.81       */
   20.82      public static JSType of(final Object obj) {
   20.83 -        if (obj == ScriptRuntime.UNDEFINED) {
   20.84 -            return JSType.UNDEFINED;
   20.85 +        // Order of these statements is tuned for performance (see JDK-8024476)
   20.86 +        if (obj == null) {
   20.87 +            return JSType.NULL;
   20.88          }
   20.89  
   20.90 -        if (obj == null) {
   20.91 -            return JSType.NULL;
   20.92 +        if (obj instanceof ScriptObject) {
   20.93 +            return (obj instanceof ScriptFunction) ? JSType.FUNCTION : JSType.OBJECT;
   20.94          }
   20.95  
   20.96          if (obj instanceof Boolean) {
   20.97              return JSType.BOOLEAN;
   20.98          }
   20.99  
  20.100 +        if (obj instanceof String || obj instanceof ConsString) {
  20.101 +            return JSType.STRING;
  20.102 +        }
  20.103 +
  20.104          if (obj instanceof Number) {
  20.105              return JSType.NUMBER;
  20.106          }
  20.107  
  20.108 -        if (obj instanceof String || obj instanceof ConsString) {
  20.109 -            return JSType.STRING;
  20.110 +        if (obj == ScriptRuntime.UNDEFINED) {
  20.111 +            return JSType.UNDEFINED;
  20.112          }
  20.113  
  20.114 -        if (Bootstrap.isCallable(obj)) {
  20.115 -            return JSType.FUNCTION;
  20.116 -        }
  20.117 -
  20.118 -        return JSType.OBJECT;
  20.119 +        return Bootstrap.isCallable(obj) ? JSType.FUNCTION : JSType.OBJECT;
  20.120      }
  20.121  
  20.122      /**
  20.123 @@ -849,6 +864,53 @@
  20.124      }
  20.125  
  20.126      /**
  20.127 +     * Script object to Java array conversion.
  20.128 +     *
  20.129 +     * @param obj script object to be converted to Java array
  20.130 +     * @param componentType component type of the destination array required
  20.131 +     * @return converted Java array
  20.132 +     */
  20.133 +    public static Object toJavaArray(final Object obj, final Class<?> componentType) {
  20.134 +        if (obj instanceof ScriptObject) {
  20.135 +            return convertArray(((ScriptObject)obj).getArray().asObjectArray(), componentType);
  20.136 +        } else if (obj instanceof JSObject) {
  20.137 +            final ArrayLikeIterator itr = ArrayLikeIterator.arrayLikeIterator(obj);
  20.138 +            final int len = (int) itr.getLength();
  20.139 +            final Object[] res = new Object[len];
  20.140 +            int idx = 0;
  20.141 +            while (itr.hasNext()) {
  20.142 +                res[idx++] = itr.next();
  20.143 +            }
  20.144 +            return convertArray(res, componentType);
  20.145 +        } else {
  20.146 +            throw new IllegalArgumentException("not a script object");
  20.147 +        }
  20.148 +    }
  20.149 +
  20.150 +    /**
  20.151 +     * Java array to java array conversion - but using type conversions implemented by linker.
  20.152 +     *
  20.153 +     * @param src source array
  20.154 +     * @param componentType component type of the destination array required
  20.155 +     * @return converted Java array
  20.156 +     */
  20.157 +    public static Object convertArray(final Object[] src, final Class<?> componentType) {
  20.158 +        final int l = src.length;
  20.159 +        final Object dst = Array.newInstance(componentType, l);
  20.160 +        final MethodHandle converter = Bootstrap.getLinkerServices().getTypeConverter(Object.class, componentType);
  20.161 +        try {
  20.162 +            for (int i = 0; i < src.length; i++) {
  20.163 +                Array.set(dst, i, invoke(converter, src[i]));
  20.164 +            }
  20.165 +        } catch (final RuntimeException | Error e) {
  20.166 +            throw e;
  20.167 +        } catch (final Throwable t) {
  20.168 +            throw new RuntimeException(t);
  20.169 +        }
  20.170 +        return dst;
  20.171 +    }
  20.172 +
  20.173 +    /**
  20.174       * Check if an object is null or undefined
  20.175       *
  20.176       * @param obj object to check
  20.177 @@ -953,4 +1015,13 @@
  20.178          return Double.NaN;
  20.179      }
  20.180  
  20.181 +    private static Object invoke(final MethodHandle mh, final Object arg) {
  20.182 +        try {
  20.183 +            return mh.invoke(arg);
  20.184 +        } catch (final RuntimeException | Error e) {
  20.185 +            throw e;
  20.186 +        } catch (final Throwable t) {
  20.187 +            throw new RuntimeException(t);
  20.188 +        }
  20.189 +    }
  20.190  }

    21.1 --- a/src/jdk/nashorn/internal/runtime/ListAdapter.java	Thu Sep 12 11:09:22 2013 -0700
    21.2 +++ b/src/jdk/nashorn/internal/runtime/ListAdapter.java	Tue Sep 17 08:21:42 2013 -0700
    21.3 @@ -32,6 +32,7 @@
    21.4  import java.util.NoSuchElementException;
    21.5  import java.util.RandomAccess;
    21.6  import java.util.concurrent.Callable;
    21.7 +import jdk.nashorn.api.scripting.JSObject;
    21.8  import jdk.nashorn.internal.runtime.linker.Bootstrap;
    21.9  import jdk.nashorn.internal.runtime.linker.InvokeByName;
   21.10  
   21.11 @@ -48,7 +49,7 @@
   21.12   * operations respectively, while {@link #addLast(Object)} and {@link #removeLast()} will translate to {@code push} and
   21.13   * {@code pop}.
   21.14   */
   21.15 -public final class ListAdapter extends AbstractList<Object> implements RandomAccess, Deque<Object> {
   21.16 +public abstract class ListAdapter extends AbstractList<Object> implements RandomAccess, Deque<Object> {
   21.17      // These add to the back and front of the list
   21.18      private static final Object PUSH    = new Object();
   21.19      private static InvokeByName getPUSH() {
   21.20 @@ -56,7 +57,7 @@
   21.21                  new Callable<InvokeByName>() {
   21.22                      @Override
   21.23                      public InvokeByName call() {
   21.24 -                        return new InvokeByName("push", ScriptObject.class, void.class, Object.class);
   21.25 +                        return new InvokeByName("push", Object.class, void.class, Object.class);
   21.26                      }
   21.27                  });
   21.28      }
   21.29 @@ -67,7 +68,7 @@
   21.30                  new Callable<InvokeByName>() {
   21.31                      @Override
   21.32                      public InvokeByName call() {
   21.33 -                        return new InvokeByName("unshift", ScriptObject.class, void.class, Object.class);
   21.34 +                        return new InvokeByName("unshift", Object.class, void.class, Object.class);
   21.35                      }
   21.36                  });
   21.37      }
   21.38 @@ -79,7 +80,7 @@
   21.39                  new Callable<InvokeByName>() {
   21.40                      @Override
   21.41                      public InvokeByName call() {
   21.42 -                        return new InvokeByName("pop", ScriptObject.class, Object.class);
   21.43 +                        return new InvokeByName("pop", Object.class, Object.class);
   21.44                      }
   21.45                  });
   21.46      }
   21.47 @@ -90,7 +91,7 @@
   21.48                  new Callable<InvokeByName>() {
   21.49                      @Override
   21.50                      public InvokeByName call() {
   21.51 -                        return new InvokeByName("shift", ScriptObject.class, Object.class);
   21.52 +                        return new InvokeByName("shift", Object.class, Object.class);
   21.53                      }
   21.54                  });
   21.55      }
   21.56 @@ -102,7 +103,7 @@
   21.57                  new Callable<InvokeByName>() {
   21.58                      @Override
   21.59                      public InvokeByName call() {
   21.60 -                        return new InvokeByName("splice", ScriptObject.class, void.class, int.class, int.class, Object.class);
   21.61 +                        return new InvokeByName("splice", Object.class, void.class, int.class, int.class, Object.class);
   21.62                      }
   21.63                  });
   21.64      }
   21.65 @@ -113,40 +114,52 @@
   21.66                  new Callable<InvokeByName>() {
   21.67                      @Override
   21.68                      public InvokeByName call() {
   21.69 -                        return new InvokeByName("splice", ScriptObject.class, void.class, int.class, int.class);
   21.70 +                        return new InvokeByName("splice", Object.class, void.class, int.class, int.class);
   21.71                      }
   21.72                  });
   21.73      }
   21.74  
   21.75 -    private final ScriptObject obj;
   21.76 +    protected final Object obj;
   21.77  
   21.78 -    /**
   21.79 -     * Creates a new list wrapper for the specified script object.
   21.80 -     * @param obj script the object to wrap
   21.81 -     */
   21.82 -    public ListAdapter(ScriptObject obj) {
   21.83 +    // allow subclasses only in this package
   21.84 +    ListAdapter(Object obj) {
   21.85          this.obj = obj;
   21.86      }
   21.87  
   21.88 -    @Override
   21.89 -    public int size() {
   21.90 -        return JSType.toInt32(obj.getLength());
   21.91 +    /**
   21.92 +     * Factory to create a ListAdapter for a given script object.
   21.93 +     *
   21.94 +     * @param obj script object to wrap as a ListAdapter
   21.95 +     * @return A ListAdapter wrapper object
   21.96 +     */
   21.97 +    public static ListAdapter create(final Object obj) {
   21.98 +        if (obj instanceof ScriptObject) {
   21.99 +            return new ScriptObjectListAdapter((ScriptObject)obj);
  21.100 +        } else if (obj instanceof JSObject) {
  21.101 +            return new JSObjectListAdapter((JSObject)obj);
  21.102 +        } else {
  21.103 +            throw new IllegalArgumentException("ScriptObject or JSObject expected");
  21.104 +        }
  21.105      }
  21.106  
  21.107      @Override
  21.108 -    public Object get(int index) {
  21.109 +    public final Object get(int index) {
  21.110          checkRange(index);
  21.111 -        return obj.get(index);
  21.112 +        return getAt(index);
  21.113      }
  21.114  
  21.115 +    protected abstract Object getAt(final int index);
  21.116 +
  21.117      @Override
  21.118      public Object set(int index, Object element) {
  21.119          checkRange(index);
  21.120 -        final Object prevValue = get(index);
  21.121 -        obj.set(index, element, false);
  21.122 +        final Object prevValue = getAt(index);
  21.123 +        setAt(index, element);
  21.124          return prevValue;
  21.125      }
  21.126  
  21.127 +    protected abstract void setAt(int index, Object element);
  21.128 +
  21.129      private void checkRange(int index) {
  21.130          if(index < 0 || index >= size()) {
  21.131              throw invalidIndex(index);
  21.132 @@ -154,18 +167,18 @@
  21.133      }
  21.134  
  21.135      @Override
  21.136 -    public void push(Object e) {
  21.137 +    public final void push(Object e) {
  21.138          addFirst(e);
  21.139      }
  21.140  
  21.141      @Override
  21.142 -    public boolean add(Object e) {
  21.143 +    public final boolean add(Object e) {
  21.144          addLast(e);
  21.145          return true;
  21.146      }
  21.147  
  21.148      @Override
  21.149 -    public void addFirst(Object e) {
  21.150 +    public final void addFirst(Object e) {
  21.151          try {
  21.152              final InvokeByName unshiftInvoker = getUNSHIFT();
  21.153              final Object fn = unshiftInvoker.getGetter().invokeExact(obj);
  21.154 @@ -179,7 +192,7 @@
  21.155      }
  21.156  
  21.157      @Override
  21.158 -    public void addLast(Object e) {
  21.159 +    public final void addLast(Object e) {
  21.160          try {
  21.161              final InvokeByName pushInvoker = getPUSH();
  21.162              final Object fn = pushInvoker.getGetter().invokeExact(obj);
  21.163 @@ -193,7 +206,7 @@
  21.164      }
  21.165  
  21.166      @Override
  21.167 -    public void add(int index, Object e) {
  21.168 +    public final void add(int index, Object e) {
  21.169          try {
  21.170              if(index < 0) {
  21.171                  throw invalidIndex(index);
  21.172 @@ -229,40 +242,40 @@
  21.173      }
  21.174  
  21.175      @Override
  21.176 -    public boolean offer(Object e) {
  21.177 +    public final boolean offer(Object e) {
  21.178          return offerLast(e);
  21.179      }
  21.180  
  21.181      @Override
  21.182 -    public boolean offerFirst(Object e) {
  21.183 +    public final boolean offerFirst(Object e) {
  21.184          addFirst(e);
  21.185          return true;
  21.186      }
  21.187  
  21.188      @Override
  21.189 -    public boolean offerLast(Object e) {
  21.190 +    public final boolean offerLast(Object e) {
  21.191          addLast(e);
  21.192          return true;
  21.193      }
  21.194  
  21.195      @Override
  21.196 -    public Object pop() {
  21.197 +    public final Object pop() {
  21.198          return removeFirst();
  21.199      }
  21.200  
  21.201      @Override
  21.202 -    public Object remove() {
  21.203 +    public final Object remove() {
  21.204          return removeFirst();
  21.205      }
  21.206  
  21.207      @Override
  21.208 -    public Object removeFirst() {
  21.209 +    public final Object removeFirst() {
  21.210          checkNonEmpty();
  21.211          return invokeShift();
  21.212      }
  21.213  
  21.214      @Override
  21.215 -    public Object removeLast() {
  21.216 +    public final Object removeLast() {
  21.217          checkNonEmpty();
  21.218          return invokePop();
  21.219      }
  21.220 @@ -274,7 +287,7 @@
  21.221      }
  21.222  
  21.223      @Override
  21.224 -    public Object remove(int index) {
  21.225 +    public final Object remove(int index) {
  21.226          if(index < 0) {
  21.227              throw invalidIndex(index);
  21.228          } else if (index == 0) {
  21.229 @@ -320,7 +333,7 @@
  21.230      }
  21.231  
  21.232      @Override
  21.233 -    protected void removeRange(int fromIndex, int toIndex) {
  21.234 +    protected final void removeRange(int fromIndex, int toIndex) {
  21.235          invokeSpliceRemove(fromIndex, toIndex - fromIndex);
  21.236      }
  21.237  
  21.238 @@ -338,54 +351,54 @@
  21.239      }
  21.240  
  21.241      @Override
  21.242 -    public Object poll() {
  21.243 +    public final Object poll() {
  21.244          return pollFirst();
  21.245      }
  21.246  
  21.247      @Override
  21.248 -    public Object pollFirst() {
  21.249 +    public final Object pollFirst() {
  21.250          return isEmpty() ? null : invokeShift();
  21.251      }
  21.252  
  21.253      @Override
  21.254 -    public Object pollLast() {
  21.255 +    public final Object pollLast() {
  21.256          return isEmpty() ? null : invokePop();
  21.257      }
  21.258  
  21.259      @Override
  21.260 -    public Object peek() {
  21.261 +    public final Object peek() {
  21.262          return peekFirst();
  21.263      }
  21.264  
  21.265      @Override
  21.266 -    public Object peekFirst() {
  21.267 +    public final Object peekFirst() {
  21.268          return isEmpty() ? null : get(0);
  21.269      }
  21.270  
  21.271      @Override
  21.272 -    public Object peekLast() {
  21.273 +    public final Object peekLast() {
  21.274          return isEmpty() ? null : get(size() - 1);
  21.275      }
  21.276  
  21.277      @Override
  21.278 -    public Object element() {
  21.279 +    public final Object element() {
  21.280          return getFirst();
  21.281      }
  21.282  
  21.283      @Override
  21.284 -    public Object getFirst() {
  21.285 +    public final Object getFirst() {
  21.286          checkNonEmpty();
  21.287          return get(0);
  21.288      }
  21.289  
  21.290      @Override
  21.291 -    public Object getLast() {
  21.292 +    public final Object getLast() {
  21.293          checkNonEmpty();
  21.294          return get(size() - 1);
  21.295      }
  21.296  
  21.297      @Override
  21.298 -    public Iterator<Object> descendingIterator() {
  21.299 +    public final Iterator<Object> descendingIterator() {
  21.300          final ListIterator<Object> it = listIterator(size());
  21.301          return new Iterator<Object>() {
  21.302              @Override
  21.303 @@ -406,12 +419,12 @@
  21.304      }
  21.305  
  21.306      @Override
  21.307 -    public boolean removeFirstOccurrence(Object o) {
  21.308 +    public final boolean removeFirstOccurrence(Object o) {
  21.309          return removeOccurrence(o, iterator());
  21.310      }
  21.311  
  21.312      @Override
  21.313 -    public boolean removeLastOccurrence(Object o) {
  21.314 +    public final boolean removeLastOccurrence(Object o) {
  21.315          return removeOccurrence(o, descendingIterator());
  21.316      }
  21.317  

    22.1 --- a/src/jdk/nashorn/internal/runtime/NashornLoader.java	Thu Sep 12 11:09:22 2013 -0700
    22.2 +++ b/src/jdk/nashorn/internal/runtime/NashornLoader.java	Tue Sep 17 08:21:42 2013 -0700
    22.3 @@ -38,10 +38,7 @@
    22.4  import jdk.nashorn.tools.Shell;
    22.5  
    22.6  /**
    22.7 - * Superclass for Nashorn class loader classes. This stores Context
    22.8 - * instance as an instance field. The current context can be
    22.9 - * efficiently accessed from a given Class via it's ClassLoader.
   22.10 - *
   22.11 + * Superclass for Nashorn class loader classes.
   22.12   */
   22.13  abstract class NashornLoader extends SecureClassLoader {
   22.14      private static final String OBJECTS_PKG        = "jdk.nashorn.internal.objects";
   22.15 @@ -69,27 +66,8 @@
   22.16          };
   22.17      }
   22.18  
   22.19 -    private final Context context;
   22.20 -
   22.21 -    final Context getContext() {
   22.22 -        return context;
   22.23 -    }
   22.24 -
   22.25 -    NashornLoader(final ClassLoader parent, final Context context) {
   22.26 +    NashornLoader(final ClassLoader parent) {
   22.27          super(parent);
   22.28 -        this.context = context;
   22.29 -    }
   22.30 -
   22.31 -
   22.32 -    /**
   22.33 -     * Called by subclass after package access check is done
   22.34 -     * @param name name of the class to be loaded
   22.35 -     * @param resolve whether the class should be resolved or not
   22.36 -     * @return Class object
   22.37 -     * @throws ClassNotFoundException if class cannot be loaded
   22.38 -     */
   22.39 -    protected final Class<?> loadClassTrusted(final String name, final boolean resolve) throws ClassNotFoundException {
   22.40 -        return super.loadClass(name, resolve);
   22.41      }
   22.42  
   22.43      protected static void checkPackageAccess(final String name) {
   22.44 @@ -122,10 +100,6 @@
   22.45          return permCollection;
   22.46      }
   22.47  
   22.48 -    static boolean isStructureClass(final String fullName) {
   22.49 -        return fullName.startsWith(SCRIPTS_PKG);
   22.50 -    }
   22.51 -
   22.52      /**
   22.53       * Create a secure URL class loader for the given classpath
   22.54       * @param classPath classpath for the loader to search from

    23.1 --- a/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java	Thu Sep 12 11:09:22 2013 -0700
    23.2 +++ b/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java	Tue Sep 17 08:21:42 2013 -0700
    23.3 @@ -198,7 +198,7 @@
    23.4          final String propertyName = desc.getNameToken(2);
    23.5          final String fullName     = name.isEmpty() ? propertyName : name + "." + propertyName;
    23.6  
    23.7 -        final Context context = getContext();
    23.8 +        final Context context = Context.getContextTrusted();
    23.9  
   23.10          Class<?> javaClass = null;
   23.11          try {

    24.1 --- a/src/jdk/nashorn/internal/runtime/ScriptLoader.java	Thu Sep 12 11:09:22 2013 -0700
    24.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptLoader.java	Tue Sep 17 08:21:42 2013 -0700
    24.3 @@ -33,17 +33,42 @@
    24.4   *
    24.5   */
    24.6  final class ScriptLoader extends NashornLoader {
    24.7 +    private static final String NASHORN_PKG_PREFIX = "jdk.nashorn.internal.";
    24.8 +
    24.9 +    private final Context context;
   24.10 +
   24.11 +    /*package-private*/ Context getContext() {
   24.12 +        return context;
   24.13 +    }
   24.14 +
   24.15      /**
   24.16       * Constructor.
   24.17       */
   24.18 -    ScriptLoader(final StructureLoader parent, final Context context) {
   24.19 -        super(parent, context);
   24.20 +    ScriptLoader(final ClassLoader parent, final Context context) {
   24.21 +        super(parent);
   24.22 +        this.context = context;
   24.23      }
   24.24  
   24.25      @Override
   24.26      protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
   24.27          checkPackageAccess(name);
   24.28 -        return super.loadClassTrusted(name, resolve);
   24.29 +        try {
   24.30 +            return super.loadClass(name, resolve);
   24.31 +        } catch (final ClassNotFoundException | SecurityException e) {
   24.32 +            // We'll get ClassNotFoundException for Nashorn 'struct' classes.
   24.33 +            // Also, we'll get SecurityException for jdk.nashorn.internal.*
   24.34 +            // classes. So, load these using to context's 'shared' loader.
   24.35 +            // All these classes start with "jdk.nashorn.internal." prefix.
   24.36 +            try {
   24.37 +                if (name.startsWith(NASHORN_PKG_PREFIX)) {
   24.38 +                    return context.getSharedLoader().loadClass(name);
   24.39 +                }
   24.40 +            } catch (final ClassNotFoundException ignored) {
   24.41 +            }
   24.42 +
   24.43 +            // throw the original exception from here
   24.44 +            throw e;
   24.45 +        }
   24.46      }
   24.47  
   24.48      // package-private and private stuff below this point

    25.1 --- a/src/jdk/nashorn/internal/runtime/ScriptObject.java	Thu Sep 12 11:09:22 2013 -0700
    25.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java	Tue Sep 17 08:21:42 2013 -0700
    25.3 @@ -87,6 +87,8 @@
    25.4   */
    25.5  
    25.6  public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess {
    25.7 +    /** __proto__ special property name */
    25.8 +    public static final String PROTO_PROPERTY_NAME   = "__proto__";
    25.9  
   25.10      /** Search fall back routine name for "no such method" */
   25.11      static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
   25.12 @@ -118,9 +120,6 @@
   25.13      /** objects proto. */
   25.14      private ScriptObject proto;
   25.15  
   25.16 -    /** Context of the object, lazily cached. */
   25.17 -    private Context context;
   25.18 -
   25.19      /** Object flags. */
   25.20      private int flags;
   25.21  
   25.22 @@ -130,6 +129,9 @@
   25.23      /** Indexed array data. */
   25.24      private ArrayData arrayData;
   25.25  
   25.26 +    static final MethodHandle GETPROTO           = findOwnMH("getProto", ScriptObject.class);
   25.27 +    static final MethodHandle SETPROTOCHECK      = findOwnMH("setProtoCheck", void.class, Object.class);
   25.28 +
   25.29      static final MethodHandle SETFIELD           = findOwnMH("setField",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, MethodHandle.class, Object.class, Object.class);
   25.30      static final MethodHandle SETSPILL           = findOwnMH("setSpill",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
   25.31      static final MethodHandle SETSPILLWITHNEW    = findOwnMH("setSpillWithNew",  void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
   25.32 @@ -150,6 +152,9 @@
   25.33      /** Method handle for setting the proto of a ScriptObject */
   25.34      public static final Call SET_PROTO          = virtualCallNoLookup(ScriptObject.class, "setProto", void.class, ScriptObject.class);
   25.35  
   25.36 +    /** Method handle for setting the proto of a ScriptObject after checking argument */
   25.37 +    public static final Call SET_PROTO_CHECK    = virtualCallNoLookup(ScriptObject.class, "setProtoCheck", void.class, Object.class);
   25.38 +
   25.39      /** Method handle for setting the user accessors of a ScriptObject */
   25.40      public static final Call SET_USER_ACCESSORS = virtualCall(MethodHandles.lookup(), ScriptObject.class, "setUserAccessors", void.class, String.class, ScriptFunction.class, ScriptFunction.class);
   25.41  
   25.42 @@ -1035,40 +1040,11 @@
   25.43      }
   25.44  
   25.45      /**
   25.46 -     * Return true if the script object context is strict
   25.47 -     * @return true if strict context
   25.48 -     */
   25.49 -    public final boolean isStrictContext() {
   25.50 -        return getContext()._strict;
   25.51 -    }
   25.52 -
   25.53 -    /**
   25.54 -     * Checks if this object belongs to the given context
   25.55 -     * @param ctx context to check against
   25.56 -     * @return true if this object belongs to the given context
   25.57 -     */
   25.58 -    public final boolean isOfContext(final Context ctx) {
   25.59 -        return context == ctx;
   25.60 -    }
   25.61 -
   25.62 -    /**
   25.63       * Return the current context from the object's map.
   25.64       * @return Current context.
   25.65       */
   25.66 -    protected final Context getContext() {
   25.67 -        if (context == null) {
   25.68 -            context = Context.fromClass(getClass());
   25.69 -        }
   25.70 -        return context;
   25.71 -    }
   25.72 -
   25.73 -    /**
   25.74 -     * Set the current context.
   25.75 -     * @param ctx context instance to set
   25.76 -     */
   25.77 -    protected final void setContext(final Context ctx) {
   25.78 -        ctx.getClass();
   25.79 -        this.context = ctx;
   25.80 +    protected Context getContext() {
   25.81 +        return Context.fromClass(getClass());
   25.82      }
   25.83  
   25.84      /**
   25.85 @@ -1474,9 +1450,10 @@
   25.86      /**
   25.87       * Clears the properties from a ScriptObject
   25.88       * (java.util.Map-like method to help ScriptObjectMirror implementation)
   25.89 +     *
   25.90 +     * @param strict strict mode or not
   25.91       */
   25.92 -    public void clear() {
   25.93 -        final boolean strict = isStrictContext();
   25.94 +    public void clear(final boolean strict) {
   25.95          final Iterator<String> iter = propertyIterator();
   25.96          while (iter.hasNext()) {
   25.97              delete(iter.next(), strict);
   25.98 @@ -1560,11 +1537,12 @@
   25.99       *
  25.100       * @param key property key
  25.101       * @param value property value
  25.102 +     * @param strict strict mode or not
  25.103       * @return oldValue if property with same key existed already
  25.104       */
  25.105 -    public Object put(final Object key, final Object value) {
  25.106 +    public Object put(final Object key, final Object value, final boolean strict) {
  25.107          final Object oldValue = get(key);
  25.108 -        set(key, value, isStrictContext());
  25.109 +        set(key, value, strict);
  25.110          return oldValue;
  25.111      }
  25.112  
  25.113 @@ -1574,9 +1552,9 @@
  25.114       * (java.util.Map-like method to help ScriptObjectMirror implementation)
  25.115       *
  25.116       * @param otherMap a {@literal <key,value>} map of properties to add
  25.117 +     * @param strict strict mode or not
  25.118       */
  25.119 -    public void putAll(final Map<?, ?> otherMap) {
  25.120 -        final boolean strict = isStrictContext();
  25.121 +    public void putAll(final Map<?, ?> otherMap, final boolean strict) {
  25.122          for (final Map.Entry<?, ?> entry : otherMap.entrySet()) {
  25.123              set(entry.getKey(), entry.getValue(), strict);
  25.124          }
  25.125 @@ -1587,26 +1565,16 @@
  25.126       * (java.util.Map-like method to help ScriptObjectMirror implementation)
  25.127       *
  25.128       * @param key the key of the property
  25.129 +     * @param strict strict mode or not
  25.130       * @return the oldValue of the removed property
  25.131       */
  25.132 -    public Object remove(final Object key) {
  25.133 +    public Object remove(final Object key, final boolean strict) {
  25.134          final Object oldValue = get(key);
  25.135 -        delete(key, isStrictContext());
  25.136 +        delete(key, strict);
  25.137          return oldValue;
  25.138      }
  25.139  
  25.140      /**
  25.141 -     * Delete a property from the ScriptObject.
  25.142 -     * (to help ScriptObjectMirror implementation)
  25.143 -     *
  25.144 -     * @param key the key of the property
  25.145 -     * @return if the delete was successful or not
  25.146 -     */
  25.147 -    public boolean delete(final Object key) {
  25.148 -        return delete(key, isStrictContext());
  25.149 -    }
  25.150 -
  25.151 -    /**
  25.152       * Return the size of the ScriptObject - i.e. the number of properties
  25.153       * it contains
  25.154       * (java.util.Map-like method to help ScriptObjectMirror implementation)
  25.155 @@ -1745,6 +1713,10 @@
  25.156          MethodHandle methodHandle;
  25.157  
  25.158          if (find == null) {
  25.159 +            if (PROTO_PROPERTY_NAME.equals(name)) {
  25.160 +                return new GuardedInvocation(GETPROTO, NashornGuards.getScriptObjectGuard());
  25.161 +            }
  25.162 +
  25.163              if ("getProp".equals(operator)) {
  25.164                  return noSuchProperty(desc, request);
  25.165              } else if ("getMethod".equals(operator)) {
  25.166 @@ -1851,6 +1823,7 @@
  25.167           * toString = function() { print("global toString"); } // don't affect Object.prototype.toString
  25.168           */
  25.169          FindProperty find = findProperty(name, true, scope, this);
  25.170 +
  25.171          // If it's not a scope search, then we don't want any inherited properties except those with user defined accessors.
  25.172          if (!scope && find != null && find.isInherited() && !(find.getProperty() instanceof UserAccessorProperty)) {
  25.173              // We should still check if inherited data property is not writable
  25.174 @@ -1866,9 +1839,12 @@
  25.175                  // Existing, non-writable property
  25.176                  return createEmptySetMethod(desc, "property.not.writable", true);
  25.177              }
  25.178 -        } else if (!isExtensible()) {
  25.179 -            // Non-existing property on a non-extensible object
  25.180 -            return createEmptySetMethod(desc, "object.non.extensible", false);
  25.181 +        } else {
  25.182 +            if (PROTO_PROPERTY_NAME.equals(name)) {
  25.183 +                return new GuardedInvocation(SETPROTOCHECK, NashornGuards.getScriptObjectGuard());
  25.184 +            } else if (! isExtensible()) {
  25.185 +                return createEmptySetMethod(desc, "object.non.extensible", false);
  25.186 +            }
  25.187          }
  25.188  
  25.189          return new SetMethodCreator(this, find, desc).createGuardedInvocation();
  25.190 @@ -2317,11 +2293,9 @@
  25.191             return;
  25.192         }
  25.193  
  25.194 -       final boolean isStrict = isStrictContext();
  25.195 -
  25.196         if (newLength > arrayLength) {
  25.197             setArray(getArray().ensure(newLength - 1));
  25.198 -            if (getArray().canDelete(arrayLength, (newLength - 1), isStrict)) {
  25.199 +            if (getArray().canDelete(arrayLength, (newLength - 1), false)) {
  25.200                 setArray(getArray().delete(arrayLength, (newLength - 1)));
  25.201             }
  25.202             return;

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptObjectListAdapter.java	Tue Sep 17 08:21:42 2013 -0700
    26.3 @@ -0,0 +1,54 @@
    26.4 +/*
    26.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    26.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.7 + *
    26.8 + * This code is free software; you can redistribute it and/or modify it
    26.9 + * under the terms of the GNU General Public License version 2 only, as
   26.10 + * published by the Free Software Foundation.  Oracle designates this
   26.11 + * particular file as subject to the "Classpath" exception as provided
   26.12 + * by Oracle in the LICENSE file that accompanied this code.
   26.13 + *
   26.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   26.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   26.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   26.17 + * version 2 for more details (a copy is included in the LICENSE file that
   26.18 + * accompanied this code).
   26.19 + *
   26.20 + * You should have received a copy of the GNU General Public License version
   26.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   26.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   26.23 + *
   26.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   26.25 + * or visit www.oracle.com if you need additional information or have any
   26.26 + * questions.
   26.27 + */
   26.28 +
   26.29 +package jdk.nashorn.internal.runtime;
   26.30 +
   26.31 +/**
   26.32 + * A ListAdapter that can wrap a ScriptObject.
   26.33 + */
   26.34 +public final class ScriptObjectListAdapter extends ListAdapter {
   26.35 +    /**
   26.36 +     * Creates a new list wrapper for the specified ScriptObject.
   26.37 +     * @param obj script the object to wrap
   26.38 +     */
   26.39 +    public ScriptObjectListAdapter(final ScriptObject obj) {
   26.40 +        super(obj);
   26.41 +    }
   26.42 +
   26.43 +    @Override
   26.44 +    public int size() {
   26.45 +        return JSType.toInt32(((ScriptObject)obj).getLength());
   26.46 +    }
   26.47 +
   26.48 +    @Override
   26.49 +    protected Object getAt(int index) {
   26.50 +        return ((ScriptObject)obj).get(index);
   26.51 +    }
   26.52 +
   26.53 +    @Override
   26.54 +    protected void setAt(int index, Object element) {
   26.55 +        ((ScriptObject)obj).set(index, element, false);
   26.56 +    }
   26.57 +}

    27.1 --- a/src/jdk/nashorn/internal/runtime/ScriptRuntime.java	Thu Sep 12 11:09:22 2013 -0700
    27.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptRuntime.java	Tue Sep 17 08:21:42 2013 -0700
    27.3 @@ -43,6 +43,7 @@
    27.4  import java.util.NoSuchElementException;
    27.5  import java.util.Objects;
    27.6  import jdk.internal.dynalink.beans.StaticClass;
    27.7 +import jdk.nashorn.api.scripting.JSObject;
    27.8  import jdk.nashorn.api.scripting.ScriptObjectMirror;
    27.9  import jdk.nashorn.internal.codegen.CompilerConstants.Call;
   27.10  import jdk.nashorn.internal.ir.debug.JSONWriter;
   27.11 @@ -190,8 +191,8 @@
   27.12          case FUNCTION:
   27.13              if (self instanceof ScriptObject) {
   27.14                  className = ((ScriptObject)self).getClassName();
   27.15 -            } else if (self instanceof ScriptObjectMirror) {
   27.16 -                className = ((ScriptObjectMirror)self).getClassName();
   27.17 +            } else if (self instanceof JSObject) {
   27.18 +                className = ((JSObject)self).getClassName();
   27.19              } else {
   27.20                  className = self.getClass().getName();
   27.21              }
   27.22 @@ -245,8 +246,8 @@
   27.23              return new RangeIterator(Array.getLength(obj));
   27.24          }
   27.25  
   27.26 -        if (obj instanceof ScriptObjectMirror) {
   27.27 -            return ((ScriptObjectMirror)obj).keySet().iterator();
   27.28 +        if (obj instanceof JSObject) {
   27.29 +            return ((JSObject)obj).keySet().iterator();
   27.30          }
   27.31  
   27.32          if (obj instanceof List) {
   27.33 @@ -323,8 +324,8 @@
   27.34              };
   27.35          }
   27.36  
   27.37 -        if (obj instanceof ScriptObjectMirror) {
   27.38 -            return ((ScriptObjectMirror)obj).values().iterator();
   27.39 +        if (obj instanceof JSObject) {
   27.40 +            return ((JSObject)obj).values().iterator();
   27.41          }
   27.42  
   27.43          if (obj instanceof Map) {
   27.44 @@ -352,35 +353,6 @@
   27.45      }
   27.46  
   27.47      /**
   27.48 -     * Check that the target function is associated with current Context. And also make sure that 'self', if
   27.49 -     * ScriptObject, is from current context.
   27.50 -     *
   27.51 -     * Call a function given self and args. If the number of the arguments is known in advance, you can likely achieve
   27.52 -     * better performance by {@link Bootstrap#createDynamicInvoker(String, Class, Class...) creating a dynamic invoker}
   27.53 -     * for operation {@code "dyn:call"}, then using its {@link MethodHandle#invokeExact(Object...)} method instead.
   27.54 -     *
   27.55 -     * @param target ScriptFunction object.
   27.56 -     * @param self   Receiver in call.
   27.57 -     * @param args   Call arguments.
   27.58 -     * @return Call result.
   27.59 -     */
   27.60 -    public static Object checkAndApply(final ScriptFunction target, final Object self, final Object... args) {
   27.61 -        final ScriptObject global = Context.getGlobalTrusted();
   27.62 -        assert (global instanceof GlobalObject): "No current global set";
   27.63 -
   27.64 -        if (target.getContext() != global.getContext()) {
   27.65 -            throw new IllegalArgumentException("'target' function is not from current Context");
   27.66 -        }
   27.67 -
   27.68 -        if (self instanceof ScriptObject && ((ScriptObject)self).getContext() != global.getContext()) {
   27.69 -            throw new IllegalArgumentException("'self' object is not from current Context");
   27.70 -        }
   27.71 -
   27.72 -        // all in order - call real 'apply'
   27.73 -        return apply(target, self, args);
   27.74 -    }
   27.75 -
   27.76 -    /**
   27.77       * Call a function given self and args. If the number of the arguments is known in advance, you can likely achieve
   27.78       * better performance by {@link Bootstrap#createDynamicInvoker(String, Class, Class...) creating a dynamic invoker}
   27.79       * for operation {@code "dyn:call"}, then using its {@link MethodHandle#invokeExact(Object...)} method instead.
   27.80 @@ -401,28 +373,6 @@
   27.81      }
   27.82  
   27.83      /**
   27.84 -     * Check that the target function is associated with current Context.
   27.85 -     * And also make sure that 'self', if ScriptObject, is from current context.
   27.86 -     *
   27.87 -     * Call a function as a constructor given args.
   27.88 -     *
   27.89 -     * @param target ScriptFunction object.
   27.90 -     * @param args   Call arguments.
   27.91 -     * @return Constructor call result.
   27.92 -     */
   27.93 -    public static Object checkAndConstruct(final ScriptFunction target, final Object... args) {
   27.94 -        final ScriptObject global = Context.getGlobalTrusted();
   27.95 -        assert (global instanceof GlobalObject): "No current global set";
   27.96 -
   27.97 -        if (target.getContext() != global.getContext()) {
   27.98 -            throw new IllegalArgumentException("'target' function is not from current Context");
   27.99 -        }
  27.100 -
  27.101 -        // all in order - call real 'construct'
  27.102 -        return construct(target, args);
  27.103 -    }
  27.104 -
  27.105 -    /**
  27.106       * Call a script function as a constructor with given args.
  27.107       *
  27.108       * @param target ScriptFunction object.
  27.109 @@ -520,9 +470,12 @@
  27.110              throw typeError(global, "cant.apply.with.to.null");
  27.111          }
  27.112  
  27.113 -        final ScriptObject withObject = new WithObject(scope, JSType.toScriptObject(global, expression));
  27.114 +        final Object wrappedExpr = JSType.toScriptObject(global, expression);
  27.115 +        if (wrappedExpr instanceof ScriptObject) {
  27.116 +            return new WithObject(scope, (ScriptObject)wrappedExpr);
  27.117 +        }
  27.118  
  27.119 -        return withObject;
  27.120 +        throw typeError(global, "cant.apply.with.to.non.scriptobject");
  27.121      }
  27.122  
  27.123      /**
  27.124 @@ -534,7 +487,7 @@
  27.125       */
  27.126      public static ScriptObject closeWith(final ScriptObject scope) {
  27.127          if (scope instanceof WithObject) {
  27.128 -            return scope.getProto();
  27.129 +            return ((WithObject)scope).getParentScope();
  27.130          }
  27.131          return scope;
  27.132      }
  27.133 @@ -619,8 +572,8 @@
  27.134                  throw typeError("cant.get.property", safeToString(property), "null");
  27.135              } else if (JSType.isPrimitive(obj)) {
  27.136                  obj = ((ScriptObject)JSType.toScriptObject(obj)).get(property);
  27.137 -            } else if (obj instanceof ScriptObjectMirror) {
  27.138 -                obj = ((ScriptObjectMirror)obj).getMember(property.toString());
  27.139 +            } else if (obj instanceof JSObject) {
  27.140 +                obj = ((JSObject)obj).getMember(property.toString());
  27.141              } else {
  27.142                  obj = UNDEFINED;
  27.143              }
  27.144 @@ -672,6 +625,11 @@
  27.145              return ((ScriptObject) JSType.toScriptObject(obj)).delete(property, Boolean.TRUE.equals(strict));
  27.146          }
  27.147  
  27.148 +        if (obj instanceof JSObject) {
  27.149 +            ((JSObject)obj).removeMember(Objects.toString(property));
  27.150 +            return true;
  27.151 +        }
  27.152 +
  27.153          // if object is not reference type, vacuously delete is successful.
  27.154          return true;
  27.155      }
  27.156 @@ -863,6 +821,10 @@
  27.157                  return ((ScriptObject)obj).has(property);
  27.158              }
  27.159  
  27.160 +            if (obj instanceof JSObject) {
  27.161 +                return ((JSObject)obj).hasMember(Objects.toString(property));
  27.162 +            }
  27.163 +
  27.164              return false;
  27.165          }
  27.166  
  27.167 @@ -889,11 +851,13 @@
  27.168              return ((StaticClass)clazz).getRepresentedClass().isInstance(obj);
  27.169          }
  27.170  
  27.171 -        if (clazz instanceof ScriptObjectMirror) {
  27.172 -            if (obj instanceof ScriptObjectMirror) {
  27.173 -                return ((ScriptObjectMirror)clazz).isInstance((ScriptObjectMirror)obj);
  27.174 -            }
  27.175 -            return false;
  27.176 +        if (clazz instanceof JSObject) {
  27.177 +            return ((JSObject)clazz).isInstance(obj);
  27.178 +        }
  27.179 +
  27.180 +        // provide for reverse hook
  27.181 +        if (obj instanceof JSObject) {
  27.182 +            return ((JSObject)obj).isInstanceOf(clazz);
  27.183          }
  27.184  
  27.185          throw typeError("instanceof.on.non.object");

    28.1 --- a/src/jdk/nashorn/internal/runtime/StructureLoader.java	Thu Sep 12 11:09:22 2013 -0700
    28.2 +++ b/src/jdk/nashorn/internal/runtime/StructureLoader.java	Tue Sep 17 08:21:42 2013 -0700
    28.3 @@ -34,7 +34,6 @@
    28.4  
    28.5  /**
    28.6   * Responsible for on the fly construction of structure classes.
    28.7 - *
    28.8   */
    28.9  final class StructureLoader extends NashornLoader {
   28.10      private static final String JS_OBJECT_PREFIX_EXTERNAL = binaryName(SCRIPTS_PACKAGE) + '.' + JS_OBJECT_PREFIX.symbolName();
   28.11 @@ -42,27 +41,17 @@
   28.12      /**
   28.13       * Constructor.
   28.14       */
   28.15 -    StructureLoader(final ClassLoader parent, final Context context) {
   28.16 -        super(parent, context);
   28.17 +    StructureLoader(final ClassLoader parent) {
   28.18 +        super(parent);
   28.19      }
   28.20  
   28.21 -    @Override
   28.22 -    protected synchronized Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
   28.23 -        // check the cache first
   28.24 -        final Class<?> loadedClass = findLoadedClass(name);
   28.25 -        if (loadedClass != null) {
   28.26 -            if (resolve) {
   28.27 -                resolveClass(loadedClass);
   28.28 -            }
   28.29 -            return loadedClass;
   28.30 -        }
   28.31 -
   28.32 -        return super.loadClassTrusted(name, resolve);
   28.33 +    static boolean isStructureClass(final String name) {
   28.34 +        return name.startsWith(JS_OBJECT_PREFIX_EXTERNAL);
   28.35      }
   28.36  
   28.37      @Override
   28.38      protected Class<?> findClass(final String name) throws ClassNotFoundException {
   28.39 -        if (name.startsWith(JS_OBJECT_PREFIX_EXTERNAL)) {
   28.40 +        if (isStructureClass(name)) {
   28.41              return generateClass(name, name.substring(JS_OBJECT_PREFIX_EXTERNAL.length()));
   28.42          }
   28.43          return super.findClass(name);
   28.44 @@ -75,11 +64,7 @@
   28.45       * @return Generated class.
   28.46       */
   28.47      private Class<?> generateClass(final String name, final String descriptor) {
   28.48 -        Context context = getContext();
   28.49 -
   28.50 -        if (context == null) {
   28.51 -            context = Context.getContextTrusted();
   28.52 -        }
   28.53 +        final Context context = Context.getContextTrusted();
   28.54  
   28.55          final byte[] code = new ObjectClassGenerator(context).generate(descriptor);
   28.56          return defineClass(name, code, 0, code.length, new ProtectionDomain(null, getPermissions(null)));

    29.1 --- a/src/jdk/nashorn/internal/runtime/WithObject.java	Thu Sep 12 11:09:22 2013 -0700
    29.2 +++ b/src/jdk/nashorn/internal/runtime/WithObject.java	Tue Sep 17 08:21:42 2013 -0700
    29.3 @@ -30,26 +30,26 @@
    29.4  import java.lang.invoke.MethodHandle;
    29.5  import java.lang.invoke.MethodHandles;
    29.6  import java.lang.invoke.MethodType;
    29.7 +import java.lang.invoke.SwitchPoint;
    29.8  import jdk.internal.dynalink.CallSiteDescriptor;
    29.9  import jdk.internal.dynalink.linker.GuardedInvocation;
   29.10  import jdk.internal.dynalink.linker.LinkRequest;
   29.11  import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
   29.12  import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
   29.13  
   29.14 -
   29.15  /**
   29.16   * This class supports the handling of scope in a with body.
   29.17   *
   29.18   */
   29.19  public final class WithObject extends ScriptObject implements Scope {
   29.20 -
   29.21 +    private static final MethodHandle WITHEXPRESSIONGUARD    = findOwnMH("withExpressionGuard",  boolean.class, Object.class, PropertyMap.class, SwitchPoint.class);
   29.22      private static final MethodHandle WITHEXPRESSIONFILTER   = findOwnMH("withFilterExpression", Object.class, Object.class);
   29.23      private static final MethodHandle WITHSCOPEFILTER        = findOwnMH("withFilterScope",      Object.class, Object.class);
   29.24      private static final MethodHandle BIND_TO_EXPRESSION_OBJ = findOwnMH("bindToExpression",     Object.class, Object.class, Object.class);
   29.25      private static final MethodHandle BIND_TO_EXPRESSION_FN  = findOwnMH("bindToExpression",     Object.class, ScriptFunction.class, Object.class);
   29.26  
   29.27      /** With expression object. */
   29.28 -    private final Object expression;
   29.29 +    private final ScriptObject expression;
   29.30  
   29.31      /**
   29.32       * Constructor
   29.33 @@ -57,12 +57,13 @@
   29.34       * @param scope scope object
   29.35       * @param expression with expression
   29.36       */
   29.37 -    WithObject(final ScriptObject scope, final Object expression) {
   29.38 +    WithObject(final ScriptObject scope, final ScriptObject expression) {
   29.39          super(scope, null);
   29.40          setIsScope();
   29.41          this.expression = expression;
   29.42      }
   29.43  
   29.44 +
   29.45      /**
   29.46       * Delete a property based on a key.
   29.47       * @param key Any valid JavaScript value.
   29.48 @@ -71,15 +72,13 @@
   29.49       */
   29.50      @Override
   29.51      public boolean delete(final Object key, final boolean strict) {
   29.52 -        if (expression instanceof ScriptObject) {
   29.53 -            final ScriptObject self = (ScriptObject)expression;
   29.54 -            final String propName = JSType.toString(key);
   29.55 +        final ScriptObject self = expression;
   29.56 +        final String propName = JSType.toString(key);
   29.57  
   29.58 -            final FindProperty find = self.findProperty(propName, true);
   29.59 +        final FindProperty find = self.findProperty(propName, true);
   29.60  
   29.61 -            if (find != null) {
   29.62 -                return self.delete(propName, strict);
   29.63 -            }
   29.64 +        if (find != null) {
   29.65 +            return self.delete(propName, strict);
   29.66          }
   29.67  
   29.68          return false;
   29.69 @@ -105,18 +104,16 @@
   29.70              name = null;
   29.71          }
   29.72  
   29.73 -        if (expression instanceof ScriptObject) {
   29.74 -            self = (ScriptObject)expression;
   29.75 -            if (isNamedOperation) {
   29.76 -                find = self.findProperty(name, true);
   29.77 -            }
   29.78 +        self = expression;
   29.79 +        if (isNamedOperation) {
   29.80 +             find = self.findProperty(name, true);
   29.81 +        }
   29.82  
   29.83 -            if (find != null) {
   29.84 -                link = self.lookup(desc, request);
   29.85 +        if (find != null) {
   29.86 +            link = self.lookup(desc, request);
   29.87  
   29.88 -                if (link != null) {
   29.89 -                    return fixExpressionCallSite(ndesc, link);
   29.90 -                }
   29.91 +            if (link != null) {
   29.92 +                return fixExpressionCallSite(ndesc, link);
   29.93              }
   29.94          }
   29.95  
   29.96 @@ -126,7 +123,7 @@
   29.97          }
   29.98  
   29.99          if (find != null) {
  29.100 -            return fixScopeCallSite(scope.lookup(desc, request));
  29.101 +            return fixScopeCallSite(scope.lookup(desc, request), name);
  29.102          }
  29.103  
  29.104          // the property is not found - now check for
  29.105 @@ -178,7 +175,7 @@
  29.106          link = scope.lookup(desc, request);
  29.107  
  29.108          if (link != null) {
  29.109 -            return fixScopeCallSite(link);
  29.110 +            return fixScopeCallSite(link, name);
  29.111          }
  29.112  
  29.113          return null;
  29.114 @@ -197,11 +194,9 @@
  29.115       */
  29.116      @Override
  29.117      FindProperty findProperty(final String key, final boolean deep, final boolean stopOnNonScope, final ScriptObject start) {
  29.118 -        if (expression instanceof ScriptObject) {
  29.119 -            final FindProperty exprProperty = ((ScriptObject)expression).findProperty(key, deep, stopOnNonScope, start);
  29.120 -            if(exprProperty != null) {
  29.121 -                return exprProperty;
  29.122 -            }
  29.123 +        final FindProperty exprProperty = expression.findProperty(key, deep, stopOnNonScope, start);
  29.124 +        if (exprProperty != null) {
  29.125 +             return exprProperty;
  29.126          }
  29.127          return super.findProperty(key, deep, stopOnNonScope, start);
  29.128      }
  29.129 @@ -220,16 +215,17 @@
  29.130       * Get first parent scope that is not an instance of WithObject.
  29.131       */
  29.132      private Scope getNonWithParent() {
  29.133 -        ScriptObject proto = getProto();
  29.134 +        ScriptObject proto = getParentScope();
  29.135  
  29.136          while (proto != null && proto instanceof WithObject) {
  29.137 -            proto = proto.getProto();
  29.138 +            proto = ((WithObject)proto).getParentScope();
  29.139          }
  29.140  
  29.141          assert proto instanceof Scope : "with scope without parent scope";
  29.142          return (Scope) proto;
  29.143      }
  29.144  
  29.145 +
  29.146      private static GuardedInvocation fixReceiverType(final GuardedInvocation link, final MethodHandle filter) {
  29.147          // The receiver may be an Object or a ScriptObject.
  29.148          final MethodType invType = link.getInvocation().type();
  29.149 @@ -256,9 +252,13 @@
  29.150                  filterGuard(link, WITHEXPRESSIONFILTER));
  29.151      }
  29.152  
  29.153 -    private static GuardedInvocation fixScopeCallSite(final GuardedInvocation link) {
  29.154 +    private GuardedInvocation fixScopeCallSite(final GuardedInvocation link, final String name) {
  29.155          final GuardedInvocation newLink = fixReceiverType(link, WITHSCOPEFILTER);
  29.156 -        return link.replaceMethods(filter(newLink.getInvocation(), WITHSCOPEFILTER), filterGuard(newLink, WITHSCOPEFILTER));
  29.157 +        return link.replaceMethods(filter(newLink.getInvocation(), WITHSCOPEFILTER),
  29.158 +            MH.guardWithTest(
  29.159 +                expressionGuard(name),
  29.160 +                filterGuard(newLink, WITHSCOPEFILTER),
  29.161 +                MH.dropArguments(MH.constant(boolean.class, false), 0, Object.class)));
  29.162      }
  29.163  
  29.164      private static MethodHandle filterGuard(final GuardedInvocation link, final MethodHandle filter) {
  29.165 @@ -279,7 +279,6 @@
  29.166          return ((WithObject)receiver).expression;
  29.167      }
  29.168  
  29.169 -
  29.170      @SuppressWarnings("unused")
  29.171      private static Object bindToExpression(final Object fn, final Object receiver) {
  29.172          return fn instanceof ScriptFunction ? bindToExpression((ScriptFunction) fn, receiver) : fn;
  29.173 @@ -289,6 +288,17 @@
  29.174          return fn.makeBoundFunction(withFilterExpression(receiver), new Object[0]);
  29.175      }
  29.176  
  29.177 +    private MethodHandle expressionGuard(final String name) {
  29.178 +        final PropertyMap map = expression.getMap();
  29.179 +        final SwitchPoint sp = map.getProtoGetSwitchPoint(expression.getProto(), name);
  29.180 +        return MH.insertArguments(WITHEXPRESSIONGUARD, 1, map, sp);
  29.181 +    }
  29.182 +
  29.183 +    @SuppressWarnings("unused")
  29.184 +    private static boolean withExpressionGuard(final Object receiver, final PropertyMap map, final SwitchPoint sp) {
  29.185 +        return ((WithObject)receiver).expression.getMap() == map && (sp == null || !sp.hasBeenInvalidated());
  29.186 +    }
  29.187 +
  29.188      /**
  29.189       * Drops the WithObject wrapper from the scope.
  29.190       * @param receiver WithObject wrapper.
  29.191 @@ -302,10 +312,14 @@
  29.192       * Get the with expression for this {@code WithObject}
  29.193       * @return the with expression
  29.194       */
  29.195 -    public Object getExpression() {
  29.196 +    public ScriptObject getExpression() {
  29.197          return expression;
  29.198      }
  29.199  
  29.200 +    public ScriptObject getParentScope() {
  29.201 +        return getProto();
  29.202 +    }
  29.203 +
  29.204      private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
  29.205          return MH.findStatic(MethodHandles.lookup(), WithObject.class, name, MH.type(rtype, types));
  29.206      }

    30.1 --- a/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java	Thu Sep 12 11:09:22 2013 -0700
    30.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java	Tue Sep 17 08:21:42 2013 -0700
    30.3 @@ -26,10 +26,9 @@
    30.4  package jdk.nashorn.internal.runtime.arrays;
    30.5  
    30.6  import java.lang.invoke.MethodHandle;
    30.7 -import java.lang.reflect.Array;
    30.8  import jdk.nashorn.internal.runtime.GlobalObject;
    30.9 +import jdk.nashorn.internal.runtime.JSType;
   30.10  import jdk.nashorn.internal.runtime.PropertyDescriptor;
   30.11 -import jdk.nashorn.internal.runtime.linker.Bootstrap;
   30.12  
   30.13  /**
   30.14   * ArrayData - abstraction for wrapping array elements
   30.15 @@ -204,20 +203,7 @@
   30.16       * @return and array of the given type
   30.17       */
   30.18      public Object asArrayOfType(final Class<?> componentType) {
   30.19 -        final Object[] src = asObjectArray();
   30.20 -        final int l = src.length;
   30.21 -        final Object dst = Array.newInstance(componentType, l);
   30.22 -        final MethodHandle converter = Bootstrap.getLinkerServices().getTypeConverter(Object.class, componentType);
   30.23 -        try {
   30.24 -            for (int i = 0; i < src.length; i++) {
   30.25 -                Array.set(dst, i, invoke(converter, src[i]));
   30.26 -            }
   30.27 -        } catch (final RuntimeException | Error e) {
   30.28 -            throw e;
   30.29 -        } catch (final Throwable t) {
   30.30 -            throw new RuntimeException(t);
   30.31 -        }
   30.32 -        return dst;
   30.33 +        return JSType.convertArray(asObjectArray(), componentType);
   30.34      }
   30.35  
   30.36      /**

    31.1 --- a/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java	Thu Sep 12 11:09:22 2013 -0700
    31.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java	Tue Sep 17 08:21:42 2013 -0700
    31.3 @@ -27,7 +27,7 @@
    31.4  
    31.5  import java.util.Iterator;
    31.6  import java.util.List;
    31.7 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
    31.8 +import jdk.nashorn.api.scripting.JSObject;
    31.9  import jdk.nashorn.internal.runtime.JSType;
   31.10  import jdk.nashorn.internal.runtime.ScriptObject;
   31.11  
   31.12 @@ -127,8 +127,8 @@
   31.13              return new ScriptObjectIterator((ScriptObject)obj, includeUndefined);
   31.14          }
   31.15  
   31.16 -        if (obj instanceof ScriptObjectMirror) {
   31.17 -            return new ScriptObjectMirrorIterator((ScriptObjectMirror)obj, includeUndefined);
   31.18 +        if (obj instanceof JSObject) {
   31.19 +            return new JSObjectIterator((JSObject)obj, includeUndefined);
   31.20          }
   31.21  
   31.22          if (obj instanceof List) {
   31.23 @@ -160,8 +160,8 @@
   31.24              return new ReverseScriptObjectIterator((ScriptObject)obj, includeUndefined);
   31.25          }
   31.26  
   31.27 -        if (obj instanceof ScriptObjectMirror) {
   31.28 -            return new ReverseScriptObjectMirrorIterator((ScriptObjectMirror)obj, includeUndefined);
   31.29 +        if (obj instanceof JSObject) {
   31.30 +            return new ReverseJSObjectIterator((JSObject)obj, includeUndefined);
   31.31          }
   31.32  
   31.33          if (obj instanceof List) {

    32.1 --- a/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java	Thu Sep 12 11:09:22 2013 -0700
    32.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java	Tue Sep 17 08:21:42 2013 -0700
    32.3 @@ -27,7 +27,7 @@
    32.4  
    32.5  import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
    32.6  
    32.7 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
    32.8 +import jdk.nashorn.api.scripting.JSObject;
    32.9  import jdk.nashorn.internal.runtime.Context;
   32.10  import jdk.nashorn.internal.runtime.ScriptFunction;
   32.11  import jdk.nashorn.internal.runtime.ScriptRuntime;
   32.12 @@ -101,9 +101,9 @@
   32.13          final boolean strict;
   32.14          if (callbackfn instanceof ScriptFunction) {
   32.15              strict = ((ScriptFunction)callbackfn).isStrict();
   32.16 -        } else if (callbackfn instanceof ScriptObjectMirror &&
   32.17 -            ((ScriptObjectMirror)callbackfn).isFunction()) {
   32.18 -            strict = ((ScriptObjectMirror)callbackfn).isStrictFunction();
   32.19 +        } else if (callbackfn instanceof JSObject &&
   32.20 +            ((JSObject)callbackfn).isFunction()) {
   32.21 +            strict = ((JSObject)callbackfn).isStrictFunction();
   32.22          } else if (Bootstrap.isDynamicMethod(callbackfn) || Bootstrap.isFunctionalInterfaceObject(callbackfn)) {
   32.23              strict = false;
   32.24          } else {

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java	Tue Sep 17 08:21:42 2013 -0700
    33.3 @@ -0,0 +1,81 @@
    33.4 +/*
    33.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    33.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 + *
    33.8 + * This code is free software; you can redistribute it and/or modify it
    33.9 + * under the terms of the GNU General Public License version 2 only, as
   33.10 + * published by the Free Software Foundation.  Oracle designates this
   33.11 + * particular file as subject to the "Classpath" exception as provided
   33.12 + * by Oracle in the LICENSE file that accompanied this code.
   33.13 + *
   33.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   33.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.17 + * version 2 for more details (a copy is included in the LICENSE file that
   33.18 + * accompanied this code).
   33.19 + *
   33.20 + * You should have received a copy of the GNU General Public License version
   33.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   33.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.23 + *
   33.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   33.25 + * or visit www.oracle.com if you need additional information or have any
   33.26 + * questions.
   33.27 + */
   33.28 +
   33.29 +package jdk.nashorn.internal.runtime.arrays;
   33.30 +
   33.31 +import java.util.NoSuchElementException;
   33.32 +import jdk.nashorn.api.scripting.JSObject;
   33.33 +import jdk.nashorn.internal.runtime.JSType;
   33.34 +
   33.35 +/**
   33.36 + * Iterator over a ScriptObjectMirror
   33.37 + */
   33.38 +class JSObjectIterator extends ArrayLikeIterator<Object> {
   33.39 +
   33.40 +    protected final JSObject obj;
   33.41 +    private final long length;
   33.42 +
   33.43 +    JSObjectIterator(final JSObject obj, final boolean includeUndefined) {
   33.44 +        super(includeUndefined);
   33.45 +        this.obj    = obj;
   33.46 +        this.length = JSType.toUint32(obj.hasMember("length")? obj.getMember("length") : 0);
   33.47 +        this.index  = 0;
   33.48 +    }
   33.49 +
   33.50 +    protected boolean indexInArray() {
   33.51 +        return index < length;
   33.52 +    }
   33.53 +
   33.54 +    @Override
   33.55 +    public long getLength() {
   33.56 +        return length;
   33.57 +    }
   33.58 +
   33.59 +    @Override
   33.60 +    public boolean hasNext() {
   33.61 +        if (length == 0L) {
   33.62 +            return false; //return empty string if toUint32(length) == 0
   33.63 +        }
   33.64 +
   33.65 +        while (indexInArray()) {
   33.66 +            if (obj.hasSlot((int)index) || includeUndefined) {
   33.67 +                break;
   33.68 +            }
   33.69 +            bumpIndex();
   33.70 +        }
   33.71 +
   33.72 +        return indexInArray();
   33.73 +    }
   33.74 +
   33.75 +    @Override
   33.76 +    public Object next() {
   33.77 +        if (indexInArray()) {
   33.78 +            return obj.getSlot((int)bumpIndex());
   33.79 +        }
   33.80 +
   33.81 +        throw new NoSuchElementException();
   33.82 +    }
   33.83 +}
   33.84 +

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java	Tue Sep 17 08:21:42 2013 -0700
    34.3 @@ -0,0 +1,56 @@
    34.4 +/*
    34.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    34.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.7 + *
    34.8 + * This code is free software; you can redistribute it and/or modify it
    34.9 + * under the terms of the GNU General Public License version 2 only, as
   34.10 + * published by the Free Software Foundation.  Oracle designates this
   34.11 + * particular file as subject to the "Classpath" exception as provided
   34.12 + * by Oracle in the LICENSE file that accompanied this code.
   34.13 + *
   34.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   34.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   34.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   34.17 + * version 2 for more details (a copy is included in the LICENSE file that
   34.18 + * accompanied this code).
   34.19 + *
   34.20 + * You should have received a copy of the GNU General Public License version
   34.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   34.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   34.23 + *
   34.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   34.25 + * or visit www.oracle.com if you need additional information or have any
   34.26 + * questions.
   34.27 + */
   34.28 +
   34.29 +package jdk.nashorn.internal.runtime.arrays;
   34.30 +
   34.31 +import jdk.nashorn.api.scripting.JSObject;
   34.32 +import jdk.nashorn.internal.runtime.JSType;
   34.33 +
   34.34 +/**
   34.35 + * Reverse iterator over a ScriptObjectMirror
   34.36 + */
   34.37 +final class ReverseJSObjectIterator extends JSObjectIterator {
   34.38 +
   34.39 +    ReverseJSObjectIterator(final JSObject obj, final boolean includeUndefined) {
   34.40 +        super(obj, includeUndefined);
   34.41 +        this.index = JSType.toUint32(obj.hasMember("length")? obj.getMember("length") : 0) - 1;
   34.42 +    }
   34.43 +
   34.44 +    @Override
   34.45 +    public boolean isReverse() {
   34.46 +        return true;
   34.47 +    }
   34.48 +
   34.49 +    @Override
   34.50 +    protected boolean indexInArray() {
   34.51 +        return index >= 0;
   34.52 +    }
   34.53 +
   34.54 +    @Override
   34.55 +    protected long bumpIndex() {
   34.56 +        return index--;
   34.57 +    }
   34.58 +}
   34.59 +

    35.1 --- a/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectMirrorIterator.java	Thu Sep 12 11:09:22 2013 -0700
    35.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.3 @@ -1,56 +0,0 @@
    35.4 -/*
    35.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    35.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.7 - *
    35.8 - * This code is free software; you can redistribute it and/or modify it
    35.9 - * under the terms of the GNU General Public License version 2 only, as
   35.10 - * published by the Free Software Foundation.  Oracle designates this
   35.11 - * particular file as subject to the "Classpath" exception as provided
   35.12 - * by Oracle in the LICENSE file that accompanied this code.
   35.13 - *
   35.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   35.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   35.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   35.17 - * version 2 for more details (a copy is included in the LICENSE file that
   35.18 - * accompanied this code).
   35.19 - *
   35.20 - * You should have received a copy of the GNU General Public License version
   35.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   35.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   35.23 - *
   35.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   35.25 - * or visit www.oracle.com if you need additional information or have any
   35.26 - * questions.
   35.27 - */
   35.28 -
   35.29 -package jdk.nashorn.internal.runtime.arrays;
   35.30 -
   35.31 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
   35.32 -import jdk.nashorn.internal.runtime.JSType;
   35.33 -
   35.34 -/**
   35.35 - * Reverse iterator over a ScriptObjectMirror
   35.36 - */
   35.37 -final class ReverseScriptObjectMirrorIterator extends ScriptObjectMirrorIterator {
   35.38 -
   35.39 -    ReverseScriptObjectMirrorIterator(final ScriptObjectMirror obj, final boolean includeUndefined) {
   35.40 -        super(obj, includeUndefined);
   35.41 -        this.index = JSType.toUint32(obj.containsKey("length")? obj.getMember("length") : 0) - 1;
   35.42 -    }
   35.43 -
   35.44 -    @Override
   35.45 -    public boolean isReverse() {
   35.46 -        return true;
   35.47 -    }
   35.48 -
   35.49 -    @Override
   35.50 -    protected boolean indexInArray() {
   35.51 -        return index >= 0;
   35.52 -    }
   35.53 -
   35.54 -    @Override
   35.55 -    protected long bumpIndex() {
   35.56 -        return index--;
   35.57 -    }
   35.58 -}
   35.59 -

    36.1 --- a/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectMirrorIterator.java	Thu Sep 12 11:09:22 2013 -0700
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,81 +0,0 @@
    36.4 -/*
    36.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
    36.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.7 - *
    36.8 - * This code is free software; you can redistribute it and/or modify it
    36.9 - * under the terms of the GNU General Public License version 2 only, as
   36.10 - * published by the Free Software Foundation.  Oracle designates this
   36.11 - * particular file as subject to the "Classpath" exception as provided
   36.12 - * by Oracle in the LICENSE file that accompanied this code.
   36.13 - *
   36.14 - * This code is distributed in the hope that it will be useful, but WITHOUT
   36.15 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   36.16 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   36.17 - * version 2 for more details (a copy is included in the LICENSE file that
   36.18 - * accompanied this code).
   36.19 - *
   36.20 - * You should have received a copy of the GNU General Public License version
   36.21 - * 2 along with this work; if not, write to the Free Software Foundation,
   36.22 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   36.23 - *
   36.24 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   36.25 - * or visit www.oracle.com if you need additional information or have any
   36.26 - * questions.
   36.27 - */
   36.28 -
   36.29 -package jdk.nashorn.internal.runtime.arrays;
   36.30 -
   36.31 -import java.util.NoSuchElementException;
   36.32 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
   36.33 -import jdk.nashorn.internal.runtime.JSType;
   36.34 -
   36.35 -/**
   36.36 - * Iterator over a ScriptObjectMirror
   36.37 - */
   36.38 -class ScriptObjectMirrorIterator extends ArrayLikeIterator<Object> {
   36.39 -
   36.40 -    protected final ScriptObjectMirror obj;
   36.41 -    private final long length;
   36.42 -
   36.43 -    ScriptObjectMirrorIterator(final ScriptObjectMirror obj, final boolean includeUndefined) {
   36.44 -        super(includeUndefined);
   36.45 -        this.obj    = obj;
   36.46 -        this.length = JSType.toUint32(obj.containsKey("length")? obj.getMember("length") : 0);
   36.47 -        this.index  = 0;
   36.48 -    }
   36.49 -
   36.50 -    protected boolean indexInArray() {
   36.51 -        return index < length;
   36.52 -    }
   36.53 -
   36.54 -    @Override
   36.55 -    public long getLength() {
   36.56 -        return length;
   36.57 -    }
   36.58 -
   36.59 -    @Override
   36.60 -    public boolean hasNext() {
   36.61 -        if (length == 0L) {
   36.62 -            return false; //return empty string if toUint32(length) == 0
   36.63 -        }
   36.64 -
   36.65 -        while (indexInArray()) {
   36.66 -            if (obj.containsKey(index) || includeUndefined) {
   36.67 -                break;
   36.68 -            }
   36.69 -            bumpIndex();
   36.70 -        }
   36.71 -
   36.72 -        return indexInArray();
   36.73 -    }
   36.74 -
   36.75 -    @Override
   36.76 -    public Object next() {
   36.77 -        if (indexInArray()) {
   36.78 -            return obj.get(bumpIndex());
   36.79 -        }
   36.80 -
   36.81 -        throw new NoSuchElementException();
   36.82 -    }
   36.83 -}
   36.84 -

    37.1 --- a/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java	Thu Sep 12 11:09:22 2013 -0700
    37.2 +++ b/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java	Tue Sep 17 08:21:42 2013 -0700
    37.3 @@ -39,7 +39,7 @@
    37.4  import jdk.internal.dynalink.beans.StaticClass;
    37.5  import jdk.internal.dynalink.linker.GuardedInvocation;
    37.6  import jdk.internal.dynalink.linker.LinkerServices;
    37.7 -import jdk.nashorn.api.scripting.ScriptObjectMirror;
    37.8 +import jdk.nashorn.api.scripting.JSObject;
    37.9  import jdk.nashorn.internal.codegen.CompilerConstants.Call;
   37.10  import jdk.nashorn.internal.codegen.RuntimeCallSite;
   37.11  import jdk.nashorn.internal.runtime.JSType;
   37.12 @@ -87,7 +87,7 @@
   37.13          }
   37.14  
   37.15          return obj instanceof ScriptFunction ||
   37.16 -            ((obj instanceof ScriptObjectMirror) && ((ScriptObjectMirror)obj).isFunction()) ||
   37.17 +            ((obj instanceof JSObject) && ((JSObject)obj).isFunction()) ||
   37.18              isDynamicMethod(obj) ||
   37.19              isFunctionalInterfaceObject(obj) ||
   37.20              obj instanceof StaticClass;

    38.1 --- a/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Thu Sep 12 11:09:22 2013 -0700
    38.2 +++ b/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Tue Sep 17 08:21:42 2013 -0700
    38.3 @@ -30,7 +30,6 @@
    38.4  import java.lang.invoke.MethodHandle;
    38.5  import java.lang.invoke.MethodHandles;
    38.6  import java.lang.invoke.MethodType;
    38.7 -import java.util.Objects;
    38.8  import jdk.internal.dynalink.CallSiteDescriptor;
    38.9  import jdk.internal.dynalink.linker.GuardedInvocation;
   38.10  import jdk.internal.dynalink.linker.LinkRequest;
   38.11 @@ -88,8 +87,9 @@
   38.12              case "setElem":
   38.13                  return c > 2 ? findSetMethod(desc) : findSetIndexMethod();
   38.14              case "call":
   38.15 +                return findCallMethod(desc, operator);
   38.16              case "callMethod":
   38.17 -                return findCallMethod(desc, operator);
   38.18 +                return findCallMethodMethod(desc, operator);
   38.19              case "new":
   38.20                  return findNewMethod(desc);
   38.21              default:
   38.22 @@ -98,33 +98,37 @@
   38.23      }
   38.24  
   38.25      private static GuardedInvocation findGetMethod(final CallSiteDescriptor desc) {
   38.26 -        final MethodHandle getter = MH.insertArguments(JSOBJECT_GET, 1, desc.getNameToken(2));
   38.27 +        final MethodHandle getter = MH.insertArguments(JSOBJECT_GETMEMBER, 1, desc.getNameToken(2));
   38.28          return new GuardedInvocation(getter, null, IS_JSOBJECT_GUARD);
   38.29      }
   38.30  
   38.31      private static GuardedInvocation findGetIndexMethod() {
   38.32 -        return new GuardedInvocation(JSOBJECT_GET, null, IS_JSOBJECT_GUARD);
   38.33 +        return new GuardedInvocation(JSOBJECTLINKER_GET, null, IS_JSOBJECT_GUARD);
   38.34      }
   38.35  
   38.36      private static GuardedInvocation findSetMethod(final CallSiteDescriptor desc) {
   38.37 -        final MethodHandle getter = MH.insertArguments(JSOBJECT_PUT, 1, desc.getNameToken(2));
   38.38 +        final MethodHandle getter = MH.insertArguments(JSOBJECT_SETMEMBER, 1, desc.getNameToken(2));
   38.39          return new GuardedInvocation(getter, null, IS_JSOBJECT_GUARD);
   38.40      }
   38.41  
   38.42      private static GuardedInvocation findSetIndexMethod() {
   38.43 -        return new GuardedInvocation(JSOBJECT_PUT, null, IS_JSOBJECT_GUARD);
   38.44 +        return new GuardedInvocation(JSOBJECTLINKER_PUT, null, IS_JSOBJECT_GUARD);
   38.45      }
   38.46  
   38.47 -    private static GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final String operator) {
   38.48 -        // if operator is "call", then 'self' is a JSObject function object already. Use 'call' as the method name
   38.49 -        final String methodName = "callMethod".equals(operator)? desc.getNameToken(2) : "call";
   38.50 -        MethodHandle func = MH.insertArguments(JSOBJECT_CALL, 1, methodName);
   38.51 +    private static GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final String operator) {
   38.52 +        final String methodName = desc.getNameToken(2);
   38.53 +        MethodHandle func = MH.insertArguments(JSOBJECT_CALLMEMBER, 1, methodName);
   38.54          func = MH.asCollector(func, Object[].class, desc.getMethodType().parameterCount() - 1);
   38.55          return new GuardedInvocation(func, null, IS_JSOBJECT_GUARD);
   38.56      }
   38.57  
   38.58 +    private static GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final String operator) {
   38.59 +        final MethodHandle func = MH.asCollector(JSOBJECT_CALL, Object[].class, desc.getMethodType().parameterCount() - 2);
   38.60 +        return new GuardedInvocation(func, null, IS_JSOBJECT_GUARD);
   38.61 +    }
   38.62 +
   38.63      private static GuardedInvocation findNewMethod(final CallSiteDescriptor desc) {
   38.64 -        MethodHandle func = MH.asCollector(JSOBJECT_NEW, Object[].class, desc.getMethodType().parameterCount() - 1);
   38.65 +        final MethodHandle func = MH.asCollector(JSOBJECT_NEW, Object[].class, desc.getMethodType().parameterCount() - 1);
   38.66          return new GuardedInvocation(func, null, IS_JSOBJECT_GUARD);
   38.67      }
   38.68  
   38.69 @@ -135,36 +139,30 @@
   38.70  
   38.71      @SuppressWarnings("unused")
   38.72      private static Object get(final Object jsobj, final Object key) {
   38.73 -        if (key instanceof String) {
   38.74 -            return ((JSObject)jsobj).getMember((String)key);
   38.75 +        if (key instanceof Integer) {
   38.76 +            return ((JSObject)jsobj).getSlot((int)(Integer)key);
   38.77          } else if (key instanceof Number) {
   38.78              final int index = getIndex((Number)key);
   38.79              if (index > -1) {
   38.80                  return ((JSObject)jsobj).getSlot(index);
   38.81              }
   38.82 +        } else if (key instanceof String) {
   38.83 +            return ((JSObject)jsobj).getMember((String)key);
   38.84          }
   38.85          return null;
   38.86      }
   38.87  
   38.88      @SuppressWarnings("unused")
   38.89      private static void put(final Object jsobj, final Object key, final Object value) {
   38.90 -        if (key instanceof String) {
   38.91 -            ((JSObject)jsobj).setMember((String)key, value);
   38.92 +        if (key instanceof Integer) {
   38.93 +            ((JSObject)jsobj).setSlot((int)(Integer)key, value);
   38.94          } else if (key instanceof Number) {
   38.95              ((JSObject)jsobj).setSlot(getIndex((Number)key), value);
   38.96 +        } else if (key instanceof String) {
   38.97 +            ((JSObject)jsobj).setMember((String)key, value);
   38.98          }
   38.99      }
  38.100  
  38.101 -    @SuppressWarnings("unused")
  38.102 -    private static Object call(final Object jsobj, final Object method, final Object... args) {
  38.103 -        return ((JSObject)jsobj).call(Objects.toString(method), args);
  38.104 -    }
  38.105 -
  38.106 -    @SuppressWarnings("unused")
  38.107 -    private static Object newObject(final Object jsobj, final Object... args) {
  38.108 -        return ((JSObject)jsobj).newObject(null, args);
  38.109 -    }
  38.110 -
  38.111      private static int getIndex(final Number n) {
  38.112          final double value = n.doubleValue();
  38.113          return JSType.isRepresentableAsInt(value) ? (int)value : -1;
  38.114 @@ -172,11 +170,17 @@
  38.115  
  38.116      private static final MethodHandleFunctionality MH = MethodHandleFactory.getFunctionality();
  38.117  
  38.118 -    private static final MethodHandle IS_JSOBJECT_GUARD = findOwnMH("isJSObject", boolean.class, Object.class);
  38.119 -    private static final MethodHandle JSOBJECT_GET = findOwnMH("get", Object.class, Object.class, Object.class);
  38.120 -    private static final MethodHandle JSOBJECT_PUT = findOwnMH("put", Void.TYPE, Object.class, Object.class, Object.class);
  38.121 -    private static final MethodHandle JSOBJECT_CALL = findOwnMH("call", Object.class, Object.class, Object.class, Object[].class);
  38.122 -    private static final MethodHandle JSOBJECT_NEW = findOwnMH("newObject", Object.class, Object.class, Object[].class);
  38.123 +    // method handles of the current class
  38.124 +    private static final MethodHandle IS_JSOBJECT_GUARD  = findOwnMH("isJSObject", boolean.class, Object.class);
  38.125 +    private static final MethodHandle JSOBJECTLINKER_GET = findOwnMH("get", Object.class, Object.class, Object.class);
  38.126 +    private static final MethodHandle JSOBJECTLINKER_PUT = findOwnMH("put", Void.TYPE, Object.class, Object.class, Object.class);
  38.127 +
  38.128 +    // method handles of JSObject class
  38.129 +    private static final MethodHandle JSOBJECT_GETMEMBER  = findJSObjectMH("getMember", Object.class, String.class);
  38.130 +    private static final MethodHandle JSOBJECT_SETMEMBER  = findJSObjectMH("setMember", Void.TYPE, String.class, Object.class);
  38.131 +    private static final MethodHandle JSOBJECT_CALLMEMBER = findJSObjectMH("callMember", Object.class, String.class, Object[].class);
  38.132 +    private static final MethodHandle JSOBJECT_CALL       = findJSObjectMH("call", Object.class, Object.class, Object[].class);
  38.133 +    private static final MethodHandle JSOBJECT_NEW        = findJSObjectMH("newObject", Object.class, Object[].class);
  38.134  
  38.135      private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
  38.136          final Class<?>   own = JSObjectLinker.class;
  38.137 @@ -187,4 +191,14 @@
  38.138              return MH.findVirtual(MethodHandles.lookup(), own, name, mt);
  38.139          }
  38.140      }
  38.141 +
  38.142 +    private static MethodHandle findJSObjectMH(final String name, final Class<?> rtype, final Class<?>... types) {
  38.143 +        final Class<?>   own = JSObject.class;
  38.144 +        final MethodType mt  = MH.type(rtype, types);
  38.145 +        try {
  38.146 +            return MH.findVirtual(MethodHandles.publicLookup(), own, name, mt);
  38.147 +        } catch (final MethodHandleFactory.LookupException e) {
  38.148 +            return MH.findVirtual(MethodHandles.lookup(), own, name, mt);
  38.149 +        }
  38.150 +    }
  38.151  }

    39.1 --- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java	Thu Sep 12 11:09:22 2013 -0700
    39.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java	Tue Sep 17 08:21:42 2013 -0700
    39.3 @@ -263,15 +263,6 @@
    39.4          }
    39.5  
    39.6          if (atom()) {
    39.7 -            // Check for character classes that never or always match
    39.8 -            if (sb.toString().endsWith("[]")) {
    39.9 -                sb.setLength(sb.length() - 1);
   39.10 -                sb.append("^\\s\\S]");
   39.11 -            } else if (sb.toString().endsWith("[^]")) {
   39.12 -                sb.setLength(sb.length() - 2);
   39.13 -                sb.append("\\s\\S]");
   39.14 -            }
   39.15 -
   39.16              quantifier();
   39.17              return true;
   39.18          }
   39.19 @@ -767,7 +758,18 @@
   39.20  
   39.21                  if (classRanges() && ch0 == ']') {
   39.22                      pop(']');
   39.23 -                    return commit(1);
   39.24 +                    commit(1);
   39.25 +
   39.26 +                    // Substitute empty character classes [] and [^] that never or always match
   39.27 +                    if (position == startIn + 2) {
   39.28 +                        sb.setLength(sb.length() - 1);
   39.29 +                        sb.append("^\\s\\S]");
   39.30 +                    } else if (position == startIn + 3 && inNegativeClass) {
   39.31 +                        sb.setLength(sb.length() - 2);
   39.32 +                        sb.append("\\s\\S]");
   39.33 +                    }
   39.34 +
   39.35 +                    return true;
   39.36                  }
   39.37              } finally {
   39.38                  inCharClass = false;  // no nested character classes in JavaScript

    40.1 --- a/src/jdk/nashorn/internal/runtime/resources/Messages.properties	Thu Sep 12 11:09:22 2013 -0700
    40.2 +++ b/src/jdk/nashorn/internal/runtime/resources/Messages.properties	Tue Sep 17 08:21:42 2013 -0700
    40.3 @@ -110,6 +110,7 @@
    40.4  type.error.cannot.get.default.number=Cannot get default number value
    40.5  type.error.cant.apply.with.to.null=Cannot apply "with" to null
    40.6  type.error.cant.apply.with.to.undefined=Cannot apply "with" to undefined
    40.7 +type.error.cant.apply.with.to.non.scriptobject=Cannot apply "with" to non script object
    40.8  type.error.in.with.non.object=Right hand side of "in" cannot be non-Object, found {0}
    40.9  type.error.prototype.not.an.object="prototype" of {0} is not an Object, it is {1}
   40.10  type.error.cant.load.script=Cannot load script from {0}

    41.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/base.js	Thu Sep 12 11:09:22 2013 -0700
    41.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/base.js	Tue Sep 17 08:21:42 2013 -0700
    41.3 @@ -23,204 +23,126 @@
    41.4   * questions.
    41.5   */
    41.6  
    41.7 -Scene                                  = Java.type("javafx.scene.Scene");
    41.8 -Group                                  = Java.type("javafx.scene.Group");
    41.9 -Stage                                  = Java.type("javafx.stage.Stage");
   41.10 +var JFX_BASE_CLASSES     = [];
   41.11 +var JFX_GRAPHICS_CLASSES = [];
   41.12 +var JFX_CONTROLS_CLASSES = [];
   41.13 +var JFX_FXML_CLASSES     = [];
   41.14 +var JFX_WEB_CLASSES      = [];
   41.15 +var JFX_MEDIA_CLASSES    = [];
   41.16 +var JFX_SWING_CLASSES    = [];
   41.17 +var JFX_SWT_CLASSES      = [];
   41.18  
   41.19 -Binding                                = Java.type("javafx.beans.binding.Binding");
   41.20 -Bindings                               = Java.type("javafx.beans.binding.Bindings");
   41.21 -BooleanBinding                         = Java.type("javafx.beans.binding.BooleanBinding");
   41.22 -BooleanExpression                      = Java.type("javafx.beans.binding.BooleanExpression");
   41.23 -DoubleBinding                          = Java.type("javafx.beans.binding.DoubleBinding");
   41.24 -DoubleExpression                       = Java.type("javafx.beans.binding.DoubleExpression");
   41.25 -FloatBinding                           = Java.type("javafx.beans.binding.FloatBinding");
   41.26 -FloatExpression                        = Java.type("javafx.beans.binding.FloatExpression");
   41.27 -IntegerBinding                         = Java.type("javafx.beans.binding.IntegerBinding");
   41.28 -IntegerExpression                      = Java.type("javafx.beans.binding.IntegerExpression");
   41.29 -ListBinding                            = Java.type("javafx.beans.binding.ListBinding");
   41.30 -ListExpression                         = Java.type("javafx.beans.binding.ListExpression");
   41.31 -LongBinding                            = Java.type("javafx.beans.binding.LongBinding");
   41.32 -LongExpression                         = Java.type("javafx.beans.binding.LongExpression");
   41.33 -MapBinding                             = Java.type("javafx.beans.binding.MapBinding");
   41.34 -MapExpression                          = Java.type("javafx.beans.binding.MapExpression");
   41.35 -NumberBinding                          = Java.type("javafx.beans.binding.NumberBinding");
   41.36 -NumberExpression                       = Java.type("javafx.beans.binding.NumberExpression");
   41.37 -NumberExpressionBase                   = Java.type("javafx.beans.binding.NumberExpressionBase");
   41.38 -ObjectBinding                          = Java.type("javafx.beans.binding.ObjectBinding");
   41.39 -ObjectExpression                       = Java.type("javafx.beans.binding.ObjectExpression");
   41.40 -SetBinding                             = Java.type("javafx.beans.binding.SetBinding");
   41.41 -SetExpression                          = Java.type("javafx.beans.binding.SetExpression");
   41.42 -StringBinding                          = Java.type("javafx.beans.binding.StringBinding");
   41.43 -StringExpression                       = Java.type("javafx.beans.binding.StringExpression");
   41.44 -When                                   = Java.type("javafx.beans.binding.When");
   41.45 -DefaultProperty                        = Java.type("javafx.beans.DefaultProperty");
   41.46 -InvalidationListener                   = Java.type("javafx.beans.InvalidationListener");
   41.47 -Observable                             = Java.type("javafx.beans.Observable");
   41.48 -JavaBeanBooleanProperty                = Java.type("javafx.beans.property.adapter.JavaBeanBooleanProperty");
   41.49 -JavaBeanBooleanPropertyBuilder         = Java.type("javafx.beans.property.adapter.JavaBeanBooleanPropertyBuilder");
   41.50 -JavaBeanDoubleProperty                 = Java.type("javafx.beans.property.adapter.JavaBeanDoubleProperty");
   41.51 -JavaBeanDoublePropertyBuilder          = Java.type("javafx.beans.property.adapter.JavaBeanDoublePropertyBuilder");
   41.52 -JavaBeanFloatProperty                  = Java.type("javafx.beans.property.adapter.JavaBeanFloatProperty");
   41.53 -JavaBeanFloatPropertyBuilder           = Java.type("javafx.beans.property.adapter.JavaBeanFloatPropertyBuilder");
   41.54 -JavaBeanIntegerProperty                = Java.type("javafx.beans.property.adapter.JavaBeanIntegerProperty");
   41.55 -JavaBeanIntegerPropertyBuilder         = Java.type("javafx.beans.property.adapter.JavaBeanIntegerPropertyBuilder");
   41.56 -JavaBeanLongProperty                   = Java.type("javafx.beans.property.adapter.JavaBeanLongProperty");
   41.57 -JavaBeanLongPropertyBuilder            = Java.type("javafx.beans.property.adapter.JavaBeanLongPropertyBuilder");
   41.58 -JavaBeanObjectProperty                 = Java.type("javafx.beans.property.adapter.JavaBeanObjectProperty");
   41.59 -JavaBeanObjectPropertyBuilder          = Java.type("javafx.beans.property.adapter.JavaBeanObjectPropertyBuilder");
   41.60 -JavaBeanProperty                       = Java.type("javafx.beans.property.adapter.JavaBeanProperty");
   41.61 -JavaBeanStringProperty                 = Java.type("javafx.beans.property.adapter.JavaBeanStringProperty");
   41.62 -JavaBeanStringPropertyBuilder          = Java.type("javafx.beans.property.adapter.JavaBeanStringPropertyBuilder");
   41.63 -ReadOnlyJavaBeanBooleanProperty        = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanBooleanProperty");
   41.64 -ReadOnlyJavaBeanBooleanPropertyBuilder = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanBooleanPropertyBuilder");
   41.65 -ReadOnlyJavaBeanDoubleProperty         = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanDoubleProperty");
   41.66 -ReadOnlyJavaBeanDoublePropertyBuilder  = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanDoublePropertyBuilder");
   41.67 -ReadOnlyJavaBeanFloatProperty          = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanFloatProperty");
   41.68 -ReadOnlyJavaBeanFloatPropertyBuilder   = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanFloatPropertyBuilder");
   41.69 -ReadOnlyJavaBeanIntegerProperty        = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanIntegerProperty");
   41.70 -ReadOnlyJavaBeanIntegerPropertyBuilder = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanIntegerPropertyBuilder");
   41.71 -ReadOnlyJavaBeanLongProperty           = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanLongProperty");
   41.72 -ReadOnlyJavaBeanLongPropertyBuilder    = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanLongPropertyBuilder");
   41.73 -ReadOnlyJavaBeanObjectProperty         = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanObjectProperty");
   41.74 -ReadOnlyJavaBeanObjectPropertyBuilder  = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanObjectPropertyBuilder");
   41.75 -ReadOnlyJavaBeanProperty               = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanProperty");
   41.76 -ReadOnlyJavaBeanStringProperty         = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanStringProperty");
   41.77 -ReadOnlyJavaBeanStringPropertyBuilder  = Java.type("javafx.beans.property.adapter.ReadOnlyJavaBeanStringPropertyBuilder");
   41.78 -BooleanProperty                        = Java.type("javafx.beans.property.BooleanProperty");
   41.79 -BooleanPropertyBase                    = Java.type("javafx.beans.property.BooleanPropertyBase");
   41.80 -DoubleProperty                         = Java.type("javafx.beans.property.DoubleProperty");
   41.81 -DoublePropertyBase                     = Java.type("javafx.beans.property.DoublePropertyBase");
   41.82 -FloatProperty                          = Java.type("javafx.beans.property.FloatProperty");
   41.83 -FloatPropertyBase                      = Java.type("javafx.beans.property.FloatPropertyBase");
   41.84 -IntegerProperty                        = Java.type("javafx.beans.property.IntegerProperty");
   41.85 -IntegerPropertyBase                    = Java.type("javafx.beans.property.IntegerPropertyBase");
   41.86 -ListProperty                           = Java.type("javafx.beans.property.ListProperty");
   41.87 -ListPropertyBase                       = Java.type("javafx.beans.property.ListPropertyBase");
   41.88 -LongProperty                           = Java.type("javafx.beans.property.LongProperty");
   41.89 -LongPropertyBase                       = Java.type("javafx.beans.property.LongPropertyBase");
   41.90 -MapProperty                            = Java.type("javafx.beans.property.MapProperty");
   41.91 -MapPropertyBase                        = Java.type("javafx.beans.property.MapPropertyBase");
   41.92 -ObjectProperty                         = Java.type("javafx.beans.property.ObjectProperty");
   41.93 -ObjectPropertyBase                     = Java.type("javafx.beans.property.ObjectPropertyBase");
   41.94 -Property                               = Java.type("javafx.beans.property.Property");
   41.95 -ReadOnlyBooleanProperty                = Java.type("javafx.beans.property.ReadOnlyBooleanProperty");
   41.96 -ReadOnlyBooleanPropertyBase            = Java.type("javafx.beans.property.ReadOnlyBooleanPropertyBase");
   41.97 -ReadOnlyBooleanWrapper                 = Java.type("javafx.beans.property.ReadOnlyBooleanWrapper");
   41.98 -ReadOnlyDoubleProperty                 = Java.type("javafx.beans.property.ReadOnlyDoubleProperty");
   41.99 -ReadOnlyDoublePropertyBase             = Java.type("javafx.beans.property.ReadOnlyDoublePropertyBase");
  41.100 -ReadOnlyDoubleWrapper                  = Java.type("javafx.beans.property.ReadOnlyDoubleWrapper");
  41.101 -ReadOnlyFloatProperty                  = Java.type("javafx.beans.property.ReadOnlyFloatProperty");
  41.102 -ReadOnlyFloatPropertyBase              = Java.type("javafx.beans.property.ReadOnlyFloatPropertyBase");
  41.103 -ReadOnlyFloatWrapper                   = Java.type("javafx.beans.property.ReadOnlyFloatWrapper");
  41.104 -ReadOnlyIntegerProperty                = Java.type("javafx.beans.property.ReadOnlyIntegerProperty");
  41.105 -ReadOnlyIntegerPropertyBase            = Java.type("javafx.beans.property.ReadOnlyIntegerPropertyBase");
  41.106 -ReadOnlyIntegerWrapper                 = Java.type("javafx.beans.property.ReadOnlyIntegerWrapper");
  41.107 -ReadOnlyListProperty                   = Java.type("javafx.beans.property.ReadOnlyListProperty");
  41.108 -ReadOnlyListPropertyBase               = Java.type("javafx.beans.property.ReadOnlyListPropertyBase");
  41.109 -ReadOnlyListWrapper                    = Java.type("javafx.beans.property.ReadOnlyListWrapper");
  41.110 -ReadOnlyLongProperty                   = Java.type("javafx.beans.property.ReadOnlyLongProperty");
  41.111 -ReadOnlyLongPropertyBase               = Java.type("javafx.beans.property.ReadOnlyLongPropertyBase");
  41.112 -ReadOnlyLongWrapper                    = Java.type("javafx.beans.property.ReadOnlyLongWrapper");
  41.113 -ReadOnlyMapProperty                    = Java.type("javafx.beans.property.ReadOnlyMapProperty");
  41.114 -ReadOnlyMapPropertyBase                = Java.type("javafx.beans.property.ReadOnlyMapPropertyBase");
  41.115 -ReadOnlyMapWrapper                     = Java.type("javafx.beans.property.ReadOnlyMapWrapper");
  41.116 -ReadOnlyObjectProperty                 = Java.type("javafx.beans.property.ReadOnlyObjectProperty");
  41.117 -ReadOnlyObjectPropertyBase             = Java.type("javafx.beans.property.ReadOnlyObjectPropertyBase");
  41.118 -ReadOnlyObjectWrapper                  = Java.type("javafx.beans.property.ReadOnlyObjectWrapper");
  41.119 -ReadOnlyProperty                       = Java.type("javafx.beans.property.ReadOnlyProperty");
  41.120 -ReadOnlySetProperty                    = Java.type("javafx.beans.property.ReadOnlySetProperty");
  41.121 -ReadOnlySetPropertyBase                = Java.type("javafx.beans.property.ReadOnlySetPropertyBase");
  41.122 -ReadOnlySetWrapper                     = Java.type("javafx.beans.property.ReadOnlySetWrapper");
  41.123 -ReadOnlyStringProperty                 = Java.type("javafx.beans.property.ReadOnlyStringProperty");
  41.124 -ReadOnlyStringPropertyBase             = Java.type("javafx.beans.property.ReadOnlyStringPropertyBase");
  41.125 -ReadOnlyStringWrapper                  = Java.type("javafx.beans.property.ReadOnlyStringWrapper");
  41.126 -SetProperty                            = Java.type("javafx.beans.property.SetProperty");
  41.127 -SetPropertyBase                        = Java.type("javafx.beans.property.SetPropertyBase");
  41.128 -SimpleBooleanProperty                  = Java.type("javafx.beans.property.SimpleBooleanProperty");
  41.129 -SimpleDoubleProperty                   = Java.type("javafx.beans.property.SimpleDoubleProperty");
  41.130 -SimpleFloatProperty                    = Java.type("javafx.beans.property.SimpleFloatProperty");
  41.131 -SimpleIntegerProperty                  = Java.type("javafx.beans.property.SimpleIntegerProperty");
  41.132 -SimpleListProperty                     = Java.type("javafx.beans.property.SimpleListProperty");
  41.133 -SimpleLongProperty                     = Java.type("javafx.beans.property.SimpleLongProperty");
  41.134 -SimpleMapProperty                      = Java.type("javafx.beans.property.SimpleMapProperty");
  41.135 -SimpleObjectProperty                   = Java.type("javafx.beans.property.SimpleObjectProperty");
  41.136 -SimpleSetProperty                      = Java.type("javafx.beans.property.SimpleSetProperty");
  41.137 -SimpleStringProperty                   = Java.type("javafx.beans.property.SimpleStringProperty");
  41.138 -StringProperty                         = Java.type("javafx.beans.property.StringProperty");
  41.139 -StringPropertyBase                     = Java.type("javafx.beans.property.StringPropertyBase");
  41.140 -ChangeListener                         = Java.type("javafx.beans.value.ChangeListener");
  41.141 -ObservableBooleanValue                 = Java.type("javafx.beans.value.ObservableBooleanValue");
  41.142 -ObservableDoubleValue                  = Java.type("javafx.beans.value.ObservableDoubleValue");
  41.143 -ObservableFloatValue                   = Java.type("javafx.beans.value.ObservableFloatValue");
  41.144 -ObservableIntegerValue                 = Java.type("javafx.beans.value.ObservableIntegerValue");
  41.145 -ObservableListValue                    = Java.type("javafx.beans.value.ObservableListValue");
  41.146 -ObservableLongValue                    = Java.type("javafx.beans.value.ObservableLongValue");
  41.147 -ObservableMapValue                     = Java.type("javafx.beans.value.ObservableMapValue");
  41.148 -ObservableNumberValue                  = Java.type("javafx.beans.value.ObservableNumberValue");
  41.149 -ObservableObjectValue                  = Java.type("javafx.beans.value.ObservableObjectValue");
  41.150 -ObservableSetValue                     = Java.type("javafx.beans.value.ObservableSetValue");
  41.151 -ObservableStringValue                  = Java.type("javafx.beans.value.ObservableStringValue");
  41.152 -ObservableValue                        = Java.type("javafx.beans.value.ObservableValue");
  41.153 -ObservableValueBase                    = Java.type("javafx.beans.value.ObservableValueBase");
  41.154 -WeakChangeListener                     = Java.type("javafx.beans.value.WeakChangeListener");
  41.155 -WritableBooleanValue                   = Java.type("javafx.beans.value.WritableBooleanValue");
  41.156 -WritableDoubleValue                    = Java.type("javafx.beans.value.WritableDoubleValue");
  41.157 -WritableFloatValue                     = Java.type("javafx.beans.value.WritableFloatValue");
  41.158 -WritableIntegerValue                   = Java.type("javafx.beans.value.WritableIntegerValue");
  41.159 -WritableListValue                      = Java.type("javafx.beans.value.WritableListValue");
  41.160 -WritableLongValue                      = Java.type("javafx.beans.value.WritableLongValue");
  41.161 -WritableMapValue                       = Java.type("javafx.beans.value.WritableMapValue");
  41.162 -WritableNumberValue                    = Java.type("javafx.beans.value.WritableNumberValue");
  41.163 -WritableObjectValue                    = Java.type("javafx.beans.value.WritableObjectValue");
  41.164 -WritableSetValue                       = Java.type("javafx.beans.value.WritableSetValue");
  41.165 -WritableStringValue                    = Java.type("javafx.beans.value.WritableStringValue");
  41.166 -WritableValue                          = Java.type("javafx.beans.value.WritableValue");
  41.167 -WeakInvalidationListener               = Java.type("javafx.beans.WeakInvalidationListener");
  41.168 -WeakListener                           = Java.type("javafx.beans.WeakListener");
  41.169 -FXCollections                          = Java.type("javafx.collections.FXCollections");
  41.170 -ListChangeListener                     = Java.type("javafx.collections.ListChangeListener");
  41.171 -ListChangeListener$Change              = Java.type("javafx.collections.ListChangeListener$Change");
  41.172 -MapChangeListener                      = Java.type("javafx.collections.MapChangeListener");
  41.173 -MapChangeListener$Change               = Java.type("javafx.collections.MapChangeListener$Change");
  41.174 -ModifiableObservableListBase           = Java.type("javafx.collections.ModifiableObservableListBase");
  41.175 -ObservableList                         = Java.type("javafx.collections.ObservableList");
  41.176 -ObservableListBase                     = Java.type("javafx.collections.ObservableListBase");
  41.177 -ObservableMap                          = Java.type("javafx.collections.ObservableMap");
  41.178 -ObservableSet                          = Java.type("javafx.collections.ObservableSet");
  41.179 -SetChangeListener                      = Java.type("javafx.collections.SetChangeListener");
  41.180 -SetChangeListener$Change               = Java.type("javafx.collections.SetChangeListener$Change");
  41.181 -WeakListChangeListener                 = Java.type("javafx.collections.WeakListChangeListener");
  41.182 -WeakMapChangeListener                  = Java.type("javafx.collections.WeakMapChangeListener");
  41.183 -WeakSetChangeListener                  = Java.type("javafx.collections.WeakSetChangeListener");
  41.184 -ActionEvent                            = Java.type("javafx.event.ActionEvent");
  41.185 -Event                                  = Java.type("javafx.event.Event");
  41.186 -EventDispatchChain                     = Java.type("javafx.event.EventDispatchChain");
  41.187 -EventDispatcher                        = Java.type("javafx.event.EventDispatcher");
  41.188 -EventHandler                           = Java.type("javafx.event.EventHandler");
  41.189 -EventTarget                            = Java.type("javafx.event.EventTarget");
  41.190 -EventType                              = Java.type("javafx.event.EventType");
  41.191 -WeakEventHandler                       = Java.type("javafx.event.WeakEventHandler");
  41.192 -Builder                                = Java.type("javafx.util.Builder");
  41.193 -BuilderFactory                         = Java.type("javafx.util.BuilderFactory");
  41.194 -Callback                               = Java.type("javafx.util.Callback");
  41.195 -BigDecimalStringConverter              = Java.type("javafx.util.converter.BigDecimalStringConverter");
  41.196 -BigIntegerStringConverter              = Java.type("javafx.util.converter.BigIntegerStringConverter");
  41.197 -BooleanStringConverter                 = Java.type("javafx.util.converter.BooleanStringConverter");
  41.198 -ByteStringConverter                    = Java.type("javafx.util.converter.ByteStringConverter");
  41.199 -CharacterStringConverter               = Java.type("javafx.util.converter.CharacterStringConverter");
  41.200 -CurrencyStringConverter                = Java.type("javafx.util.converter.CurrencyStringConverter");
  41.201 -DateStringConverter                    = Java.type("javafx.util.converter.DateStringConverter");
  41.202 -DateTimeStringConverter                = Java.type("javafx.util.converter.DateTimeStringConverter");
  41.203 -DefaultStringConverter                 = Java.type("javafx.util.converter.DefaultStringConverter");
  41.204 -DoubleStringConverter                  = Java.type("javafx.util.converter.DoubleStringConverter");
  41.205 -FloatStringConverter                   = Java.type("javafx.util.converter.FloatStringConverter");
  41.206 -FormatStringConverter                  = Java.type("javafx.util.converter.FormatStringConverter");
  41.207 -IntegerStringConverter                 = Java.type("javafx.util.converter.IntegerStringConverter");
  41.208 -LongStringConverter                    = Java.type("javafx.util.converter.LongStringConverter");
  41.209 -NumberStringConverter                  = Java.type("javafx.util.converter.NumberStringConverter");
  41.210 -PercentageStringConverter              = Java.type("javafx.util.converter.PercentageStringConverter");
  41.211 -ShortStringConverter                   = Java.type("javafx.util.converter.ShortStringConverter");
  41.212 -TimeStringConverter                    = Java.type("javafx.util.converter.TimeStringConverter");
  41.213 -Duration                               = Java.type("javafx.util.Duration");
  41.214 -Pair                                   = Java.type("javafx.util.Pair");
  41.215 -StringConverter                        = Java.type("javafx.util.StringConverter");
  41.216 +function LOAD_FX_CLASSES(clsList) {
  41.217 +
  41.218 +    for each (var cls in clsList) {
  41.219 +        // Ex. Stage = Java.type("javafx.stage.Stage");
  41.220 +        this[cls[cls.length - 1]] = Java.type(cls.join("."));
  41.221 +    }
  41.222 +}
  41.223 +
  41.224 +(function() {
  41.225 +    var System           = Java.type("java.lang.System");
  41.226 +    var ZipFile          = Java.type("java.util.zip.ZipFile");
  41.227 +
  41.228 +    var SUFFIX_LENGTH    = ".class".length;
  41.229 +
  41.230 +    try {
  41.231 +        var jfxrtJar = new ZipFile(System.getProperty("java.home") + "/lib/ext/jfxrt.jar");
  41.232 +    } catch (ex) {
  41.233 +        throw new Error("JavaFX runtime not found");
  41.234 +    }
  41.235 +
  41.236 +    var entries = jfxrtJar.entries();
  41.237 +
  41.238 +    while (entries.hasMoreElements()) {
  41.239 +        var entry = entries.nextElement();
  41.240 +
  41.241 +        if (entry.isDirectory()) {
  41.242 +            continue;
  41.243 +        }
  41.244 +
  41.245 +        var name = entry.name;
  41.246 +
  41.247 +        if (!name.endsWith(".class")) {
  41.248 +            continue;
  41.249 +        }
  41.250 +
  41.251 +        name = name.substring(0, name.length - SUFFIX_LENGTH);
  41.252 +        cls = name.split("/");
  41.253 +
  41.254 +        if (cls[0] != "javafx") {
  41.255 +            continue;
  41.256 +        }
  41.257 +
  41.258 +        var last = cls[cls.length - 1];
  41.259 +        var nested = last.lastIndexOf("$");
  41.260 +
  41.261 +        // If class name ends with $nnn
  41.262 +        if (nested != -1 && !(last.substring(nested) - 0)) {
  41.263 +            continue;
  41.264 +        }
  41.265 +
  41.266 +        switch (cls[1]) {
  41.267 +        case "stage":
  41.268 +            if (cls[2] == "Stage") {
  41.269 +                JFX_BASE_CLASSES.push(cls);
  41.270 +            } else {
  41.271 +                JFX_GRAPHICS_CLASSES.push(cls);
  41.272 +            }
  41.273 +            break;
  41.274 +
  41.275 +        case "scene":
  41.276 +            switch (cls[2]) {
  41.277 +            case "Scene":
  41.278 +            case "Group":
  41.279 +                JFX_BASE_CLASSES.push(cls);
  41.280 +                break;
  41.281 +
  41.282 +            case "chart":
  41.283 +            case "control":
  41.284 +                JFX_CONTROLS_CLASSES.push(cls);
  41.285 +                break;
  41.286 +
  41.287 +            case "web":
  41.288 +                JFX_WEB_CLASSES.push(cls);
  41.289 +                break;
  41.290 +
  41.291 +            case "media":
  41.292 +                JFX_MEDIA_CLASSES.push(cls);
  41.293 +                break;
  41.294 +
  41.295 +            default:
  41.296 +                JFX_GRAPHICS_CLASSES.push(cls);
  41.297 +                break;
  41.298 +            }
  41.299 +            break;
  41.300 +
  41.301 +        case "beans":
  41.302 +        case "collections":
  41.303 +        case "events":
  41.304 +        case "util":
  41.305 +            JFX_BASE_CLASSES.push(cls);
  41.306 +            break;
  41.307 +
  41.308 +        case "animation":
  41.309 +        case "application":
  41.310 +        case "concurrent":
  41.311 +        case "css":
  41.312 +        case "geometry":
  41.313 +            JFX_GRAPHICS_CLASSES.push(cls);
  41.314 +            break;
  41.315 +
  41.316 +        case "fxml":
  41.317 +            JFX_FXML_CLASSES.push(cls);
  41.318 +            break;
  41.319 +
  41.320 +        case "embed":
  41.321 +            if (cls[2] == "swing") {
  41.322 +                JFX_SWING_CLASSES.push(cls);
  41.323 +            } else {
  41.324 +                JFX_SWT_CLASSES.push(cls);
  41.325 +            }
  41.326 +            break;
  41.327 +        }
  41.328 +    }
  41.329 +})();

    42.1 --- a/src/jdk/nashorn/internal/runtime/resources/fx/controls.js	Thu Sep 12 11:09:22 2013 -0700
    42.2 +++ b/src/jdk/nashorn/internal/runtime/resources/fx/controls.js	Tue Sep 17 08:21:42 2013 -0700
    42.3 @@ -23,242 +23,8 @@
    42.4   * questions.
    42.5   */
    42.6  
    42.7 -AreaChart                                  = Java.type("javafx.scene.chart.AreaChart");
    42.8 -AreaChartBuilder                           = Java.type("javafx.scene.chart.AreaChartBuilder");
    42.9 -Axis                                       = Java.type("javafx.scene.chart.Axis");
   42.10 -Axis$TickMark                              = Java.type("javafx.scene.chart.Axis$TickMark");
   42.11 -AxisBuilder                                = Java.type("javafx.scene.chart.AxisBuilder");
   42.12 -BarChart                                   = Java.type("javafx.scene.chart.BarChart");
   42.13 -BarChartBuilder                            = Java.type("javafx.scene.chart.BarChartBuilder");
   42.14 -BubbleChart                                = Java.type("javafx.scene.chart.BubbleChart");
   42.15 -BubbleChartBuilder                         = Java.type("javafx.scene.chart.BubbleChartBuilder");
   42.16 -CategoryAxis                               = Java.type("javafx.scene.chart.CategoryAxis");
   42.17 -CategoryAxisBuilder                        = Java.type("javafx.scene.chart.CategoryAxisBuilder");
   42.18 -Chart                                      = Java.type("javafx.scene.chart.Chart");
   42.19 -ChartBuilder                               = Java.type("javafx.scene.chart.ChartBuilder");
   42.20 -LineChart                                  = Java.type("javafx.scene.chart.LineChart");
   42.21 -LineChartBuilder                           = Java.type("javafx.scene.chart.LineChartBuilder");
   42.22 -NumberAxis                                 = Java.type("javafx.scene.chart.NumberAxis");
   42.23 -NumberAxis$DefaultFormatter                = Java.type("javafx.scene.chart.NumberAxis$DefaultFormatter");
   42.24 -NumberAxisBuilder                          = Java.type("javafx.scene.chart.NumberAxisBuilder");
   42.25 -PieChart                                   = Java.type("javafx.scene.chart.PieChart");
   42.26 -PieChart$Data                              = Java.type("javafx.scene.chart.PieChart$Data");
   42.27 -PieChartBuilder                            = Java.type("javafx.scene.chart.PieChartBuilder");
   42.28 -ScatterChart                               = Java.type("javafx.scene.chart.ScatterChart");
   42.29 -ScatterChartBuilder                        = Java.type("javafx.scene.chart.ScatterChartBuilder");
   42.30 -StackedAreaChart                           = Java.type("javafx.scene.chart.StackedAreaChart");
   42.31 -StackedAreaChartBuilder                    = Java.type("javafx.scene.chart.StackedAreaChartBuilder");
   42.32 -StackedBarChart                            = Java.type("javafx.scene.chart.StackedBarChart");
   42.33 -StackedBarChartBuilder                     = Java.type("javafx.scene.chart.StackedBarChartBuilder");
   42.34 -ValueAxis                                  = Java.type("javafx.scene.chart.ValueAxis");
   42.35 -ValueAxisBuilder                           = Java.type("javafx.scene.chart.ValueAxisBuilder");
   42.36 -XYChart                                    = Java.type("javafx.scene.chart.XYChart");
   42.37 -XYChart$Data                               = Java.type("javafx.scene.chart.XYChart$Data");
   42.38 -XYChart$Series                             = Java.type("javafx.scene.chart.XYChart$Series");
   42.39 -XYChartBuilder                             = Java.type("javafx.scene.chart.XYChartBuilder");
   42.40 -Accordion                                  = Java.type("javafx.scene.control.Accordion");
   42.41 -AccordionBuilder                           = Java.type("javafx.scene.control.AccordionBuilder");
   42.42 -Button                                     = Java.type("javafx.scene.control.Button");
   42.43 -ButtonBase                                 = Java.type("javafx.scene.control.ButtonBase");
   42.44 -ButtonBaseBuilder                          = Java.type("javafx.scene.control.ButtonBaseBuilder");
   42.45 -ButtonBuilder                              = Java.type("javafx.scene.control.ButtonBuilder");
   42.46 -Cell                                       = Java.type("javafx.scene.control.Cell");
   42.47 -CheckBoxListCell                           = Java.type("javafx.scene.control.cell.CheckBoxListCell");
   42.48 -CheckBoxListCellBuilder                    = Java.type("javafx.scene.control.cell.CheckBoxListCellBuilder");
   42.49 -CheckBoxTableCell                          = Java.type("javafx.scene.control.cell.CheckBoxTableCell");
   42.50 -CheckBoxTableCellBuilder                   = Java.type("javafx.scene.control.cell.CheckBoxTableCellBuilder");
   42.51 -CheckBoxTreeCell                           = Java.type("javafx.scene.control.cell.CheckBoxTreeCell");
   42.52 -CheckBoxTreeCellBuilder                    = Java.type("javafx.scene.control.cell.CheckBoxTreeCellBuilder");
   42.53 -CheckBoxTreeTableCell                      = Java.type("javafx.scene.control.cell.CheckBoxTreeTableCell");
   42.54 -//CheckBoxTreeTableCellBuilder               = Java.type("javafx.scene.control.cell.CheckBoxTreeTableCellBuilder");
   42.55 -ChoiceBoxListCell                          = Java.type("javafx.scene.control.cell.ChoiceBoxListCell");
   42.56 -ChoiceBoxListCellBuilder                   = Java.type("javafx.scene.control.cell.ChoiceBoxListCellBuilder");
   42.57 -ChoiceBoxTableCell                         = Java.type("javafx.scene.control.cell.ChoiceBoxTableCell");
   42.58 -ChoiceBoxTableCellBuilder                  = Java.type("javafx.scene.control.cell.ChoiceBoxTableCellBuilder");
   42.59 -ChoiceBoxTreeCell                          = Java.type("javafx.scene.control.cell.ChoiceBoxTreeCell");
   42.60 -ChoiceBoxTreeCellBuilder                   = Java.type("javafx.scene.control.cell.ChoiceBoxTreeCellBuilder");
   42.61 -ChoiceBoxTreeTableCell                     = Java.type("javafx.scene.control.cell.ChoiceBoxTreeTableCell");
   42.62 -//ChoiceBoxTreeTableCellBuilder              = Java.type("javafx.scene.control.cell.ChoiceBoxTreeTableCellBuilder");
   42.63 -ComboBoxListCell                           = Java.type("javafx.scene.control.cell.ComboBoxListCell");
   42.64 -ComboBoxListCellBuilder                    = Java.type("javafx.scene.control.cell.ComboBoxListCellBuilder");
   42.65 -ComboBoxTableCell                          = Java.type("javafx.scene.control.cell.ComboBoxTableCell");
   42.66 -ComboBoxTableCellBuilder                   = Java.type("javafx.scene.control.cell.ComboBoxTableCellBuilder");
   42.67 -ComboBoxTreeCell                           = Java.type("javafx.scene.control.cell.ComboBoxTreeCell");
   42.68 -ComboBoxTreeCellBuilder                    = Java.type("javafx.scene.control.cell.ComboBoxTreeCellBuilder");
   42.69 -ComboBoxTreeTableCell                      = Java.type("javafx.scene.control.cell.ComboBoxTreeTableCell");
   42.70 -//ComboBoxTreeTableCellBuilder               = Java.type("javafx.scene.control.cell.ComboBoxTreeTableCellBuilder");
   42.71 -MapValueFactory                            = Java.type("javafx.scene.control.cell.MapValueFactory");
   42.72 -ProgressBarTableCell                       = Java.type("javafx.scene.control.cell.ProgressBarTableCell");
   42.73 -ProgressBarTreeTableCell                   = Java.type("javafx.scene.control.cell.ProgressBarTreeTableCell");
   42.74 -PropertyValueFactory                       = Java.type("javafx.scene.control.cell.PropertyValueFactory");
   42.75 -PropertyValueFactoryBuilder                = Java.type("javafx.scene.control.cell.PropertyValueFactoryBuilder");
   42.76 -TextFieldListCell                          = Java.type("javafx.scene.control.cell.TextFieldListCell");
   42.77 -TextFieldListCellBuilder                   = Java.type("javafx.scene.control.cell.TextFieldListCellBuilder");
   42.78 -TextFieldTableCell                         = Java.type("javafx.scene.control.cell.TextFieldTableCell");
   42.79 -TextFieldTableCellBuilder                  = Java.type("javafx.scene.control.cell.TextFieldTableCellBuilder");
   42.80 -TextFieldTreeCell                          = Java.type("javafx.scene.control.cell.TextFieldTreeCell");
   42.81 -TextFieldTreeCellBuilder                   = Java.type("javafx.scene.control.cell.TextFieldTreeCellBuilder");
   42.82 -TextFieldTreeTableCell                     = Java.type("javafx.scene.control.cell.TextFieldTreeTableCell");
   42.83 -//TextFieldTreeTableCellBuilder              = Java.type("javafx.scene.control.cell.TextFieldTreeTableCellBuilder");
   42.84 -TreeItemPropertyValueFactory               = Java.type("javafx.scene.control.cell.TreeItemPropertyValueFactory");
   42.85 -//TreeItemPropertyValueFactoryBuilder        = Java.type("javafx.scene.control.cell.TreeItemPropertyValueFactoryBuilder");
   42.86 -CellBuilder                                = Java.type("javafx.scene.control.CellBuilder");
   42.87 -CheckBox                                   = Java.type("javafx.scene.control.CheckBox");
   42.88 -CheckBoxBuilder                            = Java.type("javafx.scene.control.CheckBoxBuilder");
   42.89 -CheckBoxTreeItem                           = Java.type("javafx.scene.control.CheckBoxTreeItem");
   42.90 -CheckBoxTreeItem$TreeModificationEvent     = Java.type("javafx.scene.control.CheckBoxTreeItem$TreeModificationEvent");
   42.91 -CheckBoxTreeItemBuilder                    = Java.type("javafx.scene.control.CheckBoxTreeItemBuilder");
   42.92 -CheckMenuItem                              = Java.type("javafx.scene.control.CheckMenuItem");
   42.93 -CheckMenuItemBuilder                       = Java.type("javafx.scene.control.CheckMenuItemBuilder");
   42.94 -ChoiceBox                                  = Java.type("javafx.scene.control.ChoiceBox");
   42.95 -ChoiceBoxBuilder                           = Java.type("javafx.scene.control.ChoiceBoxBuilder");
   42.96 -ColorPicker                                = Java.type("javafx.scene.control.ColorPicker");
   42.97 -ColorPickerBuilder                         = Java.type("javafx.scene.control.ColorPickerBuilder");
   42.98 -ComboBox                                   = Java.type("javafx.scene.control.ComboBox");
   42.99 -ComboBoxBase                               = Java.type("javafx.scene.control.ComboBoxBase");
  42.100 -ComboBoxBaseBuilder                        = Java.type("javafx.scene.control.ComboBoxBaseBuilder");
  42.101 -ComboBoxBuilder                            = Java.type("javafx.scene.control.ComboBoxBuilder");
  42.102 -ContentDisplay                             = Java.type("javafx.scene.control.ContentDisplay");
  42.103 -ContextMenu                                = Java.type("javafx.scene.control.ContextMenu");
  42.104 -ContextMenuBuilder                         = Java.type("javafx.scene.control.ContextMenuBuilder");
  42.105 -Control                                    = Java.type("javafx.scene.control.Control");
  42.106 -ControlBuilder                             = Java.type("javafx.scene.control.ControlBuilder");
  42.107 -CustomMenuItem                             = Java.type("javafx.scene.control.CustomMenuItem");
  42.108 -CustomMenuItemBuilder                      = Java.type("javafx.scene.control.CustomMenuItemBuilder");
  42.109 -FocusModel                                 = Java.type("javafx.scene.control.FocusModel");
  42.110 -Hyperlink                                  = Java.type("javafx.scene.control.Hyperlink");
  42.111 -HyperlinkBuilder                           = Java.type("javafx.scene.control.HyperlinkBuilder");
  42.112 -IndexedCell                                = Java.type("javafx.scene.control.IndexedCell");
  42.113 -IndexedCellBuilder                         = Java.type("javafx.scene.control.IndexedCellBuilder");
  42.114 -IndexRange                                 = Java.type("javafx.scene.control.IndexRange");
  42.115 -IndexRangeBuilder                          = Java.type("javafx.scene.control.IndexRangeBuilder");
  42.116 -Label                                      = Java.type("javafx.scene.control.Label");
  42.117 -LabelBuilder                               = Java.type("javafx.scene.control.LabelBuilder");
  42.118 -Labeled                                    = Java.type("javafx.scene.control.Labeled");
  42.119 -LabeledBuilder                             = Java.type("javafx.scene.control.LabeledBuilder");
  42.120 -ListCell                                   = Java.type("javafx.scene.control.ListCell");
  42.121 -ListCellBuilder                            = Java.type("javafx.scene.control.ListCellBuilder");
  42.122 -ListView                                   = Java.type("javafx.scene.control.ListView");
  42.123 -ListView$EditEvent                         = Java.type("javafx.scene.control.ListView$EditEvent");
  42.124 -ListViewBuilder                            = Java.type("javafx.scene.control.ListViewBuilder");
  42.125 -Menu                                       = Java.type("javafx.scene.control.Menu");
  42.126 -MenuBar                                    = Java.type("javafx.scene.control.MenuBar");
  42.127 -MenuBarBuilder                             = Java.type("javafx.scene.control.MenuBarBuilder");
  42.128 -MenuBuilder                                = Java.type("javafx.scene.control.MenuBuilder");
  42.129 -MenuButton                                 = Java.type("javafx.scene.control.MenuButton");
  42.130 -MenuButtonBuilder                          = Java.type("javafx.scene.control.MenuButtonBuilder");
  42.131 -MenuItem                                   = Java.type("javafx.scene.control.MenuItem");
  42.132 -MenuItemBuilder                            = Java.type("javafx.scene.control.MenuItemBuilder");
  42.133 -MultipleSelectionModel                     = Java.type("javafx.scene.control.MultipleSelectionModel");
  42.134 -MultipleSelectionModelBuilder              = Java.type("javafx.scene.control.MultipleSelectionModelBuilder");
  42.135 -OverrunStyle                               = Java.type("javafx.scene.control.OverrunStyle");
  42.136 -Pagination                                 = Java.type("javafx.scene.control.Pagination");
  42.137 -PaginationBuilder                          = Java.type("javafx.scene.control.PaginationBuilder");
  42.138 -PasswordField                              = Java.type("javafx.scene.control.PasswordField");
  42.139 -PasswordFieldBuilder                       = Java.type("javafx.scene.control.PasswordFieldBuilder");
  42.140 -PopupControl                               = Java.type("javafx.scene.control.PopupControl");
  42.141 -PopupControlBuilder                        = Java.type("javafx.scene.control.PopupControlBuilder");
  42.142 -ProgressBar                                = Java.type("javafx.scene.control.ProgressBar");
  42.143 -ProgressBarBuilder                         = Java.type("javafx.scene.control.ProgressBarBuilder");
  42.144 -ProgressIndicator                          = Java.type("javafx.scene.control.ProgressIndicator");
  42.145 -ProgressIndicatorBuilder                   = Java.type("javafx.scene.control.ProgressIndicatorBuilder");
  42.146 -RadioButton                                = Java.type("javafx.scene.control.RadioButton");
  42.147 -RadioButtonBuilder                         = Java.type("javafx.scene.control.RadioButtonBuilder");
  42.148 -RadioMenuItem                              = Java.type("javafx.scene.control.RadioMenuItem");
  42.149 -RadioMenuItemBuilder                       = Java.type("javafx.scene.control.RadioMenuItemBuilder");
  42.150 -ResizeFeaturesBase                         = Java.type("javafx.scene.control.ResizeFeaturesBase");
  42.151 -//ResizeFeaturesBaseBuilder                  = Java.type("javafx.scene.control.ResizeFeaturesBaseBuilder");
  42.152 -ScrollBar                                  = Java.type("javafx.scene.control.ScrollBar");
  42.153 -ScrollBarBuilder                           = Java.type("javafx.scene.control.ScrollBarBuilder");
  42.154 -ScrollPane                                 = Java.type("javafx.scene.control.ScrollPane");
  42.155 -ScrollPane$ScrollBarPolicy                 = Java.type("javafx.scene.control.ScrollPane$ScrollBarPolicy");
  42.156 -ScrollPaneBuilder                          = Java.type("javafx.scene.control.ScrollPaneBuilder");
  42.157 -ScrollToEvent                              = Java.type("javafx.scene.control.ScrollToEvent");
  42.158 -SelectionMode                              = Java.type("javafx.scene.control.SelectionMode");
  42.159 -SelectionModel                             = Java.type("javafx.scene.control.SelectionModel");
  42.160 -Separator                                  = Java.type("javafx.scene.control.Separator");
  42.161 -SeparatorBuilder                           = Java.type("javafx.scene.control.SeparatorBuilder");
  42.162 -SeparatorMenuItem                          = Java.type("javafx.scene.control.SeparatorMenuItem");
  42.163 -SeparatorMenuItemBuilder                   = Java.type("javafx.scene.control.SeparatorMenuItemBuilder");
  42.164 -SingleSelectionModel                       = Java.type("javafx.scene.control.SingleSelectionModel");
  42.165 -Skin                                       = Java.type("javafx.scene.control.Skin");
  42.166 -SkinBase                                   = Java.type("javafx.scene.control.SkinBase");
  42.167 -//SkinBaseBuilder                            = Java.type("javafx.scene.control.SkinBaseBuilder");
  42.168 -Skinnable                                  = Java.type("javafx.scene.control.Skinnable");
  42.169 -Slider                                     = Java.type("javafx.scene.control.Slider");
  42.170 -SliderBuilder                              = Java.type("javafx.scene.control.SliderBuilder");
  42.171 -SortEvent                                  = Java.type("javafx.scene.control.SortEvent");
  42.172 -SplitMenuButton                            = Java.type("javafx.scene.control.SplitMenuButton");
  42.173 -SplitMenuButtonBuilder                     = Java.type("javafx.scene.control.SplitMenuButtonBuilder");
  42.174 -SplitPane                                  = Java.type("javafx.scene.control.SplitPane");
  42.175 -SplitPane$Divider                          = Java.type("javafx.scene.control.SplitPane$Divider");
  42.176 -SplitPaneBuilder                           = Java.type("javafx.scene.control.SplitPaneBuilder");
  42.177 -Tab                                        = Java.type("javafx.scene.control.Tab");
  42.178 -TabBuilder                                 = Java.type("javafx.scene.control.TabBuilder");
  42.179 -TableCell                                  = Java.type("javafx.scene.control.TableCell");
  42.180 -TableCellBuilder                           = Java.type("javafx.scene.control.TableCellBuilder");
  42.181 -TableColumn                                = Java.type("javafx.scene.control.TableColumn");
  42.182 -TableColumn$CellDataFeatures               = Java.type("javafx.scene.control.TableColumn$CellDataFeatures");
  42.183 -TableColumn$CellEditEvent                  = Java.type("javafx.scene.control.TableColumn$CellEditEvent");
  42.184 -TableColumn$SortType                       = Java.type("javafx.scene.control.TableColumn$SortType");
  42.185 -TableColumnBase                            = Java.type("javafx.scene.control.TableColumnBase");
  42.186 -//TableColumnBaseBuilder                     = Java.type("javafx.scene.control.TableColumnBaseBuilder");
  42.187 -TableColumnBuilder                         = Java.type("javafx.scene.control.TableColumnBuilder");
  42.188 -TableFocusModel                            = Java.type("javafx.scene.control.TableFocusModel");
  42.189 -TablePosition                              = Java.type("javafx.scene.control.TablePosition");
  42.190 -TablePositionBase                          = Java.type("javafx.scene.control.TablePositionBase");
  42.191 -TableRow                                   = Java.type("javafx.scene.control.TableRow");
  42.192 -TableRowBuilder                            = Java.type("javafx.scene.control.TableRowBuilder");
  42.193 -TableSelectionModel                        = Java.type("javafx.scene.control.TableSelectionModel");
  42.194 -//TableSelectionModelBuilder                 = Java.type("javafx.scene.control.TableSelectionModelBuilder");
  42.195 -TableView                                  = Java.type("javafx.scene.control.TableView");
  42.196 -TableView$ResizeFeatures                   = Java.type("javafx.scene.control.TableView$ResizeFeatures");
  42.197 -TableView$TableViewFocusModel              = Java.type("javafx.scene.control.TableView$TableViewFocusModel");
  42.198 -TableView$TableViewSelectionModel          = Java.type("javafx.scene.control.TableView$TableViewSelectionModel");
  42.199 -TableViewBuilder                           = Java.type("javafx.scene.control.TableViewBuilder");
  42.200 -TabPane                                    = Java.type("javafx.scene.control.TabPane");
  42.201 -TabPane$TabClosingPolicy                   = Java.type("javafx.scene.control.TabPane$TabClosingPolicy");
  42.202 -TabPaneBuilder                             = Java.type("javafx.scene.control.TabPaneBuilder");
  42.203 -TextArea                                   = Java.type("javafx.scene.control.TextArea");
  42.204 -TextAreaBuilder                            = Java.type("javafx.scene.control.TextAreaBuilder");
  42.205 -TextField                                  = Java.type("javafx.scene.control.TextField");
  42.206 -TextFieldBuilder                           = Java.type("javafx.scene.control.TextFieldBuilder");
  42.207 -TextInputControl                           = Java.type("javafx.scene.control.TextInputControl");
  42.208 -TextInputControl$Content                   = Java.type("javafx.scene.control.TextInputControl$Content");
  42.209 -TextInputControlBuilder                    = Java.type("javafx.scene.control.TextInputControlBuilder");
  42.210 -TitledPane                                 = Java.type("javafx.scene.control.TitledPane");
  42.211 -TitledPaneBuilder                          = Java.type("javafx.scene.control.TitledPaneBuilder");
  42.212 -Toggle                                     = Java.type("javafx.scene.control.Toggle");
  42.213 -ToggleButton                               = Java.type("javafx.scene.control.ToggleButton");
  42.214 -ToggleButtonBuilder                        = Java.type("javafx.scene.control.ToggleButtonBuilder");
  42.215 -ToggleGroup                                = Java.type("javafx.scene.control.ToggleGroup");
  42.216 -ToggleGroupBuilder                         = Java.type("javafx.scene.control.ToggleGroupBuilder");
  42.217 -ToolBar                                    = Java.type("javafx.scene.control.ToolBar");
  42.218 -ToolBarBuilder                             = Java.type("javafx.scene.control.ToolBarBuilder");
  42.219 -Tooltip                                    = Java.type("javafx.scene.control.Tooltip");
  42.220 -TooltipBuilder                             = Java.type("javafx.scene.control.TooltipBuilder");
  42.221 -TreeCell                                   = Java.type("javafx.scene.control.TreeCell");
  42.222 -TreeCellBuilder                            = Java.type("javafx.scene.control.TreeCellBuilder");
  42.223 -TreeItem                                   = Java.type("javafx.scene.control.TreeItem");
  42.224 -TreeItem$TreeModificationEvent             = Java.type("javafx.scene.control.TreeItem$TreeModificationEvent");
  42.225 -TreeItemBuilder                            = Java.type("javafx.scene.control.TreeItemBuilder");
  42.226 -TreeSortMode                               = Java.type("javafx.scene.control.TreeSortMode");
  42.227 -TreeTableCell                              = Java.type("javafx.scene.control.TreeTableCell");
  42.228 -//TreeTableCellBuilder                       = Java.type("javafx.scene.control.TreeTableCellBuilder");
  42.229 -TreeTableColumn                            = Java.type("javafx.scene.control.TreeTableColumn");
  42.230 -TreeTableColumn$CellDataFeatures           = Java.type("javafx.scene.control.TreeTableColumn$CellDataFeatures");
  42.231 -TreeTableColumn$CellEditEvent              = Java.type("javafx.scene.control.TreeTableColumn$CellEditEvent");
  42.232 -TreeTableColumn$SortType                   = Java.type("javafx.scene.control.TreeTableColumn$SortType");
  42.233 -//TreeTableColumnBuilder                     = Java.type("javafx.scene.control.TreeTableColumnBuilder");
  42.234 -TreeTablePosition                          = Java.type("javafx.scene.control.TreeTablePosition");
  42.235 -TreeTableRow                               = Java.type("javafx.scene.control.TreeTableRow");
  42.236 -//TreeTableRowBuilder                        = Java.type("javafx.scene.control.TreeTableRowBuilder");
  42.237 -TreeTableView                              = Java.type("javafx.scene.control.TreeTableView");
  42.238 -TreeTableView$EditEvent                    = Java.type("javafx.scene.control.TreeTableView$EditEvent");
  42.239 -TreeTableView$ResizeFeatures               = Java.type("javafx.scene.control.TreeTableView$ResizeFeatures");
  42.240 -TreeTableView$TreeTableViewFocusModel      = Java.type("javafx.scene.control.TreeTableView$TreeTableViewFocusModel");
  42.241 -TreeTableView$TreeTableViewSelectionModel  = Java.type("javafx.scene.control.TreeTableView$TreeTableViewSelectionModel");
  42.242 -//TreeTableViewBuilder                       = Java.type("javafx.scene.control.TreeTableViewBuilder");
  42.243 -TreeView                                   = Java.type("javafx.scene.control.TreeView");
  42.244 -TreeView$EditEvent                         = Java.type("javafx.scene.control.TreeView$EditEvent");
  42.245 -TreeViewBuilder                            = Java.type("javafx.scene.control.TreeViewBuilder");
  42.246 +if (!this.JFX_BASE_CLASSES) {
  42.247 +    load("fx:base.js")
  42.248 +}
  42.249 +
  42.250 +LOAD_FX_CLASSES(JFX_CONTROLS_CLASSES);