# HG changeset patch # User jlaskey # Date 1362238007 14400 # Node ID 8cfcd914d26df83df3b995a380b89c608ddb0a74 # Parent 5ddfc1208ef397d3f49021560c25b10b5d8db7e6# Parent 675a0caf75bc5ecb95525154afc7dbc322683bb5 Merge diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/make/build.xml --- a/nashorn/make/build.xml Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/make/build.xml Sat Mar 02 11:26:47 2013 -0400 @@ -21,7 +21,7 @@ or visit www.oracle.com if you need additional information or have any questions. --> - + diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/make/project.properties --- a/nashorn/make/project.properties Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/make/project.properties Sat Mar 02 11:26:47 2013 -0400 @@ -24,7 +24,7 @@ application.title=nashorn # location of JDK embedded ASM sources -jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal +jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal/org/objectweb/asm # source and target levels build.compiler=modern diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java --- a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Sat Mar 02 11:26:47 2013 -0400 @@ -83,7 +83,6 @@ package jdk.internal.dynalink.beans; -import java.beans.Introspector; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -136,16 +135,16 @@ // Add the method as a property getter and/or setter if(name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0) { // Property getter - setPropertyGetter(Introspector.decapitalize(name.substring(3)), introspector.unreflect( + setPropertyGetter(decapitalize(name.substring(3)), introspector.unreflect( getMostGenericGetter(method)), ValidationType.INSTANCE_OF); } else if(name.startsWith("is") && name.length() > 2 && method.getParameterTypes().length == 0 && method.getReturnType() == boolean.class) { // Boolean property getter - setPropertyGetter(Introspector.decapitalize(name.substring(2)), introspector.unreflect( + setPropertyGetter(decapitalize(name.substring(2)), introspector.unreflect( getMostGenericGetter(method)), ValidationType.INSTANCE_OF); } else if(name.startsWith("set") && name.length() > 3 && method.getParameterTypes().length == 1) { // Property setter - addMember(Introspector.decapitalize(name.substring(3)), methodHandle, propertySetters); + addMember(decapitalize(name.substring(3)), methodHandle, propertySetters); } } @@ -170,6 +169,27 @@ } } + private static String decapitalize(String str) { + assert str != null; + if(str.isEmpty()) { + return str; + } + + final char c0 = str.charAt(0); + if(Character.isLowerCase(c0)) { + return str; + } + + // If it has two consecutive upper-case characters, i.e. "URL", don't decapitalize + if(str.length() > 1 && Character.isUpperCase(str.charAt(1))) { + return str; + } + + final char c[] = str.toCharArray(); + c[0] = Character.toLowerCase(c0); + return new String(c); + } + abstract FacetIntrospector createFacetIntrospector(); void setPropertyGetter(String name, MethodHandle handle, ValidationType validationType) { diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java --- a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java Sat Mar 02 11:26:47 2013 -0400 @@ -83,7 +83,6 @@ package jdk.internal.dynalink.beans; -import java.beans.BeanInfo; import java.lang.invoke.MethodHandles; import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.DynamicLinkerFactory; @@ -99,11 +98,9 @@ *

expose all public methods of form {@code setXxx()}, {@code getXxx()}, and {@code isXxx()} as property setters and * getters for {@code dyn:setProp} and {@code dyn:getProp} operations;
expose all property getters and setters declared by the class' {@link BeanInfo};
expose all public methods and methods declared by the class' {@link BeanInfo} for invocation through - * {@code dyn:callMethod} operation;
expose all public methods and methods declared by the class' {@link BeanInfo} for retrieval for - * {@code dyn:getMethod} operation; the methods thus retrieved can then be invoked using {@code dyn:call};
expose all public methods for invocation through {@code dyn:callMethod} operation;
expose all public methods for retrieval for {@code dyn:getMethod} operation; the methods thus retrieved can then + * be invoked using {@code dyn:call};
expose all public fields as properties, unless there are getters or setters for the properties of the same name;
expose {@code dyn:getLength}, {@code dyn:getElem} and {@code dyn:setElem} on native Java arrays, as well as * {@link java.util.List} and {@link java.util.Map} objects; ({@code dyn:getLength} works on any diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java --- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java Sat Mar 02 11:26:47 2013 -0400 @@ -95,7 +95,7 @@ *
* There is also a very nice debug interface that can emit formatted * bytecodes that have been written. This is enabled by setting the - * environment "nashorn.codegen.debug" to true, or --log=codegen: + * environment "nashorn.codegen.debug" to true, or --log=codegen:{@literal } *
* A ClassEmitter implements an Emitter - i.e. it needs to have * well defined start and end calls for whatever it is generating. Assertions diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java --- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java Sat Mar 02 11:26:47 2013 -0400 @@ -46,7 +46,6 @@ import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL; import static jdk.nashorn.internal.ir.Symbol.IS_TEMP; import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FAST_SCOPE; -import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FUNCTION_DECLARATION; import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_SCOPE; import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT; @@ -2052,9 +2051,6 @@ if (needsScope) { int flags = CALLSITE_SCOPE | getCallSiteFlags(); - if (varNode.isFunctionVarNode()) { - flags |= CALLSITE_FUNCTION_DECLARATION; - } final IdentNode identNode = varNode.getName(); final Type type = identNode.getType(); if (varSymbol.isFastScope(getCurrentFunctionNode())) { diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java --- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Sat Mar 02 11:26:47 2013 -0400 @@ -112,7 +112,7 @@ private final Context context; /** - * The list of available accessor types in width order. This order is used for type guesses narrow->wide + * The list of available accessor types in width order. This order is used for type guesses narrow{@literal ->} wide * in the dual--fields world */ public static final List ACCESSOR_TYPES = Collections.unmodifiableList( @@ -184,7 +184,7 @@ /** * Return the accessor type based on its index in [0..getNumberOfAccessorTypes()) - * Indexes are ordered narrower->wider / optimistic->pessimistic. Invalidations always + * Indexes are ordered narrower{@literal ->}wider / optimistic{@literal ->}pessimistic. Invalidations always * go to a type of higher index * * @param index accessor type index diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java --- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java Sat Mar 02 11:26:47 2013 -0400 @@ -459,120 +459,120 @@ } /** - * Specialized version of < operator for two int arguments. Do not call directly. + * Specialized version of {@literal <} operator for two int arguments. Do not call directly. * @param a int * @param b int - * @return a < b + * @return a {@code <} b */ public static boolean LT(final int a, final int b) { return a < b; } /** - * Specialized version of < operator for two double arguments. Do not call directly. + * Specialized version of {@literal <} operator for two double arguments. Do not call directly. * @param a double * @param b double - * @return a < b + * @return a {@literal <} b */ public static boolean LT(final double a, final double b) { return a < b; } /** - * Specialized version of < operator for two long arguments. Do not call directly. + * Specialized version of {@literal <} operator for two long arguments. Do not call directly. * @param a long * @param b long - * @return a < b + * @return a {@literal <} b */ public static boolean LT(final long a, final long b) { return a < b; } /** - * Specialized version of <= operator for two int arguments. Do not call directly. + * Specialized version of {@literal <=} operator for two int arguments. Do not call directly. * @param a int * @param b int - * @return a <= b + * @return a {@literal <=} b */ public static boolean LE(final int a, final int b) { return a <= b; } /** - * Specialized version of <= operator for two double arguments. Do not call directly. + * Specialized version of {@literal <=} operator for two double arguments. Do not call directly. * @param a double * @param b double - * @return a <= b + * @return a {@literal <=} b */ public static boolean LE(final double a, final double b) { return a <= b; } /** - * Specialized version of <= operator for two long arguments. Do not call directly. + * Specialized version of {@literal <=} operator for two long arguments. Do not call directly. * @param a long * @param b long - * @return a <= b + * @return a {@literal <=} b */ public static boolean LE(final long a, final long b) { return a <= b; } /** - * Specialized version of > operator for two int arguments. Do not call directly. + * Specialized version of {@literal >} operator for two int arguments. Do not call directly. * @param a int * @param b int - * @return a > b + * @return a {@literal >} b */ public static boolean GT(final int a, final int b) { return a > b; } /** - * Specialized version of > operator for two double arguments. Do not call directly. + * Specialized version of {@literal >} operator for two double arguments. Do not call directly. * @param a double * @param b double - * @return a > b + * @return a {@literal >} b */ public static boolean GT(final double a, final double b) { return a > b; } /** - * Specialized version of > operator for two long arguments. Do not call directly. + * Specialized version of {@literal >} operator for two long arguments. Do not call directly. * @param a long * @param b long - * @return a > b + * @return a {@literal >} b */ public static boolean GT(final long a, final long b) { return a > b; } /** - * Specialized version of >= operator for two int arguments. Do not call directly. + * Specialized version of {@literal >=} operator for two int arguments. Do not call directly. * @param a int * @param b int - * @return a >= b + * @return a {@literal >=} b */ public static boolean GE(final int a, final int b) { return a >= b; } /** - * Specialized version of >= operator for two double arguments. Do not call directly. + * Specialized version of {@literal >=} operator for two double arguments. Do not call directly. * @param a double * @param b double - * @return a >= b + * @return a {@literal >=} b */ public static boolean GE(final double a, final double b) { return a >= b; } /** - * Specialized version of >= operator for two long arguments. Do not call directly. + * Specialized version of {@literal >=} operator for two long arguments. Do not call directly. * @param a long * @param b long - * @return a >= b + * @return a {@code >=} b */ public static boolean GE(final long a, final long b) { return a >= b; diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/ir/Assignment.java --- a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java Sat Mar 02 11:26:47 2013 -0400 @@ -46,18 +46,4 @@ * @return get the assignment source node */ public Node getAssignmentSource(); - - /** - * Reset the assignment source - * - * @param newSource new source node - */ - public void setAssignmentSource(final Node newSource); - - /** - * Reset the assignment destination - * - * @param newDest new destination node - */ - public void setAssignmentDest(final D newDest); } diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java --- a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java Sat Mar 02 11:26:47 2013 -0400 @@ -140,21 +140,11 @@ } @Override - public void setAssignmentDest(final Node node) { - setLHS(node); - } - - @Override public Node getAssignmentSource() { return rhs(); } @Override - public void setAssignmentSource(final Node source) { - setRHS(source); - } - - @Override public boolean equals(final Object other) { if (!super.equals(other)) { return false; diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java --- a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java Sat Mar 02 11:26:47 2013 -0400 @@ -64,17 +64,17 @@ EQ_STRICT(TokenType.EQ_STRICT, Type.BOOLEAN, 2, true), /** == operator with at least one object */ EQ(TokenType.EQ, Type.BOOLEAN, 2, true), - /** >= operator with at least one object */ + /** {@literal >=} operator with at least one object */ GE(TokenType.GE, Type.BOOLEAN, 2, true), - /** > operator with at least one object */ + /** {@literal >} operator with at least one object */ GT(TokenType.GT, Type.BOOLEAN, 2, true), /** in operator */ IN(TokenType.IN, Type.BOOLEAN, 2), /** instanceof operator */ INSTANCEOF(TokenType.INSTANCEOF, Type.BOOLEAN, 2), - /** <= operator with at least one object */ + /** {@literal <=} operator with at least one object */ LE(TokenType.LE, Type.BOOLEAN, 2, true), - /** < operator with at least one object */ + /** {@literal <} operator with at least one object */ LT(TokenType.LT, Type.BOOLEAN, 2, true), /** !== operator with at least one object */ NE_STRICT(TokenType.NE_STRICT, Type.BOOLEAN, 2, true), @@ -184,7 +184,7 @@ /** * If this request can be reversed, return the reverse request - * Eq EQ -> NE. + * Eq EQ {@literal ->} NE. * * @param request request to reverse * diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java --- a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java Sat Mar 02 11:26:47 2013 -0400 @@ -109,16 +109,6 @@ } @Override - public void setAssignmentSource(final Node source) { - setAssignmentDest(source); - } - - @Override - public void setAssignmentDest(final Node source) { - setRHS(source); - } - - @Override public boolean equals(final Object other) { if (!super.equals(other)) { return false; diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/ir/VarNode.java --- a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java Sat Mar 02 11:26:47 2013 -0400 @@ -83,20 +83,10 @@ } @Override - public void setAssignmentDest(final IdentNode node) { - setName(name); - } - - @Override public Node getAssignmentSource() { return isAssignment() ? getInit() : null; } - @Override - public void setAssignmentSource(final Node source) { - setInit(source); - } - /** * Does this variable declaration have an init value * @return true if an init exists, false otherwise diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java --- a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java Sat Mar 02 11:26:47 2013 -0400 @@ -542,7 +542,7 @@ } /** - * Binary enter - callback for entering && operator + * Binary enter - callback for entering {@literal &&} operator * * @param binaryNode the node * @return processed node @@ -552,7 +552,7 @@ } /** - * Binary leave - callback for leaving a && operator + * Binary leave - callback for leaving a {@literal &&} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -602,7 +602,7 @@ } /** - * Binary enter - callback for entering &= operator + * Binary enter - callback for entering {@literal &=} operator * * @param binaryNode the node * @return processed node @@ -612,7 +612,7 @@ } /** - * Binary leave - callback for leaving a &= operator + * Binary leave - callback for leaving a {@literal &=} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -722,7 +722,7 @@ } /** - * Binary enter - callback for entering >>= operator + * Binary enter - callback for entering {@literal >>=} operator * * @param binaryNode the node * @return processed node @@ -732,7 +732,7 @@ } /** - * Binary leave - callback for leaving a >>= operator + * Binary leave - callback for leaving a {@literal >>=} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -742,7 +742,7 @@ } /** - * Binary enter - callback for entering a <<= operator + * Binary enter - callback for entering a {@literal <<=} operator * * @param binaryNode the node * @return processed node @@ -752,7 +752,7 @@ } /** - * Binary leave - callback for leaving a <<= operator + * Binary leave - callback for leaving a {@literal <<=} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -762,7 +762,7 @@ } /** - * Binary enter - callback for entering >>>= operator + * Binary enter - callback for entering {@literal >>>=} operator * * @param binaryNode the node * @return processed node @@ -772,7 +772,7 @@ } /** - * Binary leave - callback for leaving a >>>= operator + * Binary leave - callback for leaving a {@literal >>>=} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -822,7 +822,7 @@ } /** - * Binary enter - callback for entering & operator + * Binary enter - callback for entering {@literal &} operator * * @param binaryNode the node * @return processed node @@ -832,7 +832,7 @@ } /** - * Binary leave - callback for leaving a & operator + * Binary leave - callback for leaving a {@literal &} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -986,7 +986,7 @@ } /** - * Binary enter - callback for entering >= operator + * Binary enter - callback for entering {@literal >=} operator * * @param binaryNode the node * @return processed node @@ -996,7 +996,7 @@ } /** - * Binary leave - callback for leaving >= operator + * Binary leave - callback for leaving {@literal >=} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -1006,7 +1006,7 @@ } /** - * Binary enter - callback for entering > operator + * Binary enter - callback for entering {@literal >} operator * * @param binaryNode the node * @return processed node @@ -1016,7 +1016,7 @@ } /** - * Binary leave - callback for leaving > operator + * Binary leave - callback for leaving {@literal >} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -1066,7 +1066,7 @@ } /** - * Binary enter - callback for entering <= operator + * Binary enter - callback for entering {@literal <=} operator * * @param binaryNode the node * @return processed node @@ -1076,7 +1076,7 @@ } /** - * Binary leave - callback for leaving <= operator + * Binary leave - callback for leaving {@literal <=} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -1086,7 +1086,7 @@ } /** - * Binary enter - callback for entering < operator + * Binary enter - callback for entering {@literal <} operator * * @param binaryNode the node * @return processed node @@ -1096,7 +1096,7 @@ } /** - * Binary leave - callback for leaving < operator + * Binary leave - callback for leaving {@literal <} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -1205,7 +1205,7 @@ } /** - * Binary enter - callback for entering >> operator + * Binary enter - callback for entering {@literal >>} operator * * @param binaryNode the node * @return processed node @@ -1215,7 +1215,7 @@ } /** - * Binary leave - callback for leaving >> operator + * Binary leave - callback for leaving {@literal >>} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -1225,7 +1225,7 @@ } /** - * Binary enter - callback for entering << operator + * Binary enter - callback for entering {@literal <<} operator * * @param binaryNode the node * @return processed node @@ -1235,7 +1235,7 @@ } /** - * Binary leave - callback for leaving << operator + * Binary leave - callback for leaving {@literal <<} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node @@ -1244,7 +1244,7 @@ return leaveDefault(binaryNode); } /** - * Binary enter - callback for entering >>> operator + * Binary enter - callback for entering {@literal >>>} operator * * @param binaryNode the node * @return processed node @@ -1254,7 +1254,7 @@ } /** - * Binary leave - callback for leaving >>> operator + * Binary leave - callback for leaving {@literal >>>} operator * * @param binaryNode the node * @return processed node, which will replace the original one, or the original node diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/objects/DateParser.java --- a/nashorn/src/jdk/nashorn/internal/objects/DateParser.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java Sat Mar 02 11:26:47 2013 -0400 @@ -221,7 +221,7 @@ * *
English month names and selected time zone names as well as AM/PM markers are recognized * and handled properly. Additionally, numeric time zone offsets such as (+|-)hh:mm or - * (+|-)hhmm are recognized. If the string does not contain a time zone offset + * (+|-)hhmm are recognized. If the string does not contain a time zone offset * the TIMEZONEfield is left undefined, meaning the local time zone should be applied.
* *
English weekday names are recognized but ignored. All text in parentheses is ignored as well. diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java --- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java Sat Mar 02 11:26:47 2013 -0400 @@ -74,13 +74,16 @@ * delete x.p; // calls y.__delete__ * for (i in x) { print(i); } // calls y.__getIds__ * + *
* JavaScript caller of adapter object is isolated from the fact that the property access/mutation/deletion are really * calls to JavaScript methods on adaptee. - *
+ *
+ *
* JSAdapter constructor can optionally receive an "overrides" object. Properties of overrides object is copied to * JSAdapter instance. When user accessed property is one of these, then adaptee's methods like {@code __get__}, * {@code __put__} etc. are not called for those. This can be used to make certain "preferred" properties that can be * accessed in the usual/faster way avoiding proxy mechanism. Example: + *
*
```
  *     var x = new JSAdapter({ foo: 444, bar: 6546 }) {
  *          __get__: function(name) { return name; }
diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java	Wed Feb 27 14:12:45 2013 +0000
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java	Sat Mar 02 11:26:47 2013 -0400
@@ -65,6 +65,7 @@
     }
 
     /**
+     * 
      * Given a name of a Java type, returns an object representing that type in Nashorn. The Java class of the objects
      * used to represent Java types in Nashorn is not {@link java.lang.Class} but rather {@link StaticClass}. They are
      * the objects that you can use with the {@code new} operator to create new instances of the class as well as to
@@ -75,7 +76,8 @@
      * different expression (e.g. {@code java.io.File}) as an argument in "new" and to address statics, and it is
      * distinct from the {@code Class} object (e.g. {@code java.io.File.class}). Below we cover in details the
      * properties of the type objects.
-     * 
Constructing Java objects
+     * 
+     * Constructing Java objects
      * Examples:
      *       * var arrayListType = Java.type("java.util.ArrayList")
@@ -104,19 +106,24 @@
      * var arctype = Java.type("java.awt.geom.Arc2D")
      * var ftype = arctype.Float
      * 
+     * 
      * You can access both static and non-static inner classes. If you want to create an instance of a non-static
      * inner class, remember to pass an instance of its outer class as the first argument to the constructor.
-     * 

+     * 
+     * 
      * If the type is abstract, you can instantiate an anonymous subclass of it using an argument list that is
      * applicable to any of its public or protected constructors, but inserting a JavaScript object with functions
      * properties that provide JavaScript implementations of the abstract methods. If method names are overloaded, the
      * JavaScript function will provide implementation for all overloads. E.g.:
+     * 
      *       * var TimerTask =  Java.type("java.util.TimerTask")
      * var task = new TimerTask({ run: function() { print("Hello World!") } })
      * 
+     * 
      * Nashorn supports a syntactic extension where a "new" expression followed by an argument is identical to
      * invoking the constructor and passing the argument to it, so you can write the above example also as:
+     * 
      *       * var task = new TimerTask {
      *     run: function() {
@@ -124,30 +131,38 @@
      *     }
      * }
      * 
+     * 
      * which is very similar to Java anonymous inner class definition. On the other hand, if the type is an abstract
      * type with a single abstract method (commonly referred to as a "SAM type") or all abstract methods it has share
      * the same overloaded name), then instead of an object, you can just pass a function, so the above example can
      * become even more simplified to:
+     * 
      *       * var task = new TimerTask(function() { print("Hello World!") })
      * 
+     * 
      * Note that in every one of these cases if you are trying to instantiate an abstract class that has constructors
      * that take some arguments, you can invoke those simply by specifying the arguments after the initial
      * implementation object or function.
-     * 
The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type,
+     * 
+     * The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type,
      * you can just pass in a function object, and Nashorn will know what you meant:
+     * 
      *       * var timer = new Java.type("java.util.Timer")
      * timer.schedule(function() { print("Hello World!") })
      * 
+     * 
      * Here, {@code Timer.schedule()} expects a {@code TimerTask} as its argument, so Nashorn creates an instance of a
      * {@code TimerTask} subclass and uses the passed function to implement its only abstract method, {@code run()}. In
      * this usage though, you can't use non-default constructors; the type must be either an interface, or must have a
      * protected or public no-arg constructor.
-     * 

+     * 
+     * 
      * You can also subclass non-abstract classes; for that you will need to use the {@link #extend(Object, Object...)}
      * method.
-     * 
Accessing static members
+     * 
+     * Accessing static members
      * Examples:
      *       * var File = Java.type("java.io.File")
@@ -176,7 +191,7 @@
      * var File = Java.type("java.io.File")
      * print(File.class.static === File) // prints true
      * 
-     * {@code instanceof} operator
+     * {@code instanceof} operator
      * The standard ECMAScript {@code instanceof} operator is extended to recognize Java objects and their type objects:
      *       * var File = Java.type("java.io.File")
@@ -368,6 +383,7 @@
      * If the Java method is overloaded (as in the above example {@code List.add()}), then your JavaScript adapter
      * must be prepared to deal with all overloads.
      * You can't invoke {@code super.*()} from adapters for now.
+     * 
```

* @param self not used * @param types the original types. The caller must pass at least one Java type object of class {@link StaticClass} * representing either a public interface or a non-final public class with at least one public or protected diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java --- a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java Sat Mar 02 11:26:47 2013 -0400 @@ -30,7 +30,7 @@ * As only the code generating package (i.e. Context) knows about * the ScriptLoader and it would be a security hazard otherwise * the Compiler is given an installation interface for its code. - *

> + *

* The compiler still retains most of the state around code emission * and management internally, so this is to avoid passing around any * logic that isn't directly related to installing a class diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/Context.java --- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java Sat Mar 02 11:26:47 2013 -0400 @@ -509,7 +509,7 @@ * * @param fullName full name of class, e.g. jdk.nashorn.internal.objects.JO$2P1 contains 2 fields and 1 parameter. * - * @return the Class for this structure + * @return the {@code Class} for this structure * * @throws ClassNotFoundException if structure class cannot be resolved */ @@ -523,7 +523,7 @@ * * @param fullName full name of class to load * - * @return the Class for the name + * @return the {@code Class} for the name * * @throws ClassNotFoundException if class cannot be resolved */ diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java --- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java Sat Mar 02 11:26:47 2013 -0400 @@ -1463,7 +1463,7 @@ } /** - * Returns the set of entries that make up this + * Returns the set of {@literal } entries that make up this * ScriptObject's properties * (java.util.Map-like method to help ScriptObjectMirror implementation) * @@ -1524,7 +1524,7 @@ * of their keys to their values * (java.util.Map-like method to help ScriptObjectMirror implementation) * - * @param otherMap a map of properties to add + * @param otherMap a {@literal } map of properties to add */ public void putAll(final Map otherMap) { final boolean strict = getContext()._strict; diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java --- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java Sat Mar 02 11:26:47 2013 -0400 @@ -815,7 +815,7 @@ } /** - * ECMA 11.8.1 - The less than operator (<) - generic implementation + * ECMA 11.8.1 - The less than operator ({@literal <}) - generic implementation * * @param x first object to compare * @param y second object to compare @@ -828,7 +828,7 @@ } /** - * ECMA 11.8.2 - The greater than operator (>) - generic implementation + * ECMA 11.8.2 - The greater than operator ({@literal >}) - generic implementation * * @param x first object to compare * @param y second object to compare @@ -841,7 +841,7 @@ } /** - * ECMA 11.8.3 - The less than or equal operator (<=) - generic implementation + * ECMA 11.8.3 - The less than or equal operator ({@literal <=}) - generic implementation * * @param x first object to compare * @param y second object to compare @@ -854,7 +854,7 @@ } /** - * ECMA 11.8.4 - The greater than or equal operator (>=) - generic implementation + * ECMA 11.8.4 - The greater than or equal operator ({@literal >=}) - generic implementation * * @param x first object to compare * @param y second object to compare diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Sat Mar 02 11:26:47 2013 -0400 @@ -87,7 +87,7 @@ import jdk.nashorn.internal.runtime.Undefined; /** - * A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and + *

A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and * extending of Java classes from JavaScript. For every combination of a superclass to extend and interfaces to * implement (collectively: "original types"), exactly one adapter class is generated that extends the specified * superclass and implements the specified interfaces. diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java Sat Mar 02 11:26:47 2013 -0400 @@ -43,8 +43,6 @@ public static final int CALLSITE_SCOPE = 0x01; /** Flags that the call site is in code that uses ECMAScript strict mode. */ public static final int CALLSITE_STRICT = 0x02; - /** Flags that a property setter call site is part of a function declaration that assigns the function object to a name. */ - public static final int CALLSITE_FUNCTION_DECLARATION = 0x04; /** Flags that a property getter or setter call site references a scope variable that is not in the global scope * (it is in a function lexical scope), and the function's scope object class is fixed and known in advance. Such * getters and setters can often be linked more optimally using these assumptions. */ @@ -182,7 +180,7 @@ /** * Returns the named operand in this descriptor's name. Equivalent to * {@code getNameToken(CallSiteDescriptor.NAME_OPERAND)}. E.g. for operation {@code "dyn:getProp:color"}, returns - * {@code "color"}. For call sites without named operands (e.g. {@link "dyn:new"}) returns null. + * {@code "color"}. For call sites without named operands (e.g. {@code "dyn:new"}) returns null. * @return the named operand in this descriptor's name. */ public String getOperand() { diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/options/Options.java --- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java Sat Mar 02 11:26:47 2013 -0400 @@ -200,7 +200,7 @@ /** * Return an option given its resource key. If the key doesn't begin with - * .option it will be completed using the resource from this + * {@literal }.option it will be completed using the resource from this * instance * * @param key key for option diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java --- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Sat Mar 02 11:26:47 2013 -0400 @@ -117,10 +117,6 @@ return new JoniRegExp(pattern, flags); } - @Override - protected String replaceToken(final String str) { - return str.equals("[^]") ? "[\\s\\S]" : str; - } } class JoniMatcher implements RegExpMatcher { diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java --- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java Sat Mar 02 11:26:47 2013 -0400 @@ -68,25 +68,6 @@ } /** - * Replace a regexp token as suitable for regexp instances created by this factory. - * - * @param str a regular expression token - * @return the replacement token - */ - protected String replaceToken(final String str) { - switch (str) { - case "\\s": - return "[" + Lexer.getWhitespaceRegExp() + "]"; - case "\\S": - return "[^" + Lexer.getWhitespaceRegExp() + "]"; - case "[^]": - return "[\\s\\S]"; - default: - return str; - } - } - - /** * Compile a regexp with the given {@code source} and {@code flags}. * * @param pattern RegExp pattern string @@ -99,16 +80,6 @@ } /** - * Replace a regexp token as needed by the currently installed factory instance. - * - * @param token a regexp token - * @return the replacement token - */ - public static String replace(final String token) { - return instance.replaceToken(token); - } - - /** * Validate a regexp with the given {@code source} and {@code flags}. * * @param pattern RegExp pattern string @@ -120,4 +91,13 @@ public static void validate(final String pattern, final String flags) throws ParserException { instance.compile(pattern, flags); } + + /** + * Returns true if the instance uses the JDK's {@code java.util.regex} package. + * + * @return true if instance uses JDK regex package + */ + public static boolean usesJavaUtilRegex() { + return instance != null && instance.getClass() == RegExpFactory.class; + } } diff -r 5ddfc1208ef3 -r 8cfcd914d26d nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java --- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Wed Feb 27 14:12:45 2013 +0000 +++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Sat Mar 02 11:26:47 2013 -0400 @@ -25,15 +25,15 @@ package jdk.nashorn.internal.runtime.regexp; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.regex.PatternSyntaxException; +import jdk.nashorn.internal.parser.Lexer; import jdk.nashorn.internal.parser.Scanner; import jdk.nashorn.internal.runtime.BitVector; @@ -44,17 +44,13 @@ final class RegExpScanner extends Scanner { /** - * String builder to accumulate the result - this contains verbatim parsed JavaScript. - * to get the java equivalent we need to create a Pattern token and return its toString() + * String builder used to rewrite the pattern for the currently used regexp factory. */ private final StringBuilder sb; /** Is this the special case of a regexp that never matches anything */ private boolean neverMatches; - /** The resulting java.util.regex pattern string. */ - private String javaPattern; - /** Expected token table */ private final Map expected = new HashMap<>(); @@ -62,11 +58,14 @@ private final List caps = new LinkedList<>(); /** Forward references to capturing parenthesis to be resolved later.*/ - private final Map forwardReferences = new LinkedHashMap<>(); + private final Set forwardReferences = new LinkedHashSet<>(); /** Current level of zero-width negative lookahead assertions. */ private int negativeLookaheadLevel; + /** Are we currently inside a character class? */ + private boolean inCharClass = false; + private static final String NON_IDENT_ESCAPES = "$^*+(){}[]|\\.?"; private static class Capture { @@ -74,11 +73,6 @@ * Zero-width negative lookaheads enclosing the capture. */ private final int negativeLookaheadLevel; - /** - * Captures that live inside a negative lookahead are dead after the - * lookahead and will be undefined if referenced from outside. - */ - private boolean isDead; Capture(final int negativeLookaheadLevel) { this.negativeLookaheadLevel = negativeLookaheadLevel; @@ -88,336 +82,6 @@ return negativeLookaheadLevel; } - public boolean isDead() { - return isDead; - } - - public void setDead() { - this.isDead = true; - } - } - - /** - * This is a token - the JavaScript regexp is scanned into a token tree - * A token has other tokens as children as well as "atoms", i.e. Strings. - */ - private static class Token { - - private enum Type { - PATTERN, - DISJUNCTION, - ALTERNATIVE, - TERM, - ASSERTION, - QUANTIFIER, - QUANTIFIER_PREFIX, - ATOM, - PATTERN_CHARACTER, - ATOM_ESCAPE, - CHARACTER_ESCAPE, - CONTROL_ESCAPE, - CONTROL_LETTER, - IDENTITY_ESCAPE, - DECIMAL_ESCAPE, - CHARACTERCLASS_ESCAPE, - CHARACTERCLASS, - CLASSRANGES, - NON_EMPTY_CLASSRANGES, - NON_EMPTY_CLASSRANGES_NODASH, - CLASSATOM, - CLASSATOM_NODASH, - CLASS_ESCAPE, - DECIMALDIGITS, - HEX_ESCAPESEQUENCE, - UNICODE_ESCAPESEQUENCE, - } - - /** - * Token tyoe - */ - private final Token.Type type; - - /** - * Child nodes - */ - private final List

Constructing Java objects

Accessing static members

{@code instanceof} operator