Mercurial > hg > openjdk > jdk9 > nashorn
changeset 877:cf4d2252d444
8044638: Tidy up Nashorn codebase for code standards
Reviewed-by: lagergren, sundar
line wrap: on
line diff
--- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java Wed Jun 04 13:08:57 2014 +0200 @@ -31,29 +31,29 @@ import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC; import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE_DESC; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_TYPE; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_INIT_DESC; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_TYPE; import static jdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_EMPTY_LIST; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_TYPE; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD_DESC; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_TYPE; import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.GETTER_PREFIX; import static jdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME; import static jdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_TYPE; import static jdk.nashorn.internal.tools.nasgen.StringConstants.LIST_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_EMPTY_LIST; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_MAKEFUNCTION; import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_MAKEFUNCTION_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_MAKEFUNCTION_SPECS_DESC;
--- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java Wed Jun 04 13:08:57 2014 +0200 @@ -32,9 +32,9 @@ import static jdk.nashorn.internal.tools.nasgen.StringConstants.CONSTRUCTOR_SUFFIX; import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE;
--- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java Wed Jun 04 13:08:57 2014 +0200 @@ -31,9 +31,9 @@ import static jdk.internal.org.objectweb.asm.Opcodes.V1_7; import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE; import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPE_SUFFIX; import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC;
--- a/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java Wed Jun 04 13:55:21 2014 +0530 +++ b/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,8 +26,8 @@ package jdk.nashorn.internal.tools.nasgen; import java.lang.invoke.MethodHandle; +import java.util.ArrayList; import java.util.Collection; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import jdk.internal.org.objectweb.asm.Type;
--- a/src/jdk/internal/dynalink/ChainedCallSite.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/ChainedCallSite.java Wed Jun 04 13:08:57 2014 +0200 @@ -88,7 +88,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.concurrent.atomic.AtomicReference; - import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.internal.dynalink.support.AbstractRelinkableCallSite; import jdk.internal.dynalink.support.Lookup; @@ -132,7 +131,7 @@ * Creates a new chained call site. * @param descriptor the descriptor for the call site. */ - public ChainedCallSite(CallSiteDescriptor descriptor) { + public ChainedCallSite(final CallSiteDescriptor descriptor) { super(descriptor); } @@ -146,16 +145,16 @@ } @Override - public void relink(GuardedInvocation guardedInvocation, MethodHandle fallback) { + public void relink(final GuardedInvocation guardedInvocation, final MethodHandle fallback) { relinkInternal(guardedInvocation, fallback, false, false); } @Override - public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle fallback) { + public void resetAndRelink(final GuardedInvocation guardedInvocation, final MethodHandle fallback) { relinkInternal(guardedInvocation, fallback, true, false); } - private MethodHandle relinkInternal(GuardedInvocation invocation, MethodHandle relink, boolean reset, boolean removeCatches) { + private MethodHandle relinkInternal(final GuardedInvocation invocation, final MethodHandle relink, final boolean reset, final boolean removeCatches) { final LinkedList<GuardedInvocation> currentInvocations = invocations.get(); @SuppressWarnings({ "unchecked", "rawtypes" }) final LinkedList<GuardedInvocation> newInvocations = @@ -163,7 +162,7 @@ // First, prune the chain of invalidated switchpoints, we always do this // We also remove any catches if the remove catches flag is set - for(Iterator<GuardedInvocation> it = newInvocations.iterator(); it.hasNext();) { + for(final Iterator<GuardedInvocation> it = newInvocations.iterator(); it.hasNext();) { final GuardedInvocation inv = it.next(); if(inv.hasBeenInvalidated() || (removeCatches && inv.getException() != null)) { it.remove(); @@ -187,7 +186,7 @@ // Fold the new chain MethodHandle target = relink; - for(GuardedInvocation inv: newInvocations) { + for(final GuardedInvocation inv: newInvocations) { target = inv.compose(target, pruneAndInvokeSwitchPoints, pruneAndInvokeCatches); } @@ -222,7 +221,7 @@ * @param relink the ultimate fallback for the chain (the {@code DynamicLinker}'s relink). * @return a method handle for prune-and-invoke */ - private MethodHandle makePruneAndInvokeMethod(MethodHandle relink, MethodHandle prune) { + private MethodHandle makePruneAndInvokeMethod(final MethodHandle relink, final MethodHandle prune) { // Bind prune to (this, relink) final MethodHandle boundPrune = MethodHandles.insertArguments(prune, 0, this, relink); // Make it ignore all incoming arguments @@ -232,7 +231,7 @@ } @SuppressWarnings("unused") - private MethodHandle prune(MethodHandle relink, final boolean catches) { + private MethodHandle prune(final MethodHandle relink, final boolean catches) { return relinkInternal(null, relink, false, catches); } }
--- a/src/jdk/internal/dynalink/DefaultBootstrapper.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/DefaultBootstrapper.java Wed Jun 04 13:08:57 2014 +0200 @@ -117,7 +117,7 @@ * @param type the method signature at the call site * @return a new {@link MonomorphicCallSite} linked with the default dynamic linker. */ - public static CallSite bootstrap(MethodHandles.Lookup caller, String name, MethodType type) { + public static CallSite bootstrap(final MethodHandles.Lookup caller, final String name, final MethodType type) { return bootstrapInternal(caller, name, type); } @@ -133,11 +133,11 @@ * @param type the method signature at the call site * @return a new {@link MonomorphicCallSite} linked with the default dynamic linker. */ - public static CallSite publicBootstrap(MethodHandles.Lookup caller, String name, MethodType type) { + public static CallSite publicBootstrap(final MethodHandles.Lookup caller, final String name, final MethodType type) { return bootstrapInternal(MethodHandles.publicLookup(), name, type); } - private static CallSite bootstrapInternal(MethodHandles.Lookup caller, String name, MethodType type) { + private static CallSite bootstrapInternal(final MethodHandles.Lookup caller, final String name, final MethodType type) { return dynamicLinker.link(new MonomorphicCallSite(CallSiteDescriptorFactory.create(caller, name, type))); } }
--- a/src/jdk/internal/dynalink/DynamicLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/DynamicLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -159,8 +159,8 @@ * @param prelinkFilter see {@link DynamicLinkerFactory#setPrelinkFilter(GuardedInvocationFilter)} * @param runtimeContextArgCount see {@link DynamicLinkerFactory#setRuntimeContextArgCount(int)} */ - DynamicLinker(LinkerServices linkerServices, GuardedInvocationFilter prelinkFilter, int runtimeContextArgCount, - boolean syncOnRelink, int unstableRelinkThreshold) { + DynamicLinker(final LinkerServices linkerServices, final GuardedInvocationFilter prelinkFilter, final int runtimeContextArgCount, + final boolean syncOnRelink, final int unstableRelinkThreshold) { if(runtimeContextArgCount < 0) { throw new IllegalArgumentException("runtimeContextArgCount < 0"); } @@ -201,7 +201,7 @@ private static final MethodHandle RELINK = Lookup.findOwnSpecial(MethodHandles.lookup(), RELINK_METHOD_NAME, MethodHandle.class, RelinkableCallSite.class, int.class, Object[].class); - private MethodHandle createRelinkAndInvokeMethod(final RelinkableCallSite callSite, int relinkCount) { + private MethodHandle createRelinkAndInvokeMethod(final RelinkableCallSite callSite, final int relinkCount) { // Make a bound MH of invoke() for this linker and call site final MethodHandle boundRelinker = MethodHandles.insertArguments(RELINK, 0, this, callSite, Integer.valueOf( relinkCount)); @@ -221,7 +221,7 @@ * @throws Exception rethrows any exception thrown by the linkers */ @SuppressWarnings("unused") - private MethodHandle relink(RelinkableCallSite callSite, int relinkCount, Object... arguments) throws Exception { + private MethodHandle relink(final RelinkableCallSite callSite, final int relinkCount, final Object... arguments) throws Exception { final CallSiteDescriptor callSiteDescriptor = callSite.getDescriptor(); final boolean unstableDetectionEnabled = unstableRelinkThreshold > 0; final boolean callSiteUnstable = unstableDetectionEnabled && relinkCount >= unstableRelinkThreshold;
--- a/src/jdk/internal/dynalink/DynamicLinkerFactory.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/DynamicLinkerFactory.java Wed Jun 04 13:08:57 2014 +0200 @@ -137,7 +137,7 @@ * * @param classLoader the class loader used for the autodiscovery of available linkers. */ - public void setClassLoader(ClassLoader classLoader) { + public void setClassLoader(final ClassLoader classLoader) { this.classLoader = classLoader; classLoaderExplicitlySet = true; } @@ -151,7 +151,7 @@ * @param prioritizedLinkers the list of prioritized linkers. Null can be passed to indicate no prioritized linkers * (this is also the default value). */ - public void setPrioritizedLinkers(List<? extends GuardingDynamicLinker> prioritizedLinkers) { + public void setPrioritizedLinkers(final List<? extends GuardingDynamicLinker> prioritizedLinkers) { this.prioritizedLinkers = prioritizedLinkers == null ? null : new ArrayList<>(prioritizedLinkers); } @@ -164,7 +164,7 @@ * * @param prioritizedLinkers a list of prioritized linkers. */ - public void setPrioritizedLinkers(GuardingDynamicLinker... prioritizedLinkers) { + public void setPrioritizedLinkers(final GuardingDynamicLinker... prioritizedLinkers) { setPrioritizedLinkers(Arrays.asList(prioritizedLinkers)); } @@ -175,7 +175,7 @@ * @param prioritizedLinker the single prioritized linker. Must not be null. * @throws IllegalArgumentException if null is passed. */ - public void setPrioritizedLinker(GuardingDynamicLinker prioritizedLinker) { + public void setPrioritizedLinker(final GuardingDynamicLinker prioritizedLinker) { if(prioritizedLinker == null) { throw new IllegalArgumentException("prioritizedLinker == null"); } @@ -190,7 +190,7 @@ * @param fallbackLinkers the list of fallback linkers. Can be empty to indicate the caller wishes to set no * fallback linkers. */ - public void setFallbackLinkers(List<? extends GuardingDynamicLinker> fallbackLinkers) { + public void setFallbackLinkers(final List<? extends GuardingDynamicLinker> fallbackLinkers) { this.fallbackLinkers = fallbackLinkers == null ? null : new ArrayList<>(fallbackLinkers); } @@ -202,7 +202,7 @@ * @param fallbackLinkers the list of fallback linkers. Can be empty to indicate the caller wishes to set no * fallback linkers. If it is left as null, the standard fallback {@link BeansLinker} will be used. */ - public void setFallbackLinkers(GuardingDynamicLinker... fallbackLinkers) { + public void setFallbackLinkers(final GuardingDynamicLinker... fallbackLinkers) { setFallbackLinkers(Arrays.asList(fallbackLinkers)); } @@ -216,7 +216,7 @@ * * @param runtimeContextArgCount the number of language runtime context arguments in call sites. */ - public void setRuntimeContextArgCount(int runtimeContextArgCount) { + public void setRuntimeContextArgCount(final int runtimeContextArgCount) { if(runtimeContextArgCount < 0) { throw new IllegalArgumentException("runtimeContextArgCount < 0"); } @@ -229,7 +229,7 @@ * multithreaded execution of dynamically linked code. * @param syncOnRelink true for invoking sync on relink, false otherwise. */ - public void setSyncOnRelink(boolean syncOnRelink) { + public void setSyncOnRelink(final boolean syncOnRelink) { this.syncOnRelink = syncOnRelink; } @@ -240,7 +240,7 @@ * call sites will never be considered unstable. * @see LinkRequest#isCallSiteUnstable() */ - public void setUnstableRelinkThreshold(int unstableRelinkThreshold) { + public void setUnstableRelinkThreshold(final int unstableRelinkThreshold) { if(unstableRelinkThreshold < 0) { throw new IllegalArgumentException("unstableRelinkThreshold < 0"); } @@ -254,7 +254,7 @@ * When not set explicitly, {@link DefaultPrelinkFilter} will be used. * @param prelinkFilter the pre-link filter for the dynamic linker. */ - public void setPrelinkFilter(GuardedInvocationFilter prelinkFilter) { + public void setPrelinkFilter(final GuardedInvocationFilter prelinkFilter) { this.prelinkFilter = prelinkFilter; } @@ -289,7 +289,7 @@ // ... prioritized linkers, ... linkers.addAll(prioritizedLinkers); // ... filtered discovered linkers, ... - for(GuardingDynamicLinker linker: discovered) { + for(final GuardingDynamicLinker linker: discovered) { if(!knownLinkerClasses.contains(linker.getClass())) { linkers.add(linker); } @@ -314,7 +314,7 @@ } final List<GuardingTypeConverterFactory> typeConverters = new LinkedList<>(); - for(GuardingDynamicLinker linker: linkers) { + for(final GuardingDynamicLinker linker: linkers) { if(linker instanceof GuardingTypeConverterFactory) { typeConverters.add((GuardingTypeConverterFactory)linker); } @@ -337,9 +337,9 @@ }, ClassLoaderGetterContextProvider.GET_CLASS_LOADER_CONTEXT); } - private static void addClasses(Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses, - List<? extends GuardingDynamicLinker> linkers) { - for(GuardingDynamicLinker linker: linkers) { + private static void addClasses(final Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses, + final List<? extends GuardingDynamicLinker> linkers) { + for(final GuardingDynamicLinker linker: linkers) { knownLinkerClasses.add(linker.getClass()); } }
--- a/src/jdk/internal/dynalink/MonomorphicCallSite.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/MonomorphicCallSite.java Wed Jun 04 13:08:57 2014 +0200 @@ -99,17 +99,17 @@ * Creates a new call site with monomorphic inline caching strategy. * @param descriptor the descriptor for this call site */ - public MonomorphicCallSite(CallSiteDescriptor descriptor) { + public MonomorphicCallSite(final CallSiteDescriptor descriptor) { super(descriptor); } @Override - public void relink(GuardedInvocation guardedInvocation, MethodHandle relink) { + public void relink(final GuardedInvocation guardedInvocation, final MethodHandle relink) { setTarget(guardedInvocation.compose(relink)); } @Override - public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle relink) { + public void resetAndRelink(final GuardedInvocation guardedInvocation, final MethodHandle relink) { relink(guardedInvocation, relink); } }
--- a/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java Wed Jun 04 13:08:57 2014 +0200 @@ -97,7 +97,7 @@ * Creates a new NoSuchDynamicMethodException * @param message the message of the exception. */ - public NoSuchDynamicMethodException(String message) { + public NoSuchDynamicMethodException(final String message) { super(message); } }
--- a/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -123,18 +123,18 @@ private final Map<String, DynamicMethod> propertySetters = new HashMap<>(); private final Map<String, DynamicMethod> methods = new HashMap<>(); - AbstractJavaLinker(Class<?> clazz, MethodHandle classGuard) { + AbstractJavaLinker(final Class<?> clazz, final MethodHandle classGuard) { this(clazz, classGuard, classGuard); } - AbstractJavaLinker(Class<?> clazz, MethodHandle classGuard, MethodHandle assignableGuard) { + AbstractJavaLinker(final Class<?> clazz, final MethodHandle classGuard, final MethodHandle assignableGuard) { this.clazz = clazz; this.classGuard = classGuard; this.assignableGuard = assignableGuard; final FacetIntrospector introspector = createFacetIntrospector(); // Add methods and properties - for(Method method: introspector.getMethods()) { + for(final Method method: introspector.getMethods()) { final String name = method.getName(); // Add method addMember(name, method, methods); @@ -153,7 +153,7 @@ } // Add field getter/setters as property getters/setters. - for(Field field: introspector.getFields()) { + for(final Field field: introspector.getFields()) { final String name = field.getName(); // Only add a property getter when one is not defined already as a getXxx()/isXxx() method. if(!propertyGetters.containsKey(name)) { @@ -166,7 +166,7 @@ } // Add inner classes, but only those for which we don't hide a property with it - for(Map.Entry<String, MethodHandle> innerClassSpec: introspector.getInnerClassGetters().entrySet()) { + for(final Map.Entry<String, MethodHandle> innerClassSpec: introspector.getInnerClassGetters().entrySet()) { final String name = innerClassSpec.getKey(); if(!propertyGetters.containsKey(name)) { setPropertyGetter(name, innerClassSpec.getValue(), ValidationType.EXACT_CLASS); @@ -174,7 +174,7 @@ } } - private static String decapitalize(String str) { + private static String decapitalize(final String str) { assert str != null; if(str.isEmpty()) { return str; @@ -209,7 +209,7 @@ return getUnmodifiableKeys(methods); } - private static Collection<String> getUnmodifiableKeys(Map<String, ?> m) { + private static Collection<String> getUnmodifiableKeys(final Map<String, ?> m) { return Collections.unmodifiableCollection(m.keySet()); } @@ -222,7 +222,7 @@ * @param handle the method handle that implements the property getter * @param validationType the validation type for the property */ - private void setPropertyGetter(String name, SingleDynamicMethod handle, ValidationType validationType) { + private void setPropertyGetter(final String name, final SingleDynamicMethod handle, final ValidationType validationType) { propertyGetters.put(name, new AnnotatedDynamicMethod(handle, validationType)); } @@ -232,7 +232,7 @@ * @param prefixLen the getter prefix in the method name; should be 3 for getter names starting with "get" and 2 for * names starting with "is". */ - private void setPropertyGetter(Method getter, int prefixLen) { + private void setPropertyGetter(final Method getter, final int prefixLen) { setPropertyGetter(decapitalize(getter.getName().substring(prefixLen)), createDynamicMethod( getMostGenericGetter(getter)), ValidationType.INSTANCE_OF); } @@ -246,15 +246,15 @@ * @param handle the method handle that implements the property getter * @param validationType the validation type for the property */ - void setPropertyGetter(String name, MethodHandle handle, ValidationType validationType) { + void setPropertyGetter(final String name, final MethodHandle handle, final ValidationType validationType) { setPropertyGetter(name, new SimpleDynamicMethod(handle, clazz, name), validationType); } - private void addMember(String name, AccessibleObject ao, Map<String, DynamicMethod> methodMap) { + private void addMember(final String name, final AccessibleObject ao, final Map<String, DynamicMethod> methodMap) { addMember(name, createDynamicMethod(ao), methodMap); } - private void addMember(String name, SingleDynamicMethod method, Map<String, DynamicMethod> methodMap) { + private void addMember(final String name, final SingleDynamicMethod method, final Map<String, DynamicMethod> methodMap) { final DynamicMethod existingMethod = methodMap.get(name); final DynamicMethod newMethod = mergeMethods(method, existingMethod, clazz, name); if(newMethod != existingMethod) { @@ -270,9 +270,9 @@ * @param name the common name of the reflective members. * @return a dynamic method representing all the specified reflective members. */ - static DynamicMethod createDynamicMethod(Iterable<? extends AccessibleObject> members, Class<?> clazz, String name) { + static DynamicMethod createDynamicMethod(final Iterable<? extends AccessibleObject> members, final Class<?> clazz, final String name) { DynamicMethod dynMethod = null; - for(AccessibleObject method: members) { + for(final AccessibleObject method: members) { dynMethod = mergeMethods(createDynamicMethod(method), dynMethod, clazz, name); } return dynMethod; @@ -285,7 +285,7 @@ * @param m the reflective member * @return the single dynamic method representing the reflective member */ - private static SingleDynamicMethod createDynamicMethod(AccessibleObject m) { + private static SingleDynamicMethod createDynamicMethod(final AccessibleObject m) { if(CallerSensitiveDetector.isCallerSensitive(m)) { return new CallerSensitiveDynamicMethod(m); } @@ -301,7 +301,7 @@ * @param m the method or constructor * @return the method handle */ - private static MethodHandle unreflectSafely(AccessibleObject m) { + private static MethodHandle unreflectSafely(final AccessibleObject m) { if(m instanceof Method) { final Method reflMethod = (Method)m; final MethodHandle handle = Lookup.PUBLIC.unreflect(reflMethod); @@ -313,7 +313,7 @@ return StaticClassIntrospector.editConstructorMethodHandle(Lookup.PUBLIC.unreflectConstructor((Constructor<?>)m)); } - private static DynamicMethod mergeMethods(SingleDynamicMethod method, DynamicMethod existing, Class<?> clazz, String name) { + private static DynamicMethod mergeMethods(final SingleDynamicMethod method, final DynamicMethod existing, final Class<?> clazz, final String name) { if(existing == null) { return method; } else if(existing.contains(method)) { @@ -331,7 +331,7 @@ } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest request, final LinkerServices linkerServices) + public GuardedInvocation getGuardedInvocation(final LinkRequest request, final LinkerServices linkerServices) throws Exception { final LinkRequest ncrequest = request.withoutRuntimeContext(); // BeansLinker already checked that the name is at least 2 elements long and the first element is "dyn". @@ -353,8 +353,8 @@ return null; } - protected GuardedInvocationComponent getGuardedInvocationComponent(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, List<String> operations) throws Exception { + protected GuardedInvocationComponent getGuardedInvocationComponent(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final List<String> operations) throws Exception { if(operations.isEmpty()) { return null; } @@ -374,27 +374,27 @@ return null; } - static final <T> List<T> pop(List<T> l) { + static final <T> List<T> pop(final List<T> l) { return l.subList(1, l.size()); } - MethodHandle getClassGuard(CallSiteDescriptor desc) { + MethodHandle getClassGuard(final CallSiteDescriptor desc) { return getClassGuard(desc.getMethodType()); } - MethodHandle getClassGuard(MethodType type) { + MethodHandle getClassGuard(final MethodType type) { return Guards.asType(classGuard, type); } - GuardedInvocationComponent getClassGuardedInvocationComponent(MethodHandle invocation, MethodType type) { + GuardedInvocationComponent getClassGuardedInvocationComponent(final MethodHandle invocation, final MethodType type) { return new GuardedInvocationComponent(invocation, getClassGuard(type), clazz, ValidationType.EXACT_CLASS); } - private MethodHandle getAssignableGuard(MethodType type) { + private MethodHandle getAssignableGuard(final MethodType type) { return Guards.asType(assignableGuard, type); } - private GuardedInvocation getCallPropWithThis(CallSiteDescriptor callSiteDescriptor, LinkerServices linkerServices) { + private GuardedInvocation getCallPropWithThis(final CallSiteDescriptor callSiteDescriptor, final LinkerServices linkerServices) { switch(callSiteDescriptor.getNameTokenCount()) { case 3: { return createGuardedDynamicMethodInvocation(callSiteDescriptor, linkerServices, @@ -406,25 +406,25 @@ } } - private GuardedInvocation createGuardedDynamicMethodInvocation(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, String methodName, Map<String, DynamicMethod> methodMap){ + private GuardedInvocation createGuardedDynamicMethodInvocation(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final String methodName, final Map<String, DynamicMethod> methodMap){ final MethodHandle inv = getDynamicMethodInvocation(callSiteDescriptor, linkerServices, methodName, methodMap); return inv == null ? null : new GuardedInvocation(inv, getClassGuard(callSiteDescriptor.getMethodType())); } - private static MethodHandle getDynamicMethodInvocation(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, String methodName, Map<String, DynamicMethod> methodMap) { + private static MethodHandle getDynamicMethodInvocation(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final String methodName, final Map<String, DynamicMethod> methodMap) { final DynamicMethod dynaMethod = getDynamicMethod(methodName, methodMap); return dynaMethod != null ? dynaMethod.getInvocation(callSiteDescriptor, linkerServices) : null; } - private static DynamicMethod getDynamicMethod(String methodName, Map<String, DynamicMethod> methodMap) { + private static DynamicMethod getDynamicMethod(final String methodName, final Map<String, DynamicMethod> methodMap) { final DynamicMethod dynaMethod = methodMap.get(methodName); return dynaMethod != null ? dynaMethod : getExplicitSignatureDynamicMethod(methodName, methodMap); } - private static SingleDynamicMethod getExplicitSignatureDynamicMethod(String methodName, - Map<String, DynamicMethod> methodsMap) { + private static SingleDynamicMethod getExplicitSignatureDynamicMethod(final String methodName, + final Map<String, DynamicMethod> methodsMap) { // What's below is meant to support the "name(type, type, ...)" syntax that programmers can use in a method name // to manually pin down an exact overloaded variant. This is not usually required, as the overloaded method // resolution works correctly in almost every situation. However, in presence of many language-specific @@ -457,8 +457,8 @@ private static final MethodHandle CONSTANT_NULL_DROP_METHOD_HANDLE = MethodHandles.dropArguments( MethodHandles.constant(Object.class, null), 0, MethodHandle.class); - private GuardedInvocationComponent getPropertySetter(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, List<String> operations) throws Exception { + private GuardedInvocationComponent getPropertySetter(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final List<String> operations) throws Exception { switch(callSiteDescriptor.getNameTokenCount()) { case 2: { // Must have three arguments: target object, property name, and property value. @@ -547,8 +547,8 @@ "getTarget", MethodType.methodType(MethodHandle.class, MethodHandles.Lookup.class)); private static final MethodHandle GETTER_INVOKER = MethodHandles.invoker(MethodType.methodType(Object.class, Object.class)); - private GuardedInvocationComponent getPropertyGetter(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, List<String> ops) throws Exception { + private GuardedInvocationComponent getPropertyGetter(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final List<String> ops) throws Exception { switch(callSiteDescriptor.getNameTokenCount()) { case 2: { // Since we can't know what kind of a getter we'll get back on different invocations, we'll just @@ -631,7 +631,7 @@ } } - private MethodHandle getGuard(ValidationType validationType, MethodType methodType) { + private MethodHandle getGuard(final ValidationType validationType, final MethodType methodType) { switch(validationType) { case EXACT_CLASS: { return getClassGuard(methodType); @@ -655,8 +655,8 @@ MethodType.methodType(boolean.class, Object.class)); private static final MethodHandle OBJECT_IDENTITY = MethodHandles.identity(Object.class); - private GuardedInvocationComponent getMethodGetter(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, List<String> ops) throws Exception { + private GuardedInvocationComponent getMethodGetter(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final List<String> ops) throws Exception { // The created method handle will always return a DynamicMethod (or null), but since we don't want that type to // be visible outside of this linker, declare it to return Object. final MethodType type = callSiteDescriptor.getMethodType().changeReturnType(Object.class); @@ -730,7 +730,7 @@ } } - static MethodPair matchReturnTypes(MethodHandle m1, MethodHandle m2) { + static MethodPair matchReturnTypes(final MethodHandle m1, final MethodHandle m2) { final MethodType type1 = m1.type(); final MethodType type2 = m2.type(); final Class<?> commonRetType = TypeUtilities.getCommonLosslessConversionType(type1.returnType(), @@ -740,7 +740,7 @@ m2.asType(type2.changeReturnType(commonRetType))); } - private static void assertParameterCount(CallSiteDescriptor descriptor, int paramCount) { + private static void assertParameterCount(final CallSiteDescriptor descriptor, final int paramCount) { if(descriptor.getMethodType().parameterCount() != paramCount) { throw new BootstrapMethodError(descriptor.getName() + " must have exactly " + paramCount + " parameters."); } @@ -755,7 +755,7 @@ * @return the method handle for retrieving the property, or null if the property does not exist */ @SuppressWarnings("unused") - private Object getPropertyGetterHandle(Object id) { + private Object getPropertyGetterHandle(final Object id) { return propertyGetters.get(id); } @@ -769,8 +769,8 @@ private final MethodHandle getPropertySetterHandle = GET_PROPERTY_SETTER_HANDLE.bindTo(this); @SuppressWarnings("unused") - private MethodHandle getPropertySetterHandle(CallSiteDescriptor setterDescriptor, LinkerServices linkerServices, - Object id) { + private MethodHandle getPropertySetterHandle(final CallSiteDescriptor setterDescriptor, final LinkerServices linkerServices, + final Object id) { return getDynamicMethodInvocation(setterDescriptor, linkerServices, String.valueOf(id), propertySetters); } @@ -782,7 +782,7 @@ // This method is marked to return Object instead of DynamicMethod as it's used as a linking component and we don't // want to make the DynamicMethod type observable externally (e.g. as the return type of a MethodHandle returned for // "dyn:getMethod" linking). - private Object getDynamicMethod(Object name) { + private Object getDynamicMethod(final Object name) { return getDynamicMethod(String.valueOf(name), methods); } @@ -793,7 +793,7 @@ * @return the dynamic method (either {@link SimpleDynamicMethod} or {@link OverloadedDynamicMethod}, or null if the * method with the specified name does not exist. */ - DynamicMethod getDynamicMethod(String name) { + DynamicMethod getDynamicMethod(final String name) { return getDynamicMethod(name, methods); } @@ -804,16 +804,16 @@ * @param getter the getter * @return getter with same name, declared on the most generic superclass/interface of the declaring class */ - private static Method getMostGenericGetter(Method getter) { + private static Method getMostGenericGetter(final Method getter) { return getMostGenericGetter(getter.getName(), getter.getReturnType(), getter.getDeclaringClass()); } - private static Method getMostGenericGetter(String name, Class<?> returnType, Class<?> declaringClass) { + private static Method getMostGenericGetter(final String name, final Class<?> returnType, final Class<?> declaringClass) { if(declaringClass == null) { return null; } // Prefer interfaces - for(Class<?> itf: declaringClass.getInterfaces()) { + for(final Class<?> itf: declaringClass.getInterfaces()) { final Method itfGetter = getMostGenericGetter(name, returnType, itf); if(itfGetter != null) { return itfGetter; @@ -826,7 +826,7 @@ if(!CheckRestrictedPackage.isRestrictedClass(declaringClass)) { try { return declaringClass.getMethod(name); - } catch(NoSuchMethodException e) { + } catch(final NoSuchMethodException e) { // Intentionally ignored, meant to fall through } } @@ -837,18 +837,18 @@ private final SingleDynamicMethod method; /*private*/ final ValidationType validationType; - AnnotatedDynamicMethod(SingleDynamicMethod method, ValidationType validationType) { + AnnotatedDynamicMethod(final SingleDynamicMethod method, final ValidationType validationType) { this.method = method; this.validationType = validationType; } - MethodHandle getInvocation(CallSiteDescriptor callSiteDescriptor, LinkerServices linkerServices) { + MethodHandle getInvocation(final CallSiteDescriptor callSiteDescriptor, final LinkerServices linkerServices) { return method.getInvocation(callSiteDescriptor, linkerServices); } @SuppressWarnings("unused") - MethodHandle getTarget(MethodHandles.Lookup lookup) { - MethodHandle inv = method.getTarget(lookup); + MethodHandle getTarget(final MethodHandles.Lookup lookup) { + final MethodHandle inv = method.getTarget(lookup); assert inv != null; return inv; }
--- a/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java Wed Jun 04 13:08:57 2014 +0200 @@ -104,7 +104,7 @@ class AccessibleMembersLookup { private final Map<MethodSignature, Method> methods; private final Set<Class<?>> innerClasses; - private boolean instance; + private final boolean instance; /** * Creates a mapping for all accessible methods and inner classes on a class. @@ -112,7 +112,7 @@ * @param clazz the inspected class * @param instance true to inspect instance methods, false to inspect static methods. */ - AccessibleMembersLookup(final Class<?> clazz, boolean instance) { + AccessibleMembersLookup(final Class<?> clazz, final boolean instance) { this.methods = new HashMap<>(); this.innerClasses = new LinkedHashSet<>(); this.instance = instance; @@ -153,7 +153,7 @@ * @param name the name of the method this signature represents. * @param args the argument types of the method. */ - MethodSignature(String name, Class<?>[] args) { + MethodSignature(final String name, final Class<?>[] args) { this.name = name; this.args = args; } @@ -210,7 +210,7 @@ if(!CheckRestrictedPackage.isRestrictedClass(clazz)) { searchSuperTypes = false; - for(Method method: clazz.getMethods()) { + for(final Method method: clazz.getMethods()) { final boolean isStatic = Modifier.isStatic(method.getModifiers()); if(instance != isStatic) { final MethodSignature sig = new MethodSignature(method); @@ -237,7 +237,7 @@ } } } - for(Class<?> innerClass: clazz.getClasses()) { + for(final Class<?> innerClass: clazz.getClasses()) { // Add both static and non-static classes, regardless of instance flag. StaticClassLinker will just // expose non-static classes with explicit constructor outer class argument. // NOTE: getting inner class objects through getClasses() does not resolve them, so if those classes
--- a/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java Wed Jun 04 13:08:57 2014 +0200 @@ -108,7 +108,7 @@ ApplicableOverloadedMethods(final List<SingleDynamicMethod> methods, final MethodType callSiteType, final ApplicabilityTest test) { this.methods = new LinkedList<>(); - for(SingleDynamicMethod m: methods) { + for(final SingleDynamicMethod m: methods) { if(test.isApplicable(callSiteType, m)) { this.methods.add(m); } @@ -143,7 +143,7 @@ */ static final ApplicabilityTest APPLICABLE_BY_SUBTYPING = new ApplicabilityTest() { @Override - boolean isApplicable(MethodType callSiteType, SingleDynamicMethod method) { + boolean isApplicable(final MethodType callSiteType, final SingleDynamicMethod method) { final MethodType methodType = method.getMethodType(); final int methodArity = methodType.parameterCount(); if(methodArity != callSiteType.parameterCount()) { @@ -165,7 +165,7 @@ */ static final ApplicabilityTest APPLICABLE_BY_METHOD_INVOCATION_CONVERSION = new ApplicabilityTest() { @Override - boolean isApplicable(MethodType callSiteType, SingleDynamicMethod method) { + boolean isApplicable(final MethodType callSiteType, final SingleDynamicMethod method) { final MethodType methodType = method.getMethodType(); final int methodArity = methodType.parameterCount(); if(methodArity != callSiteType.parameterCount()) { @@ -188,7 +188,7 @@ */ static final ApplicabilityTest APPLICABLE_BY_VARIABLE_ARITY = new ApplicabilityTest() { @Override - boolean isApplicable(MethodType callSiteType, SingleDynamicMethod method) { + boolean isApplicable(final MethodType callSiteType, final SingleDynamicMethod method) { if(!method.isVarArgs()) { return false; }
--- a/src/jdk/internal/dynalink/beans/BeanIntrospector.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/BeanIntrospector.java Wed Jun 04 13:08:57 2014 +0200 @@ -88,7 +88,7 @@ import java.util.Map; class BeanIntrospector extends FacetIntrospector { - BeanIntrospector(Class<?> clazz) { + BeanIntrospector(final Class<?> clazz) { super(clazz, true); } @@ -98,7 +98,7 @@ } @Override - MethodHandle editMethodHandle(MethodHandle mh) { + MethodHandle editMethodHandle(final MethodHandle mh) { return mh; } }
--- a/src/jdk/internal/dynalink/beans/BeanLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/BeanLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -106,7 +106,7 @@ * @author Attila Szegedi */ class BeanLinker extends AbstractJavaLinker implements TypeBasedGuardingDynamicLinker { - BeanLinker(Class<?> clazz) { + BeanLinker(final Class<?> clazz) { super(clazz, Guards.getClassGuard(clazz), Guards.getInstanceOfGuard(clazz)); if(clazz.isArray()) { // Some languages won't have a notion of manipulating collections. Exposing "length" on arrays as an @@ -119,7 +119,7 @@ } @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return type == clazz; } @@ -129,8 +129,8 @@ } @Override - protected GuardedInvocationComponent getGuardedInvocationComponent(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, List<String> operations) throws Exception { + protected GuardedInvocationComponent getGuardedInvocationComponent(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final List<String> operations) throws Exception { final GuardedInvocationComponent superGic = super.getGuardedInvocationComponent(callSiteDescriptor, linkerServices, operations); if(superGic != null) { @@ -166,7 +166,7 @@ private static MethodHandle MAP_GUARD = Guards.getInstanceOfGuard(Map.class); private GuardedInvocationComponent getElementGetter(final CallSiteDescriptor callSiteDescriptor, - final LinkerServices linkerServices, List<String> operations) throws Exception { + final LinkerServices linkerServices, final List<String> operations) throws Exception { final MethodType callSiteType = callSiteDescriptor.getMethodType(); final Class<?> declaredType = callSiteType.parameterType(0); final GuardedInvocationComponent nextComponent = getGuardedInvocationComponent(callSiteDescriptor, @@ -248,7 +248,7 @@ CallSiteDescriptor.NAME_OPERAND); } - private static Object convertKeyToInteger(String fixedKey, LinkerServices linkerServices) throws Exception { + private static Object convertKeyToInteger(final String fixedKey, final LinkerServices linkerServices) throws Exception { try { if(linkerServices.canConvert(String.class, Number.class)) { try { @@ -268,18 +268,18 @@ return Integer.valueOf(intIndex); } catch(Exception|Error e) { throw e; - } catch(Throwable t) { + } catch(final Throwable t) { throw new RuntimeException(t); } } return Integer.valueOf(fixedKey); - } catch(NumberFormatException e) { + } catch(final NumberFormatException e) { // key is not a number return null; } } - private static MethodHandle convertArgToInt(MethodHandle mh, LinkerServices ls, CallSiteDescriptor desc) { + private static MethodHandle convertArgToInt(final MethodHandle mh, final LinkerServices ls, final CallSiteDescriptor desc) { final Class<?> sourceType = desc.getMethodType().parameterType(1); if(TypeUtilities.isMethodInvocationConvertible(sourceType, Number.class)) { return mh; @@ -302,21 +302,21 @@ private final MethodType methodType; private final Object fixedKey; - Binder(LinkerServices linkerServices, MethodType methodType, Object fixedKey) { + Binder(final LinkerServices linkerServices, final MethodType methodType, final Object fixedKey) { this.linkerServices = linkerServices; this.methodType = fixedKey == null ? methodType : methodType.insertParameterTypes(1, fixedKey.getClass()); this.fixedKey = fixedKey; } - /*private*/ MethodHandle bind(MethodHandle handle) { + /*private*/ MethodHandle bind(final MethodHandle handle) { return bindToFixedKey(linkerServices.asTypeLosslessReturn(handle, methodType)); } - /*private*/ MethodHandle bindTest(MethodHandle handle) { + /*private*/ MethodHandle bindTest(final MethodHandle handle) { return bindToFixedKey(Guards.asType(handle, methodType)); } - private MethodHandle bindToFixedKey(MethodHandle handle) { + private MethodHandle bindToFixedKey(final MethodHandle handle) { return fixedKey == null ? handle : MethodHandles.insertArguments(handle, 1, fixedKey); } } @@ -326,12 +326,12 @@ private static MethodHandle CONTAINS_MAP = Lookup.PUBLIC.findVirtual(Map.class, "containsKey", MethodType.methodType(boolean.class, Object.class)); - private static MethodHandle findRangeCheck(Class<?> collectionType) { + private static MethodHandle findRangeCheck(final Class<?> collectionType) { return Lookup.findOwnStatic(MethodHandles.lookup(), "rangeCheck", boolean.class, collectionType, Object.class); } @SuppressWarnings("unused") - private static final boolean rangeCheck(Object array, Object index) { + private static final boolean rangeCheck(final Object array, final Object index) { if(!(index instanceof Number)) { return false; } @@ -348,7 +348,7 @@ } @SuppressWarnings("unused") - private static final boolean rangeCheck(List<?> list, Object index) { + private static final boolean rangeCheck(final List<?> list, final Object index) { if(!(index instanceof Number)) { return false; } @@ -370,8 +370,8 @@ private static MethodHandle PUT_MAP_ELEMENT = Lookup.PUBLIC.findVirtual(Map.class, "put", MethodType.methodType(Object.class, Object.class, Object.class)); - private GuardedInvocationComponent getElementSetter(CallSiteDescriptor callSiteDescriptor, - LinkerServices linkerServices, List<String> operations) throws Exception { + private GuardedInvocationComponent getElementSetter(final CallSiteDescriptor callSiteDescriptor, + final LinkerServices linkerServices, final List<String> operations) throws Exception { final MethodType callSiteType = callSiteDescriptor.getMethodType(); final Class<?> declaredType = callSiteType.parameterType(0); @@ -458,7 +458,7 @@ private static MethodHandle COLLECTION_GUARD = Guards.getInstanceOfGuard(Collection.class); - private GuardedInvocationComponent getLengthGetter(CallSiteDescriptor callSiteDescriptor) { + private GuardedInvocationComponent getLengthGetter(final CallSiteDescriptor callSiteDescriptor) { assertParameterCount(callSiteDescriptor, 1); final MethodType callSiteType = callSiteDescriptor.getMethodType(); final Class<?> declaredType = callSiteType.parameterType(0); @@ -488,7 +488,7 @@ return null; } - private static void assertParameterCount(CallSiteDescriptor descriptor, int paramCount) { + private static void assertParameterCount(final CallSiteDescriptor descriptor, final int paramCount) { if(descriptor.getMethodType().parameterCount() != paramCount) { throw new BootstrapMethodError(descriptor.getName() + " must have exactly " + paramCount + " parameters."); }
--- a/src/jdk/internal/dynalink/beans/BeansLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/BeansLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -131,7 +131,7 @@ public class BeansLinker implements GuardingDynamicLinker { private static final ClassValue<TypeBasedGuardingDynamicLinker> linkers = new ClassValue<TypeBasedGuardingDynamicLinker>() { @Override - protected TypeBasedGuardingDynamicLinker computeValue(Class<?> clazz) { + protected TypeBasedGuardingDynamicLinker computeValue(final Class<?> clazz) { // If ClassValue.put() were public, we could just pre-populate with these known mappings... return clazz == Class.class ? new ClassLinker() : @@ -154,7 +154,7 @@ * @param clazz the class * @return a bean linker for that class */ - public static TypeBasedGuardingDynamicLinker getLinkerForClass(Class<?> clazz) { + public static TypeBasedGuardingDynamicLinker getLinkerForClass(final Class<?> clazz) { return linkers.get(clazz); } @@ -173,8 +173,8 @@ * @param clazz the class * @return a collection of names of all readable instance properties of a class. */ - public static Collection<String> getReadableInstancePropertyNames(Class<?> clazz) { - TypeBasedGuardingDynamicLinker linker = getLinkerForClass(clazz); + public static Collection<String> getReadableInstancePropertyNames(final Class<?> clazz) { + final TypeBasedGuardingDynamicLinker linker = getLinkerForClass(clazz); if(linker instanceof BeanLinker) { return ((BeanLinker)linker).getReadablePropertyNames(); } @@ -186,8 +186,8 @@ * @param clazz the class * @return a collection of names of all writable instance properties of a class. */ - public static Collection<String> getWritableInstancePropertyNames(Class<?> clazz) { - TypeBasedGuardingDynamicLinker linker = getLinkerForClass(clazz); + public static Collection<String> getWritableInstancePropertyNames(final Class<?> clazz) { + final TypeBasedGuardingDynamicLinker linker = getLinkerForClass(clazz); if(linker instanceof BeanLinker) { return ((BeanLinker)linker).getWritablePropertyNames(); } @@ -199,8 +199,8 @@ * @param clazz the class * @return a collection of names of all instance methods of a class. */ - public static Collection<String> getInstanceMethodNames(Class<?> clazz) { - TypeBasedGuardingDynamicLinker linker = getLinkerForClass(clazz); + public static Collection<String> getInstanceMethodNames(final Class<?> clazz) { + final TypeBasedGuardingDynamicLinker linker = getLinkerForClass(clazz); if(linker instanceof BeanLinker) { return ((BeanLinker)linker).getMethodNames(); } @@ -212,7 +212,7 @@ * @param clazz the class * @return a collection of names of all readable static properties of a class. */ - public static Collection<String> getReadableStaticPropertyNames(Class<?> clazz) { + public static Collection<String> getReadableStaticPropertyNames(final Class<?> clazz) { return StaticClassLinker.getReadableStaticPropertyNames(clazz); } @@ -221,7 +221,7 @@ * @param clazz the class * @return a collection of names of all writable static properties of a class. */ - public static Collection<String> getWritableStaticPropertyNames(Class<?> clazz) { + public static Collection<String> getWritableStaticPropertyNames(final Class<?> clazz) { return StaticClassLinker.getWritableStaticPropertyNames(clazz); } @@ -230,12 +230,12 @@ * @param clazz the class * @return a collection of names of all static methods of a class. */ - public static Collection<String> getStaticMethodNames(Class<?> clazz) { + public static Collection<String> getStaticMethodNames(final Class<?> clazz) { return StaticClassLinker.getStaticMethodNames(clazz); } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest request, final LinkerServices linkerServices) + public GuardedInvocation getGuardedInvocation(final LinkRequest request, final LinkerServices linkerServices) throws Exception { final CallSiteDescriptor callSiteDescriptor = request.getCallSiteDescriptor(); final int l = callSiteDescriptor.getNameTokenCount();
--- a/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java Wed Jun 04 13:08:57 2014 +0200 @@ -107,14 +107,14 @@ private static final DetectionStrategy DETECTION_STRATEGY = getDetectionStrategy(); - static boolean isCallerSensitive(AccessibleObject ao) { + static boolean isCallerSensitive(final AccessibleObject ao) { return DETECTION_STRATEGY.isCallerSensitive(ao); } private static DetectionStrategy getDetectionStrategy() { try { return new PrivilegedDetectionStrategy(); - } catch(Throwable t) { + } catch(final Throwable t) { return new UnprivilegedDetectionStrategy(); } } @@ -127,7 +127,7 @@ private static final Class<? extends Annotation> CALLER_SENSITIVE_ANNOTATION_CLASS = CallerSensitive.class; @Override - boolean isCallerSensitive(AccessibleObject ao) { + boolean isCallerSensitive(final AccessibleObject ao) { return ao.getAnnotation(CALLER_SENSITIVE_ANNOTATION_CLASS) != null; } } @@ -136,8 +136,8 @@ private static final String CALLER_SENSITIVE_ANNOTATION_STRING = "@sun.reflect.CallerSensitive()"; @Override - boolean isCallerSensitive(AccessibleObject o) { - for(Annotation a: o.getAnnotations()) { + boolean isCallerSensitive(final AccessibleObject o) { + for(final Annotation a: o.getAnnotations()) { if(String.valueOf(a).equals(CALLER_SENSITIVE_ANNOTATION_STRING)) { return true; }
--- a/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java Wed Jun 04 13:08:57 2014 +0200 @@ -107,13 +107,13 @@ private final AccessibleObject target; private final MethodType type; - public CallerSensitiveDynamicMethod(AccessibleObject target) { + public CallerSensitiveDynamicMethod(final AccessibleObject target) { super(getName(target)); this.target = target; this.type = getMethodType(target); } - private static String getName(AccessibleObject target) { + private static String getName(final AccessibleObject target) { final Member m = (Member)target; return getMethodNameWithSignature(getMethodType(target), getClassAndMethodName(m.getDeclaringClass(), m.getName())); @@ -124,7 +124,7 @@ return type; } - private static MethodType getMethodType(AccessibleObject ao) { + private static MethodType getMethodType(final AccessibleObject ao) { final boolean isMethod = ao instanceof Method; final Class<?> rtype = isMethod ? ((Method)ao).getReturnType() : ((Constructor<?>)ao).getDeclaringClass(); final Class<?>[] ptypes = isMethod ? ((Method)ao).getParameterTypes() : ((Constructor<?>)ao).getParameterTypes(); @@ -144,7 +144,7 @@ } @Override - MethodHandle getTarget(MethodHandles.Lookup lookup) { + MethodHandle getTarget(final MethodHandles.Lookup lookup) { if(target instanceof Method) { final MethodHandle mh = Lookup.unreflect(lookup, (Method)target); if(Modifier.isStatic(((Member)target).getModifiers())) {
--- a/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java Wed Jun 04 13:08:57 2014 +0200 @@ -101,7 +101,7 @@ * @param clazz the class to test * @return true if the class is either not public, or it resides in a package with restricted access. */ - static boolean isRestrictedClass(Class<?> clazz) { + static boolean isRestrictedClass(final Class<?> clazz) { if(!Modifier.isPublic(clazz.getModifiers())) { // Non-public classes are always restricted return true; @@ -126,7 +126,7 @@ return null; } }, NO_PERMISSIONS_CONTEXT); - } catch(SecurityException e) { + } catch(final SecurityException e) { return true; } return false;
--- a/src/jdk/internal/dynalink/beans/ClassString.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/ClassString.java Wed Jun 04 13:08:57 2014 +0200 @@ -104,16 +104,16 @@ private final Class<?>[] classes; private int hashCode; - ClassString(Class<?>[] classes) { + ClassString(final Class<?>[] classes) { this.classes = classes; } - ClassString(MethodType type) { + ClassString(final MethodType type) { this(type.parameterArray()); } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if(!(other instanceof ClassString)) { return false; } @@ -150,7 +150,7 @@ return true; } - List<MethodHandle> getMaximallySpecifics(List<MethodHandle> methods, LinkerServices linkerServices, boolean varArg) { + List<MethodHandle> getMaximallySpecifics(final List<MethodHandle> methods, final LinkerServices linkerServices, final boolean varArg) { return MaximallySpecific.getMaximallySpecificMethodHandles(getApplicables(methods, linkerServices, varArg), varArg, classes, linkerServices); } @@ -158,7 +158,7 @@ /** * Returns all methods that are applicable to actual parameter classes represented by this ClassString object. */ - LinkedList<MethodHandle> getApplicables(List<MethodHandle> methods, LinkerServices linkerServices, boolean varArg) { + LinkedList<MethodHandle> getApplicables(final List<MethodHandle> methods, final LinkerServices linkerServices, final boolean varArg) { final LinkedList<MethodHandle> list = new LinkedList<>(); for(final MethodHandle member: methods) { if(isApplicable(member, linkerServices, varArg)) { @@ -173,7 +173,7 @@ * object. * */ - private boolean isApplicable(MethodHandle method, LinkerServices linkerServices, boolean varArg) { + private boolean isApplicable(final MethodHandle method, final LinkerServices linkerServices, final boolean varArg) { final Class<?>[] formalTypes = method.type().parameterArray(); final int cl = classes.length; final int fl = formalTypes.length - (varArg ? 1 : 0); @@ -203,7 +203,7 @@ return true; } - private static boolean canConvert(LinkerServices ls, Class<?> from, Class<?> to) { + private static boolean canConvert(final LinkerServices ls, final Class<?> from, final Class<?> to) { if(from == NULL_CLASS) { return !to.isPrimitive(); }
--- a/src/jdk/internal/dynalink/beans/DynamicMethod.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/DynamicMethod.java Wed Jun 04 13:08:57 2014 +0200 @@ -99,7 +99,7 @@ abstract class DynamicMethod { private final String name; - DynamicMethod(String name) { + DynamicMethod(final String name) { this.name = name; } @@ -138,7 +138,7 @@ */ abstract boolean contains(SingleDynamicMethod method); - static String getClassAndMethodName(Class<?> clazz, String name) { + static String getClassAndMethodName(final Class<?> clazz, final String name) { final String clazzName = clazz.getCanonicalName(); return (clazzName == null ? clazz.getName() : clazzName) + "." + name; }
--- a/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -99,12 +99,12 @@ */ class DynamicMethodLinker implements TypeBasedGuardingDynamicLinker { @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return DynamicMethod.class.isAssignableFrom(type); } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) { + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) { final Object receiver = linkRequest.getReceiver(); if(!(receiver instanceof DynamicMethod)) { return null;
--- a/src/jdk/internal/dynalink/beans/FacetIntrospector.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/FacetIntrospector.java Wed Jun 04 13:08:57 2014 +0200 @@ -106,7 +106,7 @@ protected final AccessibleMembersLookup membersLookup; - FacetIntrospector(Class<?> clazz, boolean instance) { + FacetIntrospector(final Class<?> clazz, final boolean instance) { this.clazz = clazz; this.instance = instance; isRestricted = CheckRestrictedPackage.isRestrictedClass(clazz); @@ -135,7 +135,7 @@ final Field[] fields = clazz.getFields(); final Collection<Field> cfields = new ArrayList<>(fields.length); - for(Field field: fields) { + for(final Field field: fields) { final boolean isStatic = Modifier.isStatic(field.getModifiers()); if(isStatic && clazz != field.getDeclaringClass()) { // ignore inherited static fields @@ -149,7 +149,7 @@ return cfields; } - boolean isAccessible(Member m) { + boolean isAccessible(final Member m) { final Class<?> declaring = m.getDeclaringClass(); // (declaring == clazz) is just an optimization - we're calling this only from code that operates on a // non-restriced class, so if the declaring class is identical to the class being inspected, then forego @@ -166,11 +166,11 @@ } - MethodHandle unreflectGetter(Field field) { + MethodHandle unreflectGetter(final Field field) { return editMethodHandle(Lookup.PUBLIC.unreflectGetter(field)); } - MethodHandle unreflectSetter(Field field) { + MethodHandle unreflectSetter(final Field field) { return editMethodHandle(Lookup.PUBLIC.unreflectSetter(field)); }
--- a/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java Wed Jun 04 13:08:57 2014 +0200 @@ -105,38 +105,38 @@ private final GuardedInvocation guardedInvocation; private final Validator validator; - GuardedInvocationComponent(MethodHandle invocation) { + GuardedInvocationComponent(final MethodHandle invocation) { this(invocation, null, ValidationType.NONE); } - GuardedInvocationComponent(MethodHandle invocation, MethodHandle guard, ValidationType validationType) { + GuardedInvocationComponent(final MethodHandle invocation, final MethodHandle guard, final ValidationType validationType) { this(invocation, guard, null, validationType); } - GuardedInvocationComponent(MethodHandle invocation, MethodHandle guard, Class<?> validatorClass, - ValidationType validationType) { + GuardedInvocationComponent(final MethodHandle invocation, final MethodHandle guard, final Class<?> validatorClass, + final ValidationType validationType) { this(invocation, guard, new Validator(validatorClass, validationType)); } - GuardedInvocationComponent(GuardedInvocation guardedInvocation, Class<?> validatorClass, - ValidationType validationType) { + GuardedInvocationComponent(final GuardedInvocation guardedInvocation, final Class<?> validatorClass, + final ValidationType validationType) { this(guardedInvocation, new Validator(validatorClass, validationType)); } - GuardedInvocationComponent replaceInvocation(MethodHandle newInvocation) { + GuardedInvocationComponent replaceInvocation(final MethodHandle newInvocation) { return replaceInvocation(newInvocation, guardedInvocation.getGuard()); } - GuardedInvocationComponent replaceInvocation(MethodHandle newInvocation, MethodHandle newGuard) { + GuardedInvocationComponent replaceInvocation(final MethodHandle newInvocation, final MethodHandle newGuard) { return new GuardedInvocationComponent(guardedInvocation.replaceMethods(newInvocation, newGuard), validator); } - private GuardedInvocationComponent(MethodHandle invocation, MethodHandle guard, Validator validator) { + private GuardedInvocationComponent(final MethodHandle invocation, final MethodHandle guard, final Validator validator) { this(new GuardedInvocation(invocation, guard), validator); } - private GuardedInvocationComponent(GuardedInvocation guardedInvocation, Validator validator) { + private GuardedInvocationComponent(final GuardedInvocation guardedInvocation, final Validator validator) { this.guardedInvocation = guardedInvocation; this.validator = validator; } @@ -153,8 +153,8 @@ return validator.validationType; } - GuardedInvocationComponent compose(MethodHandle compositeInvocation, MethodHandle otherGuard, - Class<?> otherValidatorClass, ValidationType otherValidationType) { + GuardedInvocationComponent compose(final MethodHandle compositeInvocation, final MethodHandle otherGuard, + final Class<?> otherValidatorClass, final ValidationType otherValidationType) { final Validator compositeValidator = validator.compose(new Validator(otherValidatorClass, otherValidationType)); final MethodHandle compositeGuard = compositeValidator == validator ? guardedInvocation.getGuard() : otherGuard; return new GuardedInvocationComponent(compositeInvocation, compositeGuard, compositeValidator); @@ -164,12 +164,12 @@ /*private*/ final Class<?> validatorClass; /*private*/ final ValidationType validationType; - Validator(Class<?> validatorClass, ValidationType validationType) { + Validator(final Class<?> validatorClass, final ValidationType validationType) { this.validatorClass = validatorClass; this.validationType = validationType; } - Validator compose(Validator other) { + Validator compose(final Validator other) { if(other.validationType == ValidationType.NONE) { return this; } @@ -240,7 +240,7 @@ throw new AssertionError("Incompatible composition " + this + " vs " + other); } - private boolean isAssignableFrom(Validator other) { + private boolean isAssignableFrom(final Validator other) { return validatorClass.isAssignableFrom(other.validatorClass); }
--- a/src/jdk/internal/dynalink/beans/MaximallySpecific.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/MaximallySpecific.java Wed Jun 04 13:08:57 2014 +0200 @@ -105,7 +105,7 @@ * @param varArgs whether to assume the methods are varargs * @return the list of maximally specific methods. */ - static List<SingleDynamicMethod> getMaximallySpecificMethods(List<SingleDynamicMethod> methods, boolean varArgs) { + static List<SingleDynamicMethod> getMaximallySpecificMethods(final List<SingleDynamicMethod> methods, final boolean varArgs) { return getMaximallySpecificSingleDynamicMethods(methods, varArgs, null, null); } @@ -116,7 +116,7 @@ private static final MethodTypeGetter<MethodHandle> METHOD_HANDLE_TYPE_GETTER = new MethodTypeGetter<MethodHandle>() { @Override - MethodType getMethodType(MethodHandle t) { + MethodType getMethodType(final MethodHandle t) { return t.type(); } }; @@ -124,7 +124,7 @@ private static final MethodTypeGetter<SingleDynamicMethod> DYNAMIC_METHOD_TYPE_GETTER = new MethodTypeGetter<SingleDynamicMethod>() { @Override - MethodType getMethodType(SingleDynamicMethod t) { + MethodType getMethodType(final SingleDynamicMethod t) { return t.getMethodType(); } }; @@ -138,8 +138,8 @@ * @param argTypes concrete argument types for the invocation * @return the list of maximally specific method handles. */ - static List<MethodHandle> getMaximallySpecificMethodHandles(List<MethodHandle> methods, boolean varArgs, - Class<?>[] argTypes, LinkerServices ls) { + static List<MethodHandle> getMaximallySpecificMethodHandles(final List<MethodHandle> methods, final boolean varArgs, + final Class<?>[] argTypes, final LinkerServices ls) { return getMaximallySpecificMethods(methods, varArgs, argTypes, ls, METHOD_HANDLE_TYPE_GETTER); } @@ -152,8 +152,8 @@ * @param argTypes concrete argument types for the invocation * @return the list of maximally specific methods. */ - static List<SingleDynamicMethod> getMaximallySpecificSingleDynamicMethods(List<SingleDynamicMethod> methods, - boolean varArgs, Class<?>[] argTypes, LinkerServices ls) { + static List<SingleDynamicMethod> getMaximallySpecificSingleDynamicMethods(final List<SingleDynamicMethod> methods, + final boolean varArgs, final Class<?>[] argTypes, final LinkerServices ls) { return getMaximallySpecificMethods(methods, varArgs, argTypes, ls, DYNAMIC_METHOD_TYPE_GETTER); } @@ -166,16 +166,16 @@ * @param argTypes concrete argument types for the invocation * @return the list of maximally specific methods. */ - private static <T> List<T> getMaximallySpecificMethods(List<T> methods, boolean varArgs, - Class<?>[] argTypes, LinkerServices ls, MethodTypeGetter<T> methodTypeGetter) { + private static <T> List<T> getMaximallySpecificMethods(final List<T> methods, final boolean varArgs, + final Class<?>[] argTypes, final LinkerServices ls, final MethodTypeGetter<T> methodTypeGetter) { if(methods.size() < 2) { return methods; } final LinkedList<T> maximals = new LinkedList<>(); - for(T m: methods) { + for(final T m: methods) { final MethodType methodType = methodTypeGetter.getMethodType(m); boolean lessSpecific = false; - for(Iterator<T> maximal = maximals.iterator(); maximal.hasNext();) { + for(final Iterator<T> maximal = maximals.iterator(); maximal.hasNext();) { final T max = maximal.next(); switch(isMoreSpecific(methodType, methodTypeGetter.getMethodType(max), varArgs, argTypes, ls)) { case TYPE_1_BETTER: { @@ -202,8 +202,8 @@ return maximals; } - private static Comparison isMoreSpecific(MethodType t1, MethodType t2, boolean varArgs, Class<?>[] argTypes, - LinkerServices ls) { + private static Comparison isMoreSpecific(final MethodType t1, final MethodType t2, final boolean varArgs, final Class<?>[] argTypes, + final LinkerServices ls) { final int pc1 = t1.parameterCount(); final int pc2 = t2.parameterCount(); assert varArgs || (pc1 == pc2) && (argTypes == null || argTypes.length == pc1); @@ -241,7 +241,7 @@ return Comparison.INDETERMINATE; } - private static Comparison compare(Class<?> c1, Class<?> c2, Class<?>[] argTypes, int i, LinkerServices cmp) { + private static Comparison compare(final Class<?> c1, final Class<?> c2, final Class<?>[] argTypes, final int i, final LinkerServices cmp) { if(cmp != null) { final Comparison c = cmp.compareConversion(argTypes[i], c1, c2); if(c != Comparison.INDETERMINATE) { @@ -256,7 +256,7 @@ return Comparison.INDETERMINATE; } - private static Class<?> getParameterClass(MethodType t, int l, int i, boolean varArgs) { + private static Class<?> getParameterClass(final MethodType t, final int l, final int i, final boolean varArgs) { return varArgs && i >= l - 1 ? t.parameterType(l - 1).getComponentType() : t.parameterType(i); } }
--- a/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java Wed Jun 04 13:08:57 2014 +0200 @@ -115,20 +115,20 @@ * @param clazz the class this method belongs to * @param name the name of the method */ - OverloadedDynamicMethod(Class<?> clazz, String name) { + OverloadedDynamicMethod(final Class<?> clazz, final String name) { this(new LinkedList<SingleDynamicMethod>(), clazz.getClassLoader(), getClassAndMethodName(clazz, name)); } - private OverloadedDynamicMethod(LinkedList<SingleDynamicMethod> methods, ClassLoader classLoader, String name) { + private OverloadedDynamicMethod(final LinkedList<SingleDynamicMethod> methods, final ClassLoader classLoader, final String name) { super(name); this.methods = methods; this.classLoader = classLoader; } @Override - SingleDynamicMethod getMethodForExactParamTypes(String paramTypes) { + SingleDynamicMethod getMethodForExactParamTypes(final String paramTypes) { final LinkedList<SingleDynamicMethod> matchingMethods = new LinkedList<>(); - for(SingleDynamicMethod method: methods) { + for(final SingleDynamicMethod method: methods) { final SingleDynamicMethod matchingMethod = method.getMethodForExactParamTypes(paramTypes); if(matchingMethod != null) { matchingMethods.add(matchingMethod); @@ -217,7 +217,7 @@ // has an already determined Lookup. final List<MethodHandle> methodHandles = new ArrayList<>(invokables.size()); final MethodHandles.Lookup lookup = callSiteDescriptor.getLookup(); - for(SingleDynamicMethod method: invokables) { + for(final SingleDynamicMethod method: invokables) { methodHandles.add(method.getTarget(lookup)); } return new OverloadedMethod(methodHandles, this, callSiteType, linkerServices).getInvoker(); @@ -227,8 +227,8 @@ } @Override - public boolean contains(SingleDynamicMethod m) { - for(SingleDynamicMethod method: methods) { + public boolean contains(final SingleDynamicMethod m) { + for(final SingleDynamicMethod method: methods) { if(method.contains(m)) { return true; } @@ -240,8 +240,8 @@ return classLoader; } - private static boolean isApplicableDynamically(LinkerServices linkerServices, MethodType callSiteType, - SingleDynamicMethod m) { + private static boolean isApplicableDynamically(final LinkerServices linkerServices, final MethodType callSiteType, + final SingleDynamicMethod m) { final MethodType methodType = m.getMethodType(); final boolean varArgs = m.isVarArgs(); final int fixedArgLen = methodType.parameterCount() - (varArgs ? 1 : 0); @@ -287,13 +287,13 @@ return true; } - private static boolean isApplicableDynamically(LinkerServices linkerServices, Class<?> callSiteType, - Class<?> methodType) { + private static boolean isApplicableDynamically(final LinkerServices linkerServices, final Class<?> callSiteType, + final Class<?> methodType) { return TypeUtilities.isPotentiallyConvertible(callSiteType, methodType) || linkerServices.canConvert(callSiteType, methodType); } - private ApplicableOverloadedMethods getApplicables(MethodType callSiteType, ApplicabilityTest test) { + private ApplicableOverloadedMethods getApplicables(final MethodType callSiteType, final ApplicabilityTest test) { return new ApplicableOverloadedMethods(methods, callSiteType, test); } @@ -302,7 +302,7 @@ * * @param method a method to add */ - public void addMethod(SingleDynamicMethod method) { + public void addMethod(final SingleDynamicMethod method) { methods.add(method); } }
--- a/src/jdk/internal/dynalink/beans/OverloadedMethod.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/OverloadedMethod.java Wed Jun 04 13:08:57 2014 +0200 @@ -112,8 +112,8 @@ private final ArrayList<MethodHandle> fixArgMethods; private final ArrayList<MethodHandle> varArgMethods; - OverloadedMethod(List<MethodHandle> methodHandles, OverloadedDynamicMethod parent, MethodType callSiteType, - LinkerServices linkerServices) { + OverloadedMethod(final List<MethodHandle> methodHandles, final OverloadedDynamicMethod parent, final MethodType callSiteType, + final LinkerServices linkerServices) { this.parent = parent; final Class<?> commonRetType = getCommonReturnType(methodHandles); this.callSiteType = callSiteType.changeReturnType(commonRetType); @@ -151,7 +151,7 @@ MethodHandle.class, Object[].class); @SuppressWarnings("unused") - private MethodHandle selectMethod(Object[] args) throws NoSuchMethodException { + private MethodHandle selectMethod(final Object[] args) throws NoSuchMethodException { final Class<?>[] argTypes = new Class[args.length]; for(int i = 0; i < argTypes.length; ++i) { final Object arg = args[i]; @@ -188,7 +188,7 @@ return method; } - private MethodHandle getNoSuchMethodThrower(Class<?>[] argTypes) { + private MethodHandle getNoSuchMethodThrower(final Class<?>[] argTypes) { return adaptThrower(MethodHandles.insertArguments(THROW_NO_SUCH_METHOD, 0, this, argTypes)); } @@ -196,7 +196,7 @@ "throwNoSuchMethod", void.class, Class[].class); @SuppressWarnings("unused") - private void throwNoSuchMethod(Class<?>[] argTypes) throws NoSuchMethodException { + private void throwNoSuchMethod(final Class<?>[] argTypes) throws NoSuchMethodException { if(varArgMethods.isEmpty()) { throw new NoSuchMethodException("None of the fixed arity signatures " + getSignatureList(fixArgMethods) + " of method " + parent.getName() + " match the argument types " + argTypesString(argTypes)); @@ -206,11 +206,11 @@ parent.getName() + " match the argument types " + argTypesString(argTypes)); } - private MethodHandle getAmbiguousMethodThrower(Class<?>[] argTypes, List<MethodHandle> methods) { + private MethodHandle getAmbiguousMethodThrower(final Class<?>[] argTypes, final List<MethodHandle> methods) { return adaptThrower(MethodHandles.insertArguments(THROW_AMBIGUOUS_METHOD, 0, this, argTypes, methods)); } - private MethodHandle adaptThrower(MethodHandle rawThrower) { + private MethodHandle adaptThrower(final MethodHandle rawThrower) { return MethodHandles.dropArguments(rawThrower, 0, callSiteType.parameterList()).asType(callSiteType); } @@ -218,20 +218,20 @@ "throwAmbiguousMethod", void.class, Class[].class, List.class); @SuppressWarnings("unused") - private void throwAmbiguousMethod(Class<?>[] argTypes, List<MethodHandle> methods) throws NoSuchMethodException { + private void throwAmbiguousMethod(final Class<?>[] argTypes, final List<MethodHandle> methods) throws NoSuchMethodException { final String arity = methods.get(0).isVarargsCollector() ? "variable" : "fixed"; throw new NoSuchMethodException("Can't unambiguously select between " + arity + " arity signatures " + getSignatureList(methods) + " of the method " + parent.getName() + " for argument types " + argTypesString(argTypes)); } - private static String argTypesString(Class<?>[] classes) { + private static String argTypesString(final Class<?>[] classes) { final StringBuilder b = new StringBuilder().append('['); appendTypes(b, classes, false); return b.append(']').toString(); } - private static String getSignatureList(List<MethodHandle> methods) { + private static String getSignatureList(final List<MethodHandle> methods) { final StringBuilder b = new StringBuilder().append('['); final Iterator<MethodHandle> it = methods.iterator(); if(it.hasNext()) { @@ -243,13 +243,13 @@ return b.append(']').toString(); } - private static void appendSig(StringBuilder b, MethodHandle m) { + private static void appendSig(final StringBuilder b, final MethodHandle m) { b.append('('); appendTypes(b, m.type().parameterArray(), m.isVarargsCollector()); b.append(')'); } - private static void appendTypes(StringBuilder b, Class<?>[] classes, boolean varArg) { + private static void appendTypes(final StringBuilder b, final Class<?>[] classes, final boolean varArg) { final int l = classes.length; if(!varArg) { if(l > 1) { @@ -266,7 +266,7 @@ } } - private static Class<?> getCommonReturnType(List<MethodHandle> methodHandles) { + private static Class<?> getCommonReturnType(final List<MethodHandle> methodHandles) { final Iterator<MethodHandle> it = methodHandles.iterator(); Class<?> retType = it.next().type().returnType(); while(it.hasNext()) {
--- a/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java Wed Jun 04 13:08:57 2014 +0200 @@ -107,12 +107,12 @@ * @param clazz the class declaring the method * @param name the simple name of the method */ - SimpleDynamicMethod(MethodHandle target, Class<?> clazz, String name) { + SimpleDynamicMethod(final MethodHandle target, final Class<?> clazz, final String name) { super(getName(target, clazz, name)); this.target = target; } - private static String getName(MethodHandle target, Class<?> clazz, String name) { + private static String getName(final MethodHandle target, final Class<?> clazz, final String name) { return getMethodNameWithSignature(target.type(), getClassAndMethodName(clazz, name)); } @@ -127,7 +127,7 @@ } @Override - MethodHandle getTarget(Lookup lookup) { + MethodHandle getTarget(final Lookup lookup) { return target; } }
--- a/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java Wed Jun 04 13:08:57 2014 +0200 @@ -104,7 +104,7 @@ private static final MethodHandle CAN_CONVERT_TO = Lookup.findOwnStatic(MethodHandles.lookup(), "canConvertTo", boolean.class, LinkerServices.class, Class.class, Object.class); - SingleDynamicMethod(String name) { + SingleDynamicMethod(final String name) { super(name); } @@ -128,22 +128,22 @@ abstract MethodHandle getTarget(MethodHandles.Lookup lookup); @Override - MethodHandle getInvocation(CallSiteDescriptor callSiteDescriptor, LinkerServices linkerServices) { + MethodHandle getInvocation(final CallSiteDescriptor callSiteDescriptor, final LinkerServices linkerServices) { return getInvocation(getTarget(callSiteDescriptor.getLookup()), callSiteDescriptor.getMethodType(), linkerServices); } @Override - SingleDynamicMethod getMethodForExactParamTypes(String paramTypes) { + SingleDynamicMethod getMethodForExactParamTypes(final String paramTypes) { return typeMatchesDescription(paramTypes, getMethodType()) ? this : null; } @Override - boolean contains(SingleDynamicMethod method) { + boolean contains(final SingleDynamicMethod method) { return getMethodType().parameterList().equals(method.getMethodType().parameterList()); } - static String getMethodNameWithSignature(MethodType type, String methodName) { + static String getMethodNameWithSignature(final MethodType type, final String methodName) { final String typeStr = type.toString(); final int retTypeIndex = typeStr.lastIndexOf(')') + 1; int secondParamIndex = typeStr.indexOf(',') + 1; @@ -164,7 +164,7 @@ * @param linkerServices the linker services used for type conversions * @return the adapted method handle. */ - static MethodHandle getInvocation(MethodHandle target, MethodType callSiteType, LinkerServices linkerServices) { + static MethodHandle getInvocation(final MethodHandle target, final MethodType callSiteType, final LinkerServices linkerServices) { final MethodType methodType = target.type(); final int paramsLen = methodType.parameterCount(); final boolean varArgs = target.isVarargsCollector(); @@ -266,7 +266,7 @@ } @SuppressWarnings("unused") - private static boolean canConvertTo(final LinkerServices linkerServices, Class<?> to, Object obj) { + private static boolean canConvertTo(final LinkerServices linkerServices, final Class<?> to, final Object obj) { return obj == null ? false : linkerServices.canConvert(obj.getClass(), to); } @@ -279,7 +279,7 @@ * @param parameterCount the total number of arguments in the new method handle * @return a collecting method handle */ - static MethodHandle collectArguments(MethodHandle target, final int parameterCount) { + static MethodHandle collectArguments(final MethodHandle target, final int parameterCount) { final MethodType methodType = target.type(); final int fixParamsLen = methodType.parameterCount() - 1; final Class<?> arrayType = methodType.parameterType(fixParamsLen); @@ -291,7 +291,7 @@ return linkerServices.asTypeLosslessReturn(sizedMethod, callSiteType); } - private static boolean typeMatchesDescription(String paramTypes, MethodType type) { + private static boolean typeMatchesDescription(final String paramTypes, final MethodType type) { final StringTokenizer tok = new StringTokenizer(paramTypes, ", "); for(int i = 1; i < type.parameterCount(); ++i) { // i = 1 as we ignore the receiver if(!(tok.hasMoreTokens() && typeNameMatches(tok.nextToken(), type.parameterType(i)))) { @@ -301,7 +301,7 @@ return !tok.hasMoreTokens(); } - private static boolean typeNameMatches(String typeName, Class<?> type) { + private static boolean typeNameMatches(final String typeName, final Class<?> type) { return typeName.equals(typeName.indexOf('.') == -1 ? type.getSimpleName() : type.getCanonicalName()); } }
--- a/src/jdk/internal/dynalink/beans/StaticClass.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/StaticClass.java Wed Jun 04 13:08:57 2014 +0200 @@ -96,7 +96,7 @@ public class StaticClass implements Serializable { private static final ClassValue<StaticClass> staticClasses = new ClassValue<StaticClass>() { @Override - protected StaticClass computeValue(Class<?> type) { + protected StaticClass computeValue(final Class<?> type) { return new StaticClass(type); } }; @@ -105,7 +105,7 @@ private final Class<?> clazz; - /*private*/ StaticClass(Class<?> clazz) { + /*private*/ StaticClass(final Class<?> clazz) { clazz.getClass(); // NPE check this.clazz = clazz; } @@ -115,7 +115,7 @@ * @param clazz the class for which the static facet is requested. * @return the {@link StaticClass} instance representing the specified class. */ - public static StaticClass forClass(Class<?> clazz) { + public static StaticClass forClass(final Class<?> clazz) { return staticClasses.get(clazz); }
--- a/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java Wed Jun 04 13:08:57 2014 +0200 @@ -90,14 +90,14 @@ import java.util.Map; class StaticClassIntrospector extends FacetIntrospector { - StaticClassIntrospector(Class<?> clazz) { + StaticClassIntrospector(final Class<?> clazz) { super(clazz, false); } @Override Map<String, MethodHandle> getInnerClassGetters() { final Map<String, MethodHandle> map = new HashMap<>(); - for(Class<?> innerClass: membersLookup.getInnerClasses()) { + for(final Class<?> innerClass: membersLookup.getInnerClasses()) { map.put(innerClass.getSimpleName(), editMethodHandle(MethodHandles.constant(StaticClass.class, StaticClass.forClass(innerClass)))); } @@ -105,15 +105,15 @@ } @Override - MethodHandle editMethodHandle(MethodHandle mh) { + MethodHandle editMethodHandle(final MethodHandle mh) { return editStaticMethodHandle(mh); } - static MethodHandle editStaticMethodHandle(MethodHandle mh) { + static MethodHandle editStaticMethodHandle(final MethodHandle mh) { return dropReceiver(mh, Object.class); } - static MethodHandle editConstructorMethodHandle(MethodHandle cmh) { + static MethodHandle editConstructorMethodHandle(final MethodHandle cmh) { return dropReceiver(cmh, StaticClass.class); }
--- a/src/jdk/internal/dynalink/beans/StaticClassLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/beans/StaticClassLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -104,7 +104,7 @@ class StaticClassLinker implements TypeBasedGuardingDynamicLinker { private static final ClassValue<SingleClassStaticsLinker> linkers = new ClassValue<SingleClassStaticsLinker>() { @Override - protected SingleClassStaticsLinker computeValue(Class<?> clazz) { + protected SingleClassStaticsLinker computeValue(final Class<?> clazz) { return new SingleClassStaticsLinker(clazz); } }; @@ -112,7 +112,7 @@ private static class SingleClassStaticsLinker extends AbstractJavaLinker { private final DynamicMethod constructor; - SingleClassStaticsLinker(Class<?> clazz) { + SingleClassStaticsLinker(final Class<?> clazz) { super(clazz, IS_CLASS.bindTo(clazz)); // Map "staticClassObject.class" to StaticClass.getRepresentedClass(). Some adventurous soul could subclass // StaticClass, so we use INSTANCE_OF validation instead of EXACT_CLASS. @@ -126,7 +126,7 @@ * @return a dynamic method containing all overloads of a class' public constructor. If the class has no public * constructors, returns null. */ - private static DynamicMethod createConstructorMethod(Class<?> clazz) { + private static DynamicMethod createConstructorMethod(final Class<?> clazz) { if(clazz.isArray()) { final MethodHandle boundArrayCtor = ARRAY_CTOR.bindTo(clazz.getComponentType()); return new SimpleDynamicMethod(StaticClassIntrospector.editConstructorMethodHandle( @@ -144,7 +144,7 @@ } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest request, LinkerServices linkerServices) + public GuardedInvocation getGuardedInvocation(final LinkRequest request, final LinkerServices linkerServices) throws Exception { final GuardedInvocation gi = super.getGuardedInvocation(request, linkerServices); if(gi != null) { @@ -162,20 +162,20 @@ } } - static Collection<String> getReadableStaticPropertyNames(Class<?> clazz) { + static Collection<String> getReadableStaticPropertyNames(final Class<?> clazz) { return linkers.get(clazz).getReadablePropertyNames(); } - static Collection<String> getWritableStaticPropertyNames(Class<?> clazz) { + static Collection<String> getWritableStaticPropertyNames(final Class<?> clazz) { return linkers.get(clazz).getWritablePropertyNames(); } - static Collection<String> getStaticMethodNames(Class<?> clazz) { + static Collection<String> getStaticMethodNames(final Class<?> clazz) { return linkers.get(clazz).getMethodNames(); } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest request, LinkerServices linkerServices) throws Exception { + public GuardedInvocation getGuardedInvocation(final LinkRequest request, final LinkerServices linkerServices) throws Exception { final Object receiver = request.getReceiver(); if(receiver instanceof StaticClass) { return linkers.get(((StaticClass)receiver).getRepresentedClass()).getGuardedInvocation(request, @@ -185,7 +185,7 @@ } @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return type == StaticClass.class; } @@ -201,7 +201,7 @@ } @SuppressWarnings("unused") - private static boolean isClass(Class<?> clazz, Object obj) { + private static boolean isClass(final Class<?> clazz, final Object obj) { return obj instanceof StaticClass && ((StaticClass)obj).getRepresentedClass() == clazz; } }
--- a/src/jdk/internal/dynalink/linker/GuardedInvocation.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/linker/GuardedInvocation.java Wed Jun 04 13:08:57 2014 +0200 @@ -91,7 +91,6 @@ import java.lang.invoke.SwitchPoint; import java.lang.invoke.WrongMethodTypeException; import java.util.List; - import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.support.Guards;
--- a/src/jdk/internal/dynalink/linker/LinkerServices.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/linker/LinkerServices.java Wed Jun 04 13:08:57 2014 +0200 @@ -192,7 +192,7 @@ * @param fromType the passed type * @return the converted method handle, as per the {@code asTypeSafeReturn} semantics. */ - public static MethodHandle asTypeLosslessReturn(LinkerServices linkerServices, MethodHandle handle, MethodType fromType) { + public static MethodHandle asTypeLosslessReturn(final LinkerServices linkerServices, final MethodHandle handle, final MethodType fromType) { final Class<?> handleReturnType = handle.type().returnType(); return linkerServices.asType(handle, TypeUtilities.isConvertibleWithoutLoss(handleReturnType, fromType.returnType()) ? fromType : fromType.changeReturnType(handleReturnType));
--- a/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -106,7 +106,7 @@ } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { return obj instanceof CallSiteDescriptor && equals((CallSiteDescriptor)obj); } @@ -115,7 +115,7 @@ * @param csd the other call site descriptor. * @return true if they are equal. */ - public boolean equals(CallSiteDescriptor csd) { + public boolean equals(final CallSiteDescriptor csd) { if(csd == null) { return false; } @@ -165,7 +165,7 @@ return l + c - 1; } - private StringBuilder appendName(StringBuilder b) { + private StringBuilder appendName(final StringBuilder b) { b.append(getNameToken(0)); final int c = getNameTokenCount(); for(int i = 1; i < c; ++i) { @@ -174,7 +174,7 @@ return b; } - private static boolean lookupsEqual(Lookup l1, Lookup l2) { + private static boolean lookupsEqual(final Lookup l1, final Lookup l2) { if(l1 == l2) { return true; }
--- a/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java Wed Jun 04 13:08:57 2014 +0200 @@ -100,7 +100,7 @@ * Creates a new relinkable call site. * @param descriptor the descriptor for this call site */ - protected AbstractRelinkableCallSite(CallSiteDescriptor descriptor) { + protected AbstractRelinkableCallSite(final CallSiteDescriptor descriptor) { super(descriptor.getMethodType()); this.descriptor = descriptor; } @@ -111,7 +111,7 @@ } @Override - public void initialize(MethodHandle relinkAndInvoke) { + public void initialize(final MethodHandle relinkAndInvoke) { setTarget(relinkAndInvoke); } }
--- a/src/jdk/internal/dynalink/support/AutoDiscovery.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/AutoDiscovery.java Wed Jun 04 13:08:57 2014 +0200 @@ -116,14 +116,14 @@ * @return a list of guarding dynamic linkers available through the specified class loader. Can be zero-length list * but not null. */ - public static List<GuardingDynamicLinker> loadLinkers(ClassLoader cl) { + public static List<GuardingDynamicLinker> loadLinkers(final ClassLoader cl) { return getLinkers(ServiceLoader.load(GuardingDynamicLinker.class, cl)); } /** * I can't believe there's no Collections API for making a List given an Iterator... */ - private static <T> List<T> getLinkers(ServiceLoader<T> loader) { + private static <T> List<T> getLinkers(final ServiceLoader<T> loader) { final List<T> list = new LinkedList<>(); for(final T linker: loader) { list.add(linker);
--- a/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -105,12 +105,12 @@ } @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return false; } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) { + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) { return null; } }
--- a/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java Wed Jun 04 13:08:57 2014 +0200 @@ -122,7 +122,7 @@ * @return a call site descriptor representing the input. Note that although the method name is "create", it will * in fact return a weakly-referenced canonical instance. */ - public static CallSiteDescriptor create(Lookup lookup, String name, MethodType methodType) { + public static CallSiteDescriptor create(final Lookup lookup, final String name, final MethodType methodType) { name.getClass(); // NPE check methodType.getClass(); // NPE check lookup.getClass(); // NPE check @@ -156,7 +156,7 @@ return new WeakReference<>(desc); } - private static CallSiteDescriptor createPublicCallSiteDescriptor(String[] tokenizedName, MethodType methodType) { + private static CallSiteDescriptor createPublicCallSiteDescriptor(final String[] tokenizedName, final MethodType methodType) { final int l = tokenizedName.length; if(l > 0 && tokenizedName[0] == "dyn") { if(l == 2) { @@ -168,7 +168,7 @@ return new DefaultCallSiteDescriptor(tokenizedName, methodType); } - private static boolean isPublicLookup(Lookup lookup) { + private static boolean isPublicLookup(final Lookup lookup) { return lookup == MethodHandles.publicLookup(); } @@ -179,7 +179,7 @@ * @param name the composite name consisting of colon-separated, possibly mangled tokens. * @return an array of tokens */ - public static String[] tokenizeName(String name) { + public static String[] tokenizeName(final String name) { final StringTokenizer tok = new StringTokenizer(name, CallSiteDescriptor.TOKEN_DELIMITER); final String[] tokens = new String[tok.countTokens()]; for(int i = 0; i < tokens.length; ++i) { @@ -198,7 +198,7 @@ * @param desc the call site descriptor with the operation * @return a list of tokens */ - public static List<String> tokenizeOperators(CallSiteDescriptor desc) { + public static List<String> tokenizeOperators(final CallSiteDescriptor desc) { final String ops = desc.getNameToken(CallSiteDescriptor.OPERATOR); final StringTokenizer tok = new StringTokenizer(ops, CallSiteDescriptor.OPERATOR_DELIMITER); final int count = tok.countTokens(); @@ -220,7 +220,7 @@ * @param end index of the first parameter to not remove * @return a new call site descriptor with modified method type */ - public static CallSiteDescriptor dropParameterTypes(CallSiteDescriptor desc, int start, int end) { + public static CallSiteDescriptor dropParameterTypes(final CallSiteDescriptor desc, final int start, final int end) { return desc.changeMethodType(desc.getMethodType().dropParameterTypes(start, end)); } @@ -232,7 +232,7 @@ * @param nptype the new parameter type * @return a new call site descriptor with modified method type */ - public static CallSiteDescriptor changeParameterType(CallSiteDescriptor desc, int num, Class<?> nptype) { + public static CallSiteDescriptor changeParameterType(final CallSiteDescriptor desc, final int num, final Class<?> nptype) { return desc.changeMethodType(desc.getMethodType().changeParameterType(num, nptype)); } @@ -243,7 +243,7 @@ * @param nrtype the new return type * @return a new call site descriptor with modified method type */ - public static CallSiteDescriptor changeReturnType(CallSiteDescriptor desc, Class<?> nrtype) { + public static CallSiteDescriptor changeReturnType(final CallSiteDescriptor desc, final Class<?> nrtype) { return desc.changeMethodType(desc.getMethodType().changeReturnType(nrtype)); } @@ -255,7 +255,7 @@ * @param ptypesToInsert the new types to insert * @return a new call site descriptor with modified method type */ - public static CallSiteDescriptor insertParameterTypes(CallSiteDescriptor desc, int num, Class<?>... ptypesToInsert) { + public static CallSiteDescriptor insertParameterTypes(final CallSiteDescriptor desc, final int num, final Class<?>... ptypesToInsert) { return desc.changeMethodType(desc.getMethodType().insertParameterTypes(num, ptypesToInsert)); } @@ -267,7 +267,7 @@ * @param ptypesToInsert the new types to insert * @return a new call site descriptor with modified method type */ - public static CallSiteDescriptor insertParameterTypes(CallSiteDescriptor desc, int num, List<Class<?>> ptypesToInsert) { + public static CallSiteDescriptor insertParameterTypes(final CallSiteDescriptor desc, final int num, final List<Class<?>> ptypesToInsert) { return desc.changeMethodType(desc.getMethodType().insertParameterTypes(num, ptypesToInsert)); } }
--- a/src/jdk/internal/dynalink/support/ClassMap.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/ClassMap.java Wed Jun 04 13:08:57 2014 +0200 @@ -110,7 +110,7 @@ * * @param classLoader the classloader that determines strong referenceability. */ - protected ClassMap(ClassLoader classLoader) { + protected ClassMap(final ClassLoader classLoader) { this.classLoader = classLoader; }
--- a/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -109,16 +109,16 @@ * * @param linkers a list of component linkers. */ - public CompositeGuardingDynamicLinker(Iterable<? extends GuardingDynamicLinker> linkers) { + public CompositeGuardingDynamicLinker(final Iterable<? extends GuardingDynamicLinker> linkers) { final List<GuardingDynamicLinker> l = new LinkedList<>(); - for(GuardingDynamicLinker linker: linkers) { + for(final GuardingDynamicLinker linker: linkers) { l.add(linker); } this.linkers = l.toArray(new GuardingDynamicLinker[l.size()]); } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, final LinkerServices linkerServices) + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception { for(final GuardingDynamicLinker linker: linkers) { final GuardedInvocation invocation = linker.getGuardedInvocation(linkRequest, linkerServices);
--- a/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -112,7 +112,7 @@ private final List<TypeBasedGuardingDynamicLinker>[] singletonLinkers; @SuppressWarnings("unchecked") - ClassToLinker(TypeBasedGuardingDynamicLinker[] linkers) { + ClassToLinker(final TypeBasedGuardingDynamicLinker[] linkers) { this.linkers = linkers; singletonLinkers = new List[linkers.length]; for(int i = 0; i < linkers.length; ++i) { @@ -121,7 +121,7 @@ } @Override - protected List<TypeBasedGuardingDynamicLinker> computeValue(Class<?> clazz) { + protected List<TypeBasedGuardingDynamicLinker> computeValue(final Class<?> clazz) { List<TypeBasedGuardingDynamicLinker> list = NO_LINKER; for(int i = 0; i < linkers.length; ++i) { final TypeBasedGuardingDynamicLinker linker = linkers[i]; @@ -152,27 +152,27 @@ * * @param linkers the component linkers */ - public CompositeTypeBasedGuardingDynamicLinker(Iterable<? extends TypeBasedGuardingDynamicLinker> linkers) { + public CompositeTypeBasedGuardingDynamicLinker(final Iterable<? extends TypeBasedGuardingDynamicLinker> linkers) { final List<TypeBasedGuardingDynamicLinker> l = new LinkedList<>(); - for(TypeBasedGuardingDynamicLinker linker: linkers) { + for(final TypeBasedGuardingDynamicLinker linker: linkers) { l.add(linker); } this.classToLinker = new ClassToLinker(l.toArray(new TypeBasedGuardingDynamicLinker[l.size()])); } @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return !classToLinker.get(type).isEmpty(); } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, final LinkerServices linkerServices) + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception { final Object obj = linkRequest.getReceiver(); if(obj == null) { return null; } - for(TypeBasedGuardingDynamicLinker linker: classToLinker.get(obj.getClass())) { + for(final TypeBasedGuardingDynamicLinker linker: classToLinker.get(obj.getClass())) { final GuardedInvocation invocation = linker.getGuardedInvocation(linkRequest, linkerServices); if(invocation != null) { return invocation; @@ -189,10 +189,10 @@ * @param linkers the list of linkers to optimize * @return the optimized list */ - public static List<GuardingDynamicLinker> optimize(Iterable<? extends GuardingDynamicLinker> linkers) { + public static List<GuardingDynamicLinker> optimize(final Iterable<? extends GuardingDynamicLinker> linkers) { final List<GuardingDynamicLinker> llinkers = new LinkedList<>(); final List<TypeBasedGuardingDynamicLinker> tblinkers = new LinkedList<>(); - for(GuardingDynamicLinker linker: linkers) { + for(final GuardingDynamicLinker linker: linkers) { if(linker instanceof TypeBasedGuardingDynamicLinker) { tblinkers.add((TypeBasedGuardingDynamicLinker)linker); } else { @@ -204,8 +204,8 @@ return llinkers; } - private static void addTypeBased(List<GuardingDynamicLinker> llinkers, - List<TypeBasedGuardingDynamicLinker> tblinkers) { + private static void addTypeBased(final List<GuardingDynamicLinker> llinkers, + final List<TypeBasedGuardingDynamicLinker> tblinkers) { switch(tblinkers.size()) { case 0: { break;
--- a/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -98,7 +98,7 @@ private final String[] tokenizedName; private final MethodType methodType; - DefaultCallSiteDescriptor(String[] tokenizedName, MethodType methodType) { + DefaultCallSiteDescriptor(final String[] tokenizedName, final MethodType methodType) { this.tokenizedName = tokenizedName; this.methodType = methodType; } @@ -109,10 +109,10 @@ } @Override - public String getNameToken(int i) { + public String getNameToken(final int i) { try { return tokenizedName[i]; - } catch(ArrayIndexOutOfBoundsException e) { + } catch(final ArrayIndexOutOfBoundsException e) { throw new IllegalArgumentException(e.getMessage()); } } @@ -127,7 +127,7 @@ } @Override - public CallSiteDescriptor changeMethodType(MethodType newMethodType) { + public CallSiteDescriptor changeMethodType(final MethodType newMethodType) { return CallSiteDescriptorFactory.getCanonicalPublicDescriptor(new DefaultCallSiteDescriptor(tokenizedName, newMethodType)); }
--- a/src/jdk/internal/dynalink/support/DefaultPrelinkFilter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/DefaultPrelinkFilter.java Wed Jun 04 13:08:57 2014 +0200 @@ -93,7 +93,7 @@ */ public class DefaultPrelinkFilter implements GuardedInvocationFilter { @Override - public GuardedInvocation filter(GuardedInvocation inv, LinkRequest request, LinkerServices linkerServices) { + public GuardedInvocation filter(final GuardedInvocation inv, final LinkRequest request, final LinkerServices linkerServices) { return inv.asType(linkerServices, request.getCallSiteDescriptor().getMethodType()); } }
--- a/src/jdk/internal/dynalink/support/Guards.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/Guards.java Wed Jun 04 13:08:57 2014 +0200 @@ -113,7 +113,7 @@ * @return a method handle testing whether its first argument is of the specified class. */ @SuppressWarnings("boxing") - public static MethodHandle isOfClass(Class<?> clazz, MethodType type) { + public static MethodHandle isOfClass(final Class<?> clazz, final MethodType type) { final Class<?> declaredType = type.parameterType(0); if(clazz == declaredType) { LOG.log(Level.WARNING, "isOfClassGuardAlwaysTrue", new Object[] { clazz.getName(), 0, type, DynamicLinker.getLinkedCallSiteLocation() }); @@ -135,7 +135,7 @@ * @param type the method type * @return a method handle testing whether its first argument is of the specified class or subclass. */ - public static MethodHandle isInstance(Class<?> clazz, MethodType type) { + public static MethodHandle isInstance(final Class<?> clazz, final MethodType type) { return isInstance(clazz, 0, type); } @@ -150,7 +150,7 @@ * @return a method handle testing whether its first argument is of the specified class or subclass. */ @SuppressWarnings("boxing") - public static MethodHandle isInstance(Class<?> clazz, int pos, MethodType type) { + public static MethodHandle isInstance(final Class<?> clazz, final int pos, final MethodType type) { final Class<?> declaredType = type.parameterType(pos); if(clazz.isAssignableFrom(declaredType)) { LOG.log(Level.WARNING, "isInstanceGuardAlwaysTrue", new Object[] { clazz.getName(), pos, type, DynamicLinker.getLinkedCallSiteLocation() }); @@ -172,7 +172,7 @@ * the arguments are ignored. */ @SuppressWarnings("boxing") - public static MethodHandle isArray(int pos, MethodType type) { + public static MethodHandle isArray(final int pos, final MethodType type) { final Class<?> declaredType = type.parameterType(pos); if(declaredType.isArray()) { LOG.log(Level.WARNING, "isArrayGuardAlwaysTrue", new Object[] { pos, type, DynamicLinker.getLinkedCallSiteLocation() }); @@ -193,7 +193,7 @@ * @param referredLoader the referred class loader * @return true if it is safe to strongly reference the class */ - public static boolean canReferenceDirectly(ClassLoader referrerLoader, final ClassLoader referredLoader) { + public static boolean canReferenceDirectly(final ClassLoader referrerLoader, final ClassLoader referredLoader) { if(referredLoader == null) { // Can always refer directly to a system class return true; @@ -215,7 +215,7 @@ return false; } - private static MethodHandle getClassBoundArgumentTest(MethodHandle test, Class<?> clazz, int pos, MethodType type) { + private static MethodHandle getClassBoundArgumentTest(final MethodHandle test, final Class<?> clazz, final int pos, final MethodType type) { // Bind the class to the first argument of the test return asType(test.bindTo(clazz), pos, type); } @@ -227,7 +227,7 @@ * @param type the type to adapt the method handle to * @return the adapted method handle */ - public static MethodHandle asType(MethodHandle test, MethodType type) { + public static MethodHandle asType(final MethodHandle test, final MethodType type) { return test.asType(getTestType(test, type)); } @@ -239,16 +239,16 @@ * @param type the type to adapt the method handle to * @return the adapted method handle */ - public static MethodHandle asType(LinkerServices linkerServices, MethodHandle test, MethodType type) { + public static MethodHandle asType(final LinkerServices linkerServices, final MethodHandle test, final MethodType type) { return linkerServices.asType(test, getTestType(test, type)); } - private static MethodType getTestType(MethodHandle test, MethodType type) { + private static MethodType getTestType(final MethodHandle test, final MethodType type) { return type.dropParameterTypes(test.type().parameterCount(), type.parameterCount()).changeReturnType(boolean.class); } - private static MethodHandle asType(MethodHandle test, int pos, MethodType type) { + private static MethodHandle asType(final MethodHandle test, final int pos, final MethodType type) { assert test != null; assert type != null; assert type.parameterCount() > 0; @@ -283,7 +283,7 @@ * @param clazz the class to test for. * @return the desired guard method. */ - public static MethodHandle getClassGuard(Class<?> clazz) { + public static MethodHandle getClassGuard(final Class<?> clazz) { return IS_OF_CLASS.bindTo(clazz); } @@ -292,7 +292,7 @@ * @param clazz the class to test for. * @return the desired guard method. */ - public static MethodHandle getInstanceOfGuard(Class<?> clazz) { + public static MethodHandle getInstanceOfGuard(final Class<?> clazz) { return IS_INSTANCE.bindTo(clazz); } @@ -301,7 +301,7 @@ * @param obj the object used as referential identity test * @return the desired guard method. */ - public static MethodHandle getIdentityGuard(Object obj) { + public static MethodHandle getIdentityGuard(final Object obj) { return IS_IDENTICAL.bindTo(obj); } @@ -322,39 +322,39 @@ } @SuppressWarnings("unused") - private static boolean isNull(Object obj) { + private static boolean isNull(final Object obj) { return obj == null; } @SuppressWarnings("unused") - private static boolean isNotNull(Object obj) { + private static boolean isNotNull(final Object obj) { return obj != null; } @SuppressWarnings("unused") - private static boolean isArray(Object o) { + private static boolean isArray(final Object o) { return o != null && o.getClass().isArray(); } @SuppressWarnings("unused") - private static boolean isOfClass(Class<?> c, Object o) { + private static boolean isOfClass(final Class<?> c, final Object o) { return o != null && o.getClass() == c; } @SuppressWarnings("unused") - private static boolean isIdentical(Object o1, Object o2) { + private static boolean isIdentical(final Object o1, final Object o2) { return o1 == o2; } - private static MethodHandle constantTrue(MethodType type) { + private static MethodHandle constantTrue(final MethodType type) { return constantBoolean(Boolean.TRUE, type); } - private static MethodHandle constantFalse(MethodType type) { + private static MethodHandle constantFalse(final MethodType type) { return constantBoolean(Boolean.FALSE, type); } - private static MethodHandle constantBoolean(Boolean value, MethodType type) { + private static MethodHandle constantBoolean(final Boolean value, final MethodType type) { return MethodHandles.permuteArguments(MethodHandles.constant(Boolean.TYPE, value), type.changeReturnType(Boolean.TYPE)); }
--- a/src/jdk/internal/dynalink/support/LinkRequestImpl.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/LinkRequestImpl.java Wed Jun 04 13:08:57 2014 +0200 @@ -109,7 +109,7 @@ * @param callSiteUnstable true if the call site being linked is considered unstable * @param arguments the arguments for the invocation */ - public LinkRequestImpl(CallSiteDescriptor callSiteDescriptor, Object callSiteToken, int linkCount, boolean callSiteUnstable, Object... arguments) { + public LinkRequestImpl(final CallSiteDescriptor callSiteDescriptor, final Object callSiteToken, final int linkCount, final boolean callSiteUnstable, final Object... arguments) { this.callSiteDescriptor = callSiteDescriptor; this.callSiteToken = callSiteToken; this.linkCount = linkCount; @@ -153,7 +153,7 @@ } @Override - public LinkRequest replaceArguments(CallSiteDescriptor newCallSiteDescriptor, Object[] newArguments) { + public LinkRequest replaceArguments(final CallSiteDescriptor newCallSiteDescriptor, final Object[] newArguments) { return new LinkRequestImpl(newCallSiteDescriptor, callSiteToken, linkCount, callSiteUnstable, newArguments); } }
--- a/src/jdk/internal/dynalink/support/LinkerServicesImpl.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/LinkerServicesImpl.java Wed Jun 04 13:08:57 2014 +0200 @@ -117,32 +117,32 @@ } @Override - public boolean canConvert(Class<?> from, Class<?> to) { + public boolean canConvert(final Class<?> from, final Class<?> to) { return typeConverterFactory.canConvert(from, to); } @Override - public MethodHandle asType(MethodHandle handle, MethodType fromType) { + public MethodHandle asType(final MethodHandle handle, final MethodType fromType) { return typeConverterFactory.asType(handle, fromType); } @Override - public MethodHandle asTypeLosslessReturn(MethodHandle handle, MethodType fromType) { + public MethodHandle asTypeLosslessReturn(final MethodHandle handle, final MethodType fromType) { return Implementation.asTypeLosslessReturn(this, handle, fromType); } @Override - public MethodHandle getTypeConverter(Class<?> sourceType, Class<?> targetType) { + public MethodHandle getTypeConverter(final Class<?> sourceType, final Class<?> targetType) { return typeConverterFactory.getTypeConverter(sourceType, targetType); } @Override - public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2) { + public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) { return typeConverterFactory.compareConversion(sourceType, targetType1, targetType2); } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest) throws Exception { + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest) throws Exception { final LinkRequest prevLinkRequest = threadLinkRequest.get(); threadLinkRequest.set(linkRequest); try { @@ -159,7 +159,7 @@ * permission. */ public static LinkRequest getCurrentLinkRequest() { - SecurityManager sm = System.getSecurityManager(); + final SecurityManager sm = System.getSecurityManager(); if(sm != null) { sm.checkPermission(GET_CURRENT_LINK_REQUEST); }
--- a/src/jdk/internal/dynalink/support/Lookup.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/Lookup.java Wed Jun 04 13:08:57 2014 +0200 @@ -104,7 +104,7 @@ * * @param lookup the {@link java.lang.invoke.MethodHandles.Lookup} it delegates to. */ - public Lookup(MethodHandles.Lookup lookup) { + public Lookup(final MethodHandles.Lookup lookup) { this.lookup = lookup; } @@ -120,7 +120,7 @@ * @param m the method to unreflect * @return the unreflected method handle. */ - public MethodHandle unreflect(Method m) { + public MethodHandle unreflect(final Method m) { return unreflect(lookup, m); } @@ -132,10 +132,10 @@ * @param m the method to unreflect * @return the unreflected method handle. */ - public static MethodHandle unreflect(MethodHandles.Lookup lookup, Method m) { + public static MethodHandle unreflect(final MethodHandles.Lookup lookup, final Method m) { try { return lookup.unreflect(m); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect method " + m); ee.initCause(e); throw ee; @@ -149,10 +149,10 @@ * @param f the field for which a getter is unreflected * @return the unreflected field getter handle. */ - public MethodHandle unreflectGetter(Field f) { + public MethodHandle unreflectGetter(final Field f) { try { return lookup.unreflectGetter(f); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect getter for field " + f); ee.initCause(e); throw ee; @@ -171,15 +171,15 @@ * @throws IllegalAccessError if the field is inaccessible. * @throws NoSuchFieldError if the field does not exist. */ - public MethodHandle findGetter(Class<?>refc, String name, Class<?> type) { + public MethodHandle findGetter(final Class<?>refc, final String name, final Class<?> type) { try { return lookup.findGetter(refc, name, type); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to access getter for field " + refc.getName() + "." + name + " of type " + type.getName()); ee.initCause(e); throw ee; - } catch(NoSuchFieldException e) { + } catch(final NoSuchFieldException e) { final NoSuchFieldError ee = new NoSuchFieldError("Failed to find getter for field " + refc.getName() + "." + name + " of type " + type.getName()); ee.initCause(e); @@ -194,10 +194,10 @@ * @param f the field for which a setter is unreflected * @return the unreflected field setter handle. */ - public MethodHandle unreflectSetter(Field f) { + public MethodHandle unreflectSetter(final Field f) { try { return lookup.unreflectSetter(f); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect setter for field " + f); ee.initCause(e); throw ee; @@ -211,7 +211,7 @@ * @param c the constructor to unreflect * @return the unreflected constructor handle. */ - public MethodHandle unreflectConstructor(Constructor<?> c) { + public MethodHandle unreflectConstructor(final Constructor<?> c) { return unreflectConstructor(lookup, c); } @@ -223,10 +223,10 @@ * @param c the constructor to unreflect * @return the unreflected constructor handle. */ - public static MethodHandle unreflectConstructor(MethodHandles.Lookup lookup, Constructor<?> c) { + public static MethodHandle unreflectConstructor(final MethodHandles.Lookup lookup, final Constructor<?> c) { try { return lookup.unreflectConstructor(c); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect constructor " + c); ee.initCause(e); throw ee; @@ -244,15 +244,15 @@ * @throws IllegalAccessError if the method is inaccessible. * @throws NoSuchMethodError if the method does not exist. */ - public MethodHandle findSpecial(Class<?> declaringClass, String name, MethodType type) { + public MethodHandle findSpecial(final Class<?> declaringClass, final String name, final MethodType type) { try { return lookup.findSpecial(declaringClass, name, type, declaringClass); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to access special method " + methodDescription( declaringClass, name, type)); ee.initCause(e); throw ee; - } catch(NoSuchMethodException e) { + } catch(final NoSuchMethodException e) { final NoSuchMethodError ee = new NoSuchMethodError("Failed to find special method " + methodDescription( declaringClass, name, type)); ee.initCause(e); @@ -260,7 +260,7 @@ } } - private static String methodDescription(Class<?> declaringClass, String name, MethodType type) { + private static String methodDescription(final Class<?> declaringClass, final String name, final MethodType type) { return declaringClass.getName() + "#" + name + type; } @@ -275,15 +275,15 @@ * @throws IllegalAccessError if the method is inaccessible. * @throws NoSuchMethodError if the method does not exist. */ - public MethodHandle findStatic(Class<?> declaringClass, String name, MethodType type) { + public MethodHandle findStatic(final Class<?> declaringClass, final String name, final MethodType type) { try { return lookup.findStatic(declaringClass, name, type); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to access static method " + methodDescription( declaringClass, name, type)); ee.initCause(e); throw ee; - } catch(NoSuchMethodException e) { + } catch(final NoSuchMethodException e) { final NoSuchMethodError ee = new NoSuchMethodError("Failed to find static method " + methodDescription( declaringClass, name, type)); ee.initCause(e); @@ -302,15 +302,15 @@ * @throws IllegalAccessError if the method is inaccessible. * @throws NoSuchMethodError if the method does not exist. */ - public MethodHandle findVirtual(Class<?> declaringClass, String name, MethodType type) { + public MethodHandle findVirtual(final Class<?> declaringClass, final String name, final MethodType type) { try { return lookup.findVirtual(declaringClass, name, type); - } catch(IllegalAccessException e) { + } catch(final IllegalAccessException e) { final IllegalAccessError ee = new IllegalAccessError("Failed to access virtual method " + methodDescription( declaringClass, name, type)); ee.initCause(e); throw ee; - } catch(NoSuchMethodException e) { + } catch(final NoSuchMethodException e) { final NoSuchMethodError ee = new NoSuchMethodError("Failed to find virtual method " + methodDescription( declaringClass, name, type)); ee.initCause(e); @@ -327,7 +327,7 @@ * @param ptypes the parameter types of the method * @return the method handle for the method */ - public static MethodHandle findOwnSpecial(MethodHandles.Lookup lookup, String name, Class<?> rtype, Class<?>... ptypes) { + public static MethodHandle findOwnSpecial(final MethodHandles.Lookup lookup, final String name, final Class<?> rtype, final Class<?>... ptypes) { return new Lookup(lookup).findOwnSpecial(name, rtype, ptypes); } @@ -341,7 +341,7 @@ * @param ptypes the parameter types of the method * @return the method handle for the method */ - public MethodHandle findOwnSpecial(String name, Class<?> rtype, Class<?>... ptypes) { + public MethodHandle findOwnSpecial(final String name, final Class<?> rtype, final Class<?>... ptypes) { return findSpecial(lookup.lookupClass(), name, MethodType.methodType(rtype, ptypes)); } @@ -355,7 +355,7 @@ * @param ptypes the parameter types of the method * @return the method handle for the method */ - public static MethodHandle findOwnStatic(MethodHandles.Lookup lookup, String name, Class<?> rtype, Class<?>... ptypes) { + public static MethodHandle findOwnStatic(final MethodHandles.Lookup lookup, final String name, final Class<?> rtype, final Class<?>... ptypes) { return new Lookup(lookup).findOwnStatic(name, rtype, ptypes); } @@ -368,7 +368,7 @@ * @param ptypes the parameter types of the method * @return the method handle for the method */ - public MethodHandle findOwnStatic(String name, Class<?> rtype, Class<?>... ptypes) { + public MethodHandle findOwnStatic(final String name, final Class<?> rtype, final Class<?>... ptypes) { return findStatic(lookup.lookupClass(), name, MethodType.methodType(rtype, ptypes)); } }
--- a/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -92,7 +92,7 @@ * @author Attila Szegedi */ class LookupCallSiteDescriptor extends DefaultCallSiteDescriptor { - private Lookup lookup; + private final Lookup lookup; /** * Create a new call site descriptor from explicit information. @@ -100,7 +100,7 @@ * @param methodType the method type * @param lookup the lookup */ - LookupCallSiteDescriptor(String[] tokenizedName, MethodType methodType, Lookup lookup) { + LookupCallSiteDescriptor(final String[] tokenizedName, final MethodType methodType, final Lookup lookup) { super(tokenizedName, methodType); this.lookup = lookup; } @@ -111,7 +111,7 @@ } @Override - public CallSiteDescriptor changeMethodType(MethodType newMethodType) { + public CallSiteDescriptor changeMethodType(final MethodType newMethodType) { return new LookupCallSiteDescriptor(getTokenizedName(), newMethodType, lookup); } }
--- a/src/jdk/internal/dynalink/support/NameCodec.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/NameCodec.java Wed Jun 04 13:08:57 2014 +0200 @@ -137,7 +137,7 @@ * @param name the symbolic name to mangle * @return the mangled form of the symbolic name. */ - public static String encode(String name) { + public static String encode(final String name) { final int l = name.length(); if(l == 0) { return EMPTY_NAME; @@ -176,7 +176,7 @@ * @param name the symbolic name to demangle * @return the demangled form of the symbolic name. */ - public static String decode(String name) { + public static String decode(final String name) { if(name.charAt(0) != ESCAPE_CHAR) { return name; } @@ -184,11 +184,11 @@ if(l == 2 && name.charAt(1) == EMPTY_CHAR) { return ""; } - StringBuilder b = new StringBuilder(name.length()); + final StringBuilder b = new StringBuilder(name.length()); int lastEscape = -2; int lastBackslash = -1; for(;;) { - int nextBackslash = name.indexOf(ESCAPE_CHAR, lastBackslash + 1); + final int nextBackslash = name.indexOf(ESCAPE_CHAR, lastBackslash + 1); if(nextBackslash == -1 || nextBackslash == l - 1) { break; } @@ -211,7 +211,7 @@ return b.toString(); } - private static void addEncoding(char from, char to) { + private static void addEncoding(final char from, final char to) { ENCODING[from - MIN_ENCODING] = to; DECODING[to - MIN_DECODING] = from; }
--- a/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -89,7 +89,7 @@ class NamedDynCallSiteDescriptor extends UnnamedDynCallSiteDescriptor { private final String name; - NamedDynCallSiteDescriptor(String op, String name, MethodType methodType) { + NamedDynCallSiteDescriptor(final String op, final String name, final MethodType methodType) { super(op, methodType); this.name = name; } @@ -100,7 +100,7 @@ } @Override - public String getNameToken(int i) { + public String getNameToken(final int i) { switch(i) { case 0: return "dyn"; case 1: return getOp(); @@ -110,7 +110,7 @@ } @Override - public CallSiteDescriptor changeMethodType(MethodType newMethodType) { + public CallSiteDescriptor changeMethodType(final MethodType newMethodType) { return CallSiteDescriptorFactory.getCanonicalPublicDescriptor(new NamedDynCallSiteDescriptor(getOp(), name, newMethodType)); }
--- a/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java Wed Jun 04 13:08:57 2014 +0200 @@ -109,8 +109,8 @@ * runtime specific context arguments. * @throws IllegalArgumentException if runtimeContextArgCount is less than 1. */ - public RuntimeContextLinkRequestImpl(CallSiteDescriptor callSiteDescriptor, Object callSiteToken, - int linkCount, boolean callSiteUnstable, Object[] arguments, int runtimeContextArgCount) { + public RuntimeContextLinkRequestImpl(final CallSiteDescriptor callSiteDescriptor, final Object callSiteToken, + final int linkCount, final boolean callSiteUnstable, final Object[] arguments, final int runtimeContextArgCount) { super(callSiteDescriptor, callSiteToken, linkCount, callSiteUnstable, arguments); if(runtimeContextArgCount < 1) { throw new IllegalArgumentException("runtimeContextArgCount < 1"); @@ -129,7 +129,7 @@ } @Override - public LinkRequest replaceArguments(CallSiteDescriptor callSiteDescriptor, Object[] arguments) { + public LinkRequest replaceArguments(final CallSiteDescriptor callSiteDescriptor, final Object[] arguments) { return new RuntimeContextLinkRequestImpl(callSiteDescriptor, getCallSiteToken(), getLinkCount(), isCallSiteUnstable(), arguments, runtimeContextArgCount); }
--- a/src/jdk/internal/dynalink/support/TypeConverterFactory.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/TypeConverterFactory.java Wed Jun 04 13:08:57 2014 +0200 @@ -91,7 +91,6 @@ import java.security.PrivilegedAction; import java.util.LinkedList; import java.util.List; - import jdk.internal.dynalink.linker.ConversionComparator; import jdk.internal.dynalink.linker.ConversionComparator.Comparison; import jdk.internal.dynalink.linker.GuardedInvocation; @@ -116,12 +115,12 @@ protected ClassMap<MethodHandle> computeValue(final Class<?> sourceType) { return new ClassMap<MethodHandle>(getClassLoader(sourceType)) { @Override - protected MethodHandle computeValue(Class<?> targetType) { + protected MethodHandle computeValue(final Class<?> targetType) { try { return createConverter(sourceType, targetType); - } catch (RuntimeException e) { + } catch (final RuntimeException e) { throw e; - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException(e); } } @@ -134,7 +133,7 @@ protected ClassMap<MethodHandle> computeValue(final Class<?> sourceType) { return new ClassMap<MethodHandle>(getClassLoader(sourceType)) { @Override - protected MethodHandle computeValue(Class<?> targetType) { + protected MethodHandle computeValue(final Class<?> targetType) { if(!canAutoConvert(sourceType, targetType)) { final MethodHandle converter = getCacheableTypeConverter(sourceType, targetType); if(converter != IDENTITY_CONVERSION) { @@ -152,12 +151,12 @@ protected ClassMap<Boolean> computeValue(final Class<?> sourceType) { return new ClassMap<Boolean>(getClassLoader(sourceType)) { @Override - protected Boolean computeValue(Class<?> targetType) { + protected Boolean computeValue(final Class<?> targetType) { try { return getTypeConverterNull(sourceType, targetType) != null; - } catch (RuntimeException e) { + } catch (final RuntimeException e) { throw e; - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException(e); } } @@ -179,10 +178,10 @@ * * @param factories the {@link GuardingTypeConverterFactory} instances to compose. */ - public TypeConverterFactory(Iterable<? extends GuardingTypeConverterFactory> factories) { + public TypeConverterFactory(final Iterable<? extends GuardingTypeConverterFactory> factories) { final List<GuardingTypeConverterFactory> l = new LinkedList<>(); final List<ConversionComparator> c = new LinkedList<>(); - for(GuardingTypeConverterFactory factory: factories) { + for(final GuardingTypeConverterFactory factory: factories) { l.add(factory); if(factory instanceof ConversionComparator) { c.add((ConversionComparator)factory); @@ -207,7 +206,7 @@ * {@link MethodHandles#filterArguments(MethodHandle, int, MethodHandle...)} with * {@link GuardingTypeConverterFactory} produced type converters as filters. */ - public MethodHandle asType(MethodHandle handle, final MethodType fromType) { + public MethodHandle asType(final MethodHandle handle, final MethodType fromType) { MethodHandle newHandle = handle; final MethodType toType = newHandle.type(); final int l = toType.parameterCount(); @@ -251,7 +250,7 @@ return newHandle.asType(fromType); } - private static MethodHandle applyConverters(MethodHandle handle, int pos, List<MethodHandle> converters) { + private static MethodHandle applyConverters(final MethodHandle handle, final int pos, final List<MethodHandle> converters) { if(converters.isEmpty()) { return handle; } @@ -286,8 +285,8 @@ * @return one of Comparison constants that establish which - if any - of the target types is preferable for the * conversion. */ - public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2) { - for(ConversionComparator comparator: comparators) { + public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) { + for(final ConversionComparator comparator: comparators) { final Comparison result = comparator.compareConversion(sourceType, targetType1, targetType2); if(result != Comparison.INDETERMINATE) { return result; @@ -314,20 +313,20 @@ return TypeUtilities.isMethodInvocationConvertible(fromType, toType); } - /*private*/ MethodHandle getCacheableTypeConverterNull(Class<?> sourceType, Class<?> targetType) { + /*private*/ MethodHandle getCacheableTypeConverterNull(final Class<?> sourceType, final Class<?> targetType) { final MethodHandle converter = getCacheableTypeConverter(sourceType, targetType); return converter == IDENTITY_CONVERSION ? null : converter; } - /*private*/ MethodHandle getTypeConverterNull(Class<?> sourceType, Class<?> targetType) { + /*private*/ MethodHandle getTypeConverterNull(final Class<?> sourceType, final Class<?> targetType) { try { return getCacheableTypeConverterNull(sourceType, targetType); - } catch(NotCacheableConverter e) { + } catch(final NotCacheableConverter e) { return e.converter; } } - /*private*/ MethodHandle getCacheableTypeConverter(Class<?> sourceType, Class<?> targetType) { + /*private*/ MethodHandle getCacheableTypeConverter(final Class<?> sourceType, final Class<?> targetType) { return converterMap.get(sourceType).get(targetType); } @@ -340,15 +339,15 @@ * @param targetType the type to convert to * @return a method handle performing the conversion. */ - public MethodHandle getTypeConverter(Class<?> sourceType, Class<?> targetType) { + public MethodHandle getTypeConverter(final Class<?> sourceType, final Class<?> targetType) { try { return converterIdentityMap.get(sourceType).get(targetType); - } catch(NotCacheableConverter e) { + } catch(final NotCacheableConverter e) { return e.converter; } } - /*private*/ MethodHandle createConverter(Class<?> sourceType, Class<?> targetType) throws Exception { + /*private*/ MethodHandle createConverter(final Class<?> sourceType, final Class<?> targetType) throws Exception { final MethodType type = MethodType.methodType(targetType, sourceType); final MethodHandle identity = IDENTITY_CONVERSION.asType(type); MethodHandle last = identity;
--- a/src/jdk/internal/dynalink/support/TypeUtilities.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/TypeUtilities.java Wed Jun 04 13:08:57 2014 +0200 @@ -115,7 +115,7 @@ * unrelated superinterfaces as their most specific common type, or the types themselves are completely * unrelated interfaces, {@link java.lang.Object} is returned. */ - public static Class<?> getCommonLosslessConversionType(Class<?> c1, Class<?> c2) { + public static Class<?> getCommonLosslessConversionType(final Class<?> c1, final Class<?> c2) { if(c1 == c2) { return c1; } else if(isConvertibleWithoutLoss(c2, c1)) { @@ -144,11 +144,11 @@ return getMostSpecificCommonTypeUnequalNonprimitives(c1, c2); } - private static Class<?> getMostSpecificCommonTypeUnequalNonprimitives(Class<?> c1, Class<?> c2) { + private static Class<?> getMostSpecificCommonTypeUnequalNonprimitives(final Class<?> c1, final Class<?> c2) { final Class<?> npc1 = c1.isPrimitive() ? getWrapperType(c1) : c1; final Class<?> npc2 = c2.isPrimitive() ? getWrapperType(c2) : c2; - Set<Class<?>> a1 = getAssignables(npc1, npc2); - Set<Class<?>> a2 = getAssignables(npc2, npc1); + final Set<Class<?>> a1 = getAssignables(npc1, npc2); + final Set<Class<?>> a2 = getAssignables(npc2, npc1); a1.retainAll(a2); if(a1.isEmpty()) { // Can happen when at least one of the arguments is an interface, @@ -159,10 +159,10 @@ // thank to interfaces. I.e., if you call this method for String.class // and Number.class, you'll have Comparable, Serializable, and Object // as maximal elements. - List<Class<?>> max = new ArrayList<>(); - outer: for(Class<?> clazz: a1) { - for(Iterator<Class<?>> maxiter = max.iterator(); maxiter.hasNext();) { - Class<?> maxClazz = maxiter.next(); + final List<Class<?>> max = new ArrayList<>(); + outer: for(final Class<?> clazz: a1) { + for(final Iterator<Class<?>> maxiter = max.iterator(); maxiter.hasNext();) { + final Class<?> maxClazz = maxiter.next(); if(isSubtype(maxClazz, clazz)) { // It can't be maximal, if there's already a more specific // maximal than it. @@ -184,21 +184,21 @@ return max.get(0); } - private static Set<Class<?>> getAssignables(Class<?> c1, Class<?> c2) { - Set<Class<?>> s = new HashSet<>(); + private static Set<Class<?>> getAssignables(final Class<?> c1, final Class<?> c2) { + final Set<Class<?>> s = new HashSet<>(); collectAssignables(c1, c2, s); return s; } - private static void collectAssignables(Class<?> c1, Class<?> c2, Set<Class<?>> s) { + private static void collectAssignables(final Class<?> c1, final Class<?> c2, final Set<Class<?>> s) { if(c1.isAssignableFrom(c2)) { s.add(c1); } - Class<?> sc = c1.getSuperclass(); + final Class<?> sc = c1.getSuperclass(); if(sc != null) { collectAssignables(sc, c2, s); } - Class<?>[] itf = c1.getInterfaces(); + final Class<?>[] itf = c1.getInterfaces(); for(int i = 0; i < itf.length; ++i) { collectAssignables(itf[i], c2, s); } @@ -221,17 +221,17 @@ return Collections.unmodifiableMap(wrapperTypes); } - private static Map<String, Class<?>> createClassNameMapping(Collection<Class<?>> classes) { + private static Map<String, Class<?>> createClassNameMapping(final Collection<Class<?>> classes) { final Map<String, Class<?>> map = new HashMap<>(); - for(Class<?> clazz: classes) { + for(final Class<?> clazz: classes) { map.put(clazz.getName(), clazz); } return map; } - private static <K, V> Map<V, K> invertMap(Map<K, V> map) { + private static <K, V> Map<V, K> invertMap(final Map<K, V> map) { final Map<V, K> inverted = new IdentityHashMap<>(map.size()); - for(Map.Entry<K, V> entry: map.entrySet()) { + for(final Map.Entry<K, V> entry: map.entrySet()) { inverted.put(entry.getValue(), entry.getKey()); } return Collections.unmodifiableMap(inverted); @@ -247,7 +247,7 @@ * @param targetType the parameter type being converted to (method type for parameter types, call site type for return types) * @return true if source type is method invocation convertible to target type. */ - public static boolean isMethodInvocationConvertible(Class<?> sourceType, Class<?> targetType) { + public static boolean isMethodInvocationConvertible(final Class<?> sourceType, final Class<?> targetType) { if(targetType.isAssignableFrom(sourceType)) { return true; } @@ -275,7 +275,7 @@ * @param targetType the target type * @return true if lossess conversion is possible */ - public static boolean isConvertibleWithoutLoss(Class<?> sourceType, Class<?> targetType) { + public static boolean isConvertibleWithoutLoss(final Class<?> sourceType, final Class<?> targetType) { if(targetType.isAssignableFrom(sourceType)) { return true; } @@ -310,7 +310,7 @@ * @param methodType the parameter type in the method declaration * @return true if callSiteType is potentially convertible to the methodType. */ - public static boolean isPotentiallyConvertible(Class<?> callSiteType, Class<?> methodType) { + public static boolean isPotentiallyConvertible(final Class<?> callSiteType, final Class<?> methodType) { // Widening or narrowing reference conversion if(areAssignable(callSiteType, methodType)) { return true; @@ -338,7 +338,7 @@ * @param c2 another one of the types * @return true if either c1 is assignable from c2 or c2 is assignable from c1. */ - public static boolean areAssignable(Class<?> c1, Class<?> c2) { + public static boolean areAssignable(final Class<?> c1, final Class<?> c2) { return c1.isAssignableFrom(c2) || c2.isAssignableFrom(c1); } @@ -353,7 +353,7 @@ * @return true if subType can be converted by identity conversion, widening primitive conversion, or widening * reference conversion to superType. */ - public static boolean isSubtype(Class<?> subType, Class<?> superType) { + public static boolean isSubtype(final Class<?> subType, final Class<?> superType) { // Covers both JLS 4.10.2 "Subtyping among Class and Interface Types" // and JLS 4.10.3 "Subtyping among Array Types", as well as primitive // type identity. @@ -384,7 +384,7 @@ * @param superType the supposed supertype * @return true if subType is a proper (not identical to) primitive subtype of the superType */ - private static boolean isProperPrimitiveSubtype(Class<?> subType, Class<?> superType) { + private static boolean isProperPrimitiveSubtype(final Class<?> subType, final Class<?> superType) { if(superType == boolean.class || subType == boolean.class) { return false; } @@ -418,7 +418,7 @@ * @return true if subType is a proper (not identical to) primitive subtype of the superType that can be represented * by the supertype without no precision loss. */ - private static boolean isProperPrimitiveLosslessSubtype(Class<?> subType, Class<?> superType) { + private static boolean isProperPrimitiveLosslessSubtype(final Class<?> subType, final Class<?> superType) { if(superType == boolean.class || subType == boolean.class) { return false; } @@ -471,13 +471,13 @@ return classes.keySet(); } - private static void addClassHierarchy(Map<Class<?>, Class<?>> map, Class<?> clazz) { + private static void addClassHierarchy(final Map<Class<?>, Class<?>> map, final Class<?> clazz) { if(clazz == null) { return; } map.put(clazz, clazz); addClassHierarchy(map, clazz.getSuperclass()); - for(Class<?> itf: clazz.getInterfaces()) { + for(final Class<?> itf: clazz.getInterfaces()) { addClassHierarchy(map, itf); } } @@ -489,7 +489,7 @@ * @return true if the class can be assigned from any boxed primitive. Basically, it is true if the class is any * primitive wrapper class, or a superclass or superinterface of any primitive wrapper class. */ - private static boolean isAssignableFromBoxedPrimitive(Class<?> clazz) { + private static boolean isAssignableFromBoxedPrimitive(final Class<?> clazz) { return PRIMITIVE_WRAPPER_TYPES.contains(clazz); } @@ -500,7 +500,7 @@ * @return the class representing the primitive type, or null if the name does not correspond to a primitive type * or is "void". */ - public static Class<?> getPrimitiveTypeByName(String name) { + public static Class<?> getPrimitiveTypeByName(final String name) { return PRIMITIVE_TYPES_BY_NAME.get(name); } @@ -511,7 +511,7 @@ * @param wrapperType the class object representing a wrapper for a primitive type * @return the class object representing the primitive type, or null if the passed class is not a primitive wrapper. */ - public static Class<?> getPrimitiveType(Class<?> wrapperType) { + public static Class<?> getPrimitiveType(final Class<?> wrapperType) { return WRAPPER_TO_PRIMITIVE_TYPES.get(wrapperType); } @@ -523,7 +523,7 @@ * @param primitiveType the class object representing a primitive type * @return the class object representing the wrapper type, or null if the passed class is not a primitive. */ - public static Class<?> getWrapperType(Class<?> primitiveType) { + public static Class<?> getWrapperType(final Class<?> primitiveType) { return WRAPPER_TYPES.get(primitiveType); } }
--- a/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -90,7 +90,7 @@ private final MethodType methodType; private final String op; - UnnamedDynCallSiteDescriptor(String op, MethodType methodType) { + UnnamedDynCallSiteDescriptor(final String op, final MethodType methodType) { this.op = op; this.methodType = methodType; } @@ -105,7 +105,7 @@ } @Override - public String getNameToken(int i) { + public String getNameToken(final int i) { switch(i) { case 0: return "dyn"; case 1: return op; @@ -119,7 +119,7 @@ } @Override - public CallSiteDescriptor changeMethodType(MethodType newMethodType) { + public CallSiteDescriptor changeMethodType(final MethodType newMethodType) { return CallSiteDescriptorFactory.getCanonicalPublicDescriptor(new UnnamedDynCallSiteDescriptor(op, newMethodType)); }
--- a/src/jdk/nashorn/api/scripting/Formatter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/api/scripting/Formatter.java Wed Jun 04 13:08:57 2014 +0200 @@ -65,8 +65,8 @@ while (m.find()) { int index = index(m.group(1)); - boolean previous = isPreviousArgument(m.group(2)); - char conversion = m.group(6).charAt(0); + final boolean previous = isPreviousArgument(m.group(2)); + final char conversion = m.group(6).charAt(0); // skip over some formats if (index < 0 || previous @@ -85,7 +85,7 @@ } // current argument - Object arg = args[index - 1]; + final Object arg = args[index - 1]; // for date we convert double to long if (m.group(5) != null) {
--- a/src/jdk/nashorn/api/scripting/NashornScriptEngine.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/api/scripting/NashornScriptEngine.java Wed Jun 04 13:08:57 2014 +0200 @@ -281,7 +281,7 @@ private static Source makeSource(final Reader reader, final ScriptContext ctxt) throws ScriptException { try { return sourceFor(getScriptName(ctxt), reader); - } catch (IOException e) { + } catch (final IOException e) { throw new ScriptException(e); } }
--- a/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java Wed Jun 04 13:08:57 2014 +0200 @@ -43,13 +43,13 @@ import java.util.concurrent.Callable; import javax.script.Bindings; import jdk.nashorn.internal.objects.Global; -import jdk.nashorn.internal.runtime.arrays.ArrayData; import jdk.nashorn.internal.runtime.ConsString; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; +import jdk.nashorn.internal.runtime.arrays.ArrayData; /** * Mirror object that wraps a given Nashorn Script object. @@ -735,7 +735,7 @@ return global; } - static Object translateUndefined(Object obj) { + static Object translateUndefined(final Object obj) { return (obj == ScriptRuntime.UNDEFINED)? null : obj; }
--- a/src/jdk/nashorn/api/scripting/ScriptUtils.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/api/scripting/ScriptUtils.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,11 +28,11 @@ import java.lang.invoke.MethodHandle; import jdk.internal.dynalink.beans.StaticClass; import jdk.internal.dynalink.linker.LinkerServices; -import jdk.nashorn.internal.runtime.linker.Bootstrap; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; +import jdk.nashorn.internal.runtime.linker.Bootstrap; /** * Utilities that are to be called from script code.
--- a/src/jdk/nashorn/api/scripting/URLReader.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/api/scripting/URLReader.java Wed Jun 04 13:08:57 2014 +0200 @@ -81,7 +81,7 @@ } @Override - public int read(char cbuf[], int off, int len) throws IOException { + public int read(final char cbuf[], final int off, final int len) throws IOException { return getReader().read(cbuf, off, len); }
--- a/src/jdk/nashorn/internal/codegen/ApplySpecialization.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/ApplySpecialization.java Wed Jun 04 13:08:57 2014 +0200 @@ -35,7 +35,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - import jdk.nashorn.internal.ir.AccessNode; import jdk.nashorn.internal.ir.CallNode; import jdk.nashorn.internal.ir.Expression;
--- a/src/jdk/nashorn/internal/codegen/Compiler.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/Compiler.java Wed Jun 04 13:08:57 2014 +0200 @@ -48,7 +48,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; - import jdk.internal.dynalink.support.NameCodec; import jdk.nashorn.internal.codegen.ClassEmitter.Flag; import jdk.nashorn.internal.codegen.types.Type;
--- a/src/jdk/nashorn/internal/codegen/CompilerConstants.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/CompilerConstants.java Wed Jun 04 13:08:57 2014 +0200 @@ -369,7 +369,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKESPECIAL, className, name, desc, false); } }; @@ -408,7 +408,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKESTATIC, className, name, desc, false); } }; @@ -448,7 +448,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className, name, descriptor, false); } }; @@ -473,7 +473,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, className, name, descriptor, true); } }; @@ -574,7 +574,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKESTATIC, className, name, descriptor, false); } }; @@ -599,7 +599,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className, name, descriptor, false); } }; @@ -625,7 +625,7 @@ } @Override - public void invoke(MethodVisitor mv) { + public void invoke(final MethodVisitor mv) { mv.visitMethodInsn(Opcodes.INVOKESPECIAL, className, name, descriptor, false); } };
--- a/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,15 +28,14 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS; import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup; import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor; +import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE; import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldName; import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getPaddedFieldCount; -import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE; import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex; import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex; import java.util.Iterator; import java.util.List; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.ir.Symbol; import jdk.nashorn.internal.runtime.Context;
--- a/src/jdk/nashorn/internal/codegen/Label.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/Label.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,6 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; - import jdk.nashorn.internal.codegen.types.Type; /**
--- a/src/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java Wed Jun 04 13:08:57 2014 +0200 @@ -35,7 +35,7 @@ private final Type[] localVariableTypes; private final int[] stackLoads; - LocalStateRestorationInfo(Type[] localVariableTypes, final int[] stackLoads) { + LocalStateRestorationInfo(final Type[] localVariableTypes, final int[] stackLoads) { this.localVariableTypes = localVariableTypes; this.stackLoads = stackLoads; }
--- a/src/jdk/nashorn/internal/codegen/ObjectCreator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/ObjectCreator.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,8 +26,8 @@ package jdk.nashorn.internal.codegen; import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE; + import java.util.List; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.PropertyMap; import jdk.nashorn.internal.runtime.ScriptObject;
--- a/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java Wed Jun 04 13:08:57 2014 +0200 @@ -55,7 +55,7 @@ */ private final List<BreakableNode> externalTargetNodes = new ArrayList<>(); - SplitMethodEmitter(final ClassEmitter classEmitter, final MethodVisitor mv, SplitNode splitNode) { + SplitMethodEmitter(final ClassEmitter classEmitter, final MethodVisitor mv, final SplitNode splitNode) { super(classEmitter, mv); this.splitNode = splitNode; }
--- a/src/jdk/nashorn/internal/codegen/Splitter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/Splitter.java Wed Jun 04 13:08:57 2014 +0200 @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import jdk.nashorn.internal.ir.Block; import jdk.nashorn.internal.ir.FunctionNode; import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
--- a/src/jdk/nashorn/internal/codegen/TypeMap.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/TypeMap.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,7 +29,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.ir.FunctionNode; import jdk.nashorn.internal.runtime.ScriptFunction;
--- a/src/jdk/nashorn/internal/codegen/WeighNodes.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/WeighNodes.java Wed Jun 04 13:08:57 2014 +0200 @@ -101,7 +101,7 @@ * * @param weightCache cache of already calculated block weights */ - private WeighNodes(FunctionNode topFunction, final Map<Node, Long> weightCache) { + private WeighNodes(final FunctionNode topFunction, final Map<Node, Long> weightCache) { super(new LexicalContext()); this.topFunction = topFunction; this.weightCache = weightCache;
--- a/src/jdk/nashorn/internal/codegen/types/BooleanType.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/types/BooleanType.java Wed Jun 04 13:08:57 2014 +0200 @@ -102,7 +102,7 @@ } @Override - public Type loadForcedInitializer(MethodVisitor method) { + public Type loadForcedInitializer(final MethodVisitor method) { method.visitInsn(ICONST_0); return BOOLEAN; }
--- a/src/jdk/nashorn/internal/codegen/types/IntType.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/types/IntType.java Wed Jun 04 13:08:57 2014 +0200 @@ -267,7 +267,7 @@ } @Override - public Type loadForcedInitializer(MethodVisitor method) { + public Type loadForcedInitializer(final MethodVisitor method) { method.visitInsn(ICONST_0); return INT; }
--- a/src/jdk/nashorn/internal/codegen/types/LongType.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/types/LongType.java Wed Jun 04 13:08:57 2014 +0200 @@ -239,7 +239,7 @@ } @Override - public Type loadForcedInitializer(MethodVisitor method) { + public Type loadForcedInitializer(final MethodVisitor method) { method.visitInsn(LCONST_0); return LONG; }
--- a/src/jdk/nashorn/internal/codegen/types/NumberType.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/types/NumberType.java Wed Jun 04 13:08:57 2014 +0200 @@ -94,7 +94,7 @@ } @Override - public Type loadForcedInitializer(MethodVisitor method) { + public Type loadForcedInitializer(final MethodVisitor method) { method.visitInsn(DCONST_0); return NUMBER; }
--- a/src/jdk/nashorn/internal/codegen/types/ObjectType.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/types/ObjectType.java Wed Jun 04 13:08:57 2014 +0200 @@ -95,7 +95,7 @@ } @Override - public Type loadForcedInitializer(MethodVisitor method) { + public Type loadForcedInitializer(final MethodVisitor method) { method.visitInsn(ACONST_NULL); // TODO: do we need a special type for null, e.g. Type.NULL? It should be assignable to any other object type // without a checkast in convert.
--- a/src/jdk/nashorn/internal/codegen/types/Type.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/codegen/types/Type.java Wed Jun 04 13:08:57 2014 +0200 @@ -1004,7 +1004,7 @@ } }; - private static <T extends Type> T putInCache(T type) { + private static <T extends Type> T putInCache(final T type) { cache.put(type.getTypeClass(), type); return type; }
--- a/src/jdk/nashorn/internal/ir/BlockLexicalContext.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/BlockLexicalContext.java Wed Jun 04 13:08:57 2014 +0200 @@ -40,14 +40,14 @@ public class BlockLexicalContext extends LexicalContext { /** statement stack, each block on the lexical context maintains one of these, which is * committed to the block on pop */ - private Deque<List<Statement>> sstack = new ArrayDeque<>(); + private final Deque<List<Statement>> sstack = new ArrayDeque<>(); /** Last non debug statement emitted in this context */ protected Statement lastStatement; @Override public <T extends LexicalContextNode> T push(final T node) { - T pushed = super.push(node); + final T pushed = super.push(node); if (node instanceof Block) { sstack.push(new ArrayList<Statement>()); } @@ -68,7 +68,7 @@ * @param block the block to operate on * @return a modified block. */ - protected Block afterSetStatements(Block block) { + protected Block afterSetStatements(final Block block) { return block; }
--- a/src/jdk/nashorn/internal/ir/CaseNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/CaseNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,7 +27,6 @@ import java.util.Collections; import java.util.List; - import jdk.nashorn.internal.codegen.Label; import jdk.nashorn.internal.ir.annotations.Immutable; import jdk.nashorn.internal.ir.visitor.NodeVisitor;
--- a/src/jdk/nashorn/internal/ir/Expression.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/Expression.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,6 @@ package jdk.nashorn.internal.ir; import java.util.function.Function; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
--- a/src/jdk/nashorn/internal/ir/FunctionNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/FunctionNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -33,7 +33,6 @@ import java.util.Objects; import java.util.Set; import java.util.function.Function; - import jdk.nashorn.internal.codegen.CompileUnit; import jdk.nashorn.internal.codegen.Compiler; import jdk.nashorn.internal.codegen.CompilerConstants;
--- a/src/jdk/nashorn/internal/ir/Labels.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/Labels.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,6 @@ package jdk.nashorn.internal.ir; import java.util.List; - import jdk.nashorn.internal.codegen.Label; /**
--- a/src/jdk/nashorn/internal/ir/LexicalContextExpression.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/LexicalContextExpression.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,15 +29,15 @@ abstract class LexicalContextExpression extends Expression implements LexicalContextNode { - LexicalContextExpression(LexicalContextExpression expr) { + LexicalContextExpression(final LexicalContextExpression expr) { super(expr); } - LexicalContextExpression(long token, int start, int finish) { + LexicalContextExpression(final long token, final int start, final int finish) { super(token, start, finish); } - LexicalContextExpression(long token, int finish) { + LexicalContextExpression(final long token, final int finish) { super(token, finish); }
--- a/src/jdk/nashorn/internal/ir/LiteralNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/LiteralNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,7 +29,6 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; - import jdk.nashorn.internal.codegen.CompileUnit; import jdk.nashorn.internal.codegen.types.ArrayType; import jdk.nashorn.internal.codegen.types.Type;
--- a/src/jdk/nashorn/internal/ir/LoopNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/LoopNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; - import jdk.nashorn.internal.codegen.Label; /**
--- a/src/jdk/nashorn/internal/ir/Node.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/Node.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.List; - import jdk.nashorn.internal.ir.visitor.NodeVisitor; import jdk.nashorn.internal.parser.Token; import jdk.nashorn.internal.parser.TokenType;
--- a/src/jdk/nashorn/internal/ir/ObjectNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/ObjectNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.ir.annotations.Immutable; import jdk.nashorn.internal.ir.visitor.NodeVisitor;
--- a/src/jdk/nashorn/internal/ir/OptimisticLexicalContext.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/OptimisticLexicalContext.java Wed Jun 04 13:08:57 2014 +0200 @@ -116,7 +116,7 @@ @Override public <T extends LexicalContextNode> T pop(final T node) { - T popped = super.pop(node); + final T popped = super.pop(node); if (isEnabled) { if(node instanceof FunctionNode) { optimisticAssumptions.pop();
--- a/src/jdk/nashorn/internal/ir/ReturnNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/ReturnNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,6 +27,7 @@ import static jdk.nashorn.internal.parser.TokenType.RETURN; import static jdk.nashorn.internal.parser.TokenType.YIELD; + import jdk.nashorn.internal.ir.annotations.Immutable; import jdk.nashorn.internal.ir.visitor.NodeVisitor;
--- a/src/jdk/nashorn/internal/ir/SplitNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/SplitNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import jdk.nashorn.internal.codegen.CompileUnit; import jdk.nashorn.internal.codegen.Label; import jdk.nashorn.internal.ir.annotations.Immutable;
--- a/src/jdk/nashorn/internal/ir/SwitchNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/SwitchNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; - import jdk.nashorn.internal.codegen.Label; import jdk.nashorn.internal.ir.annotations.Immutable; import jdk.nashorn.internal.ir.visitor.NodeVisitor;
--- a/src/jdk/nashorn/internal/ir/TernaryNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/TernaryNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,6 @@ package jdk.nashorn.internal.ir; import java.util.function.Function; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.ir.annotations.Immutable; import jdk.nashorn.internal.ir.visitor.NodeVisitor;
--- a/src/jdk/nashorn/internal/ir/TryNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/TryNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; - import jdk.nashorn.internal.ir.annotations.Immutable; import jdk.nashorn.internal.ir.visitor.NodeVisitor;
--- a/src/jdk/nashorn/internal/ir/UnaryNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/UnaryNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -34,7 +34,6 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.ir.annotations.Ignore; import jdk.nashorn.internal.ir.annotations.Immutable;
--- a/src/jdk/nashorn/internal/ir/debug/ASTWriter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/debug/ASTWriter.java Wed Jun 04 13:08:57 2014 +0200 @@ -105,7 +105,7 @@ final boolean isReference = field != null && field.isAnnotationPresent(Reference.class); - Class<?> clazz = node.getClass(); + final Class<?> clazz = node.getClass(); String type = clazz.getName(); type = type.substring(type.lastIndexOf('.') + 1, type.length());
--- a/src/jdk/nashorn/internal/ir/debug/NashornClassReader.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/debug/NashornClassReader.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,7 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import jdk.internal.org.objectweb.asm.Attribute; import jdk.internal.org.objectweb.asm.ClassReader; import jdk.internal.org.objectweb.asm.ClassVisitor; @@ -58,27 +57,27 @@ return labelMap.get(key); } - private static int readByte(final byte[] bytecode, int index) { + private static int readByte(final byte[] bytecode, final int index) { return (byte)(bytecode[index] & 0xff); } - private static int readShort(final byte[] bytecode, int index) { + private static int readShort(final byte[] bytecode, final int index) { return (short)((bytecode[index] & 0xff) << 8) | (bytecode[index + 1] & 0xff); } - private static int readInt(final byte[] bytecode, int index) { + private static int readInt(final byte[] bytecode, final int index) { return ((bytecode[index] & 0xff) << 24) | ((bytecode[index + 1] & 0xff) << 16) | ((bytecode[index + 2] & 0xff) << 8) | (bytecode[index + 3] & 0xff); } - private static long readLong(final byte[] bytecode, int index) { - int hi = readInt(bytecode, index); - int lo = readInt(bytecode, index + 4); + private static long readLong(final byte[] bytecode, final int index) { + final int hi = readInt(bytecode, index); + final int lo = readInt(bytecode, index + 4); return ((long)hi << 32) | lo; } - private static String readUTF(int index, final int utfLen, final byte[] bytecode) { - int endIndex = index + utfLen; - char buf[] = new char[utfLen * 2]; + private static String readUTF(final int index, final int utfLen, final byte[] bytecode) { + final int endIndex = index + utfLen; + final char buf[] = new char[utfLen * 2]; int strLen = 0; int c; int st = 0; @@ -123,7 +122,7 @@ int u = 0; - int magic = readInt(bytecode, u); + final int magic = readInt(bytecode, u); u += 4; //magic assert magic == 0xcafebabe : Integer.toHexString(magic); readShort(bytecode, u); //minor @@ -131,9 +130,9 @@ readShort(bytecode, u); //major u += 2; //minor - int cpc = readShort(bytecode, u); + final int cpc = readShort(bytecode, u); u += 2; - ArrayList<Constant> cp = new ArrayList<>(cpc); + final ArrayList<Constant> cp = new ArrayList<>(cpc); cp.add(null); for (int i = 1; i < cpc; i++) { @@ -180,7 +179,7 @@ u += 4; break; case 1: //utf8 - int len = readShort(bytecode, u); + final int len = readShort(bytecode, u); u += 2; cp.add(new DirectInfo<>(cp, tag, readUTF(u, len, bytecode))); u += len; @@ -200,7 +199,7 @@ u += 4; break; case 15: //methodhandle - int kind = readByte(bytecode, u); + final int kind = readByte(bytecode, u); assert kind >= 1 && kind <= 9 : kind; cp.add(new IndexInfo2(cp, tag, kind, readShort(bytecode, u + 1)) { @Override @@ -219,16 +218,16 @@ readShort(bytecode, u); //access flags u += 2; //access - int cls = readShort(bytecode, u); + final int cls = readShort(bytecode, u); u += 2; //this_class thisClassName = cp.get(cls).toString(); u += 2; //super - int ifc = readShort(bytecode, u); + final int ifc = readShort(bytecode, u); u += 2; u += ifc * 2; - int fc = readShort(bytecode, u); + final int fc = readShort(bytecode, u); u += 2; //fields for (int i = 0 ; i < fc ; i++) { @@ -236,41 +235,41 @@ readShort(bytecode, u); //fieldname u += 2; //name u += 2; //descriptor - int ac = readShort(bytecode, u); + final int ac = readShort(bytecode, u); u += 2; //field attributes for (int j = 0; j < ac; j++) { u += 2; //attribute name - int len = readInt(bytecode, u); + final int len = readInt(bytecode, u); u += 4; u += len; } } - int mc = readShort(bytecode, u); + final int mc = readShort(bytecode, u); u += 2; for (int i = 0 ; i < mc ; i++) { readShort(bytecode, u); u += 2; //access - int methodNameIndex = readShort(bytecode, u); + final int methodNameIndex = readShort(bytecode, u); u += 2; final String methodName = cp.get(methodNameIndex).toString(); - int methodDescIndex = readShort(bytecode, u); + final int methodDescIndex = readShort(bytecode, u); u += 2; final String methodDesc = cp.get(methodDescIndex).toString(); - int ac = readShort(bytecode, u); + final int ac = readShort(bytecode, u); u += 2; //method attributes for (int j = 0; j < ac; j++) { - int nameIndex = readShort(bytecode, u); + final int nameIndex = readShort(bytecode, u); u += 2; - String attrName = cp.get(nameIndex).toString(); + final String attrName = cp.get(nameIndex).toString(); - int attrLen = readInt(bytecode, u); + final int attrLen = readInt(bytecode, u); u += 4; if ("Code".equals(attrName)) { @@ -278,20 +277,20 @@ u += 2; //max stack readShort(bytecode, u); u += 2; //max locals - int len = readInt(bytecode, u); + final int len = readInt(bytecode, u); u += 4; parseCode(bytecode, u, len, fullyQualifiedName(thisClassName, methodName, methodDesc)); u += len; - int elen = readShort(bytecode, u); //exception table length + final int elen = readShort(bytecode, u); //exception table length u += 2; u += elen * 8; //method attributes - int ac2 = readShort(bytecode, u); + final int ac2 = readShort(bytecode, u); u += 2; for (int k = 0; k < ac2; k++) { u += 2; //name; - int aclen = readInt(bytecode, u); + final int aclen = readInt(bytecode, u); u += 4; //length u += aclen; //bytes; } @@ -301,13 +300,13 @@ } } - int ac = readShort(bytecode, u); + final int ac = readShort(bytecode, u); u += 2; //other attributes for (int i = 0 ; i < ac ; i++) { readShort(bytecode, u); //name index u += 2; - int len = readInt(bytecode, u); + final int len = readInt(bytecode, u); u += 4; u += len; //attribute @@ -327,7 +326,7 @@ boolean wide = false; for (int i = index; i < index + len;) { - int opcode = bytecode[i]; + final int opcode = bytecode[i]; labels.add(new NashornLabel(opcode, i - index)); switch (opcode & 0xff) { @@ -345,7 +344,7 @@ } readInt(bytecode, i); i += 4; //defaultbyte - int npairs = readInt(bytecode, i); + final int npairs = readInt(bytecode, i); i += 4; i += 8 * npairs; break; @@ -356,9 +355,9 @@ } readInt(bytecode, i); //default i += 4; - int lo = readInt(bytecode, i); + final int lo = readInt(bytecode, i); i += 4; - int hi = readInt(bytecode, i); + final int hi = readInt(bytecode, i); i += 4; i += 4 * (hi - lo + 1); break; @@ -437,13 +436,13 @@ } @Override - public void accept(final ClassVisitor classVisitor, Attribute[] attrs, final int flags) { + public void accept(final ClassVisitor classVisitor, final Attribute[] attrs, final int flags) { super.accept(classVisitor, attrs, flags); } @Override protected Label readLabel(final int offset, final Label[] labels) { - Label label = super.readLabel(offset, labels); + final Label label = super.readLabel(offset, labels); label.info = (int)offset; return label; } @@ -451,7 +450,7 @@ private abstract static class Constant { protected ArrayList<Constant> cp; protected int tag; - protected Constant(final ArrayList<Constant> cp, int tag) { + protected Constant(final ArrayList<Constant> cp, final int tag) { this.cp = cp; this.tag = tag; } @@ -469,7 +468,7 @@ private static class IndexInfo extends Constant { protected final int index; - IndexInfo(final ArrayList<Constant> cp, int tag, int index) { + IndexInfo(final ArrayList<Constant> cp, final int tag, final int index) { super(cp, tag); this.index = index; } @@ -483,7 +482,7 @@ private static class IndexInfo2 extends IndexInfo { protected final int index2; - IndexInfo2(final ArrayList<Constant> cp, int tag, int index, int index2) { + IndexInfo2(final ArrayList<Constant> cp, final int tag, final int index, final int index2) { super(cp, tag, index); this.index2 = index2; } @@ -497,7 +496,7 @@ private static class DirectInfo<T> extends Constant { protected final T info; - DirectInfo(final ArrayList<Constant> cp, int tag, T info) { + DirectInfo(final ArrayList<Constant> cp, final int tag, final T info) { super(cp, tag); this.info = info; }
--- a/src/jdk/nashorn/internal/ir/debug/NashornTextifier.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/ir/debug/NashornTextifier.java Wed Jun 04 13:08:57 2014 +0200 @@ -494,7 +494,7 @@ } @Override - public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) { + public void visitInvokeDynamicInsn(final String name, final String desc, final Handle bsm, final Object... bsmArgs) { final StringBuilder sb = new StringBuilder(); appendOpcode(sb, Opcodes.INVOKEDYNAMIC).append(' '); @@ -1005,7 +1005,7 @@ private static final String COLOR_DEFAULT = "\"#99bb99\""; private static final String COLOR_LOCALVARS = "\"#999999\""; - Graph(String name) { + Graph(final String name) { this.name = name; this.nodes = new LinkedHashSet<>(); this.contents = new HashMap<>(); @@ -1016,7 +1016,7 @@ this.exceptionMap = new HashMap<>(); } - void addEdge(String from, String to) { + void addEdge(final String from, final String to) { Set<String> edgeSet = edges.get(from); if (edgeSet == null) { edgeSet = new LinkedHashSet<>(); @@ -1026,7 +1026,7 @@ hasPreds.add(to); } - void addTryCatch(String tryNode, String catchNode) { + void addTryCatch(final String tryNode, final String catchNode) { Set<String> tryNodes = exceptionMap.get(catchNode); if (tryNodes == null) { tryNodes = new HashSet<>(); @@ -1038,20 +1038,20 @@ tryNodes.add(tryNode); } - void addNode(String node) { + void addNode(final String node) { assert !nodes.contains(node); nodes.add(node); } - void setNoFallThru(String node) { + void setNoFallThru(final String node) { noFallThru.add(node); } - boolean isNoFallThru(String node) { + boolean isNoFallThru(final String node) { return noFallThru.contains(node); } - void setIsCatch(String node, String exception) { + void setIsCatch(final String node, final String exception) { catches.put(node, exception); } @@ -1187,47 +1187,47 @@ } @Override - public Printer visitClassAnnotation(String arg0, boolean arg1) { + public Printer visitClassAnnotation(final String arg0, final boolean arg1) { return this; } @Override - public void visitClassAttribute(Attribute arg0) { + public void visitClassAttribute(final Attribute arg0) { throw new AssertionError(); } @Override - public Printer visitFieldAnnotation(String arg0, boolean arg1) { + public Printer visitFieldAnnotation(final String arg0, final boolean arg1) { throw new AssertionError(); } @Override - public void visitFieldAttribute(Attribute arg0) { + public void visitFieldAttribute(final Attribute arg0) { throw new AssertionError(); } @Override - public Printer visitMethodAnnotation(String arg0, boolean arg1) { + public Printer visitMethodAnnotation(final String arg0, final boolean arg1) { return this; } @Override - public void visitMethodAttribute(Attribute arg0) { + public void visitMethodAttribute(final Attribute arg0) { throw new AssertionError(); } @Override - public Printer visitParameterAnnotation(int arg0, String arg1, boolean arg2) { + public Printer visitParameterAnnotation(final int arg0, final String arg1, final boolean arg2) { throw new AssertionError(); } @Override - public void visit(String arg0, Object arg1) { + public void visit(final String arg0, final Object arg1) { throw new AssertionError(); } @Override - public Printer visitAnnotation(String arg0, String arg1) { + public Printer visitAnnotation(final String arg0, final String arg1) { throw new AssertionError(); } @@ -1237,17 +1237,17 @@ } @Override - public Printer visitArray(String arg0) { + public Printer visitArray(final String arg0) { throw new AssertionError(); } @Override - public void visitEnum(String arg0, String arg1, String arg2) { + public void visitEnum(final String arg0, final String arg1, final String arg2) { throw new AssertionError(); } @Override - public void visitInnerClass(String arg0, String arg1, String arg2, int arg3) { + public void visitInnerClass(final String arg0, final String arg1, final String arg2, final int arg3) { throw new AssertionError(); } }
--- a/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java Wed Jun 04 13:08:57 2014 +0200 @@ -36,14 +36,13 @@ import java.util.Arrays; import java.util.List; import java.util.logging.Level; - import jdk.nashorn.internal.runtime.ConsString; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.Debug; +import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.logging.DebugLogger; import jdk.nashorn.internal.runtime.logging.Loggable; import jdk.nashorn.internal.runtime.logging.Logger; -import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.options.Options; /**
--- a/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,6 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.sameValue; import java.util.Objects; - import jdk.nashorn.internal.objects.annotations.Property; import jdk.nashorn.internal.objects.annotations.ScriptClass; import jdk.nashorn.internal.runtime.JSType;
--- a/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java Wed Jun 04 13:08:57 2014 +0200 @@ -38,7 +38,7 @@ final class BoundScriptFunctionImpl extends ScriptFunctionImpl { private final ScriptFunction targetFunction; - BoundScriptFunctionImpl(ScriptFunctionData data, ScriptFunction targetFunction) { + BoundScriptFunctionImpl(final ScriptFunctionData data, final ScriptFunction targetFunction) { super(data, Global.instance()); setPrototype(ScriptRuntime.UNDEFINED); this.targetFunction = targetFunction;
--- a/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,6 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.sameValue; import java.util.Objects; - import jdk.nashorn.internal.objects.annotations.Property; import jdk.nashorn.internal.objects.annotations.ScriptClass; import jdk.nashorn.internal.runtime.JSType;
--- a/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,6 @@ package jdk.nashorn.internal.objects; import java.util.Objects; - import jdk.nashorn.internal.objects.annotations.Property; import jdk.nashorn.internal.objects.annotations.ScriptClass; import jdk.nashorn.internal.runtime.JSType;
--- a/src/jdk/nashorn/internal/objects/NativeBoolean.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeBoolean.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,8 +25,8 @@ package jdk.nashorn.internal.objects; +import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; -import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;
--- a/src/jdk/nashorn/internal/objects/NativeError.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeError.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,12 +25,11 @@ package jdk.nashorn.internal.objects; +import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; - import jdk.nashorn.api.scripting.NashornException; import jdk.nashorn.internal.objects.annotations.Attribute; import jdk.nashorn.internal.objects.annotations.Constructor; @@ -41,8 +40,8 @@ import jdk.nashorn.internal.runtime.ECMAException; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.PropertyMap; +import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; -import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptRuntime; /**
--- a/src/jdk/nashorn/internal/objects/NativeFloat32Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeFloat32Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -122,42 +122,42 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return (int)getDouble(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return (long)getDouble(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getElem(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getDouble(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toNumber(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { return set(index, (double)value, strict); } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (double)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { setElem(index, value); return this; }
--- a/src/jdk/nashorn/internal/objects/NativeInt16Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeInt16Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -115,43 +115,43 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return getElem(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getInt(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getInt(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getInt(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toInt32(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, (int)value, strict); } }
--- a/src/jdk/nashorn/internal/objects/NativeInt32Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeInt32Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -113,43 +113,43 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return getElem(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getInt(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getInt(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getInt(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toInt32(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, (int)value, strict); } }
--- a/src/jdk/nashorn/internal/objects/NativeInt8Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeInt8Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -113,43 +113,43 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return getElem(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getInt(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getInt(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getInt(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toInt32(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, (int)value, strict); } }
--- a/src/jdk/nashorn/internal/objects/NativeJSON.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeJSON.java Wed Jun 04 13:08:57 2014 +0200 @@ -171,7 +171,7 @@ } if (modSpace instanceof Number) { - int indent = Math.min(10, JSType.toInteger(modSpace)); + final int indent = Math.min(10, JSType.toInteger(modSpace)); if (indent < 1) { gap = ""; } else {
--- a/src/jdk/nashorn/internal/objects/NativeJava.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeJava.java Wed Jun 04 13:08:57 2014 +0200 @@ -414,7 +414,7 @@ final Context ctx = Global.getThisContext(); try { return ctx.findClass(typeName); - } catch(ClassNotFoundException e) { + } catch(final ClassNotFoundException e) { // The logic below compensates for a frequent user error - when people use dot notation to separate inner // class names, i.e. "java.lang.Character.UnicodeBlock" vs."java.lang.Character$UnicodeBlock". The logic // below will try alternative class names, replacing dots at the end of the name with dollar signs. @@ -429,7 +429,7 @@ nextName.setCharAt(lastDot, '$'); try { return ctx.findClass(nextName.toString()); - } catch(ClassNotFoundException cnfe) { + } catch(final ClassNotFoundException cnfe) { // Intentionally ignored, so the loop retries with the next name } }
--- a/src/jdk/nashorn/internal/objects/NativeNumber.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeNumber.java Wed Jun 04 13:08:57 2014 +0200 @@ -245,7 +245,7 @@ * @return number in decimal exponentiation notation or decimal fixed notation depending on {@code precision} */ @SpecializedFunction - public static String toPrecision(Object self, final int precision) { + public static String toPrecision(final Object self, final int precision) { return toPrecision(getNumberValue(self), precision); }
--- a/src/jdk/nashorn/internal/objects/NativeRegExp.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java Wed Jun 04 13:08:57 2014 +0200 @@ -213,7 +213,7 @@ * @param string pattern string * @return flat regexp */ - static NativeRegExp flatRegExp(String string) { + static NativeRegExp flatRegExp(final String string) { // escape special characters StringBuilder sb = null; final int length = string.length(); @@ -381,7 +381,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "input") - public static Object getLastInput(Object self) { + public static Object getLastInput(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getInput(); } @@ -392,7 +392,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "multiline") - public static Object getLastMultiline(Object self) { + public static Object getLastMultiline(final Object self) { return false; // doesn't ever seem to become true and isn't documented anyhwere } @@ -402,7 +402,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastMatch") - public static Object getLastMatch(Object self) { + public static Object getLastMatch(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(0); } @@ -413,7 +413,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastParen") - public static Object getLastParen(Object self) { + public static Object getLastParen(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getLastParen(); } @@ -424,7 +424,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "leftContext") - public static Object getLeftContext(Object self) { + public static Object getLeftContext(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getInput().substring(0, match.getIndex()); } @@ -435,7 +435,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "rightContext") - public static Object getRightContext(Object self) { + public static Object getRightContext(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getInput().substring(match.getIndex() + match.length()); } @@ -446,7 +446,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$1") - public static Object getGroup1(Object self) { + public static Object getGroup1(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(1); } @@ -457,7 +457,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$2") - public static Object getGroup2(Object self) { + public static Object getGroup2(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(2); } @@ -468,7 +468,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$3") - public static Object getGroup3(Object self) { + public static Object getGroup3(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(3); } @@ -479,7 +479,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$4") - public static Object getGroup4(Object self) { + public static Object getGroup4(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(4); } @@ -490,7 +490,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$5") - public static Object getGroup5(Object self) { + public static Object getGroup5(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(5); } @@ -501,7 +501,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$6") - public static Object getGroup6(Object self) { + public static Object getGroup6(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(6); } @@ -512,7 +512,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$7") - public static Object getGroup7(Object self) { + public static Object getGroup7(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(7); } @@ -523,7 +523,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$8") - public static Object getGroup8(Object self) { + public static Object getGroup8(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(8); } @@ -534,7 +534,7 @@ * @return last regexp input */ @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$9") - public static Object getGroup9(Object self) { + public static Object getGroup9(final Object self) { final RegExpResult match = Global.instance().getLastRegExpResult(); return match == null ? "" : match.getGroup(9); } @@ -571,7 +571,7 @@ } // String.prototype.split method ignores the global flag and should not update lastIndex property. - private RegExpResult execSplit(final String string, int start) { + private RegExpResult execSplit(final String string, final int start) { if (start < 0 || start > string.length()) { return null; }
--- a/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java Wed Jun 04 13:08:57 2014 +0200 @@ -32,9 +32,9 @@ import jdk.nashorn.internal.objects.annotations.Setter; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.PropertyMap; -import jdk.nashorn.internal.runtime.regexp.RegExpResult; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.arrays.ArrayData; +import jdk.nashorn.internal.runtime.regexp.RegExpResult; /** * Objects of this class are used to represent return values from
--- a/src/jdk/nashorn/internal/objects/NativeStrictArguments.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeStrictArguments.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,8 +25,8 @@ package jdk.nashorn.internal.objects; +import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;
--- a/src/jdk/nashorn/internal/objects/NativeString.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeString.java Wed Jun 04 13:08:57 2014 +0200 @@ -909,7 +909,7 @@ return splitString(str, JSType.toString(separator), lim); } - private static ScriptObject splitString(String str, String separator, long limit) { + private static ScriptObject splitString(final String str, final String separator, final long limit) { if (separator.isEmpty()) { final int length = (int) Math.min(str.length(), limit); final Object[] array = new Object[length];
--- a/src/jdk/nashorn/internal/objects/NativeUint16Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeUint16Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -119,43 +119,43 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return getElem(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getInt(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getInt(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getInt(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toInt32(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, (int)value, strict); } }
--- a/src/jdk/nashorn/internal/objects/NativeUint32Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeUint32Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -128,43 +128,43 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return (int)getLong(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getElem(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getLong(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getLong(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toInt32(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, (int)value, strict); } }
--- a/src/jdk/nashorn/internal/objects/NativeUint8Array.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeUint8Array.java Wed Jun 04 13:08:57 2014 +0200 @@ -119,43 +119,43 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return getElem(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getInt(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getInt(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getInt(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toInt32(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, (int)value, strict); }
--- a/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java Wed Jun 04 13:08:57 2014 +0200 @@ -146,47 +146,47 @@ } @Override - public int getInt(int index) { + public int getInt(final int index) { return getElem(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return getInt(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return getInt(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return getInt(index); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { return set(index, JSType.toNumber(value), strict); } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { setElem(index, value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { return set(index, (int)value, strict); } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { return set(index, rint(value), strict); } - private static double rint(double rint) { + private static double rint(final double rint) { return (int)Math.rint(rint); }
--- a/src/jdk/nashorn/internal/objects/PrototypeObject.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/objects/PrototypeObject.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,8 +25,8 @@ package jdk.nashorn.internal.objects; +import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles;
--- a/src/jdk/nashorn/internal/parser/JSONParser.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/parser/JSONParser.java Wed Jun 04 13:08:57 2014 +0200 @@ -160,7 +160,7 @@ } // First digit of number. - int digit = convertDigit(ch0, 10); + final int digit = convertDigit(ch0, 10); // skip first digit skip(1);
--- a/src/jdk/nashorn/internal/parser/Lexer.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/parser/Lexer.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,8 +27,8 @@ import static jdk.nashorn.internal.parser.TokenType.ADD; import static jdk.nashorn.internal.parser.TokenType.COMMENT; +import static jdk.nashorn.internal.parser.TokenType.DECIMAL; import static jdk.nashorn.internal.parser.TokenType.DIRECTIVE_COMMENT; -import static jdk.nashorn.internal.parser.TokenType.DECIMAL; import static jdk.nashorn.internal.parser.TokenType.EOF; import static jdk.nashorn.internal.parser.TokenType.EOL; import static jdk.nashorn.internal.parser.TokenType.ERROR;
--- a/src/jdk/nashorn/internal/runtime/CodeStore.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/CodeStore.java Wed Jun 04 13:08:57 2014 +0200 @@ -90,7 +90,7 @@ return dir; } }); - } catch (PrivilegedActionException e) { + } catch (final PrivilegedActionException e) { throw (IOException) e.getException(); } } @@ -119,13 +119,13 @@ return null; } try (ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(new FileInputStream(file)))) { - CompiledScript compiledScript = (CompiledScript) in.readObject(); + final CompiledScript compiledScript = (CompiledScript) in.readObject(); compiledScript.setSource(source); return compiledScript; } } }); - } catch (PrivilegedActionException e) { + } catch (final PrivilegedActionException e) { final Exception ex = e.getException(); if (ex instanceof IOException) { throw (IOException) ex; @@ -171,7 +171,7 @@ return null; } }); - } catch (PrivilegedActionException e) { + } catch (final PrivilegedActionException e) { throw (IOException) e.getException(); } }
--- a/src/jdk/nashorn/internal/runtime/CompiledFunction.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/CompiledFunction.java Wed Jun 04 13:08:57 2014 +0200 @@ -38,7 +38,6 @@ import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; - import jdk.nashorn.internal.codegen.Compiler; import jdk.nashorn.internal.codegen.Compiler.CompilationPhases; import jdk.nashorn.internal.codegen.types.ArrayType;
--- a/src/jdk/nashorn/internal/runtime/CompiledScript.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/CompiledScript.java Wed Jun 04 13:08:57 2014 +0200 @@ -111,7 +111,7 @@ } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (obj == this) { return true; }
--- a/src/jdk/nashorn/internal/runtime/Context.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/Context.java Wed Jun 04 13:08:57 2014 +0200 @@ -1143,7 +1143,7 @@ installer.initialize(installedClasses.values(), source, constants); - for (Object constant : constants) { + for (final Object constant : constants) { if (constant instanceof RecompilableScriptFunctionData) { ((RecompilableScriptFunctionData) constant).setCodeAndSource(installedClasses, source); }
--- a/src/jdk/nashorn/internal/runtime/Debug.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/Debug.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,6 +26,7 @@ package jdk.nashorn.internal.runtime; import static jdk.nashorn.internal.parser.TokenType.EOF; + import jdk.nashorn.internal.parser.Lexer; import jdk.nashorn.internal.parser.Token; import jdk.nashorn.internal.parser.TokenStream;
--- a/src/jdk/nashorn/internal/runtime/DebuggerSupport.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/DebuggerSupport.java Wed Jun 04 13:08:57 2014 +0200 @@ -47,6 +47,7 @@ * available to external debuggers. */ @SuppressWarnings("unused") + final DebuggerValueDesc forceLoad = new DebuggerValueDesc(null, false, null, null); } @@ -96,7 +97,7 @@ try { return context.eval(initialScope, string, callThis, ScriptRuntime.UNDEFINED, false); - } catch (Throwable ex) { + } catch (final Throwable ex) { return returnException ? ex : null; } }
--- a/src/jdk/nashorn/internal/runtime/ECMAErrors.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/ECMAErrors.java Wed Jun 04 13:08:57 2014 +0200 @@ -47,7 +47,7 @@ /** We assume that compiler generates script classes into the known package. */ private static final String scriptPackage; static { - String name = JS.class.getName(); + final String name = JS.class.getName(); scriptPackage = name.substring(0, name.lastIndexOf('.')); }
--- a/src/jdk/nashorn/internal/runtime/ECMAException.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/ECMAException.java Wed Jun 04 13:08:57 2014 +0200 @@ -96,8 +96,8 @@ // If thrown object is an Error or sub-object like TypeError, then // an ECMAException object has been already initialized at constructor. if (thrown instanceof ScriptObject) { - ScriptObject sobj = (ScriptObject)thrown; - Object exception = getException(sobj); + final ScriptObject sobj = (ScriptObject)thrown; + final Object exception = getException(sobj); if (exception instanceof ECMAException) { // copy over file name, line number and column number. final ECMAException ee = (ECMAException)exception;
--- a/src/jdk/nashorn/internal/runtime/GlobalConstants.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/GlobalConstants.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,8 +27,8 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall; import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCall; +import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.logging.DebugLogger.quote; -import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -37,7 +37,6 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Level; - import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.DynamicLinker; import jdk.internal.dynalink.linker.GuardedInvocation;
--- a/src/jdk/nashorn/internal/runtime/GlobalFunctions.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/GlobalFunctions.java Wed Jun 04 13:08:57 2014 +0200 @@ -486,7 +486,7 @@ return ScriptRuntime.UNDEFINED; } - private static int fastDigit(int ch, int radix) { + private static int fastDigit(final int ch, final int radix) { int n = -1; if (ch >= '0' && ch <= '9') { n = ch - '0';
--- a/src/jdk/nashorn/internal/runtime/JSONFunctions.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/JSONFunctions.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,6 +25,8 @@ package jdk.nashorn.internal.runtime; +import static jdk.nashorn.internal.runtime.Source.sourceFor; + import java.lang.invoke.MethodHandle; import java.util.Iterator; import java.util.concurrent.Callable; @@ -39,8 +41,6 @@ import jdk.nashorn.internal.runtime.arrays.ArrayIndex; import jdk.nashorn.internal.runtime.linker.Bootstrap; -import static jdk.nashorn.internal.runtime.Source.sourceFor; - /** * Utilities used by "JSON" object implementation. */
--- a/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java Wed Jun 04 13:08:57 2014 +0200 @@ -45,12 +45,12 @@ } @Override - protected Object getAt(int index) { + protected Object getAt(final int index) { return ((JSObject)obj).getSlot(index); } @Override - protected void setAt(int index, Object element) { + protected void setAt(final int index, final Object element) { ((JSObject)obj).setSlot(index, element); } }
--- a/src/jdk/nashorn/internal/runtime/NashornLoader.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/NashornLoader.java Wed Jun 04 13:08:57 2014 +0200 @@ -92,7 +92,7 @@ } @Override - protected PermissionCollection getPermissions(CodeSource codesource) { + protected PermissionCollection getPermissions(final CodeSource codesource) { final Permissions permCollection = new Permissions(); for (final Permission perm : SCRIPT_PERMISSIONS) { permCollection.add(perm);
--- a/src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java Wed Jun 04 13:08:57 2014 +0200 @@ -155,7 +155,7 @@ return guard; } - private static int getProvableTypeIndex(Class<?> provable) { + private static int getProvableTypeIndex(final Class<?> provable) { final int accTypeIndex = getAccessorTypeIndex(provable); if(accTypeIndex != -1) { return accTypeIndex;
--- a/src/jdk/nashorn/internal/runtime/PropertyMap.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/PropertyMap.java Wed Jun 04 13:08:57 2014 +0200 @@ -173,7 +173,7 @@ assert className != null; final Class<?> structure = Context.forStructureClass(className); - for (Property prop : props) { + for (final Property prop : props) { prop.initMethodHandles(structure); } }
--- a/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java Wed Jun 04 13:08:57 2014 +0200 @@ -710,7 +710,7 @@ } } - private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { + private void readObject(final java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); createLogger(); }
--- a/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,9 +25,9 @@ package jdk.nashorn.internal.runtime; +import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; -import static jdk.nashorn.internal.lookup.Lookup.MH; import java.io.BufferedReader; import java.io.File;
--- a/src/jdk/nashorn/internal/runtime/SetMethodCreator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/SetMethodCreator.java Wed Jun 04 13:08:57 2014 +0200 @@ -31,7 +31,6 @@ import java.lang.invoke.MethodHandle; import java.lang.invoke.SwitchPoint; - import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
--- a/src/jdk/nashorn/internal/runtime/Source.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/Source.java Wed Jun 04 13:08:57 2014 +0200 @@ -105,7 +105,7 @@ CACHE.put(newSource, newSource); return newSource; } - } catch (RuntimeException e) { + } catch (final RuntimeException e) { final Throwable cause = e.getCause(); if (cause instanceof IOException) { throw (IOException) cause; @@ -164,7 +164,7 @@ } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -225,7 +225,7 @@ } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if (this == other) { return true; } @@ -233,7 +233,7 @@ return false; } - URLData otherData = (URLData) other; + final URLData otherData = (URLData) other; if (url.equals(otherData.url)) { // Make sure both have meta data loaded @@ -245,7 +245,7 @@ } else if (otherData.isDeferred()) { otherData.loadMeta(); } - } catch (IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } @@ -737,7 +737,7 @@ md.update(getURL().toString().getBytes(StandardCharsets.UTF_8)); } digest = md.digest(bytes); - } catch (NoSuchAlgorithmException e) { + } catch (final NoSuchAlgorithmException e) { throw new RuntimeException(e); } } @@ -854,7 +854,7 @@ } @Override - public DebugLogger initLogger(Context context) { + public DebugLogger initLogger(final Context context) { return context.getLogger(this.getClass()); }
--- a/src/jdk/nashorn/internal/runtime/Timing.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/Timing.java Wed Jun 04 13:08:57 2014 +0200 @@ -32,7 +32,6 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; - import jdk.nashorn.internal.runtime.logging.DebugLogger; import jdk.nashorn.internal.runtime.logging.Loggable; import jdk.nashorn.internal.runtime.logging.Logger;
--- a/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java Wed Jun 04 13:08:57 2014 +0200 @@ -185,17 +185,17 @@ } @Override - public int getIntValue(ScriptObject self, ScriptObject owner) { + public int getIntValue(final ScriptObject self, final ScriptObject owner) { return (int)getObjectValue(self, owner); } @Override - public long getLongValue(ScriptObject self, ScriptObject owner) { + public long getLongValue(final ScriptObject self, final ScriptObject owner) { return (long)getObjectValue(self, owner); } @Override - public double getDoubleValue(ScriptObject self, ScriptObject owner) { + public double getDoubleValue(final ScriptObject self, final ScriptObject owner) { return (double)getObjectValue(self, owner); } @@ -205,17 +205,17 @@ } @Override - public void setValue(ScriptObject self, ScriptObject owner, int value, boolean strict) { + public void setValue(final ScriptObject self, final ScriptObject owner, final int value, final boolean strict) { setValue(self, owner, value, strict); } @Override - public void setValue(ScriptObject self, ScriptObject owner, long value, boolean strict) { + public void setValue(final ScriptObject self, final ScriptObject owner, final long value, final boolean strict) { setValue(self, owner, value, strict); } @Override - public void setValue(ScriptObject self, ScriptObject owner, double value, boolean strict) { + public void setValue(final ScriptObject self, final ScriptObject owner, final double value, final boolean strict) { setValue(self, owner, value, strict); }
--- a/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java Wed Jun 04 13:08:57 2014 +0200 @@ -141,7 +141,7 @@ return this; } - private static void printTrace(final Throwable t, String msg) { + private static void printTrace(final Throwable t, final String msg) { final java.io.StringWriter sw = new java.io.StringWriter(); final java.io.PrintWriter pw = new java.io.PrintWriter(sw, false); pw.println(msg);
--- a/src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -82,17 +82,17 @@ } @Override - public void shiftLeft(int by) { + public void shiftLeft(final int by) { throw unsupported("shiftLeft"); } @Override - public ArrayData shiftRight(int by) { + public ArrayData shiftRight(final int by) { throw unsupported("shiftRight"); } @Override - public ArrayData ensure(long safeIndex) { + public ArrayData ensure(final long safeIndex) { if (safeIndex < buf.capacity()) { return this; } @@ -101,12 +101,12 @@ } @Override - public ArrayData shrink(long newLength) { + public ArrayData shrink(final long newLength) { throw unsupported("shrink"); } @Override - public ArrayData set(int index, Object value, boolean strict) { + public ArrayData set(final int index, final Object value, final boolean strict) { if (value instanceof Number) { buf.put(index, ((Number)value).byteValue()); return this; @@ -116,45 +116,45 @@ } @Override - public ArrayData set(int index, int value, boolean strict) { + public ArrayData set(final int index, final int value, final boolean strict) { buf.put(index, (byte)value); return this; } @Override - public ArrayData set(int index, long value, boolean strict) { + public ArrayData set(final int index, final long value, final boolean strict) { buf.put(index, (byte)value); return this; } @Override - public ArrayData set(int index, double value, boolean strict) { + public ArrayData set(final int index, final double value, final boolean strict) { buf.put(index, (byte)value); return this; } @Override - public int getInt(int index) { + public int getInt(final int index) { return 0x0ff & buf.get(index); } @Override - public long getLong(int index) { + public long getLong(final int index) { return 0x0ff & buf.get(index); } @Override - public double getDouble(int index) { + public double getDouble(final int index) { return 0x0ff & buf.get(index); } @Override - public Object getObject(int index) { + public Object getObject(final int index) { return (int)(0x0ff & buf.get(index)); } @Override - public boolean has(int index) { + public boolean has(final int index) { return index > -1 && index < buf.capacity(); } @@ -169,12 +169,12 @@ } @Override - public ArrayData delete(int index) { + public ArrayData delete(final int index) { throw unsupported("delete"); } @Override - public ArrayData delete(long fromIndex, long toIndex) { + public ArrayData delete(final long fromIndex, final long toIndex) { throw unsupported("delete"); } @@ -189,7 +189,7 @@ } @Override - public ArrayData slice(long from, long to) { + public ArrayData slice(final long from, final long to) { throw unsupported("slice"); }
--- a/src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -35,7 +35,6 @@ import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.lang.invoke.SwitchPoint; - import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.internal.dynalink.linker.LinkRequest;
--- a/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java Wed Jun 04 13:08:57 2014 +0200 @@ -45,7 +45,7 @@ @Override public ArrayData copy() { - DeletedArrayFilter copy = new DeletedArrayFilter(underlying.copy()); + final DeletedArrayFilter copy = new DeletedArrayFilter(underlying.copy()); copy.getDeleted().copy(deleted); return copy; }
--- a/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,9 +25,9 @@ package jdk.nashorn.internal.runtime.arrays; -import jdk.nashorn.internal.objects.Global; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; +import jdk.nashorn.internal.objects.Global; import jdk.nashorn.internal.runtime.PropertyDescriptor; /**
--- a/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,6 @@ import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.Arrays; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptRuntime;
--- a/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,13 +25,12 @@ package jdk.nashorn.internal.runtime.arrays; +import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall; import static jdk.nashorn.internal.lookup.Lookup.MH; -import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.Arrays; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptRuntime;
--- a/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,14 +25,13 @@ package jdk.nashorn.internal.runtime.arrays; -import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall; import static jdk.nashorn.internal.lookup.Lookup.MH; +import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.Arrays; - import jdk.nashorn.internal.codegen.types.Type; /**
--- a/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,6 @@ import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.Arrays; - import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptRuntime;
--- a/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,9 +25,9 @@ package jdk.nashorn.internal.runtime.arrays; -import jdk.nashorn.internal.objects.Global; import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; +import jdk.nashorn.internal.objects.Global; import jdk.nashorn.internal.runtime.PropertyDescriptor; /**
--- a/src/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,7 +29,6 @@ import java.lang.invoke.MethodHandle; import java.nio.Buffer; - import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.internal.dynalink.linker.LinkRequest;
--- a/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java Wed Jun 04 13:08:57 2014 +0200 @@ -46,7 +46,7 @@ @Override public ArrayData copy() { - UndefinedArrayFilter copy = new UndefinedArrayFilter(underlying.copy()); + final UndefinedArrayFilter copy = new UndefinedArrayFilter(underlying.copy()); copy.getUndefined().copy(undefined); return copy; } @@ -155,7 +155,7 @@ } @Override - public int getIntOptimistic(int index, int programPoint) { + public int getIntOptimistic(final int index, final int programPoint) { if (undefined.isSet(index)) { throw new UnwarrantedOptimismException(UNDEFINED, programPoint); } @@ -173,7 +173,7 @@ } @Override - public long getLongOptimistic(int index, int programPoint) { + public long getLongOptimistic(final int index, final int programPoint) { if (undefined.isSet(index)) { throw new UnwarrantedOptimismException(UNDEFINED, programPoint); } @@ -191,7 +191,7 @@ } @Override - public double getDoubleOptimistic(int index, int programPoint) { + public double getDoubleOptimistic(final int index, final int programPoint) { if (undefined.isSet(index)) { throw new UnwarrantedOptimismException(UNDEFINED, programPoint); }
--- a/src/jdk/nashorn/internal/runtime/events/RecompilationEvent.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/events/RecompilationEvent.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,6 @@ package jdk.nashorn.internal.runtime.events; import java.util.logging.Level; - import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData; import jdk.nashorn.internal.runtime.RewriteException;
--- a/src/jdk/nashorn/internal/runtime/events/RuntimeEvent.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/events/RuntimeEvent.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,6 @@ package jdk.nashorn.internal.runtime.events; import java.util.logging.Level; - import jdk.nashorn.internal.objects.NativeDebug; import jdk.nashorn.internal.runtime.options.Options;
--- a/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -42,12 +42,12 @@ */ final class BoundDynamicMethodLinker implements TypeBasedGuardingDynamicLinker { @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return type == BoundDynamicMethod.class; } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) throws Exception { + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception { final Object objBoundDynamicMethod = linkRequest.getReceiver(); if(!(objBoundDynamicMethod instanceof BoundDynamicMethod)) { return null;
--- a/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java Wed Jun 04 13:08:57 2014 +0200 @@ -75,7 +75,7 @@ return representativeClass; } - boolean canSee(ClassAndLoader other) { + boolean canSee(final ClassAndLoader other) { try { final Class<?> otherClass = other.getRepresentativeClass(); return Class.forName(otherClass.getName(), false, getLoader()) == otherClass;
--- a/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java Wed Jun 04 13:08:57 2014 +0200 @@ -221,7 +221,7 @@ * filterReturnValue on the delegate handle, as that would create a new converter handle wrapping the function's * handle for every instance of the adapter, causing the handle.invokeExact() call sites to become megamorphic. */ - private Map<Class<?>, String> converterFields = new LinkedHashMap<>(); + private final Map<Class<?>, String> converterFields = new LinkedHashMap<>(); /** * Subset of possible return types for all methods; namely, all possible return types of the SAM methods (we @@ -229,7 +229,7 @@ * overloads with multiple return types. We use this set when emitting the constructor taking a ScriptFunction (the * SAM initializer) to avoid populating converter fields that will never be used by SAM methods. */ - private Set<Class<?>> samReturnTypes = new HashSet<>(); + private final Set<Class<?>> samReturnTypes = new HashSet<>(); private final ClassWriter cw; @@ -411,7 +411,7 @@ private void generateConverterInit(final InstructionAdapter mv, final boolean samOnly) { assert !samOnly || !classOverride; - for(Map.Entry<Class<?>, String> converterField: converterFields.entrySet()) { + for(final Map.Entry<Class<?>, String> converterField: converterFields.entrySet()) { final Class<?> returnType = converterField.getKey(); if(!classOverride) { mv.visitVarInsn(ALOAD, 0); @@ -496,7 +496,7 @@ // Invoke super constructor with the same arguments. mv.visitVarInsn(ALOAD, 0); int offset = 1; // First arg is at position 1, after this. - for (Type argType: argTypes) { + for (final Type argType: argTypes) { mv.load(offset, argType); offset += argType.getSize(); } @@ -976,7 +976,7 @@ } } - private void generateSuperMethod(MethodInfo mi) { + private void generateSuperMethod(final MethodInfo mi) { final Method method = mi.method; final String methodDesc = mi.type.toMethodDescriptorString();
--- a/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java Wed Jun 04 13:08:57 2014 +0200 @@ -113,15 +113,15 @@ * @throws ECMAException with a TypeError if the adapter class can not be generated because the original class is * final, non-public, or has no public or protected constructors. */ - public static StaticClass getAdapterClassFor(final Class<?>[] types, ScriptObject classOverrides, final MethodHandles.Lookup lookup) { + public static StaticClass getAdapterClassFor(final Class<?>[] types, final ScriptObject classOverrides, final MethodHandles.Lookup lookup) { return getAdapterClassFor(types, classOverrides, getProtectionDomain(lookup)); } - private static StaticClass getAdapterClassFor(final Class<?>[] types, ScriptObject classOverrides, final ProtectionDomain protectionDomain) { + private static StaticClass getAdapterClassFor(final Class<?>[] types, final ScriptObject classOverrides, final ProtectionDomain protectionDomain) { assert types != null && types.length > 0; final SecurityManager sm = System.getSecurityManager(); if (sm != null) { - for (Class<?> type : types) { + for (final Class<?> type : types) { // check for restricted package access Context.checkPackageAccess(type); // check for classes, interfaces in reflection @@ -257,7 +257,7 @@ final boolean autoConvertibleFromFunction; final AdaptationResult adaptationResult; - AdapterInfo(Class<?> superClass, List<Class<?>> interfaces, ClassAndLoader definingLoader) throws AdaptationException { + AdapterInfo(final Class<?> superClass, final List<Class<?>> interfaces, final ClassAndLoader definingLoader) throws AdaptationException { this.commonLoader = findCommonLoader(definingLoader); final JavaAdapterBytecodeGenerator gen = new JavaAdapterBytecodeGenerator(superClass, interfaces, commonLoader, false); this.autoConvertibleFromFunction = gen.isAutoConvertibleFromFunction();
--- a/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java Wed Jun 04 13:08:57 2014 +0200 @@ -150,7 +150,7 @@ return Context.getGlobal(); } - static void setClassOverrides(ScriptObject overrides) { + static void setClassOverrides(final ScriptObject overrides) { classOverrides.set(overrides); } @@ -183,7 +183,7 @@ public ClassLoader run() { return new SecureClassLoader(null) { @Override - protected Class<?> findClass(String name) throws ClassNotFoundException { + protected Class<?> findClass(final String name) throws ClassNotFoundException { if(name.equals(className)) { return defineClass(name, bytes, 0, bytes.length, new ProtectionDomain( new CodeSource(null, (CodeSigner[])null), new Permissions())); @@ -197,7 +197,7 @@ try { return MethodHandles.lookup().findStatic(Class.forName(className, true, loader), "invoke", MethodType.methodType(void.class, MethodHandle.class, Object.class)); - } catch(ReflectiveOperationException e) { + } catch(final ReflectiveOperationException e) { throw new AssertionError(e.getMessage(), e); } }
--- a/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -147,7 +147,7 @@ * @param sourceType the source method type for filtering * @return a type adapted filter */ - private static MethodHandle asFilterType(final MethodHandle filter, int pos, MethodType targetType, MethodType sourceType) { + private static MethodHandle asFilterType(final MethodHandle filter, final int pos, final MethodType targetType, final MethodType sourceType) { return filter.asType(MethodType.methodType(targetType.parameterType(pos), sourceType.parameterType(pos))); } @@ -175,7 +175,7 @@ * @return true if the receiver is a super adapter, and its underlying adapter is of the specified class */ @SuppressWarnings("unused") - private static boolean isAdapterOfClass(Class<?> clazz, Object obj) { + private static boolean isAdapterOfClass(final Class<?> clazz, final Object obj) { return obj instanceof JavaSuperAdapter && clazz == (((JavaSuperAdapter)obj).getAdapter()).getClass(); } }
--- a/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java Wed Jun 04 13:08:57 2014 +0200 @@ -43,7 +43,6 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; - import jdk.internal.dynalink.ChainedCallSite; import jdk.internal.dynalink.DynamicLinker; import jdk.internal.dynalink.linker.GuardedInvocation;
--- a/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -100,7 +100,7 @@ } @Override - public MethodHandle asTypeLosslessReturn(MethodHandle handle, MethodType fromType) { + public MethodHandle asTypeLosslessReturn(final MethodHandle handle, final MethodType fromType) { return Implementation.asTypeLosslessReturn(this, handle, fromType); }
--- a/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -223,7 +223,7 @@ return null; } - for (Class<?> iface : clazz.getInterfaces()) { + for (final Class<?> iface : clazz.getInterfaces()) { // check accessiblity up-front if (! Context.isAccessibleClass(iface)) { continue;
--- a/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,6 @@ import java.lang.invoke.MethodType; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; - import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.support.AbstractCallSiteDescriptor; import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
--- a/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java Wed Jun 04 13:08:57 2014 +0200 @@ -54,12 +54,12 @@ private static final GuardingDynamicLinker staticClassLinker = BeansLinker.getLinkerForClass(StaticClass.class); @Override - public boolean canLinkType(Class<?> type) { + public boolean canLinkType(final Class<?> type) { return type == StaticClass.class; } @Override - public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) throws Exception { + public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception { final LinkRequest request = linkRequest.withoutRuntimeContext(); // Nashorn has no runtime context final Object self = request.getReceiver(); if (self.getClass() != StaticClass.class) { @@ -99,7 +99,7 @@ return delegate(linkerServices, request); } - private static GuardedInvocation delegate(LinkerServices linkerServices, final LinkRequest request) throws Exception { + private static GuardedInvocation delegate(final LinkerServices linkerServices, final LinkRequest request) throws Exception { return NashornBeansLinker.getGuardedInvocation(staticClassLinker, request, linkerServices); }
--- a/src/jdk/nashorn/internal/runtime/logging/DebugLogger.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/logging/DebugLogger.java Wed Jun 04 13:08:57 2014 +0200 @@ -38,7 +38,6 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import java.util.logging.LoggingPermission; - import jdk.nashorn.internal.objects.Global; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.ScriptFunction;
--- a/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,8 +25,6 @@ package jdk.nashorn.internal.runtime.regexp; -import jdk.nashorn.internal.runtime.ParserException; - import static java.util.regex.Pattern.CASE_INSENSITIVE; import static java.util.regex.Pattern.MULTILINE; import static java.util.regex.Pattern.UNICODE_CASE; @@ -34,6 +32,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import jdk.nashorn.internal.runtime.ParserException; /** * Default regular expression implementation based on java.util.regex package.
--- a/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,6 +25,8 @@ package jdk.nashorn.internal.runtime.regexp; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; import jdk.nashorn.internal.runtime.ParserException; import jdk.nashorn.internal.runtime.regexp.joni.Matcher; import jdk.nashorn.internal.runtime.regexp.joni.Option; @@ -33,9 +35,6 @@ import jdk.nashorn.internal.runtime.regexp.joni.Syntax; import jdk.nashorn.internal.runtime.regexp.joni.exception.JOniException; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - /** * Regular expression implementation based on the Joni engine from the JRuby project. */ @@ -77,7 +76,7 @@ } if (parsed != null) { - char[] javaPattern = parsed.getJavaPattern().toCharArray(); + final char[] javaPattern = parsed.getJavaPattern().toCharArray(); this.regex = new Regex(javaPattern, 0, javaPattern.length, option, Syntax.JAVASCRIPT); this.groupsInNegativeLookahead = parsed.getGroupsInNegativeLookahead(); }
--- a/src/jdk/nashorn/internal/runtime/regexp/RegExp.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExp.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,12 +25,11 @@ package jdk.nashorn.internal.runtime.regexp; +import java.util.regex.MatchResult; import jdk.nashorn.internal.runtime.BitVector; import jdk.nashorn.internal.runtime.ECMAErrors; import jdk.nashorn.internal.runtime.ParserException; -import java.util.regex.MatchResult; - /** * This is the base class for representing a parsed regular expression. *
--- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Wed Jun 04 13:08:57 2014 +0200 @@ -31,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.regex.PatternSyntaxException; - import jdk.nashorn.internal.parser.Lexer; import jdk.nashorn.internal.parser.Scanner; import jdk.nashorn.internal.runtime.BitVector; @@ -101,7 +100,7 @@ private void processForwardReferences() { - Iterator<Integer> iterator = forwardReferences.descendingIterator(); + final Iterator<Integer> iterator = forwardReferences.descendingIterator(); while (iterator.hasNext()) { final int pos = iterator.next(); final int num = iterator.next();
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,7 +29,6 @@ import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite; import java.util.HashSet; - import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode; import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode; import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode; @@ -50,7 +49,7 @@ final class Analyser extends Parser { - protected Analyser(ScanEnvironment env, char[] chars, int p, int end) { + protected Analyser(final ScanEnvironment env, final char[] chars, final int p, final int end) { super(env, chars, p, end); } @@ -117,7 +116,7 @@ } // DEBUG_COMPILE } - private void swap(Node a, Node b) { + private void swap(final Node a, final Node b) { a.swap(b); if (root == b) { @@ -128,7 +127,7 @@ } // USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK - private int quantifiersMemoryInfo(Node node) { + private int quantifiersMemoryInfo(final Node node) { int info = 0; switch(node.getType()) { @@ -136,20 +135,20 @@ case NodeType.ALT: ConsAltNode can = (ConsAltNode)node; do { - int v = quantifiersMemoryInfo(can.car); + final int v = quantifiersMemoryInfo(can.car); if (v > info) info = v; } while ((can = can.cdr) != null); break; case NodeType.QTFR: - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; if (qn.upper != 0) { info = quantifiersMemoryInfo(qn.target); } break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch (en.type) { case EncloseType.MEMORY: return TargetInfo.IS_EMPTY_MEM; @@ -177,12 +176,12 @@ return info; } - private int getMinMatchLength(Node node) { + private int getMinMatchLength(final Node node) { int min = 0; switch (node.getType()) { case NodeType.BREF: - BackRefNode br = (BackRefNode)node; + final BackRefNode br = (BackRefNode)node; if (br.isRecursion()) break; if (br.backRef > env.numMem) { @@ -202,8 +201,8 @@ case NodeType.ALT: ConsAltNode y = (ConsAltNode)node; do { - Node x = y.car; - int tmin = getMinMatchLength(x); + final Node x = y.car; + final int tmin = getMinMatchLength(x); if (y == node) { min = tmin; } else if (min > tmin) { @@ -226,7 +225,7 @@ break; case NodeType.QTFR: - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; if (qn.lower > 0) { min = getMinMatchLength(qn.target); min = MinMaxLen.distanceMultiply(min, qn.lower); @@ -234,7 +233,7 @@ break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch (en.type) { case EncloseType.MEMORY: if (en.isMinFixed()) { @@ -261,14 +260,14 @@ return min; } - private int getMaxMatchLength(Node node) { + private int getMaxMatchLength(final Node node) { int max = 0; switch (node.getType()) { case NodeType.LIST: ConsAltNode ln = (ConsAltNode)node; do { - int tmax = getMaxMatchLength(ln.car); + final int tmax = getMaxMatchLength(ln.car); max = MinMaxLen.distanceAdd(max, tmax); } while ((ln = ln.cdr) != null); break; @@ -276,7 +275,7 @@ case NodeType.ALT: ConsAltNode an = (ConsAltNode)node; do { - int tmax = getMaxMatchLength(an.car); + final int tmax = getMaxMatchLength(an.car); if (max < tmax) max = tmax; } while ((an = an.cdr) != null); break; @@ -295,7 +294,7 @@ break; case NodeType.BREF: - BackRefNode br = (BackRefNode)node; + final BackRefNode br = (BackRefNode)node; if (br.isRecursion()) { max = MinMaxLen.INFINITE_DISTANCE; break; @@ -304,12 +303,12 @@ if (br.backRef > env.numMem) { throw new ValueException(ERR_INVALID_BACKREF); } - int tmax = getMaxMatchLength(env.memNodes[br.backRef]); + final int tmax = getMaxMatchLength(env.memNodes[br.backRef]); if (max < tmax) max = tmax; break; case NodeType.QTFR: - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; if (qn.upper != 0) { max = getMaxMatchLength(qn.target); if (max != 0) { @@ -323,7 +322,7 @@ break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch (en.type) { case EncloseType.MEMORY: if (en.isMaxFixed()) { @@ -352,11 +351,11 @@ private static final int GET_CHAR_LEN_VARLEN = -1; private static final int GET_CHAR_LEN_TOP_ALT_VARLEN = -2; - protected final int getCharLengthTree(Node node) { + protected final int getCharLengthTree(final Node node) { return getCharLengthTree(node, 0); } - private int getCharLengthTree(Node node, int level) { + private int getCharLengthTree(final Node node, int level) { level++; int len = 0; @@ -366,7 +365,7 @@ case NodeType.LIST: ConsAltNode ln = (ConsAltNode)node; do { - int tlen = getCharLengthTree(ln.car, level); + final int tlen = getCharLengthTree(ln.car, level); if (returnCode == 0) len = MinMaxLen.distanceAdd(len, tlen); } while (returnCode == 0 && (ln = ln.cdr) != null); break; @@ -377,7 +376,7 @@ int tlen = getCharLengthTree(an.car, level); while (returnCode == 0 && (an = an.cdr) != null) { - int tlen2 = getCharLengthTree(an.car, level); + final int tlen2 = getCharLengthTree(an.car, level); if (returnCode == 0) { if (tlen != tlen2) varLen = true; } @@ -397,12 +396,12 @@ break; case NodeType.STR: - StringNode sn = (StringNode)node; + final StringNode sn = (StringNode)node; len = sn.length(); break; case NodeType.QTFR: - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; if (qn.lower == qn.upper) { tlen = getCharLengthTree(qn.target, level); if (returnCode == 0) len = MinMaxLen.distanceMultiply(tlen, qn.lower); @@ -418,7 +417,7 @@ break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch(en.type) { case EncloseType.MEMORY: if (en.isCLenFixed()) { @@ -455,7 +454,7 @@ // !retry:! retry: while(true) { - int yType = y.getType(); + final int yType = y.getType(); switch(x.getType()) { case NodeType.CTYPE: @@ -482,12 +481,12 @@ break; case NodeType.CCLASS: - CClassNode xc = (CClassNode)x; + final CClassNode xc = (CClassNode)x; switch(yType) { case NodeType.CCLASS: - CClassNode yc = (CClassNode)y; + final CClassNode yc = (CClassNode)y; for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) { boolean v = xc.bs.at(i); @@ -514,18 +513,18 @@ break; // case NodeType.CCLASS case NodeType.STR: - StringNode xs = (StringNode)x; + final StringNode xs = (StringNode)x; if (xs.length() == 0) break; switch (yType) { case NodeType.CCLASS: - CClassNode cc = (CClassNode)y; - int code = xs.chars[xs.p]; + final CClassNode cc = (CClassNode)y; + final int code = xs.chars[xs.p]; return !cc.isCodeInCC(code); case NodeType.STR: - StringNode ys = (StringNode)y; + final StringNode ys = (StringNode)y; int len = xs.length(); if (len > ys.length()) len = ys.length(); if (xs.isAmbig() || ys.isAmbig()) { @@ -551,7 +550,7 @@ return false; } - private Node getHeadValueNode(Node node, boolean exact) { + private Node getHeadValueNode(final Node node, final boolean exact) { Node n = null; switch(node.getType()) { @@ -570,7 +569,7 @@ break; case NodeType.STR: - StringNode sn = (StringNode)node; + final StringNode sn = (StringNode)node; if (sn.end <= sn.p) break; // ??? if (exact && !sn.isRaw() && isIgnoreCase(regex.options)){ @@ -581,7 +580,7 @@ break; case NodeType.QTFR: - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; if (qn.lower > 0) { if (qn.headExact != null) { n = qn.headExact; @@ -592,11 +591,11 @@ break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch (en.type) { case EncloseType.OPTION: - int options = regex.options; + final int options = regex.options; regex.options = en.option; n = getHeadValueNode(en.target, exact); regex.options = options; @@ -610,7 +609,7 @@ break; case NodeType.ANCHOR: - AnchorNode an = (AnchorNode)node; + final AnchorNode an = (AnchorNode)node; if (an.type == AnchorType.PREC_READ) n = getHeadValueNode(an.target, exact); break; @@ -622,7 +621,7 @@ } // true: invalid - private boolean checkTypeTree(Node node, int typeMask, int encloseMask, int anchorMask) { + private boolean checkTypeTree(final Node node, final int typeMask, final int encloseMask, final int anchorMask) { if ((node.getType2Bit() & typeMask) == 0) return true; boolean invalid = false; @@ -641,13 +640,13 @@ break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; if ((en.type & encloseMask) == 0) return true; invalid = checkTypeTree(en.target, typeMask, encloseMask, anchorMask); break; case NodeType.ANCHOR: - AnchorNode an = (AnchorNode)node; + final AnchorNode an = (AnchorNode)node; if ((an.type & anchorMask) == 0) return true; if (an.target != null) invalid = checkTypeTree(an.target, typeMask, encloseMask, anchorMask); @@ -666,14 +665,14 @@ (?<!A|B) ==> (?<!A)(?<!B) */ private Node divideLookBehindAlternatives(Node node) { - AnchorNode an = (AnchorNode)node; - int anchorType = an.type; + final AnchorNode an = (AnchorNode)node; + final int anchorType = an.type; Node head = an.target; Node np = ((ConsAltNode)head).car; swap(node, head); - Node tmp = node; + final Node tmp = node; node = head; head = tmp; @@ -682,7 +681,7 @@ np = node; while ((np = ((ConsAltNode)np).cdr) != null) { - AnchorNode insert = new AnchorNode(anchorType); + final AnchorNode insert = new AnchorNode(anchorType); insert.setTarget(((ConsAltNode)np).car); ((ConsAltNode)np).setCar(insert); } @@ -697,9 +696,9 @@ return node; } - private Node setupLookBehind(Node node) { - AnchorNode an = (AnchorNode)node; - int len = getCharLengthTree(an.target); + private Node setupLookBehind(final Node node) { + final AnchorNode an = (AnchorNode)node; + final int len = getCharLengthTree(an.target); switch(returnCode) { case 0: an.charLength = len; @@ -716,16 +715,16 @@ return node; } - private void nextSetup(Node node, Node nextNode) { + private void nextSetup(Node node, final Node nextNode) { // retry: retry: while(true) { - int type = node.getType(); + final int type = node.getType(); if (type == NodeType.QTFR) { - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; if (qn.greedy && isRepeatInfinite(qn.upper)) { if (Config.USE_QTFR_PEEK_NEXT) { - StringNode n = (StringNode)getHeadValueNode(nextNode, true); + final StringNode n = (StringNode)getHeadValueNode(nextNode, true); /* '\0': for UTF-16BE etc... */ if (n != null && n.chars[n.p] != 0) { // ????????? qn.nextHeadExact = n; @@ -734,11 +733,11 @@ /* automatic posseivation a*b ==> (?>a*)b */ if (qn.lower <= 1) { if (qn.target.isSimple()) { - Node x = getHeadValueNode(qn.target, false); + final Node x = getHeadValueNode(qn.target, false); if (x != null) { - Node y = getHeadValueNode(nextNode, false); + final Node y = getHeadValueNode(nextNode, false); if (y != null && isNotIncluded(x, y)) { - EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); //onig_node_new_enclose + final EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); //onig_node_new_enclose en.setStopBtSimpleRepeat(); //en.setTarget(qn.target); // optimize it ?? swap(node, en); @@ -750,7 +749,7 @@ } } } else if (type == NodeType.ENCLOSE) { - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; if (en.isMemory()) { node = en.target; // !goto retry;! @@ -762,15 +761,15 @@ } // while } - private void updateStringNodeCaseFoldMultiByte(StringNode sn) { - char[] chars = sn.chars; - int end = sn.end; + private void updateStringNodeCaseFoldMultiByte(final StringNode sn) { + final char[] chars = sn.chars; + final int end = sn.end; value = sn.p; int sp = 0; char buf; while (value < end) { - int ovalue = value; + final int ovalue = value; buf = EncodingHelper.toLowerCase(chars[value++]); if (chars[ovalue] != buf) { @@ -781,7 +780,7 @@ while (value < end) { buf = EncodingHelper.toLowerCase(chars[value++]); if (sp >= sbuf.length) { - char[]tmp = new char[sbuf.length << 1]; + final char[]tmp = new char[sbuf.length << 1]; System.arraycopy(sbuf, 0, tmp, 0, sbuf.length); sbuf = tmp; } @@ -794,13 +793,13 @@ } } - private void updateStringNodeCaseFold(Node node) { - StringNode sn = (StringNode)node; + private void updateStringNodeCaseFold(final Node node) { + final StringNode sn = (StringNode)node; updateStringNodeCaseFoldMultiByte(sn); } - private Node expandCaseFoldMakeRemString(char[] chars, int p, int end) { - StringNode node = new StringNode(chars, p, end); + private Node expandCaseFoldMakeRemString(final char[] chars, final int p, final int end) { + final StringNode node = new StringNode(chars, p, end); updateStringNodeCaseFold(node); node.setAmbig(); @@ -808,8 +807,8 @@ return node; } - private boolean expandCaseFoldStringAlt(int itemNum, char[] items, - char[] chars, int p, int slen, int end, ObjPtr<Node> node) { + private boolean expandCaseFoldStringAlt(final int itemNum, final char[] items, + final char[] chars, final int p, final int slen, final int end, final ObjPtr<Node> node) { ConsAltNode altNode; node.p = altNode = newAltNode(null, null); @@ -822,7 +821,7 @@ snode.catCode(items[i]); - ConsAltNode an = newAltNode(null, null); + final ConsAltNode an = newAltNode(null, null); an.setCar(snode); altNode.setCdr(an); altNode = an; @@ -831,22 +830,22 @@ } private static final int THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION = 8; - private Node expandCaseFoldString(Node node) { - StringNode sn = (StringNode)node; + private Node expandCaseFoldString(final Node node) { + final StringNode sn = (StringNode)node; if (sn.isAmbig() || sn.length() <= 0) return node; - char[] chars = sn.chars; + final char[] chars = sn.chars; int p = sn.p; - int end = sn.end; + final int end = sn.end; int altNum = 1; ConsAltNode topRoot = null, root = null; - ObjPtr<Node> prevNode = new ObjPtr<Node>(); + final ObjPtr<Node> prevNode = new ObjPtr<Node>(); StringNode stringNode = null; while (p < end) { - char[] items = EncodingHelper.caseFoldCodesByString(regex.caseFoldFlag, chars[p]); + final char[] items = EncodingHelper.caseFoldCodesByString(regex.caseFoldFlag, chars[p]); if (items.length == 0) { if (stringNode == null) { @@ -877,7 +876,7 @@ } if (p < end) { - Node srem = expandCaseFoldMakeRemString(chars, p, end); + final Node srem = expandCaseFoldMakeRemString(chars, p, end); if (prevNode.p != null && root == null) { topRoot = root = ConsAltNode.listAdd(null, prevNode.p); @@ -890,7 +889,7 @@ } } /* ending */ - Node xnode = topRoot != null ? topRoot : prevNode.p; + final Node xnode = topRoot != null ? topRoot : prevNode.p; swap(node, xnode); return xnode; @@ -946,7 +945,7 @@ break; case NodeType.BREF: - BackRefNode br = (BackRefNode)node; + final BackRefNode br = (BackRefNode)node; if (br.backRef > env.numMem) { throw new ValueException(ERR_INVALID_BACKREF); } @@ -956,17 +955,17 @@ break; case NodeType.QTFR: - QuantifierNode qn = (QuantifierNode)node; + final QuantifierNode qn = (QuantifierNode)node; Node target = qn.target; if ((state & IN_REPEAT) != 0) qn.setInRepeat(); if (isRepeatInfinite(qn.upper) || qn.lower >= 1) { - int d = getMinMatchLength(target); + final int d = getMinMatchLength(target); if (d == 0) { qn.targetEmptyInfo = TargetInfo.IS_EMPTY; if (Config.USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT) { - int info = quantifiersMemoryInfo(target); + final int info = quantifiersMemoryInfo(target); if (info > 0) qn.targetEmptyInfo = info; } // USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK // strange stuff here (turned off) @@ -982,12 +981,12 @@ if (target.getType() == NodeType.STR) { if (!isRepeatInfinite(qn.lower) && qn.lower == qn.upper && qn.lower > 1 && qn.lower <= EXPAND_STRING_MAX_LENGTH) { - StringNode sn = (StringNode)target; - int len = sn.length(); + final StringNode sn = (StringNode)target; + final int len = sn.length(); if (len * qn.lower <= EXPAND_STRING_MAX_LENGTH) { - StringNode str = qn.convertToString(sn.flag); - int n = qn.lower; + final StringNode str = qn.convertToString(sn.flag); + final int n = qn.lower; for (int i = 0; i < n; i++) { str.cat(sn.chars, sn.p, sn.end); } @@ -999,7 +998,7 @@ if (Config.USE_OP_PUSH_OR_JUMP_EXACT) { if (qn.greedy && qn.targetEmptyInfo != 0) { if (target.getType() == NodeType.QTFR) { - QuantifierNode tqn = (QuantifierNode)target; + final QuantifierNode tqn = (QuantifierNode)target; if (tqn.headExact != null) { qn.headExact = tqn.headExact; tqn.headExact = null; @@ -1012,10 +1011,10 @@ break; case NodeType.ENCLOSE: - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch (en.type) { case EncloseType.OPTION: - int options = regex.options; + final int options = regex.options; regex.options = en.option; setupTree(en.target, state); regex.options = options; @@ -1033,7 +1032,7 @@ case EncloseType.STOP_BACKTRACK: setupTree(en.target, state); if (en.target.getType() == NodeType.QTFR) { - QuantifierNode tqn = (QuantifierNode)en.target; + final QuantifierNode tqn = (QuantifierNode)en.target; if (isRepeatInfinite(tqn.upper) && tqn.lower <= 1 && tqn.greedy) { /* (?>a*), a*+ etc... */ if (tqn.target.isSimple()) en.setStopBtSimpleRepeat(); @@ -1045,7 +1044,7 @@ break; case NodeType.ANCHOR: - AnchorNode an = (AnchorNode)node; + final AnchorNode an = (AnchorNode)node; switch (an.type) { case AnchorType.PREC_READ: setupTree(an.target, state); @@ -1081,14 +1080,14 @@ } private static final int MAX_NODE_OPT_INFO_REF_COUNT = 5; - private void optimizeNodeLeft(Node node, NodeOptInfo opt, OptEnvironment oenv) { // oenv remove, pass mmd + private void optimizeNodeLeft(final Node node, final NodeOptInfo opt, final OptEnvironment oenv) { // oenv remove, pass mmd opt.clear(); opt.setBoundNode(oenv.mmd); switch (node.getType()) { case NodeType.LIST: { - OptEnvironment nenv = new OptEnvironment(); - NodeOptInfo nopt = new NodeOptInfo(); + final OptEnvironment nenv = new OptEnvironment(); + final NodeOptInfo nopt = new NodeOptInfo(); nenv.copy(oenv); ConsAltNode lin = (ConsAltNode)node; do { @@ -1100,7 +1099,7 @@ } case NodeType.ALT: { - NodeOptInfo nopt = new NodeOptInfo(); + final NodeOptInfo nopt = new NodeOptInfo(); ConsAltNode aln = (ConsAltNode)node; do { optimizeNodeLeft(aln.car, nopt, oenv); @@ -1114,9 +1113,9 @@ } case NodeType.STR: { - StringNode sn = (StringNode)node; + final StringNode sn = (StringNode)node; - int slen = sn.length(); + final int slen = sn.length(); if (!sn.isAmbig()) { opt.exb.concatStr(sn.chars, sn.p, sn.end, sn.isRaw()); @@ -1150,13 +1149,13 @@ } case NodeType.CCLASS: { - CClassNode cc = (CClassNode)node; + final CClassNode cc = (CClassNode)node; /* no need to check ignore case. (setted in setup_tree()) */ if (cc.mbuf != null || cc.isNot()) { opt.length.set(1, 1); } else { for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) { - boolean z = cc.bs.at(i); + final boolean z = cc.bs.at(i); if ((z && !cc.isNot()) || (!z && cc.isNot())) { opt.map.addChar(i); } @@ -1172,7 +1171,7 @@ } case NodeType.ANCHOR: { - AnchorNode an = (AnchorNode)node; + final AnchorNode an = (AnchorNode)node; switch (an.type) { case AnchorType.BEGIN_BUF: case AnchorType.BEGIN_POSITION: @@ -1184,7 +1183,7 @@ break; case AnchorType.PREC_READ: - NodeOptInfo nopt = new NodeOptInfo(); + final NodeOptInfo nopt = new NodeOptInfo(); optimizeNodeLeft(an.target, nopt, oenv); if (nopt.exb.length > 0) { opt.expr.copy(nopt.exb); @@ -1205,17 +1204,17 @@ } case NodeType.BREF: { - BackRefNode br = (BackRefNode)node; + final BackRefNode br = (BackRefNode)node; if (br.isRecursion()) { opt.length.set(0, MinMaxLen.INFINITE_DISTANCE); break; } - Node[]nodes = oenv.scanEnv.memNodes; + final Node[]nodes = oenv.scanEnv.memNodes; - int min = getMinMatchLength(nodes[br.backRef]); - int max = getMaxMatchLength(nodes[br.backRef]); + final int min = getMinMatchLength(nodes[br.backRef]); + final int max = getMaxMatchLength(nodes[br.backRef]); opt.length.set(min, max); break; @@ -1223,8 +1222,8 @@ case NodeType.QTFR: { - NodeOptInfo nopt = new NodeOptInfo(); - QuantifierNode qn = (QuantifierNode)node; + final NodeOptInfo nopt = new NodeOptInfo(); + final QuantifierNode qn = (QuantifierNode)node; optimizeNodeLeft(qn.target, nopt, oenv); if (qn.lower == 0 && isRepeatInfinite(qn.upper)) { if (oenv.mmd.max == 0 && qn.target.getType() == NodeType.CANY && qn.greedy) { @@ -1258,7 +1257,7 @@ } } - int min = MinMaxLen.distanceMultiply(nopt.length.min, qn.lower); + final int min = MinMaxLen.distanceMultiply(nopt.length.min, qn.lower); int max; if (isRepeatInfinite(qn.upper)) { max = nopt.length.max > 0 ? MinMaxLen.INFINITE_DISTANCE : 0; @@ -1270,10 +1269,10 @@ } case NodeType.ENCLOSE: { - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; switch (en.type) { case EncloseType.OPTION: - int save = oenv.options; + final int save = oenv.options; oenv.options = en.option; optimizeNodeLeft(en.target, opt, oenv); oenv.options = save; @@ -1308,9 +1307,9 @@ } // switch } - protected final void setOptimizedInfoFromTree(Node node) { - NodeOptInfo opt = new NodeOptInfo(); - OptEnvironment oenv = new OptEnvironment(); + protected final void setOptimizedInfoFromTree(final Node node) { + final NodeOptInfo opt = new NodeOptInfo(); + final OptEnvironment oenv = new OptEnvironment(); oenv.options = regex.options; oenv.caseFoldFlag = regex.caseFoldFlag;
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java Wed Jun 04 13:08:57 2014 +0200 @@ -24,14 +24,14 @@ final class ApplyCaseFold { // i_apply_case_fold - public void apply(int from, int to, Object o) { - ApplyCaseFoldArg arg = (ApplyCaseFoldArg)o; + public void apply(final int from, final int to, final Object o) { + final ApplyCaseFoldArg arg = (ApplyCaseFoldArg)o; - ScanEnvironment env = arg.env; - CClassNode cc = arg.cc; - BitSet bs = cc.bs; + final ScanEnvironment env = arg.env; + final CClassNode cc = arg.cc; + final BitSet bs = cc.bs; - boolean inCC = cc.isCodeInCC(from); + final boolean inCC = cc.isCodeInCC(from); if (Config.CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS) { if ((inCC && !cc.isNot()) || (!inCC && cc.isNot())) {
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,7 @@ ConsAltNode altRoot; ConsAltNode tail; - public ApplyCaseFoldArg(ScanEnvironment env, CClassNode cc) { + public ApplyCaseFoldArg(final ScanEnvironment env, final CClassNode cc) { this.env = env; this.cc = cc; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java Wed Jun 04 13:08:57 2014 +0200 @@ -47,13 +47,13 @@ private char[][] templates; private int templateNum; - ArrayCompiler(Analyser analyser) { + ArrayCompiler(final Analyser analyser) { super(analyser); } @Override protected final void prepare() { - int codeSize = Config.USE_STRING_TEMPLATES ? 8 : ((analyser.getEnd() - analyser.getBegin()) * 2 + 2); + final int codeSize = Config.USE_STRING_TEMPLATES ? 8 : ((analyser.getEnd() - analyser.getBegin()) * 2 + 2); code = new int[codeSize]; codeLength = 0; } @@ -71,7 +71,7 @@ } @Override - protected void compileAltNode(ConsAltNode node) { + protected void compileAltNode(final ConsAltNode node) { ConsAltNode aln = node; int len = 0; @@ -82,7 +82,7 @@ } } while ((aln = aln.cdr) != null); - int pos = codeLength + len; /* goal position */ + final int pos = codeLength + len; /* goal position */ aln = node; do { @@ -98,15 +98,15 @@ } while ((aln = aln.cdr) != null); } - private boolean isNeedStrLenOpExact(int op) { + private boolean isNeedStrLenOpExact(final int op) { return op == OPCode.EXACTN || op == OPCode.EXACTN_IC; } - private boolean opTemplated(int op) { + private boolean opTemplated(final int op) { return isNeedStrLenOpExact(op); } - private int selectStrOpcode(int strLength, boolean ignoreCase) { + private int selectStrOpcode(final int strLength, final boolean ignoreCase) { int op; if (ignoreCase) { @@ -127,8 +127,8 @@ return op; } - private void compileTreeEmptyCheck(Node node, int emptyInfo) { - int savedNumNullCheck = regex.numNullCheck; + private void compileTreeEmptyCheck(final Node node, final int emptyInfo) { + final int savedNumNullCheck = regex.numNullCheck; if (emptyInfo != 0) { addOpcode(OPCode.NULL_CHECK_START); @@ -155,8 +155,8 @@ } } - private int addCompileStringlength(char[] chars, int p, int strLength, boolean ignoreCase) { - int op = selectStrOpcode(strLength, ignoreCase); + private int addCompileStringlength(final char[] chars, final int p, final int strLength, final boolean ignoreCase) { + final int op = selectStrOpcode(strLength, ignoreCase); int len = OPSize.OPCODE; if (Config.USE_STRING_TEMPLATES && opTemplated(op)) { @@ -170,8 +170,8 @@ } @Override - protected final void addCompileString(char[] chars, int p, int strLength, boolean ignoreCase) { - int op = selectStrOpcode(strLength, ignoreCase); + protected final void addCompileString(final char[] chars, final int p, final int strLength, final boolean ignoreCase) { + final int op = selectStrOpcode(strLength, ignoreCase); addOpcode(op); if (isNeedStrLenOpExact(op)) { @@ -187,15 +187,15 @@ } } - private int compileLengthStringNode(Node node) { - StringNode sn = (StringNode)node; + private int compileLengthStringNode(final Node node) { + final StringNode sn = (StringNode)node; if (sn.length() <= 0) return 0; - boolean ambig = sn.isAmbig(); + final boolean ambig = sn.isAmbig(); int p, prev; p = prev = sn.p; - int end = sn.end; - char[] chars = sn.chars; + final int end = sn.end; + final char[] chars = sn.chars; p++; int slen = 1; @@ -205,22 +205,22 @@ slen++; p++; } - int r = addCompileStringlength(chars, prev, slen, ambig); + final int r = addCompileStringlength(chars, prev, slen, ambig); rlen += r; return rlen; } - private int compileLengthStringRawNode(StringNode sn) { + private int compileLengthStringRawNode(final StringNode sn) { if (sn.length() <= 0) return 0; return addCompileStringlength(sn.chars, sn.p, sn.length(), false); } - private void addMultiByteCClass(CodeRangeBuffer mbuf) { + private void addMultiByteCClass(final CodeRangeBuffer mbuf) { addLength(mbuf.used); addInts(mbuf.p, mbuf.used); } - private int compileLengthCClassNode(CClassNode cc) { + private int compileLengthCClassNode(final CClassNode cc) { if (cc.isShare()) return OPSize.OPCODE + OPSize.POINTER; int len; @@ -239,7 +239,7 @@ } @Override - protected void compileCClassNode(CClassNode cc) { + protected void compileCClassNode(final CClassNode cc) { if (cc.isShare()) { // shared char class addOpcode(OPCode.CCLASS_NODE); addPointer(cc); @@ -284,7 +284,7 @@ } @Override - protected void compileBackrefNode(BackRefNode node) { + protected void compileBackrefNode(final BackRefNode node) { if (isIgnoreCase(regex.options)) { addOpcode(OPCode.BACKREFN_IC); addMemNum(node.backRef); @@ -305,7 +305,7 @@ } private static final int REPEAT_RANGE_ALLOC = 8; - private void entryRepeatRange(int id, int lower, int upper) { + private void entryRepeatRange(final int id, final int lower, final int upper) { if (regex.repeatRangeLo == null) { regex.repeatRangeLo = new int[REPEAT_RANGE_ALLOC]; regex.repeatRangeHi = new int[REPEAT_RANGE_ALLOC]; @@ -322,8 +322,8 @@ regex.repeatRangeHi[id] = isRepeatInfinite(upper) ? 0x7fffffff : upper; } - private void compileRangeRepeatNode(QuantifierNode qn, int targetLen, int emptyInfo) { - int numRepeat = regex.numRepeat; + private void compileRangeRepeatNode(final QuantifierNode qn, final int targetLen, final int emptyInfo) { + final int numRepeat = regex.numRepeat; addOpcode(qn.greedy ? OPCode.REPEAT : OPCode.REPEAT_NG); addMemNum(numRepeat); /* OP_REPEAT ID */ regex.numRepeat++; @@ -345,15 +345,15 @@ private static final int QUANTIFIER_EXPAND_LIMIT_SIZE = 50; // was 50 @SuppressWarnings("unused") - private static boolean cknOn(int ckn) { + private static boolean cknOn(final int ckn) { return ckn > 0; } - private int compileNonCECLengthQuantifierNode(QuantifierNode qn) { - boolean infinite = isRepeatInfinite(qn.upper); - int emptyInfo = qn.targetEmptyInfo; + private int compileNonCECLengthQuantifierNode(final QuantifierNode qn) { + final boolean infinite = isRepeatInfinite(qn.upper); + final int emptyInfo = qn.targetEmptyInfo; - int tlen = compileLengthTree(qn.target); + final int tlen = compileLengthTree(qn.target); /* anychar repeat */ if (qn.target.getType() == NodeType.CANY) { @@ -408,11 +408,11 @@ } @Override - protected void compileNonCECQuantifierNode(QuantifierNode qn) { - boolean infinite = isRepeatInfinite(qn.upper); - int emptyInfo = qn.targetEmptyInfo; + protected void compileNonCECQuantifierNode(final QuantifierNode qn) { + final boolean infinite = isRepeatInfinite(qn.upper); + final int emptyInfo = qn.targetEmptyInfo; - int tlen = compileLengthTree(qn.target); + final int tlen = compileLengthTree(qn.target); if (qn.isAnyCharStar()) { compileTreeNTimes(qn.target, qn.lower); @@ -422,7 +422,7 @@ } else { addOpcode(OPCode.ANYCHAR_STAR_PEEK_NEXT); } - StringNode sn = (StringNode)qn.nextHeadExact; + final StringNode sn = (StringNode)qn.nextHeadExact; addChars(sn.chars, sn.p, 1); return; } else { @@ -461,13 +461,13 @@ if (qn.greedy) { if (qn.headExact != null) { addOpcodeRelAddr(OPCode.PUSH_OR_JUMP_EXACT1, modTLen + OPSize.JUMP); - StringNode sn = (StringNode)qn.headExact; + final StringNode sn = (StringNode)qn.headExact; addChars(sn.chars, sn.p, 1); compileTreeEmptyCheck(qn.target, emptyInfo); addOpcodeRelAddr(OPCode.JUMP, -(modTLen + OPSize.JUMP + OPSize.PUSH_OR_JUMP_EXACT1)); } else if (qn.nextHeadExact != null) { addOpcodeRelAddr(OPCode.PUSH_IF_PEEK_NEXT, modTLen + OPSize.JUMP); - StringNode sn = (StringNode)qn.nextHeadExact; + final StringNode sn = (StringNode)qn.nextHeadExact; addChars(sn.chars, sn.p, 1); compileTreeEmptyCheck(qn.target, emptyInfo); addOpcodeRelAddr(OPCode.JUMP, -(modTLen + OPSize.JUMP + OPSize.PUSH_IF_PEEK_NEXT)); @@ -486,7 +486,7 @@ compileTree(qn.target); } else if (!infinite && qn.greedy && (qn.upper == 1 || (tlen + OPSize.PUSH) * qn.upper <= QUANTIFIER_EXPAND_LIMIT_SIZE)) { - int n = qn.upper - qn.lower; + final int n = qn.upper - qn.lower; compileTreeNTimes(qn.target, qn.lower); for (int i=0; i<n; i++) { @@ -502,10 +502,10 @@ } } - private int compileLengthOptionNode(EncloseNode node) { - int prev = regex.options; + private int compileLengthOptionNode(final EncloseNode node) { + final int prev = regex.options; regex.options = node.option; - int tlen = compileLengthTree(node.target); + final int tlen = compileLengthTree(node.target); regex.options = prev; if (isDynamic(prev ^ node.option)) { @@ -516,8 +516,8 @@ } @Override - protected void compileOptionNode(EncloseNode node) { - int prev = regex.options; + protected void compileOptionNode(final EncloseNode node) { + final int prev = regex.options; if (isDynamic(prev ^ node.option)) { addOpcodeOption(OPCode.SET_OPTION_PUSH, node.option); @@ -534,7 +534,7 @@ } } - private int compileLengthEncloseNode(EncloseNode node) { + private int compileLengthEncloseNode(final EncloseNode node) { if (node.isOption()) { return compileLengthOptionNode(node); } @@ -559,7 +559,7 @@ case EncloseType.STOP_BACKTRACK: if (node.isStopBtSimpleRepeat()) { - QuantifierNode qn = (QuantifierNode)node.target; + final QuantifierNode qn = (QuantifierNode)node.target; tlen = compileLengthTree(qn.target); len = tlen * qn.lower + OPSize.PUSH + tlen + OPSize.POP + OPSize.JUMP; } else { @@ -575,7 +575,7 @@ } @Override - protected void compileEncloseNode(EncloseNode node) { + protected void compileEncloseNode(final EncloseNode node) { int len; switch (node.type) { case EncloseType.MEMORY: @@ -598,7 +598,7 @@ case EncloseType.STOP_BACKTRACK: if (node.isStopBtSimpleRepeat()) { - QuantifierNode qn = (QuantifierNode)node.target; + final QuantifierNode qn = (QuantifierNode)node.target; compileTreeNTimes(qn.target, qn.lower); @@ -620,7 +620,7 @@ } // switch } - private int compileLengthAnchorNode(AnchorNode node) { + private int compileLengthAnchorNode(final AnchorNode node) { int tlen; if (node.target != null) { tlen = compileLengthTree(node.target); @@ -654,7 +654,7 @@ } @Override - protected void compileAnchorNode(AnchorNode node) { + protected void compileAnchorNode(final AnchorNode node) { int len; int n; @@ -728,7 +728,7 @@ } // switch } - private int compileLengthTree(Node node) { + private int compileLengthTree(final Node node) { int len = 0; switch (node.getType()) { @@ -750,7 +750,7 @@ break; case NodeType.STR: - StringNode sn = (StringNode)node; + final StringNode sn = (StringNode)node; if (sn.isRaw()) { len = compileLengthStringRawNode(sn); } else { @@ -768,7 +768,7 @@ break; case NodeType.BREF: - BackRefNode br = (BackRefNode)node; + final BackRefNode br = (BackRefNode)node; len = ((!isIgnoreCase(regex.options) && br.backRef <= 2) ? OPSize.OPCODE : (OPSize.OPCODE + OPSize.MEMNUM)); @@ -793,35 +793,35 @@ return len; } - private void ensure(int size) { + private void ensure(final int size) { if (size >= code.length) { int length = code.length << 1; while (length <= size) length <<= 1; - int[]tmp = new int[length]; + final int[]tmp = new int[length]; System.arraycopy(code, 0, tmp, 0, code.length); code = tmp; } } - private void addInt(int i) { + private void addInt(final int i) { if (codeLength >= code.length) { - int[]tmp = new int[code.length << 1]; + final int[]tmp = new int[code.length << 1]; System.arraycopy(code, 0, tmp, 0, code.length); code = tmp; } code[codeLength++] = i; } - void setInt(int i, int offset) { + void setInt(final int i, final int offset) { ensure(offset); regex.code[offset] = i; } - private void addObject(Object o) { + private void addObject(final Object o) { if (regex.operands == null) { regex.operands = new Object[4]; } else if (regex.operandLength >= regex.operands.length) { - Object[]tmp = new Object[regex.operands.length << 1]; + final Object[]tmp = new Object[regex.operands.length << 1]; System.arraycopy(regex.operands, 0, tmp, 0, regex.operands.length); regex.operands = tmp; } @@ -829,20 +829,20 @@ regex.operands[regex.operandLength++] = o; } - private void addChars(char[] chars, int p ,int length) { + private void addChars(final char[] chars, int p ,final int length) { ensure(codeLength + length); - int end = p + length; + final int end = p + length; while (p < end) code[codeLength++] = chars[p++]; } - private void addInts(int[]ints, int length) { + private void addInts(final int[]ints, final int length) { ensure(codeLength + length); System.arraycopy(ints, 0, code, codeLength, length); codeLength += length; } - private void addOpcode(int opcode) { + private void addOpcode(final int opcode) { addInt(opcode); switch(opcode) { @@ -880,50 +880,50 @@ } @SuppressWarnings("unused") - private void addStateCheckNum(int num) { + private void addStateCheckNum(final int num) { addInt(num); } - private void addRelAddr(int addr) { + private void addRelAddr(final int addr) { addInt(addr); } @SuppressWarnings("unused") - private void addAbsAddr(int addr) { + private void addAbsAddr(final int addr) { addInt(addr); } - private void addLength(int length) { + private void addLength(final int length) { addInt(length); } - private void addMemNum(int num) { + private void addMemNum(final int num) { addInt(num); } - private void addPointer(Object o) { + private void addPointer(final Object o) { addObject(o); } - private void addOption(int option) { + private void addOption(final int option) { addInt(option); } - private void addOpcodeRelAddr(int opcode, int addr) { + private void addOpcodeRelAddr(final int opcode, final int addr) { addOpcode(opcode); addRelAddr(addr); } - private void addOpcodeOption(int opcode, int option) { + private void addOpcodeOption(final int opcode, final int option) { addOpcode(opcode); addOption(option); } - private void addTemplate(char[] chars) { + private void addTemplate(final char[] chars) { if (templateNum == 0) { templates = new char[2][]; } else if (templateNum == templates.length) { - char[][] tmp = new char[templateNum * 2][]; + final char[][] tmp = new char[templateNum * 2][]; System.arraycopy(templates, 0, tmp, 0, templateNum); templates = tmp; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java Wed Jun 04 13:08:57 2014 +0200 @@ -31,7 +31,7 @@ private static final int BITS_TO_STRING_WRAP = 4; @Override public String toString() { - StringBuilder buffer = new StringBuilder(); + final StringBuilder buffer = new StringBuilder(); buffer.append("BitSet"); for (int i=0; i<SINGLE_BYTE_SIZE; i++) { if ((i % (SINGLE_BYTE_SIZE / BITS_TO_STRING_WRAP)) == 0) buffer.append("\n "); @@ -40,15 +40,15 @@ return buffer.toString(); } - public boolean at(int pos) { + public boolean at(final int pos) { return (bits[pos >>> ROOM_SHIFT] & bit(pos)) != 0; } - public void set(int pos) { + public void set(final int pos) { bits[pos >>> ROOM_SHIFT] |= bit(pos); } - public void clear(int pos) { + public void clear(final int pos) { bits[pos >>> ROOM_SHIFT] &= ~bit(pos); } @@ -63,7 +63,7 @@ return true; } - public void setRange(int from, int to) { + public void setRange(final int from, final int to) { for (int i=from; i<=to && i < SINGLE_BYTE_SIZE; i++) set(i); } @@ -71,19 +71,19 @@ for (int i=0; i<BITSET_SIZE; i++) bits[i] = ~bits[i]; } - public void invertTo(BitSet to) { + public void invertTo(final BitSet to) { for (int i=0; i<BITSET_SIZE; i++) to.bits[i] = ~bits[i]; } - public void and(BitSet other) { + public void and(final BitSet other) { for (int i=0; i<BITSET_SIZE; i++) bits[i] &= other.bits[i]; } - public void or(BitSet other) { + public void or(final BitSet other) { for (int i=0; i<BITSET_SIZE; i++) bits[i] |= other.bits[i]; } - public void copy(BitSet other) { + public void copy(final BitSet other) { for (int i=0; i<BITSET_SIZE; i++) bits[i] = other.bits[i]; } @@ -95,7 +95,7 @@ return num; } - static int bit(int pos){ + static int bit(final int pos){ return 1 << (pos % SINGLE_BYTE_SIZE); }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,11 +30,11 @@ return -1; } - public static boolean bsAt(int stats, int n) { + public static boolean bsAt(final int stats, final int n) { return (n < BIT_STATUS_BITS_NUM ? stats & (1 << n) : (stats & 1)) != 0; } - public static int bsOnAt(int stats, int n) { + public static int bsOnAt(int stats, final int n) { if (n < BIT_STATUS_BITS_NUM) { stats |= (1 << n); } else { @@ -43,7 +43,7 @@ return stats; } - public static int bsOnOff(int v, int f, boolean negative) { + public static int bsOnOff(int v, final int f, final boolean negative) { if (negative) { v &= ~f; } else {
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java Wed Jun 04 13:08:57 2014 +0200 @@ -20,13 +20,13 @@ package jdk.nashorn.internal.runtime.regexp.joni; import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt; +import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isNewLine; import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition; import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest; import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindNotEmpty; import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotBol; import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotEol; import static jdk.nashorn.internal.runtime.regexp.joni.Option.isPosixRegion; -import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isNewLine; import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode; import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode; @@ -47,19 +47,19 @@ private final int[] code; // byte code private int ip; // instruction pointer - ByteCodeMachine(Regex regex, char[] chars, int p, int end) { + ByteCodeMachine(final Regex regex, final char[] chars, final int p, final int end) { super(regex, chars, p, end); this.code = regex.code; } - private boolean stringCmpIC(int caseFlodFlag, int s1, IntHolder ps2, int mbLen, int textEnd) { + private boolean stringCmpIC(final int caseFlodFlag, int s1, final IntHolder ps2, final int mbLen, final int textEnd) { int s2 = ps2.value; - int end1 = s1 + mbLen; + final int end1 = s1 + mbLen; while (s1 < end1) { - char c1 = EncodingHelper.toLowerCase(chars[s1++]); - char c2 = EncodingHelper.toLowerCase(chars[s2++]); + final char c1 = EncodingHelper.toLowerCase(chars[s1++]); + final char c2 = EncodingHelper.toLowerCase(chars[s2++]); if (c1 != c2) { return false; @@ -85,18 +85,18 @@ for (i=0, q=s; i<7 && q<end && s>=0; i++) { if (q < end) Config.log.print(new String(new char[]{chars[q++]})); } - String str = q < end ? "...\"" : "\""; + final String str = q < end ? "...\"" : "\""; q += str.length(); Config.log.print(str); for (i=0; i<20-(q-s);i++) Config.log.print(" "); - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); new ByteCodePrinter(regex).compiledByteCodeToString(sb, ip); Config.log.println(sb.toString()); } } @Override - protected final int matchAt(int range, int sstart, int sprev) { + protected final int matchAt(final int range, final int sstart, final int sprev) { this.range = range; this.sstart = sstart; this.sprev = sprev; @@ -215,7 +215,7 @@ } private boolean opEnd() { - int n = s - sstart; + final int n = s - sstart; if (n > bestLen) { if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) { @@ -259,7 +259,7 @@ msaEnd = s - str; } } else { - Region region = msaRegion; + final Region region = msaRegion; if (Config.USE_POSIX_API_REGION_OPTION) { if (!isPosixRegion(regex.options)) { if (region != null) { @@ -355,7 +355,7 @@ if (s + tlen > range) {opFail(); return;} if (Config.USE_STRING_TEMPLATES) { - char[] bs = regex.templates[code[ip++]]; + final char[] bs = regex.templates[code[ip++]]; int ps = code[ip++]; while (tlen-- > 0) if (bs[ps++] != chars[s++]) {opFail(); return;} @@ -377,7 +377,7 @@ if (s + tlen > range) {opFail(); return;} if (Config.USE_STRING_TEMPLATES) { - char[] bs = regex.templates[code[ip++]]; + final char[] bs = regex.templates[code[ip++]]; int ps = code[ip++]; while (tlen-- > 0) if (bs[ps++] != EncodingHelper.toLowerCase(chars[s++])) {opFail(); return;} @@ -389,7 +389,7 @@ } private boolean isInBitSet() { - int c = chars[s]; + final int c = chars[s]; return (c <= 0xff && (code[ip + (c >>> BitSet.ROOM_SHIFT)] & (1 << c)) != 0); } @@ -401,11 +401,11 @@ } private boolean isInClassMB() { - int tlen = code[ip++]; + final int tlen = code[ip++]; if (s >= range) return false; - int ss = s; + final int ss = s; s++; - int c = chars[ss]; + final int c = chars[ss]; if (!EncodingHelper.isInCodeRange(code, ip, c)) return false; ip += tlen; return true; @@ -426,7 +426,7 @@ } else { if (!isInBitSet()) {opFail(); return;} ip += BitSet.BITSET_SIZE; - int tlen = code[ip++]; // by code range length + final int tlen = code[ip++]; // by code range length ip += tlen; s++; } @@ -441,7 +441,7 @@ } private boolean isNotInClassMB() { - int tlen = code[ip++]; + final int tlen = code[ip++]; if (!(s + 1 <= range)) { if (s >= range) return false; @@ -450,9 +450,9 @@ return true; } - int ss = s; + final int ss = s; s++; - int c = chars[ss]; + final int c = chars[ss]; if (EncodingHelper.isInCodeRange(code, ip, c)) return false; ip += tlen; @@ -463,7 +463,7 @@ if (s >= range) {opFail(); return;} if (chars[s] <= 0xff) { s++; - int tlen = code[ip++]; + final int tlen = code[ip++]; ip += tlen; sprev = sbegin; // break; return; @@ -480,7 +480,7 @@ } else { if (isInBitSet()) {opFail(); return;} ip += BitSet.BITSET_SIZE; - int tlen = code[ip++]; + final int tlen = code[ip++]; ip += tlen; s++; } @@ -489,10 +489,10 @@ private void opCClassNode() { if (s >= range) {opFail(); return;} - CClassNode cc = (CClassNode)regex.operands[code[ip++]]; - int ss = s; + final CClassNode cc = (CClassNode)regex.operands[code[ip++]]; + final int ss = s; s++; - int c = chars[ss]; + final int c = chars[ss]; if (!cc.isCodeInCCLength(c)) {opFail(); return;} sprev = sbegin; // break; } @@ -535,7 +535,7 @@ final char[] chars = this.chars; while (s < range) { - char b = chars[s]; + final char b = chars[s]; if (c == b) pushAlt(ip + 1, s, sprev); if (isNewLine(b)) {opFail(); return;} sprev = s; @@ -661,36 +661,36 @@ } private void opMemoryStartPush() { - int mem = code[ip++]; + final int mem = code[ip++]; pushMemStart(mem, s); } private void opMemoryStart() { - int mem = code[ip++]; + final int mem = code[ip++]; repeatStk[memStartStk + mem] = s; } private void opMemoryEndPush() { - int mem = code[ip++]; + final int mem = code[ip++]; pushMemEnd(mem, s); } private void opMemoryEnd() { - int mem = code[ip++]; + final int mem = code[ip++]; repeatStk[memEndStk + mem] = s; } private void opMemoryEndPushRec() { - int mem = code[ip++]; - int stkp = getMemStart(mem); /* should be before push mem-end. */ + final int mem = code[ip++]; + final int stkp = getMemStart(mem); /* should be before push mem-end. */ pushMemEnd(mem, s); repeatStk[memStartStk + mem] = stkp; } private void opMemoryEndRec() { - int mem = code[ip++]; + final int mem = code[ip++]; repeatStk[memEndStk + mem] = s; - int stkp = getMemStart(mem); + final int stkp = getMemStart(mem); if (BitStatus.bsAt(regex.btMemStart, mem)) { repeatStk[memStartStk + mem] = stkp; @@ -701,25 +701,25 @@ pushMemEndMark(mem); } - private boolean backrefInvalid(int mem) { + private boolean backrefInvalid(final int mem) { return repeatStk[memEndStk + mem] == INVALID_INDEX || repeatStk[memStartStk + mem] == INVALID_INDEX; } - private int backrefStart(int mem) { + private int backrefStart(final int mem) { return bsAt(regex.btMemStart, mem) ? stack[repeatStk[memStartStk + mem]].getMemPStr() : repeatStk[memStartStk + mem]; } - private int backrefEnd(int mem) { + private int backrefEnd(final int mem) { return bsAt(regex.btMemEnd, mem) ? stack[repeatStk[memEndStk + mem]].getMemPStr() : repeatStk[memEndStk + mem]; } - private void backref(int mem) { + private void backref(final int mem) { /* if you want to remove following line, you should check in parse and compile time. (numMem) */ if (mem > regex.numMem || backrefInvalid(mem)) {opFail(); return;} int pstart = backrefStart(mem); - int pend = backrefEnd(mem); + final int pend = backrefEnd(mem); int n = pend - pstart; if (s + n > range) {opFail(); return;} @@ -747,15 +747,15 @@ } private void opBackRefNIC() { - int mem = code[ip++]; + final int mem = code[ip++]; /* if you want to remove following line, you should check in parse and compile time. (numMem) */ if (mem > regex.numMem || backrefInvalid(mem)) {opFail(); return;} - int pstart = backrefStart(mem); - int pend = backrefEnd(mem); + final int pstart = backrefStart(mem); + final int pend = backrefEnd(mem); - int n = pend - pstart; + final int n = pend - pstart; if (s + n > range) {opFail(); return;} sprev = s; @@ -768,15 +768,15 @@ } private void opBackRefMulti() { - int tlen = code[ip++]; + final int tlen = code[ip++]; int i; loop:for (i=0; i<tlen; i++) { - int mem = code[ip++]; + final int mem = code[ip++]; if (backrefInvalid(mem)) continue; int pstart = backrefStart(mem); - int pend = backrefEnd(mem); + final int pend = backrefEnd(mem); int n = pend - pstart; if (s + n > range) {opFail(); return;} @@ -802,17 +802,17 @@ } private void opBackRefMultiIC() { - int tlen = code[ip++]; + final int tlen = code[ip++]; int i; loop:for (i=0; i<tlen; i++) { - int mem = code[ip++]; + final int mem = code[ip++]; if (backrefInvalid(mem)) continue; - int pstart = backrefStart(mem); - int pend = backrefEnd(mem); + final int pstart = backrefStart(mem); + final int pend = backrefEnd(mem); - int n = pend - pstart; + final int n = pend - pstart; if (s + n > range) {opFail(); return;} sprev = s; @@ -830,23 +830,23 @@ if (i == tlen) {opFail(); return;} } - private boolean memIsInMemp(int mem, int num, int memp) { + private boolean memIsInMemp(final int mem, final int num, int memp) { for (int i=0; i<num; i++) { - int m = code[memp++]; + final int m = code[memp++]; if (mem == m) return true; } return false; } // USE_BACKREF_AT_LEVEL // (s) and (end) implicit - private boolean backrefMatchAtNestedLevel(boolean ignoreCase, int caseFoldFlag, - int nest, int memNum, int memp) { + private boolean backrefMatchAtNestedLevel(final boolean ignoreCase, final int caseFoldFlag, + final int nest, final int memNum, final int memp) { int pend = -1; int level = 0; int k = stk - 1; while (k >= 0) { - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if (e.type == CALL_FRAME) { level--; @@ -855,7 +855,7 @@ } else if (level == nest) { if (e.type == MEM_START) { if (memIsInMemp(e.getMemNum(), memNum, memp)) { - int pstart = e.getMemPStr(); + final int pstart = e.getMemPStr(); if (pend != -1) { if (pend - pstart > end - s) return false; /* or goto next_mem; */ int p = pstart; @@ -887,9 +887,9 @@ } private void opBackRefAtLevel() { - int ic = code[ip++]; - int level = code[ip++]; - int tlen = code[ip++]; + final int ic = code[ip++]; + final int level = code[ip++]; + final int tlen = code[ip++]; sprev = s; if (backrefMatchAtNestedLevel(ic != 0, regex.caseFoldFlag, level, tlen, ip)) { // (s) and (end) implicit @@ -912,7 +912,7 @@ } private void opNullCheckStart() { - int mem = code[ip++]; + final int mem = code[ip++]; pushNullCheckStart(mem, s); } @@ -936,8 +936,8 @@ } private void opNullCheckEnd() { - int mem = code[ip++]; - int isNull = nullCheck(mem, s); /* mem: null check id */ + final int mem = code[ip++]; + final int isNull = nullCheck(mem, s); /* mem: null check id */ if (isNull != 0) { if (Config.DEBUG_MATCH) { @@ -950,8 +950,8 @@ // USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK private void opNullCheckEndMemST() { - int mem = code[ip++]; /* mem: null check id */ - int isNull = nullCheckMemSt(mem, s); + final int mem = code[ip++]; /* mem: null check id */ + final int isNull = nullCheckMemSt(mem, s); if (isNull != 0) { if (Config.DEBUG_MATCH) { @@ -965,7 +965,7 @@ // USE_SUBEXP_CALL private void opNullCheckEndMemSTPush() { - int mem = code[ip++]; /* mem: null check id */ + final int mem = code[ip++]; /* mem: null check id */ int isNull; if (Config.USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT) { @@ -991,7 +991,7 @@ } private void opPush() { - int addr = code[ip++]; + final int addr = code[ip++]; pushAlt(ip + addr, s, sprev); } @@ -1000,7 +1000,7 @@ } private void opPushOrJumpExact1() { - int addr = code[ip++]; + final int addr = code[ip++]; // beyond string check if (s < range && code[ip] == chars[s]) { ip++; @@ -1011,7 +1011,7 @@ } private void opPushIfPeekNext() { - int addr = code[ip++]; + final int addr = code[ip++]; // beyond string check if (s < range && code[ip] == chars[s]) { ip++; @@ -1022,8 +1022,8 @@ } private void opRepeat() { - int mem = code[ip++]; /* mem: OP_REPEAT ID */ - int addr= code[ip++]; + final int mem = code[ip++]; /* mem: OP_REPEAT ID */ + final int addr= code[ip++]; // ensure1(); repeatStk[mem] = stk; @@ -1035,8 +1035,8 @@ } private void opRepeatNG() { - int mem = code[ip++]; /* mem: OP_REPEAT ID */ - int addr= code[ip++]; + final int mem = code[ip++]; /* mem: OP_REPEAT ID */ + final int addr= code[ip++]; // ensure1(); repeatStk[mem] = stk; @@ -1048,8 +1048,8 @@ } } - private void repeatInc(int mem, int si) { - StackEntry e = stack[si]; + private void repeatInc(final int mem, final int si) { + final StackEntry e = stack[si]; e.increaseRepeatCount(); @@ -1065,25 +1065,25 @@ } private void opRepeatInc() { - int mem = code[ip++]; /* mem: OP_REPEAT ID */ - int si = repeatStk[mem]; + final int mem = code[ip++]; /* mem: OP_REPEAT ID */ + final int si = repeatStk[mem]; repeatInc(mem, si); } private void opRepeatIncSG() { - int mem = code[ip++]; /* mem: OP_REPEAT ID */ - int si = getRepeat(mem); + final int mem = code[ip++]; /* mem: OP_REPEAT ID */ + final int si = getRepeat(mem); repeatInc(mem, si); } - private void repeatIncNG(int mem, int si) { - StackEntry e = stack[si]; + private void repeatIncNG(final int mem, final int si) { + final StackEntry e = stack[si]; e.increaseRepeatCount(); if (e.getRepeatCount() < regex.repeatRangeHi[mem]) { if (e.getRepeatCount() >= regex.repeatRangeLo[mem]) { - int pcode = e.getRepeatPCode(); + final int pcode = e.getRepeatPCode(); pushRepeatInc(si); pushAlt(pcode, s, sprev); } else { @@ -1096,14 +1096,14 @@ } private void opRepeatIncNG() { - int mem = code[ip++]; - int si = repeatStk[mem]; + final int mem = code[ip++]; + final int si = repeatStk[mem]; repeatIncNG(mem, si); } private void opRepeatIncNGSG() { - int mem = code[ip++]; - int si = getRepeat(mem); + final int mem = code[ip++]; + final int si = getRepeat(mem); repeatIncNG(mem, si); } @@ -1112,13 +1112,13 @@ } private void opPopPos() { - StackEntry e = stack[posEnd()]; + final StackEntry e = stack[posEnd()]; s = e.getStatePStr(); sprev= e.getStatePStrPrev(); } private void opPushPosNot() { - int addr = code[ip++]; + final int addr = code[ip++]; pushPosNot(ip + addr, s, sprev); } @@ -1136,23 +1136,23 @@ } private void opLookBehind() { - int tlen = code[ip++]; + final int tlen = code[ip++]; s = EncodingHelper.stepBack(str, s, tlen); if (s == -1) {opFail(); return;} sprev = EncodingHelper.prevCharHead(str, s); } private void opLookBehindSb() { - int tlen = code[ip++]; + final int tlen = code[ip++]; s -= tlen; if (s < str) {opFail(); return;} sprev = s == str ? -1 : s - 1; } private void opPushLookBehindNot() { - int addr = code[ip++]; - int tlen = code[ip++]; - int q = EncodingHelper.stepBack(str, s, tlen); + final int addr = code[ip++]; + final int tlen = code[ip++]; + final int q = EncodingHelper.stepBack(str, s, tlen); if (q == -1) { /* too short case -> success. ex. /(?<!XXX)a/.match("a") If you want to change to fail, replace following line. */ @@ -1177,7 +1177,7 @@ } - StackEntry e = pop(); + final StackEntry e = pop(); ip = e.getStatePCode(); s = e.getStatePStr(); sprev = e.getStatePStrPrev();
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java Wed Jun 04 13:08:57 2014 +0200 @@ -214,7 +214,7 @@ Arguments.OPTION, /*OP_SET_OPTION*/ }; - public ByteCodePrinter(Regex regex) { + public ByteCodePrinter(final Regex regex) { code = regex.code; codeLength = regex.codeLength; operands = regex.operands; @@ -226,30 +226,30 @@ return compiledByteCodeListToString(); } - private void pString(StringBuilder sb, int len, int s) { + private void pString(final StringBuilder sb, final int len, final int s) { sb.append(":"); sb.append(new String(code, s, len)); } - private void pLenString(StringBuilder sb, int len, int s) { + private void pLenString(final StringBuilder sb, final int len, final int s) { sb.append(":").append(len).append(":"); sb.append(new String(code, s, len)); } - private void pLenStringFromTemplate(StringBuilder sb, int len, char[] tm, int idx) { + private void pLenStringFromTemplate(final StringBuilder sb, final int len, final char[] tm, final int idx) { sb.append(":T:").append(len).append(":"); sb.append(tm, idx, len); } - public int compiledByteCodeToString(StringBuilder sb, int bp) { + public int compiledByteCodeToString(final StringBuilder sb, int bp) { int len, n, mem, addr, scn, cod; BitSet bs; CClassNode cc; int tm, idx; sb.append("[").append(OpCodeNames[code[bp]]); - int argType = OpCodeArgTypes[code[bp]]; - int ip = bp; + final int argType = OpCodeArgTypes[code[bp]]; + final int ip = bp; if (argType != Arguments.SPECIAL) { bp++; switch (argType) { @@ -416,10 +416,10 @@ break; case OPCode.BACKREF_WITH_LEVEL: { - int option = code[bp]; + final int option = code[bp]; bp += OPSize.OPTION; sb.append(":").append(option); - int level = code[bp]; + final int level = code[bp]; bp += OPSize.LENGTH; sb.append(":").append(level); sb.append(" "); @@ -491,12 +491,12 @@ } private String compiledByteCodeListToString() { - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("code length: ").append(codeLength).append("\n"); int ncode = 0; int bp = 0; - int end = codeLength; + final int end = codeLength; while (bp < end) { ncode++;
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java Wed Jun 04 13:08:57 2014 +0200 @@ -36,13 +36,13 @@ } // CodeRange.isInCodeRange - public boolean isInCodeRange(int code) { + public boolean isInCodeRange(final int code) { int low = 0; - int n = p[0]; + final int n = p[0]; int high = n; while (low < high) { - int x = (low + high) >> 1; + final int x = (low + high) >> 1; if (code > p[(x << 1) + 2]) { low = x + 1; } else { @@ -52,7 +52,7 @@ return low < n && code >= p[(low << 1) + 1]; } - private CodeRangeBuffer(CodeRangeBuffer orig) { + private CodeRangeBuffer(final CodeRangeBuffer orig) { p = new int[orig.p.length]; System.arraycopy(orig.p, 0, p, 0, p.length); used = orig.used; @@ -60,7 +60,7 @@ @Override public String toString() { - StringBuilder buf = new StringBuilder(); + final StringBuilder buf = new StringBuilder(); buf.append("CodeRange"); buf.append("\n used: ").append(used); buf.append("\n code point: ").append(p[0]); @@ -74,45 +74,45 @@ return buf.toString(); } - private static String rangeNumToString(int num){ + private static String rangeNumToString(final int num){ return "0x" + Integer.toString(num, 16); } - public void expand(int low) { + public void expand(final int low) { int length = p.length; do { length <<= 1; } while (length < low); - int[]tmp = new int[length]; + final int[]tmp = new int[length]; System.arraycopy(p, 0, tmp, 0, used); p = tmp; } - public void ensureSize(int size) { + public void ensureSize(final int size) { int length = p.length; while (length < size ) { length <<= 1; } if (p.length != length) { - int[]tmp = new int[length]; + final int[]tmp = new int[length]; System.arraycopy(p, 0, tmp, 0, used); p = tmp; } } - private void moveRight(int from, int to, int n) { + private void moveRight(final int from, final int to, final int n) { if (to + n > p.length) expand(to + n); System.arraycopy(p, from, p, to, n); if (to + n > used) used = to + n; } - protected void moveLeft(int from, int to, int n) { + protected void moveLeft(final int from, final int to, final int n) { System.arraycopy(p, from, p, to, n); } - private void moveLeftAndReduce(int from, int to) { + private void moveLeftAndReduce(final int from, final int to) { System.arraycopy(p, from, p, to, used - from); used -= from - to; } - public void writeCodePoint(int pos, int b) { - int u = pos + 1; + public void writeCodePoint(final int pos, final int b) { + final int u = pos + 1; if (p.length < u) expand(u); p[pos] = b; if (used < u) used = u; @@ -127,21 +127,21 @@ // add_code_range_to_buf public static CodeRangeBuffer addCodeRangeToBuff(CodeRangeBuffer pbuf, int from, int to) { if (from > to) { - int n = from; + final int n = from; from = to; to = n; } if (pbuf == null) pbuf = new CodeRangeBuffer(); // move to CClassNode - int[]p = pbuf.p; + final int[]p = pbuf.p; int n = p[0]; int low = 0; int bound = n; while (low < bound) { - int x = (low + bound) >>> 1; + final int x = (low + bound) >>> 1; if (from > p[x * 2 + 2]) { low = x + 1; } else { @@ -153,7 +153,7 @@ bound = n; while (high < bound) { - int x = (high + bound) >>> 1; + final int x = (high + bound) >>> 1; if (to >= p[x * 2 + 1] - 1) { high = x + 1; } else { @@ -161,7 +161,7 @@ } } - int incN = low + 1 - high; + final int incN = low + 1 - high; if (n + incN > Config.MAX_MULTI_BYTE_RANGES_NUM) throw new ValueException(ErrorMessages.ERR_TOO_MANY_MULTI_BYTE_RANGES); @@ -171,9 +171,9 @@ } if (incN != 0 && high < n) { - int fromPos = 1 + high * 2; - int toPos = 1 + (low + 1) * 2; - int size = (n - high) * 2; + final int fromPos = 1 + high * 2; + final int toPos = 1 + (low + 1) * 2; + final int size = (n - high) * 2; if (incN > 0) { pbuf.moveRight(fromPos, toPos, size); @@ -182,7 +182,7 @@ } } - int pos = 1 + low * 2; + final int pos = 1 + low * 2; // pbuf.ensureSize(pos + 2); pbuf.writeCodePoint(pos, from); pbuf.writeCodePoint(pos + 1, to); @@ -193,7 +193,7 @@ } // add_code_range, be aware of it returning null! - public static CodeRangeBuffer addCodeRange(CodeRangeBuffer pbuf, ScanEnvironment env, int from, int to) { + public static CodeRangeBuffer addCodeRange(final CodeRangeBuffer pbuf, final ScanEnvironment env, final int from, final int to) { if (from > to) { if (env.syntax.allowEmptyRangeInCC()) { return pbuf; @@ -205,23 +205,23 @@ } // SET_ALL_MULTI_BYTE_RANGE - protected static CodeRangeBuffer setAllMultiByteRange(CodeRangeBuffer pbuf) { + protected static CodeRangeBuffer setAllMultiByteRange(final CodeRangeBuffer pbuf) { return addCodeRangeToBuff(pbuf, EncodingHelper.mbcodeStartPosition(), ALL_MULTI_BYTE_RANGE); } // ADD_ALL_MULTI_BYTE_RANGE - public static CodeRangeBuffer addAllMultiByteRange(CodeRangeBuffer pbuf) { + public static CodeRangeBuffer addAllMultiByteRange(final CodeRangeBuffer pbuf) { return setAllMultiByteRange(pbuf); } // not_code_range_buf - public static CodeRangeBuffer notCodeRangeBuff(CodeRangeBuffer bbuf) { + public static CodeRangeBuffer notCodeRangeBuff(final CodeRangeBuffer bbuf) { CodeRangeBuffer pbuf = null; if (bbuf == null) return setAllMultiByteRange(pbuf); - int[]p = bbuf.p; - int n = p[0]; + final int[]p = bbuf.p; + final int n = p[0]; if (n <= 0) return setAllMultiByteRange(pbuf); @@ -289,12 +289,12 @@ pbuf = notCodeRangeBuff(bbuf2); } - int[]p1 = bbuf1.p; - int n1 = p1[0]; + final int[]p1 = bbuf1.p; + final int n1 = p1[0]; for (int i=0; i<n1; i++) { - int from = p1[i * 2 + 1]; - int to = p1[i * 2 + 2]; + final int from = p1[i * 2 + 1]; + final int to = p1[i * 2 + 2]; pbuf = addCodeRangeToBuff(pbuf, from, to); } @@ -302,10 +302,10 @@ } // and_code_range1 - public static CodeRangeBuffer andCodeRange1(CodeRangeBuffer pbuf, int from1, int to1, int[]data, int n) { + public static CodeRangeBuffer andCodeRange1(CodeRangeBuffer pbuf, int from1, int to1, final int[]data, final int n) { for (int i=0; i<n; i++) { - int from2 = data[i * 2 + 1]; - int to2 = data[i * 2 + 2]; + final int from2 = data[i * 2 + 1]; + final int to2 = data[i * 2 + 2]; if (from2 < from1) { if (to2 < from1) { continue; @@ -355,31 +355,31 @@ tbuf = bbuf1; bbuf1 = bbuf2; bbuf2 = tbuf; } - int[]p1 = bbuf1.p; - int n1 = p1[0]; - int[]p2 = bbuf2.p; - int n2 = p2[0]; + final int[]p1 = bbuf1.p; + final int n1 = p1[0]; + final int[]p2 = bbuf2.p; + final int n2 = p2[0]; if (!not2 && !not1) { /* 1 AND 2 */ for (int i=0; i<n1; i++) { - int from1 = p1[i * 2 + 1]; - int to1 = p1[i * 2 + 2]; + final int from1 = p1[i * 2 + 1]; + final int to1 = p1[i * 2 + 2]; for (int j=0; j<n2; j++) { - int from2 = p2[j * 2 + 1]; - int to2 = p2[j * 2 + 2]; + final int from2 = p2[j * 2 + 1]; + final int to2 = p2[j * 2 + 2]; if (from2 > to1) break; if (to2 < from1) continue; - int from = from1 > from2 ? from1 : from2; - int to = to1 < to2 ? to1 : to2; + final int from = from1 > from2 ? from1 : from2; + final int to = to1 < to2 ? to1 : to2; pbuf = addCodeRangeToBuff(pbuf, from, to); } } } else if (!not1) { /* 1 AND (not 2) */ for (int i=0; i<n1; i++) { - int from1 = p1[i * 2 + 1]; - int to1 = p1[i * 2 + 2]; + final int from1 = p1[i * 2 + 1]; + final int to1 = p1[i * 2 + 2]; pbuf = andCodeRange1(pbuf, from1, to1, p2, n2); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java Wed Jun 04 13:08:57 2014 +0200 @@ -36,7 +36,7 @@ protected final Analyser analyser; protected final Regex regex; - protected Compiler(Analyser analyser) { + protected Compiler(final Analyser analyser) { this.analyser = analyser; this.regex = analyser.regex; } @@ -52,21 +52,21 @@ protected abstract void compileAltNode(ConsAltNode node); - private void compileStringRawNode(StringNode sn) { + private void compileStringRawNode(final StringNode sn) { if (sn.length() <= 0) return; addCompileString(sn.chars, sn.p, sn.length(), false); } - private void compileStringNode(StringNode node) { - StringNode sn = node; + private void compileStringNode(final StringNode node) { + final StringNode sn = node; if (sn.length() <= 0) return; - boolean ambig = sn.isAmbig(); + final boolean ambig = sn.isAmbig(); int p, prev; p = prev = sn.p; - int end = sn.end; - char[] chars = sn.chars; + final int end = sn.end; + final char[] chars = sn.chars; p++; int slen = 1; @@ -87,7 +87,7 @@ protected abstract void compileEncloseNode(EncloseNode node); protected abstract void compileAnchorNode(AnchorNode node); - protected final void compileTree(Node node) { + protected final void compileTree(final Node node) { switch (node.getType()) { case NodeType.LIST: ConsAltNode lin = (ConsAltNode)node; @@ -101,7 +101,7 @@ break; case NodeType.STR: - StringNode sn = (StringNode)node; + final StringNode sn = (StringNode)node; if (sn.isRaw()) { compileStringRawNode(sn); } else { @@ -126,7 +126,7 @@ break; case NodeType.ENCLOSE: - EncloseNode enode = (EncloseNode)node; + final EncloseNode enode = (EncloseNode)node; if (enode.isOption()) { compileOptionNode(enode); } else { @@ -144,15 +144,15 @@ } // switch } - protected final void compileTreeNTimes(Node node, int n) { + protected final void compileTreeNTimes(final Node node, final int n) { for (int i=0; i<n; i++) compileTree(node); } - protected void newSyntaxException(String message) { + protected void newSyntaxException(final String message) { throw new SyntaxException(message); } - protected void newInternalException(String message) { + protected void newInternalException(final String message) { throw new InternalException(message); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java Wed Jun 04 13:08:57 2014 +0200 @@ -19,11 +19,10 @@ */ package jdk.nashorn.internal.runtime.regexp.joni; +import java.util.Arrays; import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType; import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder; -import java.util.Arrays; - public final class EncodingHelper { final static int NEW_LINE = 0x000a; @@ -34,19 +33,19 @@ final static char[] EMPTYCHARS = new char[0]; final static int[][] codeRanges = new int[15][]; - public static int digitVal(int code) { + public static int digitVal(final int code) { return code - '0'; } - public static int odigitVal(int code) { + public static int odigitVal(final int code) { return digitVal(code); } - public static boolean isXDigit(int code) { + public static boolean isXDigit(final int code) { return Character.isDigit(code) || (code >= 'a' && code <= 'f') || (code >= 'A' && code <= 'F'); } - public static int xdigitVal(int code) { + public static int xdigitVal(final int code) { if (Character.isDigit(code)) { return code - '0'; } else if (code >= 'a' && code <= 'f') { @@ -56,36 +55,36 @@ } } - public static boolean isDigit(int code) { + public static boolean isDigit(final int code) { return code >= '0' && code <= '9'; } - public static boolean isWord(int code) { + public static boolean isWord(final int code) { // letter, digit, or '_' return (1 << Character.getType(code) & CharacterType.WORD_MASK) != 0; } - public static boolean isNewLine(int code) { + public static boolean isNewLine(final int code) { return code == NEW_LINE || code == RETURN || code == LINE_SEPARATOR || code == PARAGRAPH_SEPARATOR; } - public static boolean isNewLine(char[] chars, int p, int end) { + public static boolean isNewLine(final char[] chars, final int p, final int end) { return p < end && isNewLine(chars[p]); } // Encoding.prevCharHead - public static int prevCharHead(int p, int s) { + public static int prevCharHead(final int p, final int s) { return s <= p ? -1 : s - 1; } /* onigenc_get_right_adjust_char_head_with_prev */ - public static int rightAdjustCharHeadWithPrev(int s, IntHolder prev) { + public static int rightAdjustCharHeadWithPrev(final int s, final IntHolder prev) { if (prev != null) prev.value = -1; /* Sorry */ return s; } // Encoding.stepBack - public static int stepBack(int p, int s, int n) { + public static int stepBack(final int p, int s, int n) { while (s != -1 && n-- > 0) { if (s <= p) return -1; s--; @@ -97,7 +96,7 @@ return 0x80; } - public static char[] caseFoldCodesByString(int flag, char c) { + public static char[] caseFoldCodesByString(final int flag, final char c) { char[] codes = EMPTYCHARS; final char upper = toUpperCase(c); @@ -117,7 +116,7 @@ return codes; } - public static void applyAllCaseFold(int flag, ApplyCaseFold fun, Object arg) { + public static void applyAllCaseFold(final int flag, final ApplyCaseFold fun, final Object arg) { for (int c = 0; c < 0xffff; c++) { if (Character.isLowerCase(c)) { final int upper = toUpperCase(c); @@ -140,34 +139,34 @@ } } - public static char toLowerCase(char c) { + public static char toLowerCase(final char c) { return (char)toLowerCase((int)c); } - public static int toLowerCase(int c) { + public static int toLowerCase(final int c) { if (c < 128) { return ('A' <= c && c <= 'Z') ? (c + ('a' - 'A')) : c; } // Do not convert non-ASCII upper case character to ASCII lower case. - int lower = Character.toLowerCase(c); + final int lower = Character.toLowerCase(c); return (lower < 128) ? c : lower; } - public static char toUpperCase(char c) { + public static char toUpperCase(final char c) { return (char)toUpperCase((int)c); } - public static int toUpperCase(int c) { + public static int toUpperCase(final int c) { if (c < 128) { return ('a' <= c && c <= 'z') ? c + ('A' - 'a') : c; } // Do not convert non-ASCII lower case character to ASCII upper case. - int upper = Character.toUpperCase(c); + final int upper = Character.toUpperCase(c); return (upper < 128) ? c : upper; } - public static int[] ctypeCodeRange(int ctype, IntHolder sbOut) { + public static int[] ctypeCodeRange(final int ctype, final IntHolder sbOut) { sbOut.value = 0x100; // use bitset for codes smaller than 256 int[] range = null; @@ -206,13 +205,13 @@ } // CodeRange.isInCodeRange - public static boolean isInCodeRange(int[] p, int offset, int code) { + public static boolean isInCodeRange(final int[] p, final int offset, final int code) { int low = 0; - int n = p[offset]; + final int n = p[offset]; int high = n ; while (low < high) { - int x = (low + high) >> 1; + final int x = (low + high) >> 1; if (code > p[(x << 1) + 2 + offset]) { low = x + 1; } else { @@ -225,7 +224,7 @@ /** * @see <a href="http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt">http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt</a> */ - public static boolean isCodeCType(int code, int ctype) { + public static boolean isCodeCType(final int code, final int ctype) { int type; switch (ctype) { case CharacterType.NEWLINE:
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java Wed Jun 04 13:08:57 2014 +0200 @@ -36,7 +36,7 @@ protected final Syntax syntax; // fast access to syntax protected final Token token = new Token(); // current token - protected Lexer(ScanEnvironment env, char[] chars, int p, int end) { + protected Lexer(final ScanEnvironment env, final char[] chars, final int p, final int end) { super(chars, p, end); this.env = env; this.syntax = env.syntax; @@ -48,7 +48,7 @@ */ private int fetchRangeQuantifier() { mark(); - boolean synAllow = syntax.allowInvalidInterval(); + final boolean synAllow = syntax.allowInvalidInterval(); if (!left()) { if (synAllow) { @@ -89,7 +89,7 @@ int up; int ret = 0; if (c == ',') { - int prev = p; // ??? last + final int prev = p; // ??? last up = scanUnsignedNumber(); if (up < 0) { throw new ValueException(ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE); @@ -130,7 +130,7 @@ return ret; /* 0: normal {n,m}, 2: fixed {n} */ } - private int invalidRangeQuantifier(boolean synAllow) { + private int invalidRangeQuantifier(final boolean synAllow) { if (synAllow) { restore(); return 1; @@ -218,7 +218,7 @@ } } - private int nameEndCodePoint(int start) { + private int nameEndCodePoint(final int start) { switch(start) { case '<': return '>'; @@ -229,7 +229,7 @@ } } - private void fetchTokenInCCFor_charType(boolean flag, int type) { + private void fetchTokenInCCFor_charType(final boolean flag, final int type) { token.type = TokenType.CHAR_TYPE; token.setPropCType(type); token.setPropNot(flag); @@ -237,16 +237,16 @@ private void fetchTokenInCCFor_x() { if (!left()) return; - int last = p; + final int last = p; if (peekIs('{') && syntax.opEscXBraceHex8()) { inc(); - int num = scanUnsignedHexadecimalNumber(8); + final int num = scanUnsignedHexadecimalNumber(8); if (num < 0) { throw new ValueException(ERR_TOO_BIG_WIDE_CHAR_VALUE); } if (left()) { - int c2 = peek(); + final int c2 = peek(); if (EncodingHelper.isXDigit(c2)) { throw new ValueException(ERR_TOO_LONG_WIDE_CHAR_VALUE); } @@ -275,7 +275,7 @@ private void fetchTokenInCCFor_u() { if (!left()) return; - int last = p; + final int last = p; if (syntax.op2EscUHex4()) { int num = scanUnsignedHexadecimalNumber(4); @@ -293,7 +293,7 @@ private void fetchTokenInCCFor_digit() { if (syntax.opEscOctal3()) { unfetch(); - int last = p; + final int last = p; int num = scanUnsignedOctalNumber(3); if (num < 0) { throw new ValueException(ERR_TOO_BIG_NUMBER); @@ -381,7 +381,7 @@ default: unfetch(); - int num = fetchEscapedValue(); + final int num = fetchEscapedValue(); if (token.getC() != num) { token.setCode(num); token.type = TokenType.CODE_POINT; @@ -395,7 +395,7 @@ return token.type; } - private void fetchTokenFor_repeat(int lower, int upper) { + private void fetchTokenFor_repeat(final int lower, final int upper) { token.type = TokenType.OP_REPEAT; token.setRepeatLower(lower); token.setRepeatUpper(upper); @@ -418,7 +418,7 @@ } // inner switch } - private void fetchTokenFor_anchor(int subType) { + private void fetchTokenFor_anchor(final int subType) { token.type = TokenType.ANCHOR; token.setAnchor(subType); } @@ -426,10 +426,10 @@ private void fetchTokenFor_xBrace() { if (!left()) return; - int last = p; + final int last = p; if (peekIs('{') && syntax.opEscXBraceHex8()) { inc(); - int num = scanUnsignedHexadecimalNumber(8); + final int num = scanUnsignedHexadecimalNumber(8); if (num < 0) { throw new ValueException(ERR_TOO_BIG_WIDE_CHAR_VALUE); } @@ -462,7 +462,7 @@ private void fetchTokenFor_uHex() { if (!left()) return; - int last = p; + final int last = p; if (syntax.op2EscUHex4()) { int num = scanUnsignedHexadecimalNumber(4); @@ -479,8 +479,8 @@ private void fetchTokenFor_digit() { unfetch(); - int last = p; - int num = scanUnsignedNumber(); + final int last = p; + final int num = scanUnsignedNumber(); if (num < 0 || num > Config.MAX_BACKREF_NUM) { // goto skip_backref } else if (syntax.opDecimalBackref() && (num <= env.numMem || num <= 9)) { /* This spec. from GNU regex */ if (syntax.strictCheckBackref()) { @@ -505,7 +505,7 @@ private void fetchTokenFor_zero() { if (syntax.opEscOctal3()) { - int last = p; + final int last = p; int num = scanUnsignedOctalNumber(c == '0' ? 2 : 3); if (num < 0) { throw new ValueException(ERR_TOO_BIG_NUMBER); @@ -659,7 +659,7 @@ default: unfetch(); - int num = fetchEscapedValue(); + final int num = fetchEscapedValue(); /* set_raw: */ if (token.getC() != num) { @@ -798,11 +798,11 @@ } } - protected final void syntaxWarn(String message, char c) { + protected final void syntaxWarn(final String message, final char c) { syntaxWarn(message.replace("<%n>", Character.toString(c))); } - protected final void syntaxWarn(String message) { + protected final void syntaxWarn(final String message) { if (Config.USE_WARN) { env.reg.warnings.warn(message + ": /" + new String(chars, getBegin(), getEnd()) + "/"); }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java Wed Jun 04 13:08:57 2014 +0200 @@ -41,11 +41,11 @@ protected int msaBegin; protected int msaEnd; - public Matcher(Regex regex, char[] chars) { + public Matcher(final Regex regex, final char[] chars) { this(regex, chars, 0, chars.length); } - public Matcher(Regex regex, char[] chars, int p, int end) { + public Matcher(final Regex regex, final char[] chars, final int p, final int end) { this.regex = regex; this.chars = chars; @@ -70,16 +70,16 @@ return msaEnd; } - protected final void msaInit(int option, int start) { + protected final void msaInit(final int option, final int start) { msaOptions = option; msaStart = start; if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) msaBestLen = -1; } - public final int match(int at, int range, int option) { + public final int match(final int at, final int range, final int option) { msaInit(option, at); - int prev = EncodingHelper.prevCharHead(str, at); + final int prev = EncodingHelper.prevCharHead(str, at); if (Config.USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE) { return matchAt(end /*range*/, at, prev); @@ -89,7 +89,7 @@ } int low, high; // these are the return values - private boolean forwardSearchRange(char[] chars, int str, int end, int s, int range, IntHolder lowPrev) { + private boolean forwardSearchRange(final char[] chars, final int str, final int end, final int s, final int range, final IntHolder lowPrev) { int pprev = -1; int p = s; @@ -120,7 +120,7 @@ switch (regex.subAnchor) { case AnchorType.BEGIN_LINE: if (p != str) { - int prev = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p); + final int prev = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p); if (!EncodingHelper.isNewLine(chars, prev, end)) { // goto retry_gate; pprev = p; @@ -133,7 +133,7 @@ case AnchorType.END_LINE: if (p == end) { if (!Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) { - int prev = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p); + final int prev = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p); if (prev != -1 && EncodingHelper.isNewLine(chars, prev, end)) { // goto retry_gate; pprev = p; @@ -196,7 +196,7 @@ } // low, high - private boolean backwardSearchRange(char[] chars, int str, int end, int s, int range, int adjrange) { + private boolean backwardSearchRange(final char[] chars, final int str, final int end, final int s, int range, final int adjrange) { range += regex.dMin; int p = s; @@ -208,7 +208,7 @@ switch (regex.subAnchor) { case AnchorType.BEGIN_LINE: if (p != str) { - int prev = EncodingHelper.prevCharHead(str, p); + final int prev = EncodingHelper.prevCharHead(str, p); if (!EncodingHelper.isNewLine(chars, prev, end)) { p = prev; continue retry; @@ -219,7 +219,7 @@ case AnchorType.END_LINE: if (p == end) { if (!Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) { - int prev = EncodingHelper.prevCharHead(adjrange, p); + final int prev = EncodingHelper.prevCharHead(adjrange, p); if (prev == -1) return false; if (EncodingHelper.isNewLine(chars, prev, end)) { p = prev; @@ -256,7 +256,7 @@ } // MATCH_AND_RETURN_CHECK - private boolean matchCheck(int upperRange, int s, int prev) { + private boolean matchCheck(final int upperRange, final int s, final int prev) { if (Config.USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE) { if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) { //range = upperRange; @@ -281,10 +281,10 @@ return false; } - public final int search(int start, int range, int option) { + public final int search(int start, int range, final int option) { int s, prev; int origStart = start; - int origRange = range; + final int origRange = range; if (Config.DEBUG_SEARCH) { Config.log.println("onig_search (entry point): "+ @@ -326,7 +326,7 @@ // !end_buf:! if (endBuf(start, range, minSemiEnd, maxSemiEnd)) return -1; // mismatch_no_msa; } else if ((regex.anchor & AnchorType.SEMI_END_BUF) != 0) { - int preEnd = EncodingHelper.stepBack(str, end, 1); + final int preEnd = EncodingHelper.stepBack(str, end, 1); maxSemiEnd = end; if (EncodingHelper.isNewLine(chars, preEnd, end)) { minSemiEnd = preEnd; @@ -488,7 +488,7 @@ return mismatch(); } - private boolean endBuf(int start, int range, int minSemiEnd, int maxSemiEnd) { + private boolean endBuf(int start, int range, final int minSemiEnd, final int maxSemiEnd) { if ((maxSemiEnd - str) < regex.anchorDmin) return true; // mismatch_no_msa; if (range > start) { @@ -515,14 +515,14 @@ return false; } - private int match(int s) { + private int match(final int s) { return s - str; // sstart ??? } private int mismatch() { if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) { if (msaBestLen >= 0) { - int s = msaBestS; + final int s = msaBestS; return match(s); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java Wed Jun 04 13:08:57 2014 +0200 @@ -24,7 +24,7 @@ static final MatcherFactory DEFAULT = new MatcherFactory() { @Override - public Matcher create(Regex regex, char[] chars, int p, int end) { + public Matcher create(final Regex regex, final char[] chars, final int p, final int end) { return new ByteCodeMachine(regex, chars, p, end); } };
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,7 @@ MinMaxLen() { } - MinMaxLen(int min, int max) { + MinMaxLen(final int min, final int max) { this.min = min; this.max = max; } @@ -47,12 +47,12 @@ int distanceValue() { if (max == INFINITE_DISTANCE) return 0; - int d = max - min; + final int d = max - min; /* return dist_vals[d] * 16 / (mm->min + 12); */ return d < distValues.length ? distValues[d] : 1; } - int compareDistanceValue(MinMaxLen other, int v1, int v2) { + int compareDistanceValue(final MinMaxLen other, int v1, int v2) { if (v2 <= 0) return -1; if (v1 <= 0) return 1; @@ -67,11 +67,11 @@ return 0; } - boolean equal(MinMaxLen other) { + boolean equal(final MinMaxLen other) { return min == other.min && max == other.max; } - void set(int min, int max) { + void set(final int min, final int max) { this.min = min; this.max = max; } @@ -80,28 +80,28 @@ min = max = 0; } - void copy(MinMaxLen other) { + void copy(final MinMaxLen other) { min = other.min; max = other.max; } - void add(MinMaxLen other) { + void add(final MinMaxLen other) { min = distanceAdd(min, other.min); max = distanceAdd(max, other.max); } - void addLength(int len) { + void addLength(final int len) { min = distanceAdd(min, len); max = distanceAdd(max, len); } - void altMerge(MinMaxLen other) { + void altMerge(final MinMaxLen other) { if (min > other.min) min = other.min; if (max < other.max) max = other.max; } static final int INFINITE_DISTANCE = 0x7FFFFFFF; - static int distanceAdd(int d1, int d2) { + static int distanceAdd(final int d1, final int d2) { if (d1 == INFINITE_DISTANCE || d2 == INFINITE_DISTANCE) { return INFINITE_DISTANCE; } else { @@ -110,7 +110,7 @@ } } - static int distanceMultiply(int d, int m) { + static int distanceMultiply(final int d, final int m) { if (m == 0) return 0; if (d < INFINITE_DISTANCE / m) { return d * m; @@ -119,7 +119,7 @@ } } - static String distanceRangeToString(int a, int b) { + static String distanceRangeToString(final int a, final int b) { String s = ""; if (a == INFINITE_DISTANCE) { s += "inf";
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,7 +27,7 @@ final OptExactInfo expr = new OptExactInfo(); /* prec read (?=...) */ final OptMapInfo map = new OptMapInfo(); /* boundary */ - public void setBoundNode(MinMaxLen mmd) { + public void setBoundNode(final MinMaxLen mmd) { exb.mmd.copy(mmd); expr.mmd.copy(mmd); map.mmd.copy(mmd); @@ -42,7 +42,7 @@ map.clear(); } - public void copy(NodeOptInfo other) { + public void copy(final NodeOptInfo other) { length.copy(other.length); anchor.copy(other.anchor); exb.copy(other.exb); @@ -51,8 +51,8 @@ map.copy(other.map); } - public void concatLeftNode(NodeOptInfo other) { - OptAnchorInfo tanchor = new OptAnchorInfo(); // remove it somehow ? + public void concatLeftNode(final NodeOptInfo other) { + final OptAnchorInfo tanchor = new OptAnchorInfo(); // remove it somehow ? tanchor.concat(anchor, other.anchor, length.max, other.length.max); anchor.copy(tanchor); @@ -67,8 +67,8 @@ } } - boolean exbReach = exb.reachEnd; - boolean exmReach = exm.reachEnd; + final boolean exbReach = exb.reachEnd; + final boolean exmReach = exm.reachEnd; if (other.length.max != 0) { exb.reachEnd = exm.reachEnd = false; @@ -107,7 +107,7 @@ length.add(other.length); } - public void altMerge(NodeOptInfo other, OptEnvironment env) { + public void altMerge(final NodeOptInfo other, final OptEnvironment env) { anchor.altMerge(other.anchor); exb.altMerge(other.exb, env); exm.altMerge(other.exm, env); @@ -116,7 +116,7 @@ length.altMerge(other.length); } - public void setBound(MinMaxLen mmd) { + public void setBound(final MinMaxLen mmd) { exb.mmd.copy(mmd); expr.mmd.copy(mmd); map.mmd.copy(mmd);
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,12 +29,12 @@ leftAnchor = rightAnchor = 0; } - void copy(OptAnchorInfo other) { + void copy(final OptAnchorInfo other) { leftAnchor = other.leftAnchor; rightAnchor = other.rightAnchor; } - void concat(OptAnchorInfo left, OptAnchorInfo right, int leftLength, int rightLength) { + void concat(final OptAnchorInfo left, final OptAnchorInfo right, final int leftLength, final int rightLength) { leftAnchor = left.leftAnchor; if (leftLength == 0) leftAnchor |= right.leftAnchor; @@ -42,12 +42,12 @@ if (rightLength == 0) rightAnchor |= left.rightAnchor; } - boolean isSet(int anchor) { + boolean isSet(final int anchor) { if ((leftAnchor & anchor) != 0) return true; return (rightAnchor & anchor) != 0; } - void add(int anchor) { + void add(final int anchor) { if (isLeftAnchor(anchor)) { leftAnchor |= anchor; } else { @@ -55,7 +55,7 @@ } } - void remove(int anchor) { + void remove(final int anchor) { if (isLeftAnchor(anchor)) { leftAnchor &= ~anchor; } else { @@ -63,19 +63,19 @@ } } - void altMerge(OptAnchorInfo other) { + void altMerge(final OptAnchorInfo other) { leftAnchor &= other.leftAnchor; rightAnchor &= other.rightAnchor; } - static boolean isLeftAnchor(int anchor) { // make a mask for it ? + static boolean isLeftAnchor(final int anchor) { // make a mask for it ? return !(anchor == END_BUF || anchor == SEMI_END_BUF || anchor == END_LINE || anchor == PREC_READ || anchor == PREC_READ_NOT); } - static String anchorToString(int anchor) { - StringBuffer s = new StringBuffer("["); + static String anchorToString(final int anchor) { + final StringBuffer s = new StringBuffer("["); if ((anchor & AnchorType.BEGIN_BUF) !=0 ) s.append("begin-buf "); if ((anchor & AnchorType.BEGIN_LINE) !=0 ) s.append("begin-line ");
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,7 @@ int caseFoldFlag; ScanEnvironment scanEnv; - void copy(OptEnvironment other) { + void copy(final OptEnvironment other) { mmd.copy(other.mmd); options = other.options; caseFoldFlag = other.caseFoldFlag;
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java Wed Jun 04 13:08:57 2014 +0200 @@ -44,7 +44,7 @@ length = 0; } - void copy(OptExactInfo other) { + void copy(final OptExactInfo other) { mmd.copy(other.mmd); anchor.copy(other.anchor); reachEnd = other.reachEnd; @@ -54,14 +54,14 @@ System.arraycopy(other.chars, 0, chars, 0, OPT_EXACT_MAXLEN); } - void concat(OptExactInfo other) { + void concat(final OptExactInfo other) { if (!ignoreCase && other.ignoreCase) { if (length >= other.length) return; /* avoid */ ignoreCase = true; } int p = 0; // add->s; - int end = p + other.length; + final int end = p + other.length; int i; for (i = length; p < end;) { @@ -72,14 +72,14 @@ length = i; reachEnd = (p == end ? other.reachEnd : false); - OptAnchorInfo tmp = new OptAnchorInfo(); + final OptAnchorInfo tmp = new OptAnchorInfo(); tmp.concat(anchor, other.anchor, 1, 1); if (!other.reachEnd) tmp.rightAnchor = 0; anchor.copy(tmp); } // ?? raw is not used here - void concatStr(char[] lchars, int p, int end, boolean raw) { + void concatStr(final char[] lchars, int p, final int end, final boolean raw) { int i; for (i = length; p < end && i < OPT_EXACT_MAXLEN;) { if (i + 1 > OPT_EXACT_MAXLEN) break; @@ -89,7 +89,7 @@ length = i; } - void altMerge(OptExactInfo other, OptEnvironment env) { + void altMerge(final OptExactInfo other, final OptEnvironment env) { if (other.length == 0 || length == 0) { clear(); return; @@ -116,7 +116,7 @@ } - void select(OptExactInfo alt) { + void select(final OptExactInfo alt) { int v1 = length; int v2 = alt.length; @@ -142,11 +142,11 @@ // comp_opt_exact_or_map_info private static final int COMP_EM_BASE = 20; - int compare(OptMapInfo m) { + int compare(final OptMapInfo m) { if (m.value <= 0) return -1; - int ve = COMP_EM_BASE * length * (ignoreCase ? 1 : 2); - int vm = COMP_EM_BASE * 5 * 2 / m.value; + final int ve = COMP_EM_BASE * length * (ignoreCase ? 1 : 2); + final int vm = COMP_EM_BASE * 5 * 2 / m.value; return mmd.compareDistanceValue(m.mmd, ve, vm); }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java Wed Jun 04 13:08:57 2014 +0200 @@ -34,7 +34,7 @@ for (int i=0; i<map.length; i++) map[i] = 0; } - void copy(OptMapInfo other) { + void copy(final OptMapInfo other) { mmd.copy(other.mmd); anchor.copy(other.anchor); value = other.value; @@ -42,19 +42,19 @@ System.arraycopy(other.map, 0, map, 0, other.map.length); } - void addChar(int c) { - int c_ = c & 0xff; + void addChar(final int c) { + final int c_ = c & 0xff; if (map[c_] == 0) { map[c_] = 1; value += positionValue(c_); } } - void addCharAmb(char[] chars, int p, int end, int caseFoldFlag) { + void addCharAmb(final char[] chars, final int p, final int end, int caseFoldFlag) { addChar(chars[p]); caseFoldFlag &= ~Config.INTERNAL_ENC_CASE_FOLD_MULTI_CHAR; - char[]items = EncodingHelper.caseFoldCodesByString(caseFoldFlag, chars[p]); + final char[]items = EncodingHelper.caseFoldCodesByString(caseFoldFlag, chars[p]); for (int i=0; i<items.length; i++) { addChar(items[i]); @@ -63,21 +63,21 @@ // select_opt_map_info private static final int z = 1<<15; /* 32768: something big value */ - void select(OptMapInfo alt) { + void select(final OptMapInfo alt) { if (alt.value == 0) return; if (value == 0) { copy(alt); return; } - int v1 = z / value; - int v2 = z /alt.value; + final int v1 = z / value; + final int v2 = z /alt.value; if (mmd.compareDistanceValue(alt.mmd, v1, v2) > 0) copy(alt); } // alt_merge_opt_map_info - void altMerge(OptMapInfo other) { + void altMerge(final OptMapInfo other) { /* if (! is_equal_mml(&to->mmd, &add->mmd)) return ; */ if (value == 0) return; if (other.value == 0 || mmd.max < other.mmd.max) { @@ -109,7 +109,7 @@ }; // map_position_value - static int positionValue(int i) { + static int positionValue(final int i) { if (i < ByteValTable.length) { return ByteValTable[i]; } else {
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java Wed Jun 04 13:08:57 2014 +0200 @@ -41,7 +41,7 @@ public static final int DEFAULT = NONE; - public static String toString(int option) { + public static String toString(final int option) { String options = ""; if (isIgnoreCase(option)) options += "IGNORECASE "; if (isExtend(option)) options += "EXTEND "; @@ -60,55 +60,55 @@ return options; } - public static boolean isIgnoreCase(int option) { + public static boolean isIgnoreCase(final int option) { return (option & IGNORECASE) != 0; } - public static boolean isExtend(int option) { + public static boolean isExtend(final int option) { return (option & EXTEND) != 0; } - public static boolean isSingleline(int option) { + public static boolean isSingleline(final int option) { return (option & SINGLELINE) != 0; } - public static boolean isMultiline(int option) { + public static boolean isMultiline(final int option) { return (option & MULTILINE) != 0; } - public static boolean isFindLongest(int option) { + public static boolean isFindLongest(final int option) { return (option & FIND_LONGEST) != 0; } - public static boolean isFindNotEmpty(int option) { + public static boolean isFindNotEmpty(final int option) { return (option & FIND_NOT_EMPTY) != 0; } - public static boolean isFindCondition(int option) { + public static boolean isFindCondition(final int option) { return (option & (FIND_LONGEST | FIND_NOT_EMPTY)) != 0; } - public static boolean isNegateSingleline(int option) { + public static boolean isNegateSingleline(final int option) { return (option & NEGATE_SINGLELINE) != 0; } - public static boolean isDontCaptureGroup(int option) { + public static boolean isDontCaptureGroup(final int option) { return (option & DONT_CAPTURE_GROUP) != 0; } - public static boolean isCaptureGroup(int option) { + public static boolean isCaptureGroup(final int option) { return (option & CAPTURE_GROUP) != 0; } - public static boolean isNotBol(int option) { + public static boolean isNotBol(final int option) { return (option & NOTBOL) != 0; } - public static boolean isNotEol(int option) { + public static boolean isNotEol(final int option) { return (option & NOTEOL) != 0; } - public static boolean isPosixRegion(int option) { + public static boolean isPosixRegion(final int option) { return (option & POSIX_REGION) != 0; } @@ -116,7 +116,7 @@ // public static boolean isDynamic(int option) { // return (option & (MULTILINE | IGNORECASE)) != 0; // } - public static boolean isDynamic(int option) { + public static boolean isDynamic(final int option) { return false; } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java Wed Jun 04 13:08:57 2014 +0200 @@ -52,7 +52,7 @@ protected int returnCode; // return code used by parser methods (they itself return parsed nodes) // this approach will not affect recursive calls - protected Parser(ScanEnvironment env, char[] chars, int p, int end) { + protected Parser(final ScanEnvironment env, final char[] chars, final int p, final int end) { super(env, chars, p, end); regex = env.reg; } @@ -64,7 +64,7 @@ return root; } - private boolean codeExistCheck(int code, boolean ignoreEscaped) { + private boolean codeExistCheck(final int code, final boolean ignoreEscaped) { mark(); boolean inEsc = false; @@ -108,7 +108,7 @@ CClassNode prevCC = null; CClassNode workCC = null; - CCStateArg arg = new CCStateArg(); + final CCStateArg arg = new CCStateArg(); boolean andStart = false; arg.state = CCSTATE.START; @@ -197,7 +197,7 @@ break; case CC_CC_OPEN: /* [ */ - CClassNode acc = parseCharClass(); + final CClassNode acc = parseCharClass(); cc.or(acc); break; @@ -260,29 +260,29 @@ return cc; } - private void parseCharClassSbChar(CClassNode cc, CCStateArg arg) { + private void parseCharClassSbChar(final CClassNode cc, final CCStateArg arg) { arg.inType = CCVALTYPE.SB; arg.v = token.getC(); arg.vIsRaw = false; parseCharClassValEntry2(cc, arg); // goto val_entry2 } - private void parseCharClassRangeEndVal(CClassNode cc, CCStateArg arg) { + private void parseCharClassRangeEndVal(final CClassNode cc, final CCStateArg arg) { arg.v = '-'; arg.vIsRaw = false; parseCharClassValEntry(cc, arg); // goto val_entry } - private void parseCharClassValEntry(CClassNode cc, CCStateArg arg) { + private void parseCharClassValEntry(final CClassNode cc, final CCStateArg arg) { arg.inType = arg.v <= 0xff ? CCVALTYPE.SB : CCVALTYPE.CODE_POINT; parseCharClassValEntry2(cc, arg); // val_entry2: } - private void parseCharClassValEntry2(CClassNode cc, CCStateArg arg) { + private void parseCharClassValEntry2(final CClassNode cc, final CCStateArg arg) { cc.nextStateValue(arg, env); } - private Node parseEnclose(TokenType term) { + private Node parseEnclose(final TokenType term) { Node node = null; if (!left()) { @@ -327,8 +327,8 @@ break; case '@': if (syntax.op2AtMarkCaptureHistory()) { - EncloseNode en = new EncloseNode(); // node_new_enclose_memory - int num = env.addMemEntry(); + final EncloseNode en = new EncloseNode(); // node_new_enclose_memory + final int num = env.addMemEntry(); if (num >= BitStatus.BIT_STATUS_BITS_NUM) { throw new ValueException(ERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY); } @@ -385,17 +385,17 @@ } // switch if (c == ')') { - EncloseNode en = new EncloseNode(option, 0); // node_new_option + final EncloseNode en = new EncloseNode(option, 0); // node_new_option node = en; returnCode = 2; /* option only */ return node; } else if (c == ':') { - int prev = env.option; + final int prev = env.option; env.option = option; fetchToken(); - Node target = parseSubExp(term); + final Node target = parseSubExp(term); env.option = prev; - EncloseNode en = new EncloseNode(option, 0); // node_new_option + final EncloseNode en = new EncloseNode(option, 0); // node_new_option en.setTarget(target); node = en; returnCode = 0; @@ -418,20 +418,20 @@ returnCode = 1; /* group */ return node; } - EncloseNode en = new EncloseNode(); // node_new_enclose_memory - int num = env.addMemEntry(); + final EncloseNode en = new EncloseNode(); // node_new_enclose_memory + final int num = env.addMemEntry(); en.regNum = num; node = en; } fetchToken(); - Node target = parseSubExp(term); + final Node target = parseSubExp(term); if (node.getType() == NodeType.ANCHOR) { - AnchorNode an = (AnchorNode) node; + final AnchorNode an = (AnchorNode) node; an.setTarget(target); } else { - EncloseNode en = (EncloseNode)node; + final EncloseNode en = (EncloseNode)node; en.setTarget(target); if (en.type == EncloseType.MEMORY) { /* Don't move this to previous of parse_subexp() */ @@ -442,7 +442,7 @@ return node; // ?? } - private Node parseExp(TokenType term) { + private Node parseExp(final TokenType term) { if (token.type == term) return StringNode.EMPTY; // goto end_of_token Node node = null; @@ -458,11 +458,11 @@ if (returnCode == 1) { group = true; } else if (returnCode == 2) { /* option only */ - int prev = env.option; - EncloseNode en = (EncloseNode)node; + final int prev = env.option; + final EncloseNode en = (EncloseNode)node; env.option = en.option; fetchToken(); - Node target = parseSubExp(term); + final Node target = parseSubExp(term); env.option = prev; en.setTarget(target); return node; @@ -483,7 +483,7 @@ case RAW_BYTE: return parseExpTkRawByte(group); // tk_raw_byte: case CODE_POINT: - char[] buf = new char[] {(char)token.getCode()}; + final char[] buf = new char[] {(char)token.getCode()}; // #ifdef NUMBERED_CHAR_IS_NOT_CASE_AMBIG ... // setRaw() #else node = new StringNode(buf, 0, 1); break; @@ -494,7 +494,7 @@ case CharacterType.S: case CharacterType.W: if (Config.NON_UNICODE_SDW) { - CClassNode cc = new CClassNode(); + final CClassNode cc = new CClassNode(); cc.addCType(token.getPropCType(), false, env, this); if (token.getPropNot()) cc.setNot(); node = cc; @@ -505,7 +505,7 @@ case CharacterType.DIGIT: case CharacterType.XDIGIT: // #ifdef USE_SHARED_CCLASS_TABLE ... #endif - CClassNode ccn = new CClassNode(); + final CClassNode ccn = new CClassNode(); ccn.addCType(token.getPropCType(), false, env, this); if (token.getPropNot()) ccn.setNot(); node = ccn; @@ -518,10 +518,10 @@ break; case CC_CC_OPEN: - CClassNode cc = parseCharClass(); + final CClassNode cc = parseCharClass(); node = cc; if (isIgnoreCase(env.option)) { - ApplyCaseFoldArg arg = new ApplyCaseFoldArg(env, cc); + final ApplyCaseFoldArg arg = new ApplyCaseFoldArg(env, cc); EncodingHelper.applyAllCaseFold(env.caseFoldFlag, ApplyCaseFold.INSTANCE, arg); if (arg.altRoot != null) { @@ -536,13 +536,13 @@ case ANYCHAR_ANYTIME: node = new AnyCharNode(); - QuantifierNode qn = new QuantifierNode(0, QuantifierNode.REPEAT_INFINITE, false); + final QuantifierNode qn = new QuantifierNode(0, QuantifierNode.REPEAT_INFINITE, false); qn.setTarget(node); node = qn; break; case BACKREF: - int backRef = token.getBackrefRef(); + final int backRef = token.getBackrefRef(); node = new BackRefNode(backRef, env); break; @@ -574,8 +574,8 @@ return parseExpRepeat(node, group); // repeat: } - private Node parseExpTkByte(boolean group) { - StringNode node = new StringNode(chars, token.backP, p); // tk_byte: + private Node parseExpTkByte(final boolean group) { + final StringNode node = new StringNode(chars, token.backP, p); // tk_byte: while (true) { fetchToken(); if (token.type != TokenType.STRING) break; @@ -590,13 +590,13 @@ return parseExpRepeat(node, group); // string_end:, goto repeat } - private Node parseExpTkRawByte(boolean group) { + private Node parseExpTkRawByte(final boolean group) { // tk_raw_byte: // important: we don't use 0xff mask here neither in the compiler // (in the template string) so we won't have to mask target // strings when comparing against them in the matcher - StringNode node = new StringNode((char)token.getC()); + final StringNode node = new StringNode((char)token.getC()); node.setRaw(); fetchToken(); @@ -605,22 +605,22 @@ return parseExpRepeat(node, group); } - private Node parseExpRepeat(Node target, boolean group) { + private Node parseExpRepeat(Node target, final boolean group) { while (token.type == TokenType.OP_REPEAT || token.type == TokenType.INTERVAL) { // repeat: if (target.isInvalidQuantifier()) { throw new SyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_INVALID); } - QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(), + final QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(), token.getRepeatUpper(), token.type == TokenType.INTERVAL); qtfr.greedy = token.getRepeatGreedy(); - int ret = qtfr.setQuantifier(target, group, env, chars, getBegin(), getEnd()); + final int ret = qtfr.setQuantifier(target, group, env, chars, getBegin(), getEnd()); Node qn = qtfr; if (token.getRepeatPossessive()) { - EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose + final EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose en.setTarget(qn); qn = en; } @@ -629,7 +629,7 @@ target = qn; } else if (ret == 2) { /* split case: /abc+/ */ target = ConsAltNode.newListNode(target, null); - ConsAltNode tmp = ((ConsAltNode)target).setCdr(ConsAltNode.newListNode(qn, null)); + final ConsAltNode tmp = ((ConsAltNode)target).setCdr(ConsAltNode.newListNode(qn, null)); fetchToken(); return parseExpRepeatForCar(target, tmp, group); @@ -639,22 +639,22 @@ return target; } - private Node parseExpRepeatForCar(Node top, ConsAltNode target, boolean group) { + private Node parseExpRepeatForCar(final Node top, final ConsAltNode target, final boolean group) { while (token.type == TokenType.OP_REPEAT || token.type == TokenType.INTERVAL) { // repeat: if (target.car.isInvalidQuantifier()) { throw new SyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_INVALID); } - QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(), + final QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(), token.getRepeatUpper(), token.type == TokenType.INTERVAL); qtfr.greedy = token.getRepeatGreedy(); - int ret = qtfr.setQuantifier(target.car, group, env, chars, getBegin(), getEnd()); + final int ret = qtfr.setQuantifier(target.car, group, env, chars, getBegin(), getEnd()); Node qn = qtfr; if (token.getRepeatPossessive()) { - EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose + final EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose en.setTarget(qn); qn = en; } @@ -669,13 +669,13 @@ return top; } - private Node parseBranch(TokenType term) { + private Node parseBranch(final TokenType term) { Node node = parseExp(term); if (token.type == TokenType.EOT || token.type == term || token.type == TokenType.ALT) { return node; } else { - ConsAltNode top = ConsAltNode.newListNode(node, null); + final ConsAltNode top = ConsAltNode.newListNode(node, null); ConsAltNode t = top; while (token.type != TokenType.EOT && token.type != term && token.type != TokenType.ALT) { @@ -695,13 +695,13 @@ } /* term_tok: TK_EOT or TK_SUBEXP_CLOSE */ - private Node parseSubExp(TokenType term) { + private Node parseSubExp(final TokenType term) { Node node = parseBranch(term); if (token.type == term) { return node; } else if (token.type == TokenType.ALT) { - ConsAltNode top = ConsAltNode.newAltNode(node, null); + final ConsAltNode top = ConsAltNode.newAltNode(node, null); ConsAltNode t = top; while (token.type == TokenType.ALT) { fetchToken(); @@ -719,7 +719,7 @@ } } - private void parseSubExpError(TokenType term) { + private void parseSubExpError(final TokenType term) { if (term == TokenType.SUBEXP_CLOSE) { throw new SyntaxException(ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS); } else {
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java Wed Jun 04 13:08:57 2014 +0200 @@ -72,42 +72,42 @@ char[][] templates; int templateNum; - public Regex(CharSequence cs) { + public Regex(final CharSequence cs) { this(cs.toString()); } - public Regex(String str) { + public Regex(final String str) { this(str.toCharArray(), 0, str.length(), 0); } - public Regex(char[] chars) { + public Regex(final char[] chars) { this(chars, 0, chars.length, 0); } - public Regex(char[] chars, int p, int end) { + public Regex(final char[] chars, final int p, final int end) { this(chars, p, end, 0); } - public Regex(char[] chars, int p, int end, int option) { + public Regex(final char[] chars, final int p, final int end, final int option) { this(chars, p, end, option, Syntax.RUBY, WarnCallback.DEFAULT); } // onig_new - public Regex(char[] chars, int p, int end, int option, Syntax syntax) { + public Regex(final char[] chars, final int p, final int end, final int option, final Syntax syntax) { this(chars, p, end, option, Config.ENC_CASE_FOLD_DEFAULT, syntax, WarnCallback.DEFAULT); } - public Regex(char[]chars, int p, int end, int option, WarnCallback warnings) { + public Regex(final char[]chars, final int p, final int end, final int option, final WarnCallback warnings) { this(chars, p, end, option, Syntax.RUBY, warnings); } // onig_new - public Regex(char[] chars, int p, int end, int option, Syntax syntax, WarnCallback warnings) { + public Regex(final char[] chars, final int p, final int end, final int option, final Syntax syntax, final WarnCallback warnings) { this(chars, p, end, option, Config.ENC_CASE_FOLD_DEFAULT, syntax, warnings); } // onig_alloc_init - public Regex(char[] chars, int p, int end, int option, int caseFoldFlag, Syntax syntax, WarnCallback warnings) { + public Regex(final char[] chars, final int p, final int end, int option, final int caseFoldFlag, final Syntax syntax, final WarnCallback warnings) { if ((option & (Option.DONT_CAPTURE_GROUP | Option.CAPTURE_GROUP)) == (Option.DONT_CAPTURE_GROUP | Option.CAPTURE_GROUP)) { @@ -140,11 +140,11 @@ return factory; } - public Matcher matcher(char[] chars) { + public Matcher matcher(final char[] chars) { return matcher(chars, 0, chars.length); } - public Matcher matcher(char[] chars, int p, int end) { + public Matcher matcher(final char[] chars, final int p, final int end) { MatcherFactory matcherFactory = factory; if (matcherFactory == null) { matcherFactory = compile(); @@ -162,10 +162,10 @@ /* set skip map for Boyer-Moor search */ void setupBMSkipMap() { - char[] chars = exact; - int p = exactP; - int end = exactEnd; - int len = end - p; + final char[] chars = exact; + final int p = exactP; + final int end = exactEnd; + final int len = end - p; if (len < Config.CHAR_TABLE_SIZE) { // map/skip @@ -180,7 +180,7 @@ } } - void setExactInfo(OptExactInfo e) { + void setExactInfo(final OptExactInfo e) { if (e.length == 0) return; // shall we copy that ? @@ -207,7 +207,7 @@ } } - void setOptimizeMapInfo(OptMapInfo m) { + void setOptimizeMapInfo(final OptMapInfo m) { map = m.map; searchAlgorithm = SearchAlgorithm.MAP; @@ -219,7 +219,7 @@ } } - void setSubAnchor(OptAnchorInfo anc) { + void setSubAnchor(final OptAnchorInfo anc) { subAnchor |= anc.leftAnchor & AnchorType.BEGIN_LINE; subAnchor |= anc.rightAnchor & AnchorType.END_LINE; } @@ -236,7 +236,7 @@ } public String optimizeInfoToString() { - StringBuilder s = new StringBuilder(); + final StringBuilder s = new StringBuilder(); s.append("optimize: ").append(searchAlgorithm.getName()).append("\n"); s.append(" anchor: ").append(OptAnchorInfo.anchorToString(anchor));
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,7 @@ public final int[]beg; public final int[]end; - public Region(int num) { + public Region(final int num) { this.numRegs = num; this.beg = new int[num]; this.end = new int[num]; @@ -34,7 +34,7 @@ @Override public String toString() { - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("Region: \n"); for (int i=0; i<beg.length; i++) sb.append(" " + i + ": (" + beg[i] + "-" + end[i] + ")"); return sb.toString();
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java Wed Jun 04 13:08:57 2014 +0200 @@ -44,7 +44,7 @@ public Node memNodes[]; - public ScanEnvironment(Regex regex, Syntax syntax) { + public ScanEnvironment(final Regex regex, final Syntax syntax) { this.reg = regex; option = regex.options; caseFoldFlag = regex.caseFoldFlag; @@ -65,7 +65,7 @@ if (numMem++ == 0) { memNodes = new Node[SCANENV_MEMNODES_SIZE]; } else if (numMem >= memNodes.length) { - Node[]tmp = new Node[memNodes.length << 1]; + final Node[]tmp = new Node[memNodes.length << 1]; System.arraycopy(memNodes, 0, tmp, 0, memNodes.length); memNodes = tmp; } @@ -73,7 +73,7 @@ return numMem; } - public void setMemNode(int num, Node node) { + public void setMemNode(final int num, final Node node) { if (numMem >= num) { memNodes[num] = node; } else { @@ -81,7 +81,7 @@ } } - public int convertBackslashValue(int c) { + public int convertBackslashValue(final int c) { if (syntax.opEscControlChars()) { switch (c) { case 'n': return '\n'; @@ -101,7 +101,7 @@ return c; } - void ccEscWarn(String s) { + void ccEscWarn(final String s) { if (Config.USE_WARN) { if (syntax.warnCCOpNotEscaped() && syntax.backSlashEscapeInCC()) { reg.warnings.warn("character class has '" + s + "' without escape");
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java Wed Jun 04 13:08:57 2014 +0200 @@ -36,7 +36,7 @@ private final static int INT_SIGN_BIT = 1 << 31; - protected ScannerSupport(char[] chars, int p, int end) { + protected ScannerSupport(final char[] chars, final int p, final int end) { this.chars = chars; this.begin = p; this.end = end; @@ -53,12 +53,12 @@ } protected final int scanUnsignedNumber() { - int last = c; + final int last = c; int num = 0; // long ??? while(left()) { fetch(); if (Character.isDigit(c)) { - int onum = num; + final int onum = num; num = num * 10 + EncodingHelper.digitVal(c); if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1; } else { @@ -71,13 +71,13 @@ } protected final int scanUnsignedHexadecimalNumber(int maxLength) { - int last = c; + final int last = c; int num = 0; while(left() && maxLength-- != 0) { fetch(); if (EncodingHelper.isXDigit(c)) { - int onum = num; - int val = EncodingHelper.xdigitVal(c); + final int onum = num; + final int val = EncodingHelper.xdigitVal(c); num = (num << 4) + val; if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1; } else { @@ -90,13 +90,13 @@ } protected final int scanUnsignedOctalNumber(int maxLength) { - int last = c; + final int last = c; int num = 0; while(left() && maxLength-- != 0) { fetch(); if (Character.isDigit(c) && c < '8') { - int onum = num; - int val = EncodingHelper.odigitVal(c); + final int onum = num; + final int val = EncodingHelper.odigitVal(c); num = (num << 3) + val; if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1; } else { @@ -144,7 +144,7 @@ return p < stop ? chars[p] : 0; } - protected final boolean peekIs(int c) { + protected final boolean peekIs(final int c) { return peek() == c; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java Wed Jun 04 13:08:57 2014 +0200 @@ -34,12 +34,12 @@ } @Override - public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) { + public final int search(final Regex regex, final char[] text, final int textP, final int textEnd, final int textRange) { return textP; } @Override - public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) { + public final int searchBackward(final Regex regex, final char[] text, final int textP, final int adjustText, final int textEnd, final int textStart, final int s_, final int range_) { return textP; } @@ -53,10 +53,10 @@ } @Override - public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) { - char[] target = regex.exact; - int targetP = regex.exactP; - int targetEnd = regex.exactEnd; + public final int search(final Regex regex, final char[] text, final int textP, final int textEnd, final int textRange) { + final char[] target = regex.exact; + final int targetP = regex.exactP; + final int targetEnd = regex.exactEnd; int end = textEnd; @@ -84,10 +84,10 @@ } @Override - public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) { - char[] target = regex.exact; - int targetP = regex.exactP; - int targetEnd = regex.exactEnd; + public final int searchBackward(final Regex regex, final char[] text, final int textP, final int adjustText, final int textEnd, final int textStart, final int s_, final int range_) { + final char[] target = regex.exact; + final int targetP = regex.exactP; + final int targetEnd = regex.exactEnd; int s = textEnd; s -= targetEnd - targetP; @@ -116,7 +116,7 @@ public static final class SLOW_IC extends SearchAlgorithm { private final int caseFoldFlag; - public SLOW_IC(Regex regex) { + public SLOW_IC(final Regex regex) { this.caseFoldFlag = regex.caseFoldFlag; } @@ -126,10 +126,10 @@ } @Override - public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) { - char[] target = regex.exact; - int targetP = regex.exactP; - int targetEnd = regex.exactEnd; + public final int search(final Regex regex, final char[] text, final int textP, final int textEnd, final int textRange) { + final char[] target = regex.exact; + final int targetP = regex.exactP; + final int targetEnd = regex.exactEnd; int end = textEnd; end -= targetEnd - targetP - 1; @@ -145,10 +145,10 @@ } @Override - public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) { - char[] target = regex.exact; - int targetP = regex.exactP; - int targetEnd = regex.exactEnd; + public final int searchBackward(final Regex regex, final char[] text, final int textP, final int adjustText, final int textEnd, final int textStart, final int s_, final int range_) { + final char[] target = regex.exact; + final int targetP = regex.exactP; + final int targetEnd = regex.exactEnd; int s = textEnd; s -= targetEnd - targetP; @@ -164,8 +164,8 @@ return -1; } - private boolean lowerCaseMatch(char[] t, int tP, int tEnd, - char[] chars, int p, int end) { + private boolean lowerCaseMatch(final char[] t, int tP, final int tEnd, + final char[] chars, int p, final int end) { while (tP < tEnd) { if (t[tP++] != EncodingHelper.toLowerCase(chars[p++])) return false; @@ -182,15 +182,15 @@ } @Override - public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) { - char[] target = regex.exact; - int targetP = regex.exactP; - int targetEnd = regex.exactEnd; + public final int search(final Regex regex, final char[] text, final int textP, final int textEnd, final int textRange) { + final char[] target = regex.exact; + final int targetP = regex.exactP; + final int targetEnd = regex.exactEnd; int end = textRange + (targetEnd - targetP) - 1; if (end > textEnd) end = textEnd; - int tail = targetEnd - 1; + final int tail = targetEnd - 1; int s = textP + (targetEnd - targetP) - 1; if (regex.intMap == null) { @@ -224,10 +224,10 @@ private static final int BM_BACKWARD_SEARCH_LENGTH_THRESHOLD = 100; @Override - public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) { - char[] target = regex.exact; - int targetP = regex.exactP; - int targetEnd = regex.exactEnd; + public final int searchBackward(final Regex regex, final char[] text, final int textP, final int adjustText, final int textEnd, final int textStart, final int s_, final int range_) { + final char[] target = regex.exact; + final int targetP = regex.exactP; + final int targetEnd = regex.exactEnd; if (regex.intMapBackward == null) { if (s_ - range_ < BM_BACKWARD_SEARCH_LENGTH_THRESHOLD) { @@ -257,7 +257,7 @@ } - private void setBmBackwardSkip(Regex regex, char[] chars, int p, int end) { + private void setBmBackwardSkip(final Regex regex, final char[] chars, final int p, final int end) { int[] skip; if (regex.intMapBackward == null) { skip = new int[Config.CHAR_TABLE_SIZE]; @@ -266,7 +266,7 @@ skip = regex.intMapBackward; } - int len = end - p; + final int len = end - p; for (int i=0; i<Config.CHAR_TABLE_SIZE; i++) skip[i] = len; for (int i=len-1; i>0; i--) skip[chars[i] & 0xff] = i; @@ -281,8 +281,8 @@ } @Override - public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) { - byte[] map = regex.map; + public final int search(final Regex regex, final char[] text, final int textP, final int textEnd, final int textRange) { + final byte[] map = regex.map; int s = textP; while (s < textRange) { @@ -293,8 +293,8 @@ } @Override - public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) { - byte[] map = regex.map; + public final int searchBackward(final Regex regex, final char[] text, final int textP, final int adjustText, final int textEnd, final int textStart, final int s_, final int range_) { + final byte[] map = regex.map; int s = textStart; if (s >= textEnd) s = textEnd - 1;
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,28 +25,28 @@ // first union member /* byte code position */ - void setStatePCode(int pcode) { + void setStatePCode(final int pcode) { E1 = pcode; } int getStatePCode() { return E1; } /* string position */ - void setStatePStr(int pstr) { + void setStatePStr(final int pstr) { E2 = pstr; } int getStatePStr() { return E2; } /* previous char position of pstr */ - void setStatePStrPrev(int pstrPrev) { + void setStatePStrPrev(final int pstrPrev) { E3 = pstrPrev; } int getStatePStrPrev() { return E3; } - void setStateCheck(int check) { + void setStateCheck(final int check) { E4 = check; } int getStateCheck() { @@ -55,7 +55,7 @@ // second union member /* for OP_REPEAT_INC, OP_REPEAT_INC_NG */ - void setRepeatCount(int count) { + void setRepeatCount(final int count) { E1 = count; } int getRepeatCount() { @@ -68,14 +68,14 @@ E1++; } /* byte code position (head of repeated target) */ - void setRepeatPCode(int pcode) { + void setRepeatPCode(final int pcode) { E2 = pcode; } int getRepeatPCode() { return E2; } /* repeat id */ - void setRepeatNum(int num) { + void setRepeatNum(final int num) { E3 = num; } int getRepeatNum() { @@ -84,7 +84,7 @@ // third union member /* index of stack */ /*int repeat_inc struct*/ - void setSi(int si) { + void setSi(final int si) { E1 = si; } int getSi() { @@ -93,14 +93,14 @@ // fourth union member /* memory num */ - void setMemNum(int num) { + void setMemNum(final int num) { E1 = num; } int getMemNum() { return E1; } /* start/end position */ - void setMemPstr(int pstr) { + void setMemPstr(final int pstr) { E2 = pstr; } int getMemPStr() { @@ -109,14 +109,14 @@ /* Following information is set, if this stack type is MEM-START */ /* prev. info (for backtrack "(...)*" ) */ - void setMemStart(int start) { + void setMemStart(final int start) { E3 = start; } int getMemStart() { return E3; } /* prev. info (for backtrack "(...)*" ) */ - void setMemEnd(int end) { + void setMemEnd(final int end) { E4 = end; } int getMemEnd() { @@ -125,14 +125,14 @@ // fifth union member /* null check id */ - void setNullCheckNum(int num) { + void setNullCheckNum(final int num) { E1 = num; } int getNullCheckNum() { return E1; } /* start position */ - void setNullCheckPStr(int pstr) { + void setNullCheckPStr(final int pstr) { E2 = pstr; } int getNullCheckPStr() { @@ -141,21 +141,21 @@ // sixth union member /* byte code position */ - void setCallFrameRetAddr(int addr) { + void setCallFrameRetAddr(final int addr) { E1 = addr; } int getCallFrameRetAddr() { return E1; } /* null check id */ - void setCallFrameNum(int num) { + void setCallFrameNum(final int num) { E2 = num; } int getCallFrameNum() { return E2; } /* string position */ - void setCallFramePStr(int pstr) { + void setCallFramePStr(final int pstr) { E3 = pstr; } int getCallFramePStr() {
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,6 @@ import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt; import java.lang.ref.WeakReference; - import jdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel; import jdk.nashorn.internal.runtime.regexp.joni.constants.StackType; @@ -35,11 +34,11 @@ protected final int[]repeatStk; protected final int memStartStk, memEndStk; - protected StackMachine(Regex regex, char[] chars, int p , int end) { + protected StackMachine(final Regex regex, final char[] chars, final int p , final int end) { super(regex, chars, p, end); this.stack = regex.stackNeeded ? fetchStack() : null; - int n = regex.numRepeat + (regex.numMem << 1); + final int n = regex.numRepeat + (regex.numMem << 1); this.repeatStk = n > 0 ? new int[n] : null; memStartStk = regex.numRepeat - 1; @@ -49,13 +48,13 @@ } private static StackEntry[] allocateStack() { - StackEntry[]stack = new StackEntry[Config.INIT_MATCH_STACK_SIZE]; + final StackEntry[]stack = new StackEntry[Config.INIT_MATCH_STACK_SIZE]; stack[0] = new StackEntry(); return stack; } private void doubleStack() { - StackEntry[] newStack = new StackEntry[stack.length << 1]; + final StackEntry[] newStack = new StackEntry[stack.length << 1]; System.arraycopy(stack, 0, newStack, 0, stack.length); stack = newStack; } @@ -94,13 +93,13 @@ return e; } - protected final void pushType(int type) { + protected final void pushType(final int type) { ensure1().type = type; stk++; } - private void push(int type, int pat, int s, int prev) { - StackEntry e = ensure1(); + private void push(final int type, final int pat, final int s, final int prev) { + final StackEntry e = ensure1(); e.type = type; e.setStatePCode(pat); e.setStatePStr(s); @@ -108,22 +107,22 @@ stk++; } - protected final void pushEnsured(int type, int pat) { - StackEntry e = stack[stk]; + protected final void pushEnsured(final int type, final int pat) { + final StackEntry e = stack[stk]; e.type = type; e.setStatePCode(pat); stk++; } - protected final void pushAlt(int pat, int s, int prev) { + protected final void pushAlt(final int pat, final int s, final int prev) { push(ALT, pat, s, prev); } - protected final void pushPos(int s, int prev) { + protected final void pushPos(final int s, final int prev) { push(POS, -1 /*NULL_UCHARP*/, s, prev); } - protected final void pushPosNot(int pat, int s, int prev) { + protected final void pushPosNot(final int pat, final int s, final int prev) { push(POS_NOT, pat, s, prev); } @@ -131,12 +130,12 @@ pushType(STOP_BT); } - protected final void pushLookBehindNot(int pat, int s, int sprev) { + protected final void pushLookBehindNot(final int pat, final int s, final int sprev) { push(LOOK_BEHIND_NOT, pat, s, sprev); } - protected final void pushRepeat(int id, int pat) { - StackEntry e = ensure1(); + protected final void pushRepeat(final int id, final int pat) { + final StackEntry e = ensure1(); e.type = REPEAT; e.setRepeatNum(id); e.setRepeatPCode(pat); @@ -144,15 +143,15 @@ stk++; } - protected final void pushRepeatInc(int sindex) { - StackEntry e = ensure1(); + protected final void pushRepeatInc(final int sindex) { + final StackEntry e = ensure1(); e.type = REPEAT_INC; e.setSi(sindex); stk++; } - protected final void pushMemStart(int mnum, int s) { - StackEntry e = ensure1(); + protected final void pushMemStart(final int mnum, final int s) { + final StackEntry e = ensure1(); e.type = MEM_START; e.setMemNum(mnum); e.setMemPstr(s); @@ -163,8 +162,8 @@ stk++; } - protected final void pushMemEnd(int mnum, int s) { - StackEntry e = ensure1(); + protected final void pushMemEnd(final int mnum, final int s) { + final StackEntry e = ensure1(); e.type = MEM_END; e.setMemNum(mnum); e.setMemPstr(s); @@ -174,20 +173,20 @@ stk++; } - protected final void pushMemEndMark(int mnum) { - StackEntry e = ensure1(); + protected final void pushMemEndMark(final int mnum) { + final StackEntry e = ensure1(); e.type = MEM_END_MARK; e.setMemNum(mnum); stk++; } - protected final int getMemStart(int mnum) { + protected final int getMemStart(final int mnum) { int level = 0; int stkp = stk; while (stkp > 0) { stkp--; - StackEntry e = stack[stkp]; + final StackEntry e = stack[stkp]; if ((e.type & MASK_MEM_END_OR_MARK) != 0 && e.getMemNum() == mnum) { level++; } else if (e.type == MEM_START && e.getMemNum() == mnum) { @@ -198,16 +197,16 @@ return stkp; } - protected final void pushNullCheckStart(int cnum, int s) { - StackEntry e = ensure1(); + protected final void pushNullCheckStart(final int cnum, final int s) { + final StackEntry e = ensure1(); e.type = NULL_CHECK_START; e.setNullCheckNum(cnum); e.setNullCheckPStr(s); stk++; } - protected final void pushNullCheckEnd(int cnum) { - StackEntry e = ensure1(); + protected final void pushNullCheckEnd(final int cnum) { + final StackEntry e = ensure1(); e.type = NULL_CHECK_END; e.setNullCheckNum(cnum); stk++; @@ -233,7 +232,7 @@ private StackEntry popFree() { while (true) { - StackEntry e = stack[--stk]; + final StackEntry e = stack[--stk]; if ((e.type & MASK_POP_USED) != 0) { return e; @@ -243,7 +242,7 @@ private StackEntry popMemStart() { while (true) { - StackEntry e = stack[--stk]; + final StackEntry e = stack[--stk]; if ((e.type & MASK_POP_USED) != 0) { return e; @@ -256,7 +255,7 @@ private StackEntry popDefault() { while (true) { - StackEntry e = stack[--stk]; + final StackEntry e = stack[--stk]; if ((e.type & MASK_POP_USED) != 0) { return e; @@ -277,7 +276,7 @@ protected final void popTilPosNot() { while (true) { stk--; - StackEntry e = stack[stk]; + final StackEntry e = stack[stk]; if (e.type == POS_NOT) { break; @@ -298,7 +297,7 @@ protected final void popTilLookBehindNot() { while (true) { stk--; - StackEntry e = stack[stk]; + final StackEntry e = stack[stk]; if (e.type == LOOK_BEHIND_NOT) { break; @@ -320,7 +319,7 @@ int k = stk; while (true) { k--; - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if ((e.type & MASK_TO_VOID_TARGET) != 0) { e.type = VOID; } else if (e.type == POS) { @@ -335,7 +334,7 @@ int k = stk; while (true) { k--; - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if ((e.type & MASK_TO_VOID_TARGET) != 0) { e.type = VOID; @@ -347,11 +346,11 @@ } // int for consistency with other null check routines - protected final int nullCheck(int id, int s) { + protected final int nullCheck(final int id, final int s) { int k = stk; while (true) { k--; - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if (e.type == NULL_CHECK_START) { if (e.getNullCheckNum() == id) { @@ -361,12 +360,12 @@ } } - protected final int nullCheckRec(int id, int s) { + protected final int nullCheckRec(final int id, final int s) { int level = 0; int k = stk; while (true) { k--; - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if (e.type == NULL_CHECK_START) { if (e.getNullCheckNum() == id) { @@ -382,7 +381,7 @@ } } - protected final int nullCheckMemSt(int id, int s) { + protected final int nullCheckMemSt(final int id, final int s) { int k = stk; int isNull; while (true) { @@ -426,7 +425,7 @@ return isNull; } - protected final int nullCheckMemStRec(int id, int s) { + protected final int nullCheckMemStRec(final int id, final int s) { int level = 0; int k = stk; int isNull; @@ -477,12 +476,12 @@ return isNull; } - protected final int getRepeat(int id) { + protected final int getRepeat(final int id) { int level = 0; int k = stk; while (true) { k--; - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if (e.type == REPEAT) { if (level == 0) { @@ -501,7 +500,7 @@ int k = stk; while (true) { k--; - StackEntry e = stack[k]; + final StackEntry e = stack[k]; if (e.type == CALL_FRAME) { if (level == 0) {
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,7 +30,7 @@ public final int options; public final MetaCharTable metaCharTable; - public Syntax(int op, int op2, int behavior, int options, MetaCharTable metaCharTable) { + public Syntax(final int op, final int op2, final int behavior, final int options, final MetaCharTable metaCharTable) { this.op = op; this.op2 = op2; this.behavior = behavior; @@ -46,8 +46,8 @@ public final int oneOrMoreTime; public final int anyCharAnyTime; - public MetaCharTable(int esc, int anyChar, int anyTime, - int zeroOrOneTime, int oneOrMoreTime, int anyCharAnyTime) { + public MetaCharTable(final int esc, final int anyChar, final int anyTime, + final int zeroOrOneTime, final int oneOrMoreTime, final int anyCharAnyTime) { this.esc = esc; this.anyChar = anyChar; this.anyTime = anyTime; @@ -61,7 +61,7 @@ * OP * */ - protected boolean isOp(int opm) { + protected boolean isOp(final int opm) { return (op & opm) != 0; } @@ -194,7 +194,7 @@ * OP * */ - protected boolean isOp2(int opm) { + protected boolean isOp2(final int opm) { return (op2 & opm) != 0; } @@ -282,7 +282,7 @@ * BEHAVIOR * */ - protected boolean isBehavior(int bvm) { + protected boolean isBehavior(final int bvm) { return (behavior & bvm) != 0; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java Wed Jun 04 13:08:57 2014 +0200 @@ -33,21 +33,21 @@ int getC() { return INT1; } - void setC(int c) { + void setC(final int c) { INT1 = c; } int getCode() { return INT1; } - void setCode(int code) { + void setCode(final int code) { INT1 = code; } int getAnchor() { return INT1; } - void setAnchor(int anchor) { + void setAnchor(final int anchor) { INT1 = anchor; } @@ -55,35 +55,35 @@ int getRepeatLower() { return INT1; } - void setRepeatLower(int lower) { + void setRepeatLower(final int lower) { INT1 = lower; } int getRepeatUpper() { return INT2; } - void setRepeatUpper(int upper) { + void setRepeatUpper(final int upper) { INT2 = upper; } boolean getRepeatGreedy() { return INT3 != 0; } - void setRepeatGreedy(boolean greedy) { + void setRepeatGreedy(final boolean greedy) { INT3 = greedy ? 1 : 0; } boolean getRepeatPossessive() { return INT4 != 0; } - void setRepeatPossessive(boolean possessive) { + void setRepeatPossessive(final boolean possessive) { INT4 = possessive ? 1 : 0; } int getBackrefRef() { return INT2; } - void setBackrefRef(int ref1) { + void setBackrefRef(final int ref1) { INT2 = ref1; } @@ -91,14 +91,14 @@ int getPropCType() { return INT1; } - void setPropCType(int ctype) { + void setPropCType(final int ctype) { INT1 = ctype; } boolean getPropNot() { return INT2 != 0; } - void setPropNot(boolean not) { + void setPropNot(final boolean not) { INT2 = not ? 1 : 0; } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,7 +25,7 @@ public interface WarnCallback { WarnCallback DEFAULT = new WarnCallback() { @Override - public void warn(String message) { + public void warn(final String message) { System.err.println(message); } };
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,7 +26,7 @@ public Node target; public int charLength; - public AnchorNode(int type) { + public AnchorNode(final int type) { this.type = type; charLength = -1; } @@ -37,7 +37,7 @@ } @Override - protected void setChild(Node newChild) { + protected void setChild(final Node newChild) { target = newChild; } @@ -46,7 +46,7 @@ return target; } - public void setTarget(Node tgt) { + public void setTarget(final Node tgt) { target = tgt; tgt.parent = this; } @@ -57,15 +57,15 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(); value.append("\n type: " + typeToString()); value.append("\n target: " + pad(target, level + 1)); return value.toString(); } public String typeToString() { - StringBuilder type = new StringBuilder(); + final StringBuilder type = new StringBuilder(); if (isType(BEGIN_BUF)) type.append("BEGIN_BUF "); if (isType(BEGIN_LINE)) type.append("BEGIN_LINE "); if (isType(BEGIN_POSITION)) type.append("BEGIN_POSITION "); @@ -85,7 +85,7 @@ return type.toString(); } - private boolean isType(int type) { + private boolean isType(final int type) { return (this.type & type) != 0; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -33,8 +33,8 @@ } @Override - public String toString(int level) { - String value = ""; + public String toString(final int level) { + final String value = ""; return value; } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -24,7 +24,7 @@ public final class BackRefNode extends StateNode { public final int backRef; - public BackRefNode(int backRef, ScanEnvironment env) { + public BackRefNode(final int backRef, final ScanEnvironment env) { this.backRef = backRef; if (backRef <= env.numMem && env.memNodes[backRef] == null) { @@ -43,8 +43,8 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(super.toString(level)); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(super.toString(level)); value.append("\n back: ").append(backRef); return value.toString(); }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -19,7 +19,12 @@ */ package jdk.nashorn.internal.runtime.regexp.joni.ast; -import jdk.nashorn.internal.runtime.regexp.joni.*; +import jdk.nashorn.internal.runtime.regexp.joni.BitSet; +import jdk.nashorn.internal.runtime.regexp.joni.CodeRangeBuffer; +import jdk.nashorn.internal.runtime.regexp.joni.Config; +import jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper; +import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment; +import jdk.nashorn.internal.runtime.regexp.joni.Syntax; import jdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE; import jdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE; import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType; @@ -94,9 +99,9 @@ } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if (!(other instanceof CClassNode)) return false; - CClassNode cc = (CClassNode)other; + final CClassNode cc = (CClassNode)other; return ctype == cc.ctype && isNot() == cc.isNot(); } @@ -113,8 +118,8 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(); value.append("\n flags: " + flagsToString()); value.append("\n bs: " + pad(bs, level + 1)); value.append("\n mbuf: " + pad(mbuf, level + 1)); @@ -123,7 +128,7 @@ } public String flagsToString() { - StringBuilder flags = new StringBuilder(); + final StringBuilder flags = new StringBuilder(); if (isNot()) flags.append("NOT "); if (isShare()) flags.append("SHARE "); return flags.toString(); @@ -133,11 +138,11 @@ return mbuf == null && bs.isEmpty(); } - public void addCodeRangeToBuf(int from, int to) { + public void addCodeRangeToBuf(final int from, final int to) { mbuf = CodeRangeBuffer.addCodeRangeToBuff(mbuf, from, to); } - public void addCodeRange(ScanEnvironment env, int from, int to) { + public void addCodeRange(final ScanEnvironment env, final int from, final int to) { mbuf = CodeRangeBuffer.addCodeRange(mbuf, env, from, to); } @@ -155,22 +160,22 @@ } // and_cclass - public void and(CClassNode other) { - boolean not1 = isNot(); + public void and(final CClassNode other) { + final boolean not1 = isNot(); BitSet bsr1 = bs; - CodeRangeBuffer buf1 = mbuf; - boolean not2 = other.isNot(); + final CodeRangeBuffer buf1 = mbuf; + final boolean not2 = other.isNot(); BitSet bsr2 = other.bs; - CodeRangeBuffer buf2 = other.mbuf; + final CodeRangeBuffer buf2 = other.mbuf; if (not1) { - BitSet bs1 = new BitSet(); + final BitSet bs1 = new BitSet(); bsr1.invertTo(bs1); bsr1 = bs1; } if (not2) { - BitSet bs2 = new BitSet(); + final BitSet bs2 = new BitSet(); bsr2.invertTo(bs2); bsr2 = bs2; } @@ -202,22 +207,22 @@ } // or_cclass - public void or(CClassNode other) { - boolean not1 = isNot(); + public void or(final CClassNode other) { + final boolean not1 = isNot(); BitSet bsr1 = bs; - CodeRangeBuffer buf1 = mbuf; - boolean not2 = other.isNot(); + final CodeRangeBuffer buf1 = mbuf; + final boolean not2 = other.isNot(); BitSet bsr2 = other.bs; - CodeRangeBuffer buf2 = other.mbuf; + final CodeRangeBuffer buf2 = other.mbuf; if (not1) { - BitSet bs1 = new BitSet(); + final BitSet bs1 = new BitSet(); bsr1.invertTo(bs1); bsr1 = bs1; } if (not2) { - BitSet bs2 = new BitSet(); + final BitSet bs2 = new BitSet(); bsr2.invertTo(bs2); bsr2 = bs2; } @@ -246,8 +251,8 @@ } // add_ctype_to_cc_by_range // Encoding out! - public void addCTypeByRange(int ctype, boolean not, int sbOut, int mbr[]) { - int n = mbr[0]; + public void addCTypeByRange(final int ctype, final boolean not, final int sbOut, final int mbr[]) { + final int n = mbr[0]; if (!not) { for (int i=0; i<n; i++) { @@ -314,7 +319,7 @@ } } - public void addCType(int ctype, boolean not, ScanEnvironment env, IntHolder sbOut) { + public void addCType(int ctype, final boolean not, final ScanEnvironment env, final IntHolder sbOut) { if (Config.NON_UNICODE_SDW) { switch(ctype) { case CharacterType.D: @@ -343,7 +348,7 @@ } } - int[] ranges = EncodingHelper.ctypeCodeRange(ctype, sbOut); + final int[] ranges = EncodingHelper.ctypeCodeRange(ctype, sbOut); if (ranges != null) { addCTypeByRange(ctype, not, sbOut.value, ranges); return; @@ -416,7 +421,7 @@ public CCSTATE state; } - public void nextStateClass(CCStateArg arg, ScanEnvironment env) { + public void nextStateClass(final CCStateArg arg, final ScanEnvironment env) { if (arg.state == CCSTATE.RANGE) throw new SyntaxException(ErrorMessages.ERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE); if (arg.state == CCSTATE.VALUE && arg.type != CCVALTYPE.CLASS) { @@ -430,7 +435,7 @@ arg.type = CCVALTYPE.CLASS; } - public void nextStateValue(CCStateArg arg, ScanEnvironment env) { + public void nextStateValue(final CCStateArg arg, final ScanEnvironment env) { switch(arg.state) { case VALUE: @@ -493,7 +498,7 @@ } // onig_is_code_in_cc_len - public boolean isCodeInCCLength(int code) { + public boolean isCodeInCCLength(final int code) { boolean found; if (code > 0xff) { @@ -510,7 +515,7 @@ } // onig_is_code_in_cc - public boolean isCodeInCC(int code) { + public boolean isCodeInCC(final int code) { return isCodeInCCLength(code); }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -20,7 +20,6 @@ package jdk.nashorn.internal.runtime.regexp.joni.ast; import java.util.Set; - import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback; import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages; import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException; @@ -30,7 +29,7 @@ public ConsAltNode cdr; private int type; // List or Alt - private ConsAltNode(Node car, ConsAltNode cdr, int type) { + private ConsAltNode(final Node car, final ConsAltNode cdr, final int type) { this.car = car; if (car != null) car.parent = this; this.cdr = cdr; @@ -39,16 +38,16 @@ this.type = type; } - public static ConsAltNode newAltNode(Node left, ConsAltNode right) { + public static ConsAltNode newAltNode(final Node left, final ConsAltNode right) { return new ConsAltNode(left, right, ALT); } - public static ConsAltNode newListNode(Node left, ConsAltNode right) { + public static ConsAltNode newListNode(final Node left, final ConsAltNode right) { return new ConsAltNode(left, right, LIST); } - public static ConsAltNode listAdd(ConsAltNode list, Node x) { - ConsAltNode n = newListNode(x, null); + public static ConsAltNode listAdd(ConsAltNode list, final Node x) { + final ConsAltNode n = newListNode(x, null); if (list != null) { while (list.cdr != null) { @@ -73,7 +72,7 @@ } @Override - protected void setChild(Node newChild) { + protected void setChild(final Node newChild) { car = newChild; } @@ -83,13 +82,13 @@ } @Override - public void swap(Node with) { + public void swap(final Node with) { if (cdr != null) { cdr.parent = with; if (with instanceof ConsAltNode) { - ConsAltNode withCan = (ConsAltNode)with; + final ConsAltNode withCan = (ConsAltNode)with; withCan.cdr.parent = this; - ConsAltNode tmp = cdr; + final ConsAltNode tmp = cdr; cdr = withCan.cdr; withCan.cdr = tmp; } @@ -98,7 +97,7 @@ } @Override - public void verifyTree(Set<Node> set, WarnCallback warnings) { + public void verifyTree(final Set<Node> set, final WarnCallback warnings) { if (!set.contains(this)) { set.add(this); if (car != null) { @@ -116,13 +115,13 @@ } } - public Node setCar(Node ca) { + public Node setCar(final Node ca) { car = ca; ca.parent = this; return car; } - public ConsAltNode setCdr(ConsAltNode cd) { + public ConsAltNode setCdr(final ConsAltNode cd) { cdr = cd; cd.parent = this; return cdr; @@ -141,8 +140,8 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(); value.append("\n car: " + pad(car, level + 1)); value.append("\n cdr: " + (cdr == null ? "NULL" : cdr.toString()));
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -35,7 +35,7 @@ public int optCount; // referenced count in optimize_node_left() // node_new_enclose / onig_node_new_enclose - public EncloseNode(int type) { + public EncloseNode(final int type) { this.type = type; callAddr = -1; } @@ -46,7 +46,7 @@ } // node_new_option - public EncloseNode(int option, int i) { + public EncloseNode(final int option, final int i) { this(OPTION); this.option = option; } @@ -57,7 +57,7 @@ } @Override - protected void setChild(Node newChild) { + protected void setChild(final Node newChild) { target = newChild; } @@ -66,7 +66,7 @@ return target; } - public void setTarget(Node tgt) { + public void setTarget(final Node tgt) { target = tgt; tgt.parent = this; } @@ -77,8 +77,8 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(super.toString(level)); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(super.toString(level)); value.append("\n type: " + typeToString()); value.append("\n regNum: " + regNum); value.append("\n option: " + Option.toString(option)); @@ -93,7 +93,7 @@ } public String typeToString() { - StringBuilder types = new StringBuilder(); + final StringBuilder types = new StringBuilder(); if (isStopBacktrack()) types.append("STOP_BACKTRACK "); if (isMemory()) types.append("MEMORY "); if (isOption()) types.append("OPTION ");
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java Wed Jun 04 13:08:57 2014 +0200 @@ -20,7 +20,6 @@ package jdk.nashorn.internal.runtime.regexp.joni.ast; import java.util.Set; - import jdk.nashorn.internal.runtime.regexp.joni.Config; import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback; import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType; @@ -34,10 +33,10 @@ return 1 << getType(); } - protected void setChild(Node tgt){} // default definition + protected void setChild(final Node tgt){} // default definition protected Node getChild(){return null;} // default definition - public void swap(Node with) { + public void swap(final Node with) { Node tmp; //if (getChild() != null) getChild().parent = with; @@ -57,7 +56,7 @@ } // overridden by ConsAltNode and CallNode - public void verifyTree(Set<Node> set, WarnCallback warnings) { + public void verifyTree(final Set<Node> set, final WarnCallback warnings) { if (!set.contains(this) && getChild() != null) { set.add(this); if (getChild().parent != this) { @@ -76,15 +75,15 @@ @Override public final String toString() { - StringBuilder s = new StringBuilder(); + final StringBuilder s = new StringBuilder(); s.append("<" + getAddressName() + " (" + (parent == null ? "NULL" : parent.getAddressName()) + ")>"); return s + toString(0); } - protected static String pad(Object value, int level) { + protected static String pad(final Object value, final int level) { if (value == null) return "NULL"; - StringBuilder pad = new StringBuilder(" "); + final StringBuilder pad = new StringBuilder(" "); for (int i=0; i<level; i++) pad.append(pad); return value.toString().replace("\n", "\n" + pad);
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -19,12 +19,18 @@ */ package jdk.nashorn.internal.runtime.regexp.joni.ast; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.A; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.AQ; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.ASIS; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.DEL; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.PQ_Q; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.P_QQ; +import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.QQ; + import jdk.nashorn.internal.runtime.regexp.joni.Config; import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment; import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo; -import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.*; - public final class QuantifierNode extends StateNode { public Node target; @@ -66,7 +72,7 @@ }; - public QuantifierNode(int lower, int upper, boolean byNumber) { + public QuantifierNode(final int lower, final int upper, final boolean byNumber) { this.lower = lower; this.upper = upper; greedy = true; @@ -81,7 +87,7 @@ } @Override - protected void setChild(Node newChild) { + protected void setChild(final Node newChild) { target = newChild; } @@ -90,13 +96,13 @@ return target; } - public void setTarget(Node tgt) { + public void setTarget(final Node tgt) { target = tgt; tgt.parent = this; } - public StringNode convertToString(int flag) { - StringNode sn = new StringNode(); + public StringNode convertToString(final int flag) { + final StringNode sn = new StringNode(); sn.flag = flag; sn.swap(this); return sn; @@ -108,8 +114,8 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(super.toString(level)); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(super.toString(level)); value.append("\n target: " + pad(target, level + 1)); value.append("\n lower: " + lower); value.append("\n upper: " + upper); @@ -146,7 +152,7 @@ return -1; } - protected void set(QuantifierNode other) { + protected void set(final QuantifierNode other) { setTarget(other.target); other.target = null; lower = other.lower; @@ -161,9 +167,9 @@ isRefered = other.isRefered; } - public void reduceNestedQuantifier(QuantifierNode other) { - int pnum = popularNum(); - int cnum = other.popularNum(); + public void reduceNestedQuantifier(final QuantifierNode other) { + final int pnum = popularNum(); + final int cnum = other.popularNum(); if (pnum < 0 || cnum < 0) return; @@ -224,16 +230,16 @@ } @SuppressWarnings("fallthrough") - public int setQuantifier(Node tgt, boolean group, ScanEnvironment env, char[] chars, int p, int end) { + public int setQuantifier(final Node tgt, final boolean group, final ScanEnvironment env, final char[] chars, final int p, final int end) { if (lower == 1 && upper == 1) return 1; switch(tgt.getType()) { case STR: if (!group) { - StringNode sn = (StringNode)tgt; + final StringNode sn = (StringNode)tgt; if (sn.canBeSplit()) { - StringNode n = sn.splitLastChar(); + final StringNode n = sn.splitLastChar(); if (n != null) { setTarget(n); return 2; @@ -245,9 +251,9 @@ case QTFR: /* check redundant double repeat. */ /* verbose warn (?:.?)? etc... but not warn (.?)? etc... */ - QuantifierNode qnt = (QuantifierNode)tgt; - int nestQNum = popularNum(); - int targetQNum = qnt.popularNum(); + final QuantifierNode qnt = (QuantifierNode)tgt; + final int nestQNum = popularNum(); + final int targetQNum = qnt.popularNum(); if (Config.USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR) { if (!isByNumber() && !qnt.isByNumber() && env.syntax.warnReduntantNestedRepeat()) { @@ -290,7 +296,7 @@ } public static final int REPEAT_INFINITE = -1; - public static boolean isRepeatInfinite(int n) { + public static boolean isRepeatInfinite(final int n) { return n == REPEAT_INFINITE; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,12 +25,12 @@ protected int state; @Override - public String toString(int level) { + public String toString(final int level) { return "\n state: " + stateToString(); } public String stateToString() { - StringBuilder states = new StringBuilder(); + final StringBuilder states = new StringBuilder(); if (isMinFixed()) states.append("MIN_FIXED "); if (isMaxFixed()) states.append("MAX_FIXED "); if (isMark1()) states.append("MARK1 ");
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java Wed Jun 04 13:08:57 2014 +0200 @@ -38,14 +38,14 @@ this.chars = new char[NODE_STR_BUF_SIZE]; } - public StringNode(char[] chars, int p, int end) { + public StringNode(final char[] chars, final int p, final int end) { this.chars = chars; this.p = p; this.end = end; setShared(); } - public StringNode(char c) { + public StringNode(final char c) { this(); chars[end++] = c; } @@ -53,10 +53,10 @@ /* Ensure there is ahead bytes available in node's buffer * (assumes that the node is not shared) */ - public void ensure(int ahead) { - int len = (end - p) + ahead; + public void ensure(final int ahead) { + final int len = (end - p) + ahead; if (len >= chars.length) { - char[] tmp = new char[len + NODE_STR_MARGIN]; + final char[] tmp = new char[len + NODE_STR_MARGIN]; System.arraycopy(chars, p, tmp, 0, end - p); chars = tmp; } @@ -64,10 +64,10 @@ /* COW and/or ensure there is ahead bytes available in node's buffer */ - private void modifyEnsure(int ahead) { + private void modifyEnsure(final int ahead) { if (isShared()) { - int len = (end - p) + ahead; - char[] tmp = new char[len + NODE_STR_MARGIN]; + final int len = (end - p) + ahead; + final char[] tmp = new char[len + NODE_STR_MARGIN]; System.arraycopy(chars, p, tmp, 0, end - p); chars = tmp; end = end - p; @@ -89,8 +89,8 @@ } @Override - public String toString(int level) { - StringBuilder value = new StringBuilder(); + public String toString(final int level) { + final StringBuilder value = new StringBuilder(); value.append("\n bytes: '"); for (int i=p; i<end; i++) { if (chars[i] >= 0x20 && chars[i] < 0x7f) { @@ -111,7 +111,7 @@ StringNode n = null; if (end > p) { - int prev = EncodingHelper.prevCharHead(p, end); + final int prev = EncodingHelper.prevCharHead(p, end); if (prev != -1 && prev > p) { /* can be splitted. */ n = new StringNode(chars, prev, end); if (isRaw()) n.setRaw(); @@ -125,26 +125,26 @@ return end > p && 1 < (end - p); } - public void set(char[] chars, int p, int end) { + public void set(final char[] chars, final int p, final int end) { this.chars = chars; this.p = p; this.end = end; setShared(); } - public void cat(char[] cat, int catP, int catEnd) { - int len = catEnd - catP; + public void cat(final char[] cat, final int catP, final int catEnd) { + final int len = catEnd - catP; modifyEnsure(len); System.arraycopy(cat, catP, chars, end, len); end += len; } - public void cat(char c) { + public void cat(final char c) { modifyEnsure(1); chars[end++] = c; } - public void catCode(int code) { + public void catCode(final int code) { cat((char)code); }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java Wed Jun 04 13:08:57 2014 +0200 @@ -24,7 +24,7 @@ this(null); } - public ObjPtr(T p) { + public ObjPtr(final T p) { this.p = p; }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ public class InternalException extends JOniException{ private static final long serialVersionUID = -3871816465397927992L; - public InternalException(String message) { + public InternalException(final String message) { super(message); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ public class JOniException extends RuntimeException{ private static final long serialVersionUID = -6027192180014164667L; - public JOniException(String message) { + public JOniException(final String message) { super(message); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ public class SyntaxException extends JOniException{ private static final long serialVersionUID = 7862720128961874288L; - public SyntaxException(String message) { + public SyntaxException(final String message) { super(message); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java Wed Jun 04 13:55:21 2014 +0530 +++ b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java Wed Jun 04 13:08:57 2014 +0200 @@ -22,11 +22,11 @@ public class ValueException extends SyntaxException{ private static final long serialVersionUID = -196013852479929134L; - public ValueException(String message) { + public ValueException(final String message) { super(message); } - public ValueException(String message, String str) { + public ValueException(final String message, final String str) { super(message.replaceAll("%n", str)); }
--- a/test/examples/apply_to_call_benchmark.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/apply_to_call_benchmark.js Wed Jun 04 13:08:57 2014 +0200 @@ -10,9 +10,9 @@ Color.prototype = { red: 0, green: 0, blue: 0, initialize: function(r,g,b) { - this.red = r; - this.green = g; - this.blue = b; + this.red = r; + this.green = g; + this.blue = b; } } @@ -20,7 +20,7 @@ var d = new Date; var colors = new Array(16); for (var i=0;i<1e8;i++) { - colors[i&0xf] = (new Color(1,2,3)); + colors[i&0xf] = (new Color(1,2,3)); } print(new Date - d); return colors;
--- a/test/examples/array-micro.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/array-micro.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- a/test/examples/dual-fields-micro.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/dual-fields-micro.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -34,15 +34,15 @@ } var sum = 1; -function bench() { +function bench() { var d = new Date; for (var iter = 0; iter <4*50e6; iter++) { - sum *= 20 * b(21,22); + sum *= 20 * b(21,22); } print("time = " +(new Date-d)); - print(sum); + print(sum); } bench();
--- a/test/examples/innerbench.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/innerbench.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- a/test/examples/int-micro.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/int-micro.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- a/test/examples/string-micro.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/string-micro.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- a/test/examples/typechain.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/examples/typechain.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--- a/test/lib/benchmark.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/lib/benchmark.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,14 +33,14 @@ startTime = new Date, runs = 0; do { - method.apply(args); - runs++; - totalTime = new Date - startTime; + method.apply(args); + runs++; + totalTime = new Date - startTime; } while (totalTime < timeInMillis); - + // convert ms to seconds totalTime /= 1000; - + // period → how long per operation period = totalTime / runs;
--- a/test/opt/add.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/opt/add.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Example of an add function that gets specialized to doubles - * if run with --optimize flag set + * if run with --optimize flag set */ function add(a,b) { @@ -34,7 +34,7 @@ function bench() { var sum = 1; for (var x = 0 ; x < 10e8/2 ; x ++) { - sum *= add(x,x + 1); + sum *= add(x,x + 1); } return sum; }
--- a/test/opt/add_constant.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/opt/add_constant.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Example of an add function that gets specialized to doubles - * if run with --optimize flag set + * if run with --optimize flag set */ function add(a,b) { @@ -34,7 +34,7 @@ function bench() { var sum = 1; for (var x = 0 ; x < 5e7 ; x++) { - sum *= add(x, 17); + sum *= add(x, 17); } return sum; }
--- a/test/opt/add_reuse_callsite.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/opt/add_reuse_callsite.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Example of an add function that gets specialized to doubles - * if run with --optimize flag set + * if run with --optimize flag set */ function add(a,b) { @@ -34,10 +34,10 @@ function bench() { var sum = 1; for (var x = 0 ; x < 5e7 ; x++) { - sum *= add(x,x + 1); + sum *= add(x,x + 1); } for (var x = 0; x < 5e7 ; x++) { - sum *= add(x + 2, x + 3); + sum *= add(x + 2, x + 3); } return sum; }
--- a/test/opt/add_revert2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/opt/add_revert2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Example of an add function that gets specialized to doubles - * if run with --optimize flag set + * if run with --optimize flag set */ function add(a,b) { @@ -34,8 +34,8 @@ function bench() { var sum = 1; for (var x = 0 ; x < 5e7 ; x++) { - sum *= add(x, 17); - sum *= add(x, x); //can use same revert as 17? + sum *= add(x, 17); + sum *= add(x, x); //can use same revert as 17? } return sum; }
--- a/test/opt/cascade_specialize.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/opt/cascade_specialize.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,4 +37,4 @@ } test(); - +
--- a/test/script/assert.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/assert.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ */ // Assert is TestNG's Assert class -Object.defineProperty(this, "Assert", { +Object.defineProperty(this, "Assert", { configurable: true, enumerable: false, writable: true, @@ -40,7 +40,7 @@ configurable: true, enumerable: false, writable: true, - // 'error' is optional. if present it has to be + // 'error' is optional. if present it has to be // an ECMAScript Error object or java Throwable object value: function (message, error) { var throwable = null;
--- a/test/script/basic/8024180/global_var_delete.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/8024180/global_var_delete.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/8024180/global_var_shadow.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/8024180/global_var_shadow.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/8024180/scope_no_such_prop.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/8024180/scope_no_such_prop.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/8024180/with_expr_prop_add.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/8024180/with_expr_prop_add.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/8024180/with_expr_proto_prop_add.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/8024180/with_expr_proto_prop_add.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -42,7 +42,7 @@ if (i == 0) { p.x = "p.x"; } - } + } } }
--- a/test/script/basic/8024180/with_java_object.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/8024180/with_java_object.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8005958.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8005958.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8005958 : invoking a function through INVOKESTATIC with more + * JDK-8005958 : invoking a function through INVOKESTATIC with more * arguments than it declares resulted in malformed bytecode being * generated. *
--- a/test/script/basic/JDK-8006304.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006304.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,26 +1,26 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ - + /** * JDK-8006304 : Remove pre-population of maps for constructor produced maps. *
--- a/test/script/basic/JDK-8006337.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006337.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8006337 : Discarded arguments for INVOKESTATIC must still be + * JDK-8006337 : Discarded arguments for INVOKESTATIC must still be * evaluated for side effects. * * @test
--- a/test/script/basic/JDK-8006529-b.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006529-b.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -62,4 +62,4 @@ for(var i in x) { print("Doing " + i) new x[i]() -} \ No newline at end of file +}
--- a/test/script/basic/JDK-8006570.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006570.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -57,4 +57,4 @@ strict.call(null); strict.call("foo"); strict.call(1); -strict.call(true); \ No newline at end of file +strict.call(true);
--- a/test/script/basic/JDK-8006852a.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006852a.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,24 +27,24 @@ * @test * @run */ - -function Field(val){ - this.value = val; -} -var times = 0; - -Field.prototype = { - get value(){ - print("GETTER!"); - return this._value; - }, - set value(val){ - print("SETTER!"); - this._value = val + (++times); - } -}; - -var f = new Field("test"); -print(f.value); -f.value = "test2"; + +function Field(val){ + this.value = val; +} +var times = 0; + +Field.prototype = { + get value(){ + print("GETTER!"); + return this._value; + }, + set value(val){ + print("SETTER!"); + this._value = val + (++times); + } +}; + +var f = new Field("test"); print(f.value); +f.value = "test2"; +print(f.value);
--- a/test/script/basic/JDK-8006852b.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006852b.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + function MyCons(arg) { if (arg == 2) { this.foo = 3;
--- a/test/script/basic/JDK-8006857.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006857.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8006983.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006983.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8006984.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8006984.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,22 +23,22 @@ /** * findProperty on WithObject was not considering its object argument - * + * * @test * @run */ -var guiPkgs = { JFrame: function() { print("created"); } }; +var guiPkgs = { JFrame: function() { print("created"); } }; -with (guiPkgs) { - var main = function() { +with (guiPkgs) { + var main = function() { var frame; // <---- this local variable caused scope to be not set properly prior to fix - function createFrame() { - frame = new JFrame(); - } + function createFrame() { + frame = new JFrame(); + } - createFrame(); - } -} + createFrame(); + } +} main();
--- a/test/script/basic/JDK-8007060.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007060.js Wed Jun 04 13:08:57 2014 +0200 @@ -91,4 +91,4 @@ [1, 2, 3].filter(F, "hello"); [1, 2, 3].filter(F, 1); [1, 2, 3].filter(F, {}); -[1, 2, 3].filter(F, "hello"); \ No newline at end of file +[1, 2, 3].filter(F, "hello");
--- a/test/script/basic/JDK-8007140.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007140.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8007215.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007215.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Varargs based on too many parameters broke. Regression test. - * + * * @test * @run */ @@ -31,11 +31,11 @@ function f() { var sum = 0; for (var i = 0; i < arguments.length; i++) { - var a = arguments[i]; - sum += a; + var a = arguments[i]; + sum += a; } return sum; -} +} var res;
--- a/test/script/basic/JDK-8007460.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007460.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,4 +37,4 @@ print(y) print(arguments[0]) } -f(2) \ No newline at end of file +f(2)
--- a/test/script/basic/JDK-8007522.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007522.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8007523.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007523.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8007523: VerifyError on script that uses regular expression literals with ternary operator + * JDK-8007523: VerifyError on script that uses regular expression literals with ternary operator * * @test * @run
--- a/test/script/basic/JDK-8007619.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007619.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,11 +37,11 @@ while (match != null) { print("Match = " + match); print("RegExp.lastMatch = " + RegExp.lastMatch); - + print("RegExp.$1 = " + RegExp.$1); print("RegExp.$2 = " + RegExp.$2); print("RegExp.$3 = " + RegExp.$3); - + print("RegExp.lastParen = " + RegExp.lastParen) print("RegExp.input = " + RegExp.input);
--- a/test/script/basic/JDK-8007990.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8007990.js Wed Jun 04 13:08:57 2014 +0200 @@ -22,15 +22,15 @@ */ /** - * JDK-8007990: Access methods declared on public interfaces implemented by + * JDK-8007990: Access methods declared on public interfaces implemented by * non-public classes * * @test * @run */ -var p = new Packages.java.io.File("test/script/basic/JDK-8007990.js"); -var path = p.toPath(); -var basicView = Packages.java.nio.file.Files.getFileAttributeView(path, Packages.java.nio.file.attribute.BasicFileAttributeView.class); +var p = new Packages.java.io.File("test/script/basic/JDK-8007990.js"); +var path = p.toPath(); +var basicView = Packages.java.nio.file.Files.getFileAttributeView(path, Packages.java.nio.file.attribute.BasicFileAttributeView.class); // We just want to confirm we can access the readAttributes() function print(basicView.readAttributes().directory);
--- a/test/script/basic/JDK-8008197.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8008197.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,7 +33,7 @@ var e = m.getEngineByName("nashorn"); var obj = { - func: function(str) { + func: function(str) { return /hello/.exec(str); } };
--- a/test/script/basic/JDK-8008206.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8008206.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,9 +28,9 @@ * @run */ -var x = 1; +var x = 1; -switch (x) { - case foo = false, 1: - print("ok"); -} +switch (x) { + case foo = false, 1: + print("ok"); +}
--- a/test/script/basic/JDK-8008238.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8008238.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8008554.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8008554.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8008814-3.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8008814-3.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8008814-4.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8008814-4.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8009553.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8009553.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8009868.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8009868.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8010709.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010709.js Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ */ /** - * JDK-8010709 org on the top level doesn't resolve + * JDK-8010709 org on the top level doesn't resolve * * @test * @run
--- a/test/script/basic/JDK-8010710.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010710.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -26,7 +26,7 @@ * as array index in self modifying assigns * * @test - * @run + * @run */ function zero() { return 0; @@ -38,9 +38,9 @@ print(b[zero() + 1][2 + a[0]] += 10); //repro for NASHORN-258 that never made it -function AddRoundKey() { - var r=0; - state[r][1] &= 17; +function AddRoundKey() { + var r=0; + state[r][1] &= 17; } var srcFiles = []; @@ -52,7 +52,7 @@ //this broke the javafx build system. verify it works function bouncingBall() { for (j=0; j<100; j++) { - added += srcFiles[j]; + added += srcFiles[j]; } } bouncingBall(); @@ -61,7 +61,7 @@ //this is how they should have done it for speed, that works always, verify this too function bouncingBall2() { for (var k=0; k<100; k++) { - added += srcFiles[k]; + added += srcFiles[k]; } } bouncingBall2();
--- a/test/script/basic/JDK-8010720.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010720.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8010731.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010731.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8010804.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010804.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -83,4 +83,4 @@ var d = new Date(); d.setYear(Infinity); -print(d); \ No newline at end of file +print(d);
--- a/test/script/basic/JDK-8010946-privileged.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010946-privileged.js Wed Jun 04 13:08:57 2014 +0200 @@ -25,7 +25,7 @@ * JDK-8010946: AccessController.doPrivileged() doesn't work as expected. * This is actually a broader issue of having Dynalink correctly handle * caller-sensitive methods. - * + * * NOTE: This is not a standalone test file, it is loaded by JDK-801946.js * @subtest */
--- a/test/script/basic/JDK-8010946.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8010946.js Wed Jun 04 13:08:57 2014 +0200 @@ -34,7 +34,7 @@ load(__DIR__ + "JDK-8010946-privileged.js") try { - // This should fail, even though the code itself resides in the + // This should fail, even though the code itself resides in the // privileged script, as we're invoking it without going through // doPrivileged() print("Attempting unprivileged execution...")
--- a/test/script/basic/JDK-8011023.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011023.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Round should be ecma compliant * * @test - * @run + * @run */ print(1/Math.round(-0.5));
--- a/test/script/basic/JDK-8011209.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011209.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011237.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011237.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011274.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011274.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011357.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011357.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011362.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011362.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011365.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011365.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ try { Array.prototype.join.call(null, { toString:function() { throw 2 } }); - fail("should have thrown TypeError"); + fail("should have thrown TypeError"); } catch (e) { if (! (e instanceof TypeError)) { fail("TypeError expected, got " + e); @@ -46,7 +46,7 @@ if (funcName == "constructor") { continue; } - + var prop = Array.prototype[funcName]; if (prop instanceof Function) { // try 'null' this
--- a/test/script/basic/JDK-8011382.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011382.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8011382: Data prototype methods and constructor do not call user defined toISOString, valueOf methods per spec. + * JDK-8011382: Data prototype methods and constructor do not call user defined toISOString, valueOf methods per spec. * * @test * @run
--- a/test/script/basic/JDK-8011394.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011394.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011552.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011552.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011555.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011555.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -35,7 +35,7 @@ } catch(e) { // We expect to get a TypeError for trying to use __noSuchMethod__ as // a constructor. Before we fixed this bug, we were getting a runtime - // exception with MH type mismatch on a MH.foldArguments within the + // exception with MH type mismatch on a MH.foldArguments within the // WithObject code instead. print(e) }
--- a/test/script/basic/JDK-8011578.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011578.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011718.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011718.js Wed Jun 04 13:08:57 2014 +0200 @@ -28,19 +28,19 @@ * @run */ -var obj = { - hello:"From obj", -}; -var obj2 = { - hello:"From obj2", -}; +var obj = { + hello:"From obj", +}; +var obj2 = { + hello:"From obj2", +}; -function doit(cb){ - cb(); - var cb2 = cb.bind(obj2, "This one is not acccepted"); - cb2(); -} +function doit(cb){ + cb(); + var cb2 = cb.bind(obj2, "This one is not acccepted"); + cb2(); +} -doit(function(){ - print(this.hello); +doit(function(){ + print(this.hello); }.bind(obj));
--- a/test/script/basic/JDK-8011756.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011756.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011893.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011893.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011960.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011960.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011964.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011964.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8011974.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8011974.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8012083.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012083.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8012164.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012164.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -46,11 +46,11 @@ func(); -// See JDK-8015855: test/script/basic/JDK-8012164.js fails on Windows +// See JDK-8015855: test/script/basic/JDK-8012164.js fails on Windows // Replace '\' to '/' in class and file names of StackFrameElement objects function printFrame(stack) { var fileName = stack.fileName.replace(/\\/g, '/'); var className = stack.className.replace(/\\/g, '/'); print(className + '.' + stack.methodName + '(' + - fileName + ':' + stack.lineNumber + ')'); + fileName + ':' + stack.lineNumber + ')'); }
--- a/test/script/basic/JDK-8012191.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012191.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -// ClassCastException: Cannot cast java.lang.String to [Ljava.lang.Object; +// ClassCastException: Cannot cast java.lang.String to [Ljava.lang.Object; __noSuchProperty__ = function() { print("obj.__noSuchProperty__ invoked for " + arguments[0]); }
--- a/test/script/basic/JDK-8012240.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012240.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,15 +33,15 @@ try { Array.prototype.map.call( { - length: -1, + length: -1, get 0() { in_getter_for_0 = true; throw 0; } - }, + }, function(){}).length; } catch (e) { if (e !== 0 || !in_getter_for_0) { fail("should have thrown error from getter for '0'th element"); } -} +}
--- a/test/script/basic/JDK-8012291.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012291.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8012305.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012305.js Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ */ /** - * JDK-8012305: Function.bind can't be called on prototype function inside constructor + * JDK-8012305: Function.bind can't be called on prototype function inside constructor * * @test * @run @@ -36,4 +36,4 @@ MyObject.prototype._process = function() { print("Message "); } -var s = new MyObject(); +var s = new MyObject();
--- a/test/script/basic/JDK-8012457.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012457.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -35,7 +35,7 @@ // getter should be called var getter_0_called = false; -Function().apply(null, +Function().apply(null, Object.defineProperty([],"0", { get: function(){ getter_0_called = true; return 0 } })
--- a/test/script/basic/JDK-8012462.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8012462.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8013131.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013131.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8013167.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013167.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,4 +29,4 @@ */ var x = new Packages.jdk.nashorn.test.models.VarArgConstructor(1, false, "a", "b", "c") -print(x.indicator) \ No newline at end of file +print(x.indicator)
--- a/test/script/basic/JDK-8013325.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013325.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,9 +33,9 @@ // x doesn't see an arguments object as it has a nested function with that name // so it'll invoke the function. arguments("a", "b", "c"); - + function arguments(x, y, z) { - // The function 'arguments' OTOH can't see itself; if it uses the + // The function 'arguments' OTOH can't see itself; if it uses the // identifier 'arguments', it'll see its own arguments object. print(arguments) print(x + " " + y + " " + z)
--- a/test/script/basic/JDK-8013337.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013337.js Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ */ /** - * JDK-8013337: Issues with Date.prototype's get, set functions + * JDK-8013337: Issues with Date.prototype's get, set functions * * @test * @option -timezone=Asia/Calcutta @@ -63,7 +63,7 @@ checkGetterCalled("setUTCMonth"); try { - Date.prototype.setTime.call({}, { valueOf: function() { throw "err" } }) + Date.prototype.setTime.call({}, { valueOf: function() { throw "err" } }) } catch (e) { if (! (e instanceof TypeError)) { fail("TypeError expected, got " + e);
--- a/test/script/basic/JDK-8013444.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013444.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,14 +32,14 @@ var type = typeof JSON.parse('{}',function(){}) print("type is " + type); -var obj = JSON.parse('{"name": "nashorn"}', +var obj = JSON.parse('{"name": "nashorn"}', function(k, v) { if (k === "") return v; return v.toUpperCase(); }); print(JSON.stringify(obj)) -var array = +var array = JSON.parse("[1, 3, 5, 7, 9, 11]", function(k, v) { if (k === "") return v;
--- a/test/script/basic/JDK-8013729.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013729.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8013873.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013873.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8013874.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013874.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8013878.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013878.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8013919.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8013919.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,7 +33,7 @@ print("a"); } finally { var b = function() { - print("b"); + print("b"); } b(); }
--- a/test/script/basic/JDK-8014426.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8014426.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8014647.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8014647.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8014781.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8014781.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8014785.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8014785.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -40,7 +40,7 @@ // update obj.x via foo.x foo.x = "hello"; print("obj.x = " + obj.x); // prints "hello" now - + obj.x = 42; // foo.x also becomes 42 print("obj.x = " + obj.x); // prints 42 print("foo.x = " + foo.x); // prints 42
--- a/test/script/basic/JDK-8014953.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8014953.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + try { new java.util.ArrrayList(16) } catch(e) {
--- a/test/script/basic/JDK-8015267.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015267.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + var a = ['a', 'b', 'c', 'd'] var l = Java.to(a, java.util.List) @@ -64,10 +64,10 @@ l[7] = 'g' print(a) -try { l.add(15, '') } catch(e) { print(e.class) } -try { l.remove(15) } catch(e) { print(e.class) } -try { l.add(-1, '') } catch(e) { print(e.class) } -try { l.remove(-1) } catch(e) { print(e.class) } +try { l.add(15, '') } catch(e) { print(e.class) } +try { l.remove(15) } catch(e) { print(e.class) } +try { l.add(-1, '') } catch(e) { print(e.class) } +try { l.remove(-1) } catch(e) { print(e.class) } l.remove(7) l.remove(2)
--- a/test/script/basic/JDK-8015345.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015345.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015346.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015346.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015347.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015347.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015348.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015348.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015349.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015349.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ print(code + " = " + eval(code)); } -printEval("'abc'.lastIndexOf('a', 4)"); +printEval("'abc'.lastIndexOf('a', 4)"); printEval("'abc'.lastIndexOf('b', Infinity)"); printEval("'abc'.lastIndexOf('a', -1)"); printEval("'abc'.lastIndexOf('a', -Infinity)");
--- a/test/script/basic/JDK-8015350.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015350.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015352.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015352.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015353.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015353.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015354.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015354.js Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ */ /** - * JDK-8015354: JSON.parse should not use [[Put]] but use [[DefineOwnProperty]] instead + * JDK-8015354: JSON.parse should not use [[Put]] but use [[DefineOwnProperty]] instead * * @test * @run
--- a/test/script/basic/JDK-8015355.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015355.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * JDK-8015355: Array.prototype functions don't honour non-writable length and / or index properties - * + * * @test * @run */
--- a/test/script/basic/JDK-8015356.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015356.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * JDK-8015355: Array concatenation should ignore empty array elements. - * + * * @test * @run */
--- a/test/script/basic/JDK-8015357.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015357.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,8 +28,8 @@ * @run */ -var a = []; -a[0x7fffffff]=1; +var a = []; +a[0x7fffffff]=1; if (a.sort()[0] != 1) { fail("a.sort()[0] != 1");
--- a/test/script/basic/JDK-8015741.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015741.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015830.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015830.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015892.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015892.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,10 +29,10 @@ * @run */ -function doIt() { - if (something) { - x = x.obj; - } else { - var x = "x"; - } -} +function doIt() { + if (something) { + x = x.obj; + } else { + var x = "x"; + } +}
--- a/test/script/basic/JDK-8015945.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015945.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015959.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015959.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8015969.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8015969.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8016235.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016235.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,27 +23,27 @@ /** * JDK-8016235 : use before definition in catch block generated erroneous bytecode - * as there is no guarantee anything in the try block has executed. + * as there is no guarantee anything in the try block has executed. * * @test - * @run + * @run */ function f() { try { - var parser = {}; + var parser = {}; } catch (e) { - parser = parser.context(); + parser = parser.context(); } } -function g() { +function g() { try { return "apa"; } catch (tmp) { - //for now, too conservative as var ex declaration exists on the function - //level, but at least the code does not break, and the analysis is driven - //from the catch block (the rare case), not the try block (the common case) + //for now, too conservative as var ex declaration exists on the function + //level, but at least the code does not break, and the analysis is driven + //from the catch block (the rare case), not the try block (the common case) var ex = new Error("DOM Exception 5"); ex.code = ex.number = 5; return ex;
--- a/test/script/basic/JDK-8016239.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016239.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8016518.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016518.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8016542.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016542.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8016618.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016618.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -38,7 +38,7 @@ function func(x, y) { print('func.x = ' + x); print('func.x = ' + y) -}; +}; var obj = { foo: 'hello', @@ -54,7 +54,7 @@ }); // load on mirror with local object as argument -global.load({ +global.load({ name: "code", script: "print('x = ' + x)" });
--- a/test/script/basic/JDK-8016667.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016667.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,22 +31,22 @@ function toto() { var friends = 1; (joe = friends) == null; -} +} //JDK-8019476 duplicate case of this -Function("with(\nnull == (this % {}))( /x/g );"); +Function("with(\nnull == (this % {}))( /x/g );"); function f() { with(null == (this % {}))(/x/g); } -Function("return (null != [,,] <= this);"); +Function("return (null != [,,] <= this);"); function f2() { return (null != [,,] <= this); } -Function("/*infloop*/L:for(var x; ([+(function (window)[,,])(function(q) { return q; }, -0)].some(new Function)); [11,12,13,14].some) {/*infloop*/do {;return this; } while(x); }"); +Function("/*infloop*/L:for(var x; ([+(function (window)[,,])(function(q) { return q; }, -0)].some(new Function)); [11,12,13,14].some) {/*infloop*/do {;return this; } while(x); }"); function f3() { /*infloop*/L:for(var x; ([+(function (window)[,,])(function(q) { return q; }, -0)].some(new Function)); [11,12,13,14].some) {/*infloop*/do {;return this; } while(x); }
--- a/test/script/basic/JDK-8016681.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8016681.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8017046.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8017046.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8017082.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8017082.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8017084.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8017084.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8017768.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8017768.js Wed Jun 04 13:08:57 2014 +0200 @@ -23,7 +23,7 @@ /** * JDK-8017768: Allow use of dot notation for inner class names. - * + * * @test * @run */
--- a/test/script/basic/JDK-8017950.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8017950.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -36,7 +36,7 @@ } } -function f() { +function f() { func() }
--- a/test/script/basic/JDK-8019226.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019226.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8019226: line number not generated for first statement if it is on the same function declaration line + * JDK-8019226: line number not generated for first statement if it is on the same function declaration line * * @test * @run
--- a/test/script/basic/JDK-8019473.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019473.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019478.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019478.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019482.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019482.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019488.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019488.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019508.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019508.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019553.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019553.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019585.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019585.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,5 +30,5 @@ */ function f() { - var a = b == 17 && (a = toto(b)) && toto2(a); + var a = b == 17 && (a = toto(b)) && toto2(a); }
--- a/test/script/basic/JDK-8019629.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019629.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8019629: void operator should always evaluate to undefined + * JDK-8019629: void operator should always evaluate to undefined * * @test * @run
--- a/test/script/basic/JDK-8019783.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019783.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019791.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019791.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019805.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019805.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019808.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019808.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -Function("switch([]) { case 7: }"); +Function("switch([]) { case 7: }"); function f() { switch([]) {
--- a/test/script/basic/JDK-8019809.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019809.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -//Function("L: {break L;return; }"); +//Function("L: {break L;return; }"); function f() { L: { break L; return; }
--- a/test/script/basic/JDK-8019810.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019810.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019811.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019811.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,18 +30,18 @@ function f(x) { var window = 17; - return function (x) { - return true + return function (x) { + return true } (x) >> window; } -Function("L:if((function x ()3)() + arguments++) {return; } else if (new gc()) while(((x2.prop = functional)) && 0){ }"); +Function("L:if((function x ()3)() + arguments++) {return; } else if (new gc()) while(((x2.prop = functional)) && 0){ }"); -Function("var x = x -= '' "); +Function("var x = x -= '' "); -Function("switch((Math.pow ? x = 1.2e3 : 3)) { default: return; }") +Function("switch((Math.pow ? x = 1.2e3 : 3)) { default: return; }") Function("x = 0.1, x\ntrue\n~this"); Function("with((function (x)x2)() ^ this){return; }"); - \ No newline at end of file +
--- a/test/script/basic/JDK-8019814.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019814.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -34,7 +34,7 @@ // java.lang.AssertionError: expecting integer type or object for jump, but found double Function("with(\nnull == (this % {}))( /x/g );"); -// java.lang.AssertionError: expecting equivalent types on stack but got double and int +// java.lang.AssertionError: expecting equivalent types on stack but got double and int try { eval('Function("/*infloop*/while(((function ()4.)([z1,,], [,,]) - true++))switch(1e+81.x) { default: break; \u0009 }")'); } catch (e) { @@ -48,11 +48,11 @@ Function("return (null != [,,] <= this);"); // java.lang.AssertionError: Only return value on stack allowed at return point -// - depth=2 stack = jdk.nashorn.internal.codegen.Label$Stack@4bd0d62f +// - depth=2 stack = jdk.nashorn.internal.codegen.Label$Stack@4bd0d62f Function("x = 0.1, x\ntrue\n~this"); // java.lang.AssertionError: node NaN ~ window class jdk.nashorn.internal.ir.BinaryNode -// has no symbol! [object] function _L1() +// has no symbol! [object] function _L1() Function("throw NaN\n~window;"); // java.lang.AssertionError: array element type doesn't match array type @@ -65,9 +65,9 @@ } // java.lang.AssertionError: stacks jdk.nashorn.internal.codegen.Label$Stack@4918f90f -// is not equivalent with jdk.nashorn.internal.codegen.Label$Stack@5f9b21a1 at join point +// is not equivalent with jdk.nashorn.internal.codegen.Label$Stack@5f9b21a1 at join point Function("if((null ^ [1]) !== (this.yoyo(false))) {var NaN, x;x\n~[,,z1] }"); // java.lang.AssertionError -// at jdk.nashorn.internal.codegen.Attr.enterFunctionBody(Attr.java:276) -Function("return (void ({ set each (x2)y }));"); +// at jdk.nashorn.internal.codegen.Attr.enterFunctionBody(Attr.java:276) +Function("return (void ({ set each (x2)y }));");
--- a/test/script/basic/JDK-8019817.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019817.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ var y = 17.17; -Function("return y % function(q) { return q; }();"); +Function("return y % function(q) { return q; }();"); function f() { return y % function(q) { return q; }();
--- a/test/script/basic/JDK-8019819.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019819.js Wed Jun 04 13:08:57 2014 +0200 @@ -23,14 +23,14 @@ /** * JDK-8019819: scope symbol didn't get a slot in certain cases - * + * * @test * @run */ function f() { try { - } catch(e if [].g(e)) { - with({}) { + } catch(e if [].g(e)) { + with({}) { throw e; } } @@ -38,8 +38,8 @@ function g() { try { - } catch(e) { - with({}) { + } catch(e) { + with({}) { throw e; } }
--- a/test/script/basic/JDK-8019821.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019821.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,37 +1,37 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8019821: boolean switch value accidentally triggered "allInts" case + * JDK-8019821: boolean switch value accidentally triggered "allInts" case * as boolean is considered narrower than int. This caused a ClassCastException * * @test * @run */ -function f() { - switch(gc()) { - case true: - case 1: +function f() { + switch(gc()) { + case true: + case 1: } }
--- a/test/script/basic/JDK-8019822.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019822.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019947.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019947.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019963.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019963.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8019983.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019983.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,18 +24,18 @@ /** * JDK-8019983.js return without expression combined with return with expression should produce object * return type (undefined) - * + * * @test * @run */ -function g() { - switch(1) { - case 0: - case '': +function g() { + switch(1) { + case 0: + case '': default: - return; + return; } return 10; }
--- a/test/script/basic/JDK-8019985.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8019985.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020124.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020124.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020132.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020132.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020223.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020223.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020324.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020324.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020325.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020325.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020354.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020354.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020355.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020355.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020356.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020356.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020357.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020357.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020358.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020358.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020380.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020380.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020437.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020437.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020463.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020463.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8020508.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8020508.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8020508: Enforce reflection check on + * JDK-8020508: Enforce reflection check on * Object.bindProperties(target, source) for beans * * @test
--- a/test/script/basic/JDK-8021122.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8021122.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8022598.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8022598.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8022731.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8022731.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8022903.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8022903.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8023026.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023026.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8023373.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023373.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -50,7 +50,7 @@ write: function(s, off, len) { s = capitalize(s) // Must handle overloads by arity - if(off === undefined) { + if(off === undefined) { cw.super$write(s, 0, s.length()) } else if (typeof s === "string") { cw.super$write(s, off, len)
--- a/test/script/basic/JDK-8023531.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023531.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8023551.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023551.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8023630.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023630.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -50,7 +50,7 @@ write: function(s, off, len) { s = capitalize(s) // Must handle overloads by arity - if(off === undefined) { + if(off === undefined) { cw_super.write(s, 0, s.length()) } else if (typeof s === "string") { cw_super.write(s, off, len)
--- a/test/script/basic/JDK-8023650.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023650.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8023780.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023780.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8023784.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8023784.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8024120.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024120.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8024174.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024174.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8024255.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024255.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -39,9 +39,9 @@ } } -var obj = { +var obj = { default: 344, - in: 'hello', + in: 'hello', if: false, class: 4.223 }
--- a/test/script/basic/JDK-8024512.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024512.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8024619.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024619.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8024846.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024846.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8024847.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024847.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -79,7 +79,7 @@ var __array__ = [ "nashorn", "js" ]; var obj = new JSObject() { - + hasMember: function(name) { return name in __array__; },
--- a/test/script/basic/JDK-8024972.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8024972.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025048-2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025048-2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ function func(x) { - switch(x) { + switch(x) { case 8: break; case false: } }
--- a/test/script/basic/JDK-8025048.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025048.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ function func(x) { - switch(x) { + switch(x) { case 8: break; case true: } }
--- a/test/script/basic/JDK-8025080.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025080.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025090.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025090.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025111.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025111.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025147.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025147.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025149.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025149.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025163.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025163.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025197.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025197.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025213.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025213.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025312.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025312.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025325.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025325.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025434.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025434.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025486.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025486.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025488.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025488.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -39,5 +39,5 @@ return this.arr.toString(); } -var e = new MyError(); +var e = new MyError(); print(e.stack.replace(/\\/g, '/'));
--- a/test/script/basic/JDK-8025515.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025515.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025520.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025520.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8025589.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8025589.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026008.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026008.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026016.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026016.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026033.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026033.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026042.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026042.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026048.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026048.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026112.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026112.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026125.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026125.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026137.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026137.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8026137: Binary evaluation order in JavaScript is load load + * JDK-8026137: Binary evaluation order in JavaScript is load load * convert convert, not load convert load convert. * * @test @@ -30,16 +30,16 @@ */ try { - (function f() { - Object.defineProperty({},"x",{get: function(){return {valueOf:function(){throw 0}}}}).x - + (function f() { + Object.defineProperty({},"x",{get: function(){return {valueOf:function(){throw 0}}}}).x - Object.defineProperty({},"x",{get: function(){throw 1}}).x })() -} +} catch (e) { print(e); } try { - ({valueOf: function(){throw 0}}) - ({valueOf: function(){throw 1}} - 1) + ({valueOf: function(){throw 0}}) - ({valueOf: function(){throw 1}} - 1) } catch (e) { print(e); }
--- a/test/script/basic/JDK-8026161.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026161.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026162.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026162.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026167.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026167.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,7 +37,7 @@ e.eval('function f() { var e = 33; eval("e") } f()'); function f() { - Function.call.call(function x() { eval("x") }); eval("x") + Function.call.call(function x() { eval("x") }); eval("x") } try {
--- a/test/script/basic/JDK-8026248.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026248.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ load('nashorn:mozilla_compat.js') -importClass(java.io.File, java.io.InputStream) +importClass(java.io.File, java.io.InputStream) print(File) print(InputStream)
--- a/test/script/basic/JDK-8026264.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026264.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026292.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026292.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026302.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026302.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -45,4 +45,4 @@ var desc = Object.getOwnPropertyDescriptor(obj, prop); print(desc.get); print(desc.set); -} +}
--- a/test/script/basic/JDK-8026317.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026317.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026367.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026367.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026692.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026692.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026693.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026693.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026701.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026701.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026805.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026805.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026858.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026858.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8026955.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8026955.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027016.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027016.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027024.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027024.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8027024: String.prototype.charAt and charCodeAt do not evaluate 'self' and 'pos' arguments in right order + * JDK-8027024: String.prototype.charAt and charCodeAt do not evaluate 'self' and 'pos' arguments in right order * * @test * @run
--- a/test/script/basic/JDK-8027042.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027042.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027236.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027236.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027562.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027562.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027700.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027700.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -43,7 +43,7 @@ } } -Object.defineProperty(this, "foo", { value:0 }) +Object.defineProperty(this, "foo", { value:0 }) try { eval("function foo() {}"); fail("should have thrown TypeError");
--- a/test/script/basic/JDK-8027753.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027753.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027828.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027828.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8027933.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8027933.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8028020.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8028020.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8028210.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8028210.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8028434.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8028434.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,28 +31,28 @@ try { while (test.apa < 0) { - print("x"); + print("x"); } } catch (e) { var st = e.getStackTrace(); if (st.length != 1) { - print("erroneous stacktrace length " + s.length); + print("erroneous stacktrace length " + s.length); } if (st[0].lineNumber !== 33) { - print("erroneous stacktrace element, lineNumber=" + st[0].lineNumber + " elem=" + st); + print("erroneous stacktrace element, lineNumber=" + st[0].lineNumber + " elem=" + st); } } try { do { - print("x"); + print("x"); } while (test.apa < 0); } catch (e) { var st = e.getStackTrace(); if (st.length != 1) { - print("erroneous stacktrace length " + s.length); + print("erroneous stacktrace length " + s.length); } if (st[0].lineNumber !== 49) { - print("erroneous stacktrace element, lineNumber= " + st[0].lineNumber + " elem=" + st); + print("erroneous stacktrace element, lineNumber= " + st[0].lineNumber + " elem=" + st); } }
--- a/test/script/basic/JDK-8029364.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8029364.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8029384.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8029384.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8029467.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8029467.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8029667.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8029667.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ function f(x) { - return (function inner() { + return (function inner() { var y; (function dummy() { return y })() // force own scope for the inner function with({}) { // 'with' block turns off fast scopes return x @@ -39,8 +39,8 @@ print(f(1)); print(f(2)); -function g(x) { - (function inner() { +function g(x) { + (function inner() { var y; (function dummy() { return y })() // force own scope for the inner function with({}) { // 'with' block turns off fast scopes // Test setter as well as getter @@ -83,7 +83,7 @@ } } main(); -} +} print(withScopes[0].func); print(withScopes[1].func);
--- a/test/script/basic/JDK-8030182.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030182.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8030182_2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030182_2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,13 +28,13 @@ * @run */ -var str = ""; +var str = ""; // large code to force splitting -for (i = 0; i < 1000; ++i) +for (i = 0; i < 1000; ++i) str +="o = new Object()\n"; -str +="g()"; +str +="g()"; // check that "$split" or some such internal method // does not appear in script stack trace!!
--- a/test/script/basic/JDK-8030197.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030197.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8030199.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030199.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8030200.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030200.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8030202.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030202.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8030809.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8030809.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ function func() { - (function() { + (function() { throw new Error(); })(); }
--- a/test/script/basic/JDK-8031317.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8031317.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8031359.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8031359.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8031983.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8031983.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8031983: Error objects should capture stack at the constructor + * JDK-8031983: Error objects should capture stack at the constructor * * @test * @run
--- a/test/script/basic/JDK-8032004.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8032004.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8032004: instance property "message" of Error objects should be non-enumerable + * JDK-8032004: instance property "message" of Error objects should be non-enumerable * * @test * @run
--- a/test/script/basic/JDK-8032068.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8032068.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8034055.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8034055.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8037562.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8037562.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8038945.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8038945.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,7 +24,7 @@ /** * JDK-8038945.js : test various undefined strict intrinsics and that they * aren't erroneously applied when undefined is in any scope but global - * + * * @test * @run */ @@ -45,7 +45,7 @@ function f3(x) { //f3$f3_2 internals={} externals={x=0} function f3_2(undefined) { - return x === undefined; + return x === undefined; } return f3_2(17); } @@ -54,8 +54,8 @@ function f4(x) { //f4$f4_2 internals={} externals={x=0} function f4_2() { - var undefined = 17; - return x === undefined; + var undefined = 17; + return x === undefined; } return f4_2(); } @@ -65,7 +65,7 @@ var undefined = 17; //f5$f5_2 internals={} externals={x=0, undefined=0} function f5_2() { - return x === undefined; + return x === undefined; } return f5_2(); } @@ -97,7 +97,7 @@ function g3(x) { //g3$g3_2 internals={} externals={x=0} function g3_2(undefined) { - return x !== undefined; + return x !== undefined; } return g3_2(17); } @@ -106,8 +106,8 @@ function g4(x) { //f4$f4_2 internals={} externals={x=0} function g4_2() { - var undefined = 17; - return x !== undefined; + var undefined = 17; + return x !== undefined; } return g4_2(); } @@ -117,7 +117,7 @@ var undefined = 17; //g5$g5_2 internals={} externals={x=0, undefined=0} function g5_2() { - return x !== undefined; + return x !== undefined; } return g5_2(); } @@ -149,7 +149,7 @@ function h3(x) { //h3$f3_2 internals={} externals={x=0} function h3_2(undefined) { - return undefined === x; + return undefined === x; } return h3_2(17); } @@ -158,8 +158,8 @@ function h4(x) { //h4$h4_2 internals={} externals={x=0} function h4_2() { - var undefined = 17; - return undefined === x; + var undefined = 17; + return undefined === x; } return h4_2(); } @@ -169,7 +169,7 @@ var undefined = 17; //h5$h5_2 internals={} externals={x=0, undefined=0} function h5_2() { - return undefined === x; + return undefined === x; } return h5_2(); } @@ -201,7 +201,7 @@ function i3(x) { //i3$f3_2 internals={} externals={x=0} function i3_2(undefined) { - return undefined !== x; + return undefined !== x; } return i3_2(17); } @@ -210,8 +210,8 @@ function i4(x) { //i4$i4_2 internals={} externals={x=0} function i4_2() { - var undefined = 17; - return undefined !== x; + var undefined = 17; + return undefined !== x; } return i4_2(); } @@ -221,7 +221,7 @@ var undefined = 17; //i5$i5_2 internals={} externals={x=0, undefined=0} function i5_2() { - return undefined !== x; + return undefined !== x; } return i5_2(); }
--- a/test/script/basic/JDK-8039387.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8039387.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8040024.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8040024.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8041995.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8041995.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,16 +32,16 @@ function xyzzy() { return 17.4711; } -var obj = { +var obj = { z: -xyzzy() }; print(obj.z); function phlug() { - var obj = { - 4: -Infinity, - 5: Infinity, - length: 5 - Math.pow(2, 32) + var obj = { + 4: -Infinity, + 5: Infinity, + length: 5 - Math.pow(2, 32) }; return Array.prototype.lastIndexOf.call(obj, -Infinity) === 4; @@ -54,12 +54,12 @@ function wrong() { var obj = { - length1: 5 - Math.pow(2, 32), - length2: 4 - Math.pow(2, 32), - length3: 3 - Math.pow(2, 32), - length4: 2 - Math.pow(2, 32), - length5: 1 - Math.pow(2, 32), - length6: Math.pow(2, 32) + length1: 5 - Math.pow(2, 32), + length2: 4 - Math.pow(2, 32), + length3: 3 - Math.pow(2, 32), + length4: 2 - Math.pow(2, 32), + length5: 1 - Math.pow(2, 32), + length6: Math.pow(2, 32) }; for (var i in obj) { print(obj[i]);
--- a/test/script/basic/JDK-8041998.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8041998.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8042364.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8042364.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * JDK-8042364: Make __proto__ ES6 draft compliant - * + * * @test * @run */
--- a/test/script/basic/JDK-8043133.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8043133.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,8 +30,8 @@ var x = {} var b = false; -// Ternary expression is not optimistic, yet the analyzer must still -// find the optimistic subexpression f() that triggered deoptimizing +// Ternary expression is not optimistic, yet the analyzer must still +// find the optimistic subexpression f() that triggered deoptimizing // recompilation. Object.defineProperty(x, 'foo', { value: b ? b : f() }); print(x.foo); // Must print "Hello world" instead of 0
--- a/test/script/basic/JDK-8043235.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8043235.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,10 +28,10 @@ * @run */ -function g() { +function g() { return "Hello World!" } - + function f1() { var c; var paused = false;
--- a/test/script/basic/JDK-8043431.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8043431.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ var a = "Hello World!"; -// Without the fix, evaluating "a" optimistically will start a +// Without the fix, evaluating "a" optimistically will start a // deoptimizing recompilation in a nested object literal, and trigger an // assertion in code generator. var x = {
--- a/test/script/basic/JDK-8043930.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8043930.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * JDK-8043930: TypeError when attemping to create an instance of non-public class could be better + * JDK-8043930: TypeError when attemping to create an instance of non-public class could be better * * @test * @run
--- a/test/script/basic/JDK-8044520.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8044520.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8044533.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8044533.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8044534.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8044534.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/JDK-8044612.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK-8044612.js Wed Jun 04 13:08:57 2014 +0200 @@ -34,4 +34,4 @@ if ("hello".replace("o", "$x") != "hell$x") { fail("String.prototype.replace failed to handle '$x' as replacement"); -} +}
--- a/test/script/basic/JDK_8005848.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/JDK_8005848.js Wed Jun 04 13:08:57 2014 +0200 @@ -22,7 +22,7 @@ */ /** - * JDK-8005848 : assigning to global toString variable affects Object.prototype.toString + * JDK-8005848 : assigning to global toString variable affects Object.prototype.toString * * @test * @run
--- a/test/script/basic/NASHORN-100.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-100.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-101.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-101.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-102.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-102.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-103.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-103.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-104.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-104.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-105.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-105.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-105 : parseFloat function is not spec. compliant. - * + * * @test * @run */
--- a/test/script/basic/NASHORN-106.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-106.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-107.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-107.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-108.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-108.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-109.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-109.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-11.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-11.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-111.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-111.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,7 +31,7 @@ try { throw new TypeError("type error"); } catch (e) { - // This used to throw ClassCastException + // This used to throw ClassCastException // ThrowException cannot be cast to ScriptObject print(JSON.stringify(e)); }
--- a/test/script/basic/NASHORN-113.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-113.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-114.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-114.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-115.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-115.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-117.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-117.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -// The following code results in StackOverflowError +// The following code results in StackOverflowError var i0 = ""; var o0 = "";
--- a/test/script/basic/NASHORN-118.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-118.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * NASHORN-118 : Function.prototype.apply should accept "arguments" object + * NASHORN-118 : Function.prototype.apply should accept "arguments" object * of another function as second argument. * * @test
--- a/test/script/basic/NASHORN-119.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-119.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-12.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-12.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-120.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-120.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-122.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-122.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-126.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-126.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -26,9 +26,9 @@ * * @test * @run - */ + */ print(String(1000000000000000000000) === "1e+21"); print(String(0.000000000100000000000) === "1e-10"); - +
--- a/test/script/basic/NASHORN-127.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-127.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,11 +29,11 @@ */ try { - try { + try { throw ReferenceError(17); - } catch (e) { - print(e); - throw TypeError(4711); + } catch (e) { + print(e); + throw TypeError(4711); } -} catch (e) { print(e); +} catch (e) { print(e); }
--- a/test/script/basic/NASHORN-130.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-130.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-132.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-132.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-133.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-133.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-135.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-135.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-136.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-136.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ valueOf: function() { print("obj1.valueOf"); return 1; - }, + }, toString: function() { print("obj1.toString");
--- a/test/script/basic/NASHORN-14.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-14.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ */ -function callback() { +function callback() { print('callback with args ' + Array.prototype.join.apply(arguments)) }
--- a/test/script/basic/NASHORN-148.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-148.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,13 +23,13 @@ /** * NASHORN-148 : arguments element deletion/resurrection does not work as expected - * + * * @test * @run */ -function func(x) { +function func(x) { print("func.x = " + x); print("func.arguments[0] = " + arguments[0]); @@ -43,7 +43,7 @@ print("func.arguments[0] = " + arguments[0]); // delete arguments[0] - delete arguments[0]; + delete arguments[0]; print("func.x = " + x); print("func.arguments[0] = " + arguments[0]);
--- a/test/script/basic/NASHORN-15.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-15.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-153.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-153.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-156.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-156.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,8 +29,8 @@ * @run */ -var obj = { - get foo() { return 3; } +var obj = { + get foo() { return 3; } }; if (obj.foo != 3) {
--- a/test/script/basic/NASHORN-157.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-157.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -try { +try { print((x, 1)); fail("#1 ReferenceError should have been thrown"); } catch (e) {
--- a/test/script/basic/NASHORN-163.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-163.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-163 : Object.keys(o) should only enumerate o's own properties - * + * * @test * @run */
--- a/test/script/basic/NASHORN-164.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-164.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ var obj2 = { bar: 'hello' }; var obj = Object.create(obj2); -obj.foo = 22; +obj.foo = 22; if (JSON.stringify(obj) != '{"foo":22}') { throw Error("expected '{\"foo\":22}' got " + JSON.stringify(obj));
--- a/test/script/basic/NASHORN-165.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-165.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-166.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-166.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-168.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-168.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-169.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-169.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-172.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-172.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,12 +28,12 @@ * @run */ -if (delete x !== true) { +if (delete x !== true) { fail('#1: delete x === true'); } -if (delete this.x !== true) { - fail('#2: delete this.x === true'); +if (delete this.x !== true) { + fail('#2: delete this.x === true'); } var y = 23;
--- a/test/script/basic/NASHORN-173.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-173.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-174.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-174.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,7 +33,7 @@ if (nums.length != 4) { fail("#1: split result expected to be of length 4"); } - + function check(index, value) { if (nums[index] != value) { fail("expected value @ " + index + " is " + value);
--- a/test/script/basic/NASHORN-175.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-175.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-176.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-176.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-177.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-177.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * NASHORN-177 : null array elements become undefined on assignment + * NASHORN-177 : null array elements become undefined on assignment * * @test * @run
--- a/test/script/basic/NASHORN-178.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-178.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-179.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-179.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-18.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-18.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-181.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-181.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ try { var obj = Object.create({}, props); - if (! obj.hasOwnProperty("foo")) { + if (! obj.hasOwnProperty("foo")) { fail("obj does not have 'foo' property"); } } catch (e) {
--- a/test/script/basic/NASHORN-182.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-182.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ function callback(prev, cur, idx, obj) { fail("callback with " + idx); -} +} // array-like object var obj = { 1: 1, 2: 2, length: 3 };
--- a/test/script/basic/NASHORN-183.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-183.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-184.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-184.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-185.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-185.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-187.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-187.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,16 +31,16 @@ var obj = {}; try { - Object.defineProperty(obj, "foo", { - get: function() { return 22; }, - set: undefined + Object.defineProperty(obj, "foo", { + get: function() { return 22; }, + set: undefined }); } catch (e) { fail("failed", e); } try { - Object.defineProperty(obj, "bar", { + Object.defineProperty(obj, "bar", { get: undefined }); } catch (e) {
--- a/test/script/basic/NASHORN-188.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-188.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-19.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-19.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -38,8 +38,8 @@ do { with(myscope) { - myvalue = 12; - break; + myvalue = 12; + break; } } while (false); @@ -62,15 +62,15 @@ var scope2 = {value:20}; while (true) { with (scope) { - print(value); - value = 11; - print(value); - with (scope2) { - print(value); - value = 21; - print(value); - break; - } + print(value); + value = 11; + print(value); + with (scope2) { + print(value); + value = 21; + print(value); + break; + } } } @@ -83,19 +83,19 @@ var scope = {value:10}; var scope2 = {value:20}; while (true) { - with (scope) { - print(value); - value = 11; - print(value); - with (scope2) { - print(value); - value = 21; - print(value); - break; - } - } + with (scope) { + print(value); + value = 11; + print(value); + with (scope2) { + print(value); + value = 21; + print(value); + break; + } } - + } + print(value); } @@ -104,14 +104,14 @@ var value = "hello"; var scope = {value:10}; while (true) { - with (scope) { - print(value); - value = 11; - print(value); - if (value > ten()) { - break; - } - } + with (scope) { + print(value); + value = 11; + print(value); + if (value > ten()) { + break; + } + } } print(value); } @@ -123,24 +123,24 @@ var scope2 = {value:20}; var outer = 0; while (outer < 5) { - var i=0; - while (i < 10) { - with(scope) { - print("loop header "+i); - with (scope2) { - value = 11; - i++; - if ((i & 1) != 0) { - print("continue"); - continue; - } - } - } - print(value); - } - outer++; + var i=0; + while (i < 10) { + with(scope) { + print("loop header "+i); + with (scope2) { + value = 11; + i++; + if ((i & 1) != 0) { + print("continue"); + continue; + } + } + } + print(value); } -} + outer++; + } +} //continue one level function test4() { @@ -148,15 +148,15 @@ var scope = {value:10}; var i=0; while (i < 10) { - print("loop header "+i); - with (scope) { - value = 11; - i++; - if ((i & 1) != 0) { - print("continue"); - continue; - } - } + print("loop header "+i); + with (scope) { + value = 11; + i++; + if ((i & 1) != 0) { + print("continue"); + continue; + } + } } print(value); } @@ -170,24 +170,24 @@ var outer = 0; outer_label: while (outer < 5) { - var i=0; - while (i < 10) { - with(scope) { - print("loop header "+i); - with (scope2) { - value = 11; - i++; - if ((i & 1) != 0) { - print("continue"); - outer++; - continue outer_label; - } - } - } - print(value); - } + var i=0; + while (i < 10) { + with(scope) { + print("loop header "+i); + with (scope2) { + value = 11; + i++; + if ((i & 1) != 0) { + print("continue"); + outer++; + continue outer_label; + } + } + } + print(value); } -} + } +} //labelled break function test6() { @@ -196,21 +196,21 @@ var scope2 = {value:20}; outer: { - var i=0; - while (i < 10) { - with(scope) { - print("loop header "+i); - with (scope2) { - value = 11; - i++; - if ((i & 1) != 0) { - print("break"); - break outer; - } - } - } - print(value); - } + var i=0; + while (i < 10) { + with(scope) { + print("loop header "+i); + with (scope2) { + value = 11; + i++; + if ((i & 1) != 0) { + print("break"); + break outer; + } + } + } + print(value); + } } } @@ -218,32 +218,32 @@ function test7() { var value = "hello"; var scope = {value:10}; - var scope2 = {value:20}; + var scope2 = {value:20}; var global = false; try { - with(scope) { - try { - print(value); - value = 4711; - print(value); - with(scope2) { - print(value); - value = 17; - print(value); - global = true; - throw "inner"; - } - } catch (ei) { - print(ei); - print(value); - if (global) { - throw "outer"; - } - } - } + with(scope) { + try { + print(value); + value = 4711; + print(value); + with(scope2) { + print(value); + value = 17; + print(value); + global = true; + throw "inner"; + } + } catch (ei) { + print(ei); + print(value); + if (global) { + throw "outer"; + } + } + } } catch (eo) { - print(eo); - print(value); + print(eo); + print(value); } print(value); }
--- a/test/script/basic/NASHORN-190.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-190.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -var obj = { +var obj = { 20: 'world', "2.3": 'hello' };
--- a/test/script/basic/NASHORN-192.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-192.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-192 : User defined property setter or getter with extra arguments or lesser argument fails by throwing exception - * + * * @test * @run */ @@ -59,7 +59,7 @@ set: function(obj1, obj2, obj3) { this.val = obj1; } -}); +}); try { obj.prop = 33;
--- a/test/script/basic/NASHORN-194.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-194.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-196.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-196.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,7 +33,7 @@ Object.defineProperty(arr, "length", { value: -0 }); - + if (arr.length !== 0) { fail("array length is not zero!"); }
--- a/test/script/basic/NASHORN-198.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-198.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-20.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-20.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-201.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-201.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-202.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-202.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-203.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-203.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-204.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-204.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-205.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-205.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -54,7 +54,7 @@ } catch (e) { fail("failed", e); } - + var newDesc = Object.getOwnPropertyDescriptor(obj, "foo"); if (! newDesc.hasOwnProperty("value")) { fail("'value' missing!!");
--- a/test/script/basic/NASHORN-206.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-206.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-207.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-207.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,7 +37,7 @@ } catch (e) { if (! (e instanceof SyntaxError)) { fail("#2 SyntaxError expected but got " + e); - } + } } // cannot delete function parameter variable @@ -47,7 +47,7 @@ } catch(e) { if (! (e instanceof SyntaxError)) { fail("#4 SyntaxError expected but got " + e); - } + } } // assignment can't be used to define as new variable
--- a/test/script/basic/NASHORN-207_2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-207_2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-208.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-208.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * NASHORN-208 + * NASHORN-208 * * @test * @run
--- a/test/script/basic/NASHORN-209.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-209.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,8 +28,8 @@ * @run */ -var obj = { - in: 11, class: 'hello', try: false, +var obj = { + in: 11, class: 'hello', try: false, typeof: 456, instanceof: 'world', catch: function() { print("catch called"); } };
--- a/test/script/basic/NASHORN-21.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-21.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-211.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-211.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-212.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-212.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-213.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-213.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-215.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-215.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-216.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-216.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-217.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-217.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-219.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-219.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-22.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-22.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-221.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-221.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-222.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-222.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-223.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-223.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-225.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-225.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-226.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-226.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-227.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-227.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-228.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-228.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -51,4 +51,4 @@ fail("typeof key of a string is not 'string'"); } } - +
--- a/test/script/basic/NASHORN-229.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-229.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -39,4 +39,4 @@ } load(__DIR__ + 'NASHORN-229_subtest.js'); - +
--- a/test/script/basic/NASHORN-229_subtest.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-229_subtest.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ function func2() { var obj2 = { get bar() { return 343; } - }; + }; return (obj2.bar === 343); }
--- a/test/script/basic/NASHORN-23.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-23.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-23: calling function valued global variable before it is initialized should fail. - * + * * @test * @run */
--- a/test/script/basic/NASHORN-232.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-232.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-234.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-234.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-235.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-235.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-236.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-236.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-237.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-237.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-239.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-239.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-24.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-24.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-24: function local var assignments should resolve to 'with' scope if found in scope. - * + * * @test * @run */
--- a/test/script/basic/NASHORN-241.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-241.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ try { new 1; - fail('new "1" should have thrown TypeError'); + fail('new "1" should have thrown TypeError'); } catch (e) { if (! (e instanceof TypeError)) { fail('expected TypeError, got ' + e, e); @@ -40,7 +40,7 @@ try { var x = "1"; new x; - fail('var x = "1"; new x should have thrown TypeError'); + fail('var x = "1"; new x should have thrown TypeError'); } catch (e) { if (! (e instanceof TypeError)) { fail('var x = "1"; new x - expected TypeError, got ' + e, e); @@ -50,10 +50,10 @@ try { var x = "1"; new x(); - fail('var x = "1"; new x() should have thrown TypeError'); + fail('var x = "1"; new x() should have thrown TypeError'); } catch (e) { if (! (e instanceof TypeError)) { - fail('var x = "1"; new x() - expected TypeError, got ' + e); + fail('var x = "1"; new x() - expected TypeError, got ' + e); } }
--- a/test/script/basic/NASHORN-242.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-242.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-245.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-245.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-247.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-247.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-25.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-25.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-251.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-251.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-252.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-252.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-253.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-253.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-256.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-256.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-258.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-258.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,28 +30,28 @@ function test3(a) { for (i = 0; i < a.length ; i++) { - for (j = 0; j < a[i].length ; j++) { - for (k = 0; k < a[i][j].length ; k++) { - a[i][j][k] *= 8; - } - } + for (j = 0; j < a[i].length ; j++) { + for (k = 0; k < a[i][j].length ; k++) { + a[i][j][k] *= 8; + } + } } } function test3local(a) { for (var i = 0; i < a.length ; i++) { - for (var j = 0; j < a[i].length ; j++) { - for (var k = 0; k < a[i][j].length ; k++) { - a[i][j][k] *= 8; - } - } + for (var j = 0; j < a[i].length ; j++) { + for (var k = 0; k < a[i][j].length ; k++) { + a[i][j][k] *= 8; + } + } } } var array = [ [[1,1,1],[1,1,1],[1,1,1]], - [[1,1,1],[1,1,1],[1,1,1]], - [[1,1,1],[1,1,1],[1,1,1]] ]; - + [[1,1,1],[1,1,1],[1,1,1]], + [[1,1,1],[1,1,1],[1,1,1]] ]; + test3(array); print(array); @@ -59,17 +59,17 @@ print(array); function outer() { - + var array2 = [ [[1,1,1],[1,1,1],[1,1,1]], - [[1,1,1],[1,1,1],[1,1,1]], - [[1,1,1],[1,1,1],[1,1,1]] ]; - + [[1,1,1],[1,1,1],[1,1,1]], + [[1,1,1],[1,1,1],[1,1,1]] ]; + var f = function inner() { - for (var i = 0; i < array2.length ; i++) { - for (var j = 0; j < array2[i].length ; j++) { - array2[i][j][2] *= 8; - } - } + for (var i = 0; i < array2.length ; i++) { + for (var j = 0; j < array2[i].length ; j++) { + array2[i][j][2] *= 8; + } + } }; f();
--- a/test/script/basic/NASHORN-26.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-26.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-260.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-260.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-261.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-261.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -75,7 +75,7 @@ } } -// pass no args to our overwritten eval +// pass no args to our overwritten eval // the new eval should not print anything (no hidden args passed) eval();
--- a/test/script/basic/NASHORN-262.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-262.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-262 : for statement iterator variable is not checked in strict mode - * + * * @test * @run */
--- a/test/script/basic/NASHORN-263.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-263.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-264.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-264.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-265.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-265.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,27 +1,27 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ -/** +/** * NASHORN-265 with scope access within a nested function can't access global var * * @test
--- a/test/script/basic/NASHORN-266.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-266.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-269.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-269.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-27.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-27.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-270.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-270.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-271.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-271.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -var res = JSON.stringify(23, function(k,v) { +var res = JSON.stringify(23, function(k,v) { return (v == 23)? [1, 2] : v; }); @@ -36,8 +36,8 @@ fail("#1 expected '[1,2]' got " + res); } -var res = JSON.stringify(23, function(k,v) { - return (v == 23)? { x: 1, y: 'hello' } : v; +var res = JSON.stringify(23, function(k,v) { + return (v == 23)? { x: 1, y: 'hello' } : v; }); if (res !== '{"x":1,"y":"hello"}') {
--- a/test/script/basic/NASHORN-275.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-275.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-276.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-276.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-277.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-277.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-278.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-278.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-28.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-28.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-281.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-281.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-284.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-284.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-285.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-285.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,31 +28,31 @@ * @run */ -function do_not_loop_forever() { +function do_not_loop_forever() { var sum = 0; - for (var i = 0; i < 4711; i++) { - sum += i; - if (i >= 0) { - continue; - } - return sum; - } + for (var i = 0; i < 4711; i++) { + sum += i; + if (i >= 0) { + continue; + } + return sum; + } return sum; } function still_tag_terminal() { var sum = 0; - for (var i = 0; i < 4711; i++) { - sum += i; - for (var j = 0; j < 4712; j++) { - sum += j; - if (j & 1) { - continue; - } - } - return sum; - } + for (var i = 0; i < 4711; i++) { + sum += i; + for (var j = 0; j < 4712; j++) { + sum += j; + if (j & 1) { + continue; + } + } + return sum; + } return sum; }
--- a/test/script/basic/NASHORN-288.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-288.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-29.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-29.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-293.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-293.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-294.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-294.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-296.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-296.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-297.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-297.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-30.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-30.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,11 +30,11 @@ var obj = { valueOf: function() { - print("valueOf call"); - return -2 + print("valueOf call"); + return -2 }, - toString: function() { + toString: function() { print("toString call"); return "-2"; }
--- a/test/script/basic/NASHORN-300.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-300.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,9 +29,9 @@ */ function func1(foo) { - if (foo) { + if (foo) { var encoding = arguments[3]; - } + } var s = encoding; }
--- a/test/script/basic/NASHORN-301.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-301.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-304.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-304.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-310.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-310.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-318.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-318.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-32.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-32.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-321.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-321.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-323.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-323.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-324.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-324.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-33.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-33.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-331.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-331.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * NASHORN-331 : Nan compares + * NASHORN-331 : Nan compares * * @test * @run
--- a/test/script/basic/NASHORN-337.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-337.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-337 - Erroneous DCMPL/DCMPG instructions were generated - * + * * @test * @run */
--- a/test/script/basic/NASHORN-34.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-34.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-340.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-340.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-349.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-349.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-354.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-354.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-355.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-355.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-36.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-36.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-365.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-365.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-366.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-366.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-368.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-368.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-37.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-37.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-37 : object and array properties defined with special keys can be accessed be by special or string keys - * + * * @test * @run */
--- a/test/script/basic/NASHORN-375.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-375.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-376.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-376.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-377.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-377.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-378.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-378.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ var obj = {}; -Object.defineProperty(obj, "foo", +Object.defineProperty(obj, "foo", { get: function() { return 42; }, configurable: true});
--- a/test/script/basic/NASHORN-38.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-38.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,7 +33,7 @@ // defined later in lexical order (see below) print(typeof f); return f; - + function f(){ print("inside function 'f'"); }
--- a/test/script/basic/NASHORN-380.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-380.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-381.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-381.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-382.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-382.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-383.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-383.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-384.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-384.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-385.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-385.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,7 +37,7 @@ function checkSetter() { o.bar = 44; -} +} function checkCall() { try { @@ -51,8 +51,8 @@ checkSetter(); checkCall(); -proto.__get__ = function(name) { - print("in __get__: " + name); +proto.__get__ = function(name) { + print("in __get__: " + name); return name; };
--- a/test/script/basic/NASHORN-389.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-389.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-393.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-393.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-394.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-394.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-396.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-396.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,17 +27,17 @@ * @test * @run */ - -Object.defineProperty(Number.prototype, - "foo", + +Object.defineProperty(Number.prototype, + "foo", { get: function () { 'use strict'; return this; } -}); +}); if(!((5).foo === 5)) { fail("#1 ToObject conversion on 'thisArg' for strict getter"); } -Number.prototype.func = function() { +Number.prototype.func = function() { 'use strict'; return this; };
--- a/test/script/basic/NASHORN-397.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-397.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-398.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-398.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-40.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-40.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-400.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-400.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-401.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-401.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-402.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-402.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-404.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-404.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-405.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-405.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,13 +23,13 @@ /** * NASHORN-405 make sure slice does not modify arrays - * + * * @test * @run */ var x = ['foo', '%zx']; -var s = x.slice(1); +var s = x.slice(1); print(s); print(x);
--- a/test/script/basic/NASHORN-406.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-406.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * NASHORN-406 : Property descriptor properties should be enumerable + * NASHORN-406 : Property descriptor properties should be enumerable * * @test * @run @@ -36,7 +36,7 @@ function checkData() { var desc = Object.getOwnPropertyDescriptor(obj, "foo"); - var enumSeen = false, writeSeen = false, + var enumSeen = false, writeSeen = false, configSeen = false, valueSeen = false; for (i in desc) { switch(i) { @@ -50,7 +50,7 @@ valueSeen = true; break; } } - + return enumSeen && writeSeen && configSeen && valueSeen; } @@ -60,7 +60,7 @@ function checkAccessor() { var desc = Object.getOwnPropertyDescriptor(obj, "bar"); - var enumSeen = false, getterSeen = false, + var enumSeen = false, getterSeen = false, configSeen = false, setterSeen = false; for (i in desc) { switch(i) {
--- a/test/script/basic/NASHORN-408.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-408.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-415.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-415.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-416.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-416.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ function getter() { return 32; } -Object.defineProperty(obj, "foo", +Object.defineProperty(obj, "foo", { get: getter, configurable: true }); function setter(x) { print(x); }
--- a/test/script/basic/NASHORN-417.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-417.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-418.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-418.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-420.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-420.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-421.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-421.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -52,9 +52,9 @@ } } -var methods = [ "concat", "join", "pop", "push", "reverse", +var methods = [ "concat", "join", "pop", "push", "reverse", "shift", "unshift", "slice", "sort", "splice", - "indexOf", "lastIndexOf", "every", "some", "forEach", + "indexOf", "lastIndexOf", "every", "some", "forEach", "map", "filter", "reduce", "reduceRight" ]; for (var m in methods) {
--- a/test/script/basic/NASHORN-423.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-423.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-423a.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-423a.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-424.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-424.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-425.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-425.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-426.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-426.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-427.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-427.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-428.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-428.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-429.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-429.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-432.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-432.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-433.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-433.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-434.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-434.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -34,7 +34,7 @@ if (this !== global) { fail("#1 callback got 'this' different from global"); } -} +} function strictFunc(val, idx, obj) { 'use strict'; @@ -49,7 +49,7 @@ } var arr = [1]; -arr.forEach(func); +arr.forEach(func); arr.forEach(strictFunc); var callbackThis = {};
--- a/test/script/basic/NASHORN-435.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-435.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-437.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-437.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-44.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-44.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,9 +29,9 @@ */ function loop1() { print("loop1"); - for (var i = 0; i < 5; i++) { - print(i); - continue; + for (var i = 0; i < 5; i++) { + print(i); + continue; } print(i); print("done1"); @@ -40,8 +40,8 @@ function loop2() { print("loop2"); for (var i = 0; i < 5; i++) { - print(i); - break; + print(i); + break; } print(i); print("done2");
--- a/test/script/basic/NASHORN-441.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-441.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-442.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-442.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-443.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-443.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-444.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-444.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-445.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-445.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-446.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-446.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-447.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-447.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-448.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-448.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-449.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-449.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-449 : defineProperty on arguments object does not work element in question was deleted earlier - * + * * @test * @run */
--- a/test/script/basic/NASHORN-45.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-45.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-450.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-450.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-452.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-452.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-459.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-459.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-46.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-46.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-462.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-462.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,8 +31,8 @@ function Foo() {}; Object.defineProperty(Foo.prototype, "bar", { value: 19 }); -var fooObj = new Foo(); -fooObj.bar = "overridden"; +var fooObj = new Foo(); +fooObj.bar = "overridden"; if (fooObj.hasOwnProperty("bar")) { fail("inherited non-writable property can be overridden"); }
--- a/test/script/basic/NASHORN-463.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-463.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-468.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-468.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-47.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-47.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-473.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-473.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-474.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-474.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-478.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-478.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-48.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-48.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,9 +29,9 @@ */ function loop3() { - for (var i = 0; i < 5; i++) { - print(i); - throw "ERROR"; + for (var i = 0; i < 5; i++) { + print(i); + throw "ERROR"; } print("dead"); } @@ -41,17 +41,17 @@ } catch (e) { print(e); } - + function loop4() { var i = 0; while (i++ < 5) { - print(i); - throw "ERROR"; + print(i); + throw "ERROR"; } print("dead"); } -try { +try { loop4(); } catch (e) { print(e); @@ -60,13 +60,13 @@ function loop5() { var i = 0; do { - print(i); - throw "ERROR"; + print(i); + throw "ERROR"; } while (i++ < 5); print("dead"); } -try { +try { loop5(); } catch (e) { print(e);
--- a/test/script/basic/NASHORN-481.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-481.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -10029,7 +10029,7 @@ "tag": "mesoventral", "popularity": 4096 }]; - + var entry = largeTable[1000]; print(entry.tag, entry.popularity);
--- a/test/script/basic/NASHORN-482.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-482.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-484.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-484.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-486.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-486.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ try { // save line number and force ReferenceError for 'foo' - var lineNumber = __LINE__; print(foo); + var lineNumber = __LINE__; print(foo); fail("#1 should have thrown ReferenceError"); } catch (e) { if (! (e instanceof ReferenceError)) {
--- a/test/script/basic/NASHORN-487.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-487.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-488.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-488.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -34,7 +34,7 @@ } Object.defineProperty(Function.prototype, "prototype", { - set: undefined, get: function() { return 32; }, + set: undefined, get: function() { return 32; }, configurable: true });
--- a/test/script/basic/NASHORN-49.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-49.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-490.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-490.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-494.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-494.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-497.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-497.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-498.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-498.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,13 +30,13 @@ // no syntax error expected for the following functions function func() { - // Parser thinks it is a for-in statement! But 'in' used in + // Parser thinks it is a for-in statement! But 'in' used in // cond. expression. This is a normal for statement for (var x = a ? b in c : 3;;) {} } function func2() { - // for-in statement but init is cond. expression with 'in' + // for-in statement but init is cond. expression with 'in' // This is same as "for (var x = (a? b in c : e) in {} )" for (var x = a ? b in c : e in {}) {} }
--- a/test/script/basic/NASHORN-499.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-499.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-50.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-50.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ try { for (var y in null) { - y = 2; + y = 2; } } catch (e) { print(e); @@ -38,7 +38,7 @@ try { for (var y in undefined) { - y = 2; + y = 2; } } catch (e) { print(e);
--- a/test/script/basic/NASHORN-500.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-500.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,7 +29,7 @@ */ var origToString = Object.prototype.toString; -Object.prototype.toString = function () { +Object.prototype.toString = function () { return this.myStr(); }
--- a/test/script/basic/NASHORN-503.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-503.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-51.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-51.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-511.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-511.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-515.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-515.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,17 +30,17 @@ function a() { var x = (3.14-2.14); - + switch (x) { case 1: - print("--1"); - break; + print("--1"); + break; case 2: - print("--2"); - break; + print("--2"); + break; default: - print("default"); - break; + print("default"); + break; } } @@ -50,11 +50,11 @@ switch (index) { case 0x00: case 0x01: - print("one zero"); - break; + print("one zero"); + break; default: - print("default"); - break; + print("default"); + break; } } @@ -64,76 +64,76 @@ switch (index) { case 0x00: case 0x01: - print("one zero"); - break; + print("one zero"); + break; default: - print("default"); + print("default"); } --index; } function d() { var x = (3.14-1.14); - + switch(x) { case 1: - print("--1"); break; + print("--1"); break; case 2: - print("--2"); break; + print("--2"); break; case 3: - print("--3"); break; + print("--3"); break; case 4: - print("--4"); break; + print("--4"); break; default: - print("default"); + print("default"); } } function e() { var y = 2147483647; - + switch(y) { case -2147483648: - print("MIN_INT"); break; + print("MIN_INT"); break; case -2147483647: - print("MIN_INT+1"); break; + print("MIN_INT+1"); break; case 2147483647: - print("MAX_INT"); break; + print("MAX_INT"); break; case 1: - print("--1"); break; + print("--1"); break; case 2: - print("--2"); break; + print("--2"); break; case 3: - print("--3"); break; + print("--3"); break; case 4: - print("--4"); break; + print("--4"); break; default: - print("default"); + print("default"); } } function f() { var z = 2; - + switch(z) { case -2147483648: - print("MIN_INT"); break; + print("MIN_INT"); break; case -2147483647: - print("MIN_INT+1"); break; + print("MIN_INT+1"); break; case 2147483647: - print("MAX_INT"); break; + print("MAX_INT"); break; case 1: - print("--1"); break; + print("--1"); break; case 2: - print("--2 first"); break; + print("--2 first"); break; case 2: - print("--2 second"); break; + print("--2 second"); break; case 3: - print("--3"); break; + print("--3"); break; case 4: - print("--4"); break; + print("--4"); break; default: - print("default"); + print("default"); } }
--- a/test/script/basic/NASHORN-516.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-516.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-52.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-52.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-534.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-534.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-535.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-535.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-544.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-544.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-55.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-55.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-554.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-554.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-556.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-556.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-56.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-56.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-562.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-562.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-565.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-565.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-575.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-575.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-58.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-58.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,14 +30,14 @@ function test1() { var x = 1; - try { - print('try'); - x = 2; + try { + print('try'); + x = 2; } catch(e) { - print('catch'); - } finally { - print('finally'); - x = 3; + print('catch'); + } finally { + print('finally'); + x = 3; } print(x); } @@ -45,81 +45,81 @@ function test2() { var x = 1; try { - print('try'); + print('try'); } finally { - print('finally'); - x = 2; + print('finally'); + x = 2; } print(x); } function test3() { try { - return 2; + return 2; } finally { - return 3; + return 3; } } function test4() { try { - x = 1; - print(x); - try { - x = 2; - print(x); - } finally { - x = 3; - print(x) - try { - x = 4; - print(x); - } finally { - x = 5; - print(x); - } - } - print(x) + x = 1; + print(x); + try { + x = 2; + print(x); } finally { - x = 6; - print(x); + x = 3; + print(x) + try { + x = 4; + print(x); + } finally { + x = 5; + print(x); + } + } + print(x) + } finally { + x = 6; + print(x); } print(x); } function test5() { try { - x = 1; - print(x); - try { - x = 2; - print(x); - } finally { - x = 3; - print(x) - try { - x = 4; - print(x); - } finally { - x = 5; - return x; - } - } - print(x) + x = 1; + print(x); + try { + x = 2; + print(x); } finally { - x = 6; - return x; + x = 3; + print(x) + try { + x = 4; + print(x); + } finally { + x = 5; + return x; + } + } + print(x) + } finally { + x = 6; + return x; } } function test6() { try { - throw new Error("testing"); + throw new Error("testing"); } catch (ex) { - print(ex); - return; + print(ex); + return; } finally { - print("finally"); + print("finally"); } } @@ -133,7 +133,7 @@ i++; } if (i != 4) { - print("FAIL"); + print("FAIL"); } print("SUCCESS"); }
--- a/test/script/basic/NASHORN-59.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-59.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-592-dual.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-592-dual.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-592.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-592.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-597.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-597.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-60.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-60.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-609.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-609.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-61.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-61.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-62.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-62.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-620.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-620.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-623.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-623.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-627.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-627.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-63.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-63.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -64,7 +64,7 @@ error('Different Objects are equal'); } -var obj1 = {}; +var obj1 = {}; var obj2 = obj1; if (obj1 != obj2) { error(' Same object literals are not equal');
--- a/test/script/basic/NASHORN-637.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-637.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-639.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-639.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-64.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-64.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-642.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-642.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-646.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-646.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-658.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-658.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-659.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-659.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-66.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-66.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-664.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-664.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -34,11 +34,11 @@ e.fileName = "foo"; if (e.fileName !== 'foo') { fail("can not set e.fileName"); - } + } e.lineNumber = 100; if (e.lineNumber !== 100) { fail("can not set e.lineNumber"); - } + } e.columnNumber = 33; if (e.columnNumber !== 33) { fail("can not set e.columnNumber");
--- a/test/script/basic/NASHORN-665.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-665.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-67.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-67.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,15 +30,15 @@ function test_nested() { try { - try { - throw new Error("bam!"); - } catch (e) { - print("SUCCESS") - } + try { + throw new Error("bam!"); + } catch (e) { + print("SUCCESS") + } } catch (e2) { - fail("inner catch should have caught the exception"); - } - + fail("inner catch should have caught the exception"); + } + } test_nested()
--- a/test/script/basic/NASHORN-678.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-678.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -41,7 +41,7 @@ try { 33(); - fail("should have thrown error"); + fail("should have thrown error"); } catch (e) { if (! (e instanceof TypeError)) { fail("expected TypeError, got " + e);
--- a/test/script/basic/NASHORN-68.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-68.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-689.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-689.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-69.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-69.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-691.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-691.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-694.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-694.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-697.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-697.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-703.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-703.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ * This file is split into two tests as the presence of eval affects the whole script * * @test - * @run + * @run */ function template() {
--- a/test/script/basic/NASHORN-703a.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-703a.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ * This file is split into two tests as the presence of eval affects the whole script * * @test - * @run + * @run */ function template() {
--- a/test/script/basic/NASHORN-705.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-705.js Wed Jun 04 13:08:57 2014 +0200 @@ -2,21 +2,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-71.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-71.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-710.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-710.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-711.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-711.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-72.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-72.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-722.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-722.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-73.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-73.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -50,8 +50,8 @@ while (true) { break; - if (true) { - var s; + if (true) { + var s; } } @@ -61,20 +61,20 @@ for ( ; ; ) { break; while (true) { - do { - var u; - } while (true); - } + do { + var u; + } while (true); + } } function terminal() { print("r = "+r); print("t = "+t); for (;;) { - var r; - return; - var t; - print("THIS SHOULD NEVER BE PRINTED!"); + var r; + return; + var t; + print("THIS SHOULD NEVER BE PRINTED!"); } print("NEITHER SHOULD THIS"); } @@ -84,13 +84,13 @@ function terminal2() { print("q = "+q); for (;;) { - return; - print("THIS SHOULD NEVER BE PRINTED!"); + return; + print("THIS SHOULD NEVER BE PRINTED!"); } print("NEITHER SHOULD THIS"); } -try { +try { terminal2(); } catch (e) { print(e); @@ -108,13 +108,13 @@ } catch (e) { print(e); } - + function disp_a() { var a = 20; print("Value of 'a' inside the function " + a); } - + var a = 10; disp_a();
--- a/test/script/basic/NASHORN-737.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-737.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-74.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-74.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-740.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-740.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-75.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-75.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-758.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-758.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-759.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-759.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-760.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-760.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,8 +29,8 @@ */ // problem 1 // the conversions in TernaryNode are not necessary, but they should not cause problems. They did -// this was because the result of Global.allocate(Object[])Object which returns a NativeObject. -// was tracked as an object type on our stack. The type system did not recognize this as an array. +// this was because the result of Global.allocate(Object[])Object which returns a NativeObject. +// was tracked as an object type on our stack. The type system did not recognize this as an array. // Then the explicit conversions became "convert NativeArray->Object[]" which is a checkccast Object[] // which naturally failed.
--- a/test/script/basic/NASHORN-768.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-768.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -46,7 +46,7 @@ // global object var obj = { foo: 42, - bar: function(x) { + bar: function(x) { if (id != "engine-global-id") { throw "id != 'engine-global-id'"; }
--- a/test/script/basic/NASHORN-778.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-778.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-78.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-78.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-79.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-79.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,8 +32,8 @@ print((function f(a) { return a == 0? 1 : a*f(a-1); })(4)); - - + + print((function g(a) { function g(a) { return 1000; } return a == 0? 1 : a*g(a-1);
--- a/test/script/basic/NASHORN-792.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-792.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-80.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-80.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-81.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-81.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-833.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-833.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-837.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-837.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-85.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-85.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-86.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-86.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-87.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-87.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-89.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-89.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-90.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-90.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-91.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-91.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-92.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-92.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-93.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-93.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-95.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-95.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-96.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-96.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-97.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-97.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/NASHORN-98.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-98.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -35,7 +35,7 @@ fail("syntax error expected here got " + e); } printError(e); -} +} try { eval("var x = { foo: 33 bar: 'hello' }"); @@ -44,4 +44,4 @@ fail("syntax error expected here got " + e); } printError(e); -} +}
--- a/test/script/basic/NASHORN-99.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/NASHORN-99.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/access-specializer.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/access-specializer.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,9 +24,9 @@ /** * This is a simple test that checks that access specialization in FinalizeTypes is consistent. * Here, a2 = 0 will be turned int {I}a2 = 0, and all would be fine and well, only we can't change - * the symbol type for a2 from double, and we can't as it's not a temporary. Either we have to put + * the symbol type for a2 from double, and we can't as it's not a temporary. Either we have to put * a temporary in at the late finalize stage and add another assignment, or we genericize the check - * in CodeGenerator#Store so we detect whether a target is of the wrong type before storing. It + * in CodeGenerator#Store so we detect whether a target is of the wrong type before storing. It * is hopefully very rare, and will only be a problem when assignment results that have been * specialized live on the stack *
--- a/test/script/basic/addition.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/addition.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/allgettersetters.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/allgettersetters.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/andor.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/andor.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * and or test. * * @test - * @run + * @run */ print("a" && "b");
--- a/test/script/basic/anonrecur.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/anonrecur.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/apply_to_call/apply_to_call1.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/apply_to_call/apply_to_call1.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,44 +1,44 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * apply_to_call1.js - do one apply to call specialization, then override, apply and make sure it reverts (i.e. stops + * apply_to_call1.js - do one apply to call specialization, then override, apply and make sure it reverts (i.e. stops * calling call) * * @test * @run */ -print("start"); +print("start"); var x = { a : 0, b : 0, c : 0, initialize : function(x,y,z) { - this.a = x; - this.b = y; - this.c = z; + this.a = x; + this.b = y; + this.c = z; } }; @@ -53,12 +53,12 @@ print("Overwriting apply now"); -x.initialize = { +x.initialize = { apply : function() { - for (var i=0;i<arguments.length;i++) { - print("I am not who you think " + arguments[i]); - } - x.a = arguments[1][0]; + for (var i=0;i<arguments.length;i++) { + print("I am not who you think " + arguments[i]); + } + x.a = arguments[1][0]; } };
--- a/test/script/basic/apply_to_call/apply_to_call2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/apply_to_call/apply_to_call2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,44 +1,44 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * apply_to_call2.js - do one apply to call specialization, then override call and make sure it reverts (i.e. stops + * apply_to_call2.js - do one apply to call specialization, then override call and make sure it reverts (i.e. stops * calling call) * * @test * @run */ -print("start"); +print("start"); var x = { a : 0, b : 0, c : 0, initialize : function(x,y,z) { - this.a = x; - this.b = y; - this.c = z; + this.a = x; + this.b = y; + this.c = z; } };
--- a/test/script/basic/apply_to_call/apply_to_call3.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/apply_to_call/apply_to_call3.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,44 +1,44 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * apply_to_call3.js - do one apply to call specialization, then override, apply and make sure it reverts (i.e. stops + * apply_to_call3.js - do one apply to call specialization, then override, apply and make sure it reverts (i.e. stops * calling call). Then apply should break and throw exception * * @test * @run */ -print("start"); +print("start"); var x = { a : 0, b : 0, c : 0, initialize : function(x,y,z) { - this.a = x; - this.b = y; - this.c = z; + this.a = x; + this.b = y; + this.c = z; } };
--- a/test/script/basic/apply_to_call/apply_to_call4.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/apply_to_call/apply_to_call4.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,16 +29,16 @@ * @run */ -print("start"); +print("start"); var x = { a : 0, b : 0, c : 0, initialize : function(x,y,z) { - this.a = x; - this.b = y; - this.c = z; + this.a = x; + this.b = y; + this.c = z; } };
--- a/test/script/basic/apply_to_call/apply_to_call_recompile.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/apply_to_call/apply_to_call_recompile.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/apply_to_call/apply_to_call_varargs.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/apply_to_call/apply_to_call_varargs.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -41,19 +41,19 @@ Color.prototype = { red: 0, green: 0, blue: 0, initialize: function(r) { - this.red = r; - this.green = 255; - this.blue = 255; + this.red = r; + this.green = 255; + this.blue = 255; }, toString: function() { - print("[red=" + this.red + ", green=" + this.green + ", blue=" + this.blue + "]"); + print("[red=" + this.red + ", green=" + this.green + ", blue=" + this.blue + "]"); } }; var colors = new Array(16); function run() { for (var i = 0; i < colors.length; i++) { - colors[i&0xf] = (new Color(i)); + colors[i&0xf] = (new Color(i)); } }
--- a/test/script/basic/applycall.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/applycall.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/args.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/args.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/arity.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arity.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * arity test. * * @test - * @run + * @run */ function func1(a) { print(a); }
--- a/test/script/basic/arrayprotoclass.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arrayprotoclass.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/arrays.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arrays.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -155,6 +155,6 @@ print(Array.prototype.reduce.call("hello", function() {})); print(Array.prototype.toString.call(new java.lang.Object())); print(Array.prototype.toLocaleString.call(new java.lang.Object())); -print(Array.prototype.reduceRight.call(new java.lang.Object(), +print(Array.prototype.reduceRight.call(new java.lang.Object(), function() {}, 33));
--- a/test/script/basic/arrays2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arrays2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/arrays_int_key.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arrays_int_key.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + var o = [0]; Object.defineProperty(o, "0", { get: function() { return "zero"; }, set: function(v) { print(v); }, configurable: true });
--- a/test/script/basic/arrayset.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arrayset.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -var arr = []; +var arr = []; print(arr.length); print(arr.hasOwnProperty(10000)); print(arr.hasOwnProperty(10));
--- a/test/script/basic/arrayundefined.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/arrayundefined.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/assign.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/assign.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Assign test. * * @test - * @run + * @run */ var x = 10;
--- a/test/script/basic/bitwise_and.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/bitwise_and.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/boolean_arithmetic.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/boolean_arithmetic.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/booleangetter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/booleangetter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/builtin.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/builtin.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/builtin_assign.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/builtin_assign.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/builtinchain.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/builtinchain.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/calllink.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/calllink.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -60,7 +60,7 @@ var obj5 = new MyConstructor(); var obj6 = new MyConstructor(); -var arr = [ obj1, obj2, obj3, obj4, obj5, obj6, +var arr = [ obj1, obj2, obj3, obj4, obj5, obj6, obj1, obj2, obj3, obj4, obj5, obj6 ]; var myObj; @@ -69,8 +69,8 @@ obj3.func = function() { print("new obj3.func called"); } - obj4.func = function() { - print("new obj4.func called"); + obj4.func = function() { + print("new obj4.func called"); } MyConstructor.prototype.func = function() { print("all new MyConstructor.prototype.func");
--- a/test/script/basic/classloader.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/classloader.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/closure.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/closure.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,14 +25,14 @@ * Closure test. * * @test - * @run + * @run */ - + (function test1(a, b){ print(a, b); })(10, 20); (function test2(a, b){ print(a, b); })(10); (function test3(a, b){ print(a, b); })(10, 20, 30); -(function test4(a, b){ - print(arguments[0] + "," + arguments[1]); +(function test4(a, b){ + print(arguments[0] + "," + arguments[1]); print(arguments.callee); })(10, 20);
--- a/test/script/basic/closure.js.EXPECTED Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/closure.js.EXPECTED Wed Jun 04 13:08:57 2014 +0200 @@ -2,7 +2,7 @@ 10 undefined 10 20 10,20 -function test4(a, b){ - print(arguments[0] + "," + arguments[1]); +function test4(a, b){ + print(arguments[0] + "," + arguments[1]); print(arguments.callee); }
--- a/test/script/basic/commandargs.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/commandargs.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Simple test to check command line arguments for scripts. * * @test - * @argument hello + * @argument hello * @argument world * @run */ @@ -33,4 +33,4 @@ for (i in arguments) { print(arguments[i]); } - +
--- a/test/script/basic/compile-octane-splitter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/compile-octane-splitter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @fork * @runif external.octane * @option -scripting - */ + */ compile_only = true; load(__DIR__ + 'run-octane.js');
--- a/test/script/basic/compile-octane.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/compile-octane.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * @test * @runif external.octane * @option -scripting - */ + */ compile_only = true; load(__DIR__ + 'run-octane.js');
--- a/test/script/basic/condassign.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/condassign.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/construct.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/construct.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,19 +25,19 @@ * Constructor test. * * @test - * @run + * @run */ function Test() { this.A = "A big fat string"; this.B = 123; - + this.F = function(x) { return x; } - - var proto = Object.getPrototypeOf(this); + + var proto = Object.getPrototypeOf(this); proto.R = "A big fat string"; proto.S = 123; - + proto.T = function(x) { return x; } return "monkey";
--- a/test/script/basic/constructorname.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/constructorname.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/convert.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/convert.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/dataview_endian.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/dataview_endian.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/dataview_getset.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/dataview_getset.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/dataview_new.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/dataview_new.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/date.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/date.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/dateparse.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/dateparse.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/decinc.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/decinc.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/delete.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/delete.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/delete2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/delete2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -26,7 +26,7 @@ * throws VerifyError!! * * @test - * @run + * @run */ var a = 10; @@ -39,7 +39,7 @@ function e(g) { var f = 10; - + print(delete f); print(f); print(delete g);
--- a/test/script/basic/dotpropname.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/dotpropname.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/doublecache.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/doublecache.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -39,7 +39,7 @@ 0.5, 100, 200, - + -200, -100, -0.5, @@ -50,5 +50,5 @@ 100, 200 ]; - + for (i in x) print(x[i]);
--- a/test/script/basic/enumeration.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/enumeration.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * Make sure that there are no-enumerable items on standard objects. + * Make sure that there are no-enumerable items on standard objects. * * @test * @run
--- a/test/script/basic/errors.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/errors.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Basic checks for Error constructors. - * + * * @test * @run */
--- a/test/script/basic/errorstack.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/errorstack.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -26,7 +26,7 @@ * * @test * @run - */ + */ function func1() { func2();
--- a/test/script/basic/eval.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/eval.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * eval test. * * @test - * @run + * @run */ print("eval.length " + eval.length); @@ -33,7 +33,7 @@ function test1() { var x = 200; y = x + 2000; - + print(x); print(y); } @@ -41,7 +41,7 @@ function test2() { eval("var x = 300;"); eval("y = x + 3000;"); - + print(x); print(y); }
--- a/test/script/basic/evalreturn.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/evalreturn.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * eval return values test. * * @test - * @run + * @run */ var x = 0; @@ -65,7 +65,7 @@ var g = eval("function cake() { print('moist and delicious!'); } function cookie() { print('sweet and crunchy!'); }"); print(g); g(); - +
--- a/test/script/basic/exprclosure.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/exprclosure.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/extensibility.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/extensibility.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/fileline.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/fileline.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/finally-catchalls.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/finally-catchalls.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,75 +30,75 @@ function test1() { try { - print("try"); - throw "ex"; + print("try"); + throw "ex"; } finally { - print("finally"); + print("finally"); } } -function test2() { +function test2() { try { - print("try"); + print("try"); } finally { - print("finally"); + print("finally"); } } -function test3() { +function test3() { try { - print("try"); - return; + print("try"); + return; } finally { - print("finally"); + print("finally"); } } -function test4() { +function test4() { var i = 0; while (i<10) { - try { - print("try "+i); - i++; - continue; - } finally { - print("finally "+i); - } + try { + print("try "+i); + i++; + continue; + } finally { + print("finally "+i); + } } print(i); } -function test5() { +function test5() { var i = 0; while (i<10) { - try { - print("try "+i); - i++; - break; - } finally { - print("finally "+i); - } + try { + print("try "+i); + i++; + break; + } finally { + print("finally "+i); + } } print(i); } -function test6() { +function test6() { var i = 0; while (i<10) { - try { - print("try "+i); - if (i == 5) - break; - i++; - } finally { - print("finally "+i); - } + try { + print("try "+i); + if (i == 5) + break; + i++; + } finally { + print("finally "+i); + } } print(i); } print("\ntest 1\n"); -try { +try { test1(); } catch (e) { print("got e");
--- a/test/script/basic/finallyreturn.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/finallyreturn.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/forin.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/forin.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/forin2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/forin2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -37,7 +37,7 @@ print("error 1"); } catch(e) { if ((e instanceof TypeError) !== true) { - print(e); + print(e); } } @@ -46,30 +46,30 @@ print("error 2"); } catch(e) { if((e instanceof TypeError) !== true) { - print(e); + print(e); } } -try { - for (var y in null) { - y = 2; +try { + for (var y in null) { + y = 2; } print("this is ok 1"); } catch(e) { if ((e instanceof TypeError) !== true) { - print(e); + print(e); } } // CHECK#4 try { - for (var z in 'bbb'.match(/aaa/)) { - z = 2; + for (var z in 'bbb'.match(/aaa/)) { + z = 2; } print("this is ok 2"); } catch(e) { if((e instanceof TypeError) !== true) { - print(e); + print(e); } } @@ -79,7 +79,7 @@ print("error 5"); } catch(e) { if ((e instanceof TypeError) !== true) { - print(e); + print(e); } } @@ -88,29 +88,29 @@ print("error 6"); } catch (e) { if ((e instanceof TypeError) !== true) { - print(e); + print(e); } } // CHECK#3 try { - for (var y in undefined) { - y = 2; + for (var y in undefined) { + y = 2; } print("this is ok 3"); -} catch (e) { +} catch (e) { if ((e instanceof TypeError) !== true) { - print(e); + print(e); } } try { - for (var z in this.foo) { - z = 2; + for (var z in this.foo) { + z = 2; } print("this is ok 4"); } catch (e) { if ((e instanceof TypeError) !== true) { - print(e); + print(e); } }
--- a/test/script/basic/funcarray.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/funcarray.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,9 +25,9 @@ * Function array test. * * @test - * @run + * @run */ - + var funcs = [ function() { print("first"); }, @@ -35,7 +35,7 @@ function() { print("third"); }, function() { print("fourth"); } ]; - + funcs[0](); funcs[1](); funcs[2]();
--- a/test/script/basic/funcbind.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/funcbind.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -34,10 +34,10 @@ print("global foo"); } -function func(x, y) { +function func(x, y) { print(this == global); - print(x); - print(y); + print(x); + print(y); this.foo(); }
--- a/test/script/basic/funcbind2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/funcbind2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/funcbind3.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/funcbind3.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/funcconstructor.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/funcconstructor.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/getclassname.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/getclassname.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/getter_callsite.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/getter_callsite.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Check that getter property is properly invoked by a callsite - * + * * @test * @run */ @@ -32,7 +32,7 @@ return { get foo() { return a }}; } -function printFoo(obj) { +function printFoo(obj) { print("obj.foo is " + obj.foo); }
--- a/test/script/basic/gettercalls.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/gettercalls.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/getterfunc.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/getterfunc.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/gettersetter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/gettersetter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Getter/Setter test. * * @test - * @run + * @run */ 'use strict'; @@ -39,7 +39,7 @@ this._x = x; } }; - + var b = { _x : "default", get x() { @@ -47,7 +47,7 @@ } }; - + var c = { _x : "default", set x(x) {
--- a/test/script/basic/globalaccess.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/globalaccess.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/globals.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/globals.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/globalscope.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/globalscope.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Global scope test. * * @test - * @run + * @run */ var g = this;
--- a/test/script/basic/hello.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/hello.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Simple "hello world" test * * @test - * @run + * @run */ print("hello world");
--- a/test/script/basic/herestr_operator.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/herestr_operator.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/hideLocationProperties.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/hideLocationProperties.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Tests the hiding of location properties by local variables etc. - * + * * @test * @run */
--- a/test/script/basic/illegaljavaname.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/illegaljavaname.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/importpackage.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/importpackage.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/incheck.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/incheck.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,30 +1,30 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * Check that the expression ("property" in obj) works for own property as + * Check that the expression ("property" in obj) works for own property as * well as properties 'inherited' from proto chain. - * + * * @test * @run */
--- a/test/script/basic/indexedcall.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/indexedcall.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/info.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/info.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/inherited_nonwritable.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/inherited_nonwritable.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/instanceof.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/instanceof.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/instanceof2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/instanceof2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Instanceof test. * * @test - * @run + * @run */ var x = { a: 1, b: "string", c: [1, 2, 3], d: function() {} };
--- a/test/script/basic/interfaces.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/interfaces.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,7 +28,7 @@ * @run */ -// implement java.lang.Runnable interface +// implement java.lang.Runnable interface var runnable = new java.lang.Runnable({ run: function() { print("Inside run function");
--- a/test/script/basic/iterator.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/iterator.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Verify that basic for..in works for objects, arrays. - * + * * @test * @run */
--- a/test/script/basic/java.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/java.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/javaadapter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javaadapter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/javaarray.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javaarray.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/javaarrayconversion.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javaarrayconversion.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Tests for conversion of JavaScript arrays to Java arrays and the other - * way round. Also generally useful as a JavaScript-to-Java type conversion + * way round. Also generally useful as a JavaScript-to-Java type conversion * test. * * @test @@ -49,9 +49,9 @@ testF(inputValue, type, isNaN) } -// Those labeled "Correct?" are not clearly correct conversions. Those -// labeled "TypeError maybe?" could actually throw a TypeError, or only -// throw a TypeError when in strict mode. +// Those labeled "Correct?" are not clearly correct conversions. Those +// labeled "TypeError maybe?" could actually throw a TypeError, or only +// throw a TypeError when in strict mode. // The case of ("false", "boolean") => true is particularly amusing. test(x, "int", 0) // Correct? TypeError maybe?
--- a/test/script/basic/javaclassoverrides.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javaclassoverrides.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/javaexceptions.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javaexceptions.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * Basic checks for throwing and catching java exceptions from script. - * + * * @test * @run */
--- a/test/script/basic/javaimporter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javaimporter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -42,7 +42,7 @@ print("java=" + map.get("java")); print("cpp=" + map.get("cpp")); -var imports2 = new JavaImporter(java.io, java.util); +var imports2 = new JavaImporter(java.io, java.util); with (imports2) { print(File); }
--- a/test/script/basic/javainnerclasses.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javainnerclasses.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + // Do it with Java.type() var outer = new (Java.type("jdk.nashorn.test.models.OuterClass"))("apple") print(outer)
--- a/test/script/basic/javasigcall.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/javasigcall.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/jquery.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/jquery.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,49 +29,49 @@ */ var urls = [ - 'http://code.jquery.com/jquery-1.7.2.min.js', - 'http://code.jquery.com/jquery-1.7.2.js' - ]; - + 'http://code.jquery.com/jquery-1.7.2.min.js', + 'http://code.jquery.com/jquery-1.7.2.js' + ]; + function test_jquery(url) { - + //bug one repro - this should compile function a() { - var c; - if (func1(zz) || (c = func2(zz)) ) { - if (c) { - } - } - return target; + var c; + if (func1(zz) || (c = func2(zz)) ) { + if (c) { + } } - + return target; + } + //bug two repro - this should compile function b() { - return ((v ? i : "") + "str"); + return ((v ? i : "") + "str"); } - + function checkWindow(e) { - if (e instanceof ReferenceError && e.toString().indexOf('window') != -1) { - return; - } - throw e; + if (e instanceof ReferenceError && e.toString().indexOf('window') != -1) { + return; } - + throw e; + } + var name; - - try { - var split = url.split('/'); - name = split[split.length - 1]; - var path = __DIR__ + "../external/jquery/" + name; - try { - load(path); - } catch (e) { - checkWindow(e); - } + + try { + var split = url.split('/'); + name = split[split.length - 1]; + var path = __DIR__ + "../external/jquery/" + name; + try { + load(path); } catch (e) { - print("Unexpected exception " + e); + checkWindow(e); } - + } catch (e) { + print("Unexpected exception " + e); + } + print("done " + name); }
--- a/test/script/basic/jsadapter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/jsadapter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/jsadapterlink.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/jsadapterlink.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/json.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/json.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -51,12 +51,12 @@ print(JSON.stringify(obj)); print(JSON.stringify(obj2)); -try { +try { JSON.parse('{ "foo" /*comment */ : 44, "bar" : "hello" }', reviver); print("Fail!"); } catch (e) { if (!(e instanceof SyntaxError)) { - print("Comments are illegal in JSON. Should throw SyntaxError, not " + e); + print("Comments are illegal in JSON. Should throw SyntaxError, not " + e); } } print("Success!");
--- a/test/script/basic/list.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/list.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/literal.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/literal.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Object literal test. * * @test - * @run + * @run */
--- a/test/script/basic/load.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/load.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/loadedfile.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/loadedfile.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/localundef.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/localundef.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -32,7 +32,7 @@ function func(arg){ // initializing "x" with something removes VerifyError! var x; - if (arg == 1) { + if (arg == 1) { return x; } else { x = 0;
--- a/test/script/basic/map.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/map.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -41,7 +41,7 @@ print("m = " + m) print("m.empty = " + m.empty) // prints "false" -print("m['empty'] = " + m['empty']) +print("m['empty'] = " + m['empty']) print("m[empty_key] = " + m[empty_key]) // prints "foo" print("m.bwah = " + m.bwah) // prints "null"
--- a/test/script/basic/math.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/math.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/minuszero.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/minuszero.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/module.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/module.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,4 +31,4 @@ exports.func = function() { print("module.func called"); } -} +}
--- a/test/script/basic/moduleload.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/moduleload.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/nashorn2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/nashorn2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,9 +25,9 @@ * Regression: NAS2 - lhs of index has no symbol. * * @test - * @run + * @run */ - + var obj = { prop: [3, 4] }; print(obj.prop[0]);
--- a/test/script/basic/natives.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/natives.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + var s = "abcded"; var n = 1289.90; var b = true;
--- a/test/script/basic/new.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/new.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * new Function test. * * @test - * @run + * @run */ function MyObject() {
--- a/test/script/basic/newexpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/newexpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -44,8 +44,8 @@ } print(new func().foo); - -print ((new function() { this.x = "hello" }).x); + +print ((new function() { this.x = "hello" }).x); var abc = { bar: function() { @@ -56,10 +56,10 @@ print(new abc.bar().x); function func2() { - return { + return { foo: function() { print("foo"); - } + } }; };
--- a/test/script/basic/newnew.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/newnew.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + function myObject() { this.x = 10; this.y = 20;
--- a/test/script/basic/no_line_numbers.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/no_line_numbers.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -53,8 +53,8 @@ while (true) { break; - if (true) { - var s; + if (true) { + var s; } } @@ -64,20 +64,20 @@ for ( ; ; ) { break; while (true) { - do { - var u; - } while (true); - } + do { + var u; + } while (true); + } } function terminal() { print("r = "+r); print("t = "+t); for (;;) { - var r; - return; - var t; - print("THIS SHOULD NEVER BE PRINTED!"); + var r; + return; + var t; + print("THIS SHOULD NEVER BE PRINTED!"); } print("NEITHER SHOULD THIS"); } @@ -87,13 +87,13 @@ function terminal2() { print("q = "+q); for (;;) { - return; - print("THIS SHOULD NEVER BE PRINTED!"); + return; + print("THIS SHOULD NEVER BE PRINTED!"); } print("NEITHER SHOULD THIS"); } -try { +try { terminal2(); } catch (e) { print(e); @@ -111,13 +111,13 @@ } catch (e) { print(e); } - + function disp_a() { var a = 20; print("Value of 'a' inside the function " + a); } - + var a = 10; disp_a();
--- a/test/script/basic/nonconstructors.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/nonconstructors.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/nosuchmethod.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/nosuchmethod.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Test noSuchMethod feature. * * @test - * @run + * @run */ __noSuchProperty__ = function(a) { this[a] = "xxx"; return this[a]; }
--- a/test/script/basic/nosuchproperty.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/nosuchproperty.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/number.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/number.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/numberstring.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/numberstring.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/objectprops.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/objectprops.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -45,7 +45,7 @@ xyz: { value: 44 }, abc: { get: function() { print("get abc"); return "abc"; } } } -); +); print("obj.xyz = " + obj.xyz); print("obj.abc = " + obj.abc); @@ -54,7 +54,7 @@ var obj2 = Object.create(MyConstructor.prototype); print("obj2 in MyConstructor instance? " + (obj2 instanceof MyConstructor)); -var obj3 = Object.create(Object.prototype, +var obj3 = Object.create(Object.prototype, { xyz: { value: 44 } }
--- a/test/script/basic/objects.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/objects.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/optimistic_arithmetic_check_type.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/optimistic_arithmetic_check_type.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,8 +23,8 @@ /** * @test - * @bug 8036987, 8037572 - * @summary Implement tests that checks static types in the compiled code + * @bug 8036987, 8037572 + * @summary Implement tests that checks static types in the compiled code * @run */
--- a/test/script/basic/optimistic_assignment_check_type.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/optimistic_assignment_check_type.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -50,4 +50,4 @@ print(inspect(x.c*=x.d, "local int multiplication assignment local int")) print(inspect(x.c/=x.d, "local int division assignment local int")) print(inspect(y.b=x.c, "local undefined assignment to local int")) -print(inspect(y.c=x.c, "local boolean assignment to local int")) \ No newline at end of file +print(inspect(y.c=x.c, "local boolean assignment to local int"))
--- a/test/script/basic/optimistic_check_type.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/optimistic_check_type.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,8 +23,8 @@ /** * @test - * @bug 8036987, 8037572 - * @summary Implement tests that checks static types in the compiled code + * @bug 8036987, 8037572 + * @summary Implement tests that checks static types in the compiled code * @run */ @@ -33,24 +33,24 @@ var x = { a: 2, b:0, c:undefined} var trees = new Array("redwood", "bay", "cedar", "oak"); -// Testing conditional operator +// Testing conditional operator print(inspect("" ? b : x.a, "ternary operator")) print(inspect(x.b ? b : x.a, "ternary operator")) -print(inspect(c ? b : a, "ternary operator")) +print(inspect(c ? b : a, "ternary operator")) print(inspect(!c ? b : a, "ternary operator")) print(inspect(d ? b : x.c, "ternary operator")) print(inspect(x.c ? a : c, "ternary operator")) print(inspect(c ? d : a, "ternary operator")) -print(inspect(c ? +a : b, "ternary operator")) +print(inspect(c ? +a : b, "ternary operator")) -// Testing format methods +// Testing format methods print(inspect(b.toFixed(2), "global double toFixed()")) print(inspect(b.toPrecision(2)/1, "global double toPrecision() divided by 1")) print(inspect(b.toExponential(2), "global double toExponential()")) // Testing arrays print(inspect(trees[1], "member object")) -trees[1] = undefined; +trees[1] = undefined; print(inspect(trees[1], "member undefined")) print(inspect(1 in trees ? b : a, "conditional on array member")) delete trees[2] @@ -58,7 +58,7 @@ print(inspect(3 in trees ? trees[2]="bay" : a, "conditional on array member")) print(inspect("oak" in trees ? b : a, "conditional on array member")) -// Testing nested functions and return value +// Testing nested functions and return value function f1() { var x = 2, y = 1; function g() { @@ -96,4 +96,4 @@ } g() } -f4() \ No newline at end of file +f4()
--- a/test/script/basic/optimistic_logical_check_type.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/optimistic_logical_check_type.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * @test - * @bug 8036987, 8037572 + * @bug 8036987, 8037572 * @summary Implement tests that checks static types in the compiled code * @run */ @@ -62,4 +62,4 @@ print(inspect(x.c && !!x.a, "true AND double logical not non-falsey local int ")) print(inspect(!x.c && x.a, "false AND non-falsey local int")) print(inspect(x.a || x.c, "non-falsey local int OR true")) -print(inspect(!x.c || x.c, "false OR true")) \ No newline at end of file +print(inspect(!x.c || x.c, "false OR true"))
--- a/test/script/basic/options.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/options.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/paramspec.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/paramspec.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/assignmentExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/assignmentExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/binaryExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/binaryExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/breakStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/breakStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/condExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/condExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/continueStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/continueStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/debuggerStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/debuggerStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/functions.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/functions.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/ifStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/ifStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/labelledStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/labelledStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/lhsExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/lhsExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/loopStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/loopStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/objectLitExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/objectLitExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/parenExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/parenExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/primaryExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/primaryExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/returnStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/returnStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/switchStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/switchStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/throwStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/throwStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/tryCatchStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/tryCatchStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/unaryExpr.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/unaryExpr.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/useStrict.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/useStrict.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/util.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/util.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/varDecl.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/varDecl.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/parser/withStat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/parser/withStat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/propchange.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/propchange.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -26,7 +26,7 @@ * * @test * @run - */ + */ var obj = { x: 343 };
--- a/test/script/basic/propertycheck.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/propertycheck.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/prototype.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/prototype.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,12 +30,12 @@ function check(url_) { try { - load(url_); + load(url_); } catch (e) { - if (e instanceof ReferenceError && e.toString().indexOf('navigator') != -1) { - return; - } - throw e; + if (e instanceof ReferenceError && e.toString().indexOf('navigator') != -1) { + return; + } + throw e; } } @@ -43,7 +43,7 @@ try { try { check(file); - } catch (e) { + } catch (e) { print(e); } } catch (e) {
--- a/test/script/basic/pushpull.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/pushpull.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/regex.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/regex.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,9 +25,9 @@ * RegExp test. * * @test - * @run + * @run */ - + var regexp; regexp = new RegExp("dog");
--- a/test/script/basic/regexp_flags.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/regexp_flags.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,7 +24,7 @@ /** * NASHORN-154: Early error reporting. * - * Errors in regular expression literals that are not implementation-defined + * Errors in regular expression literals that are not implementation-defined * syntax extensions. * * @test
--- a/test/script/basic/relink_index_getter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/relink_index_getter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/run-octane.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/run-octane.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -28,8 +28,8 @@ function initZlib() { zlib = new BenchmarkSuite('zlib', [152815148], [ - new Benchmark('zlib', false, true, 10, - runZlib, undefined, tearDownZlib, null, 3)]); + new Benchmark('zlib', false, true, 10, + runZlib, undefined, tearDownZlib, null, 3)]); } var tests = [ @@ -71,27 +71,27 @@ function load_bench(arg) { for (var idx = 0; idx < arg.files.length; idx++) { - var f = arg.files[idx]; - var file = f.split('/'); - var file_name = path + file[file.length - 1]; - - var compile_and_return = should_compile_only(file_name); - if (compile_and_return) { - if (typeof compile_only === 'undefined') { //for a run, skip compile onlies, don't even compile them - return true; - } - } - - print_verbose(arg, "loading '" + arg.name + "' [" + f + "]..."); - load(file_name); + var f = arg.files[idx]; + var file = f.split('/'); + var file_name = path + file[file.length - 1]; + + var compile_and_return = should_compile_only(file_name); + if (compile_and_return) { + if (typeof compile_only === 'undefined') { //for a run, skip compile onlies, don't even compile them + return true; + } } - + + print_verbose(arg, "loading '" + arg.name + "' [" + f + "]..."); + load(file_name); + } + if (typeof arg.before !== 'undefined') { - arg.before(); + arg.before(); } if (compile_and_return) { - print_always(arg, "Compiled OK"); + print_always(arg, "Compiled OK"); } return !compile_and_return; @@ -101,82 +101,82 @@ function run_one_benchmark(arg, iters) { if (!load_bench(arg)) { - return; - } - + return; + } + var success = true; var current_name; - + if (iters == undefined) { - iters = numberOfIterations; + iters = numberOfIterations; } else { - numberOfIterations = iters; + numberOfIterations = iters; } - + var benchmarks = eval(arg.suite + ".benchmarks"); var min_score = 1e9; var max_score = 0; var mean_score = 0; try { - for (var x = 0; x < benchmarks.length ; x++) { - //do warmup run - //reset random number generator needed as of octane 9 before each run - BenchmarkSuite.ResetRNG(); - benchmarks[x].Setup(); - } - BenchmarkSuite.ResetRNG(); - print_verbose(arg, "running '" + arg.name + "' for " + iters + " iterations of no less than " + min_time + " seconds"); - - var scores = []; - - var min_time_ms = min_time * 1000; - var len = benchmarks.length; - - for (var it = 0; it < iters + 1; it++) { - //every iteration must take a minimum of 10 secs - var ops = 0; - var elapsed = 0; - var start = new Date; - do { - for (var i = 0; i < len; i++) { - benchmarks[i].run(); - //important - no timing here like elapsed = new Date() - start, as in the - //original harness. This will make timing very non-deterministic. - //NOTHING else must live in this loop - } - ops += len; - elapsed = new Date - start; - } while (elapsed < min_time * 1000); - - var score = ops / elapsed * 1000 * 60; - scores.push(score); - var name = it == 0 ? "warmup" : "iteration " + it; - print_verbose(arg, name + " finished " + score.toFixed(0) + " ops/minute"); - } + for (var x = 0; x < benchmarks.length ; x++) { + //do warmup run + //reset random number generator needed as of octane 9 before each run + BenchmarkSuite.ResetRNG(); + benchmarks[x].Setup(); + } + BenchmarkSuite.ResetRNG(); + print_verbose(arg, "running '" + arg.name + "' for " + iters + " iterations of no less than " + min_time + " seconds"); + + var scores = []; + + var min_time_ms = min_time * 1000; + var len = benchmarks.length; - for (var x = 0; x < benchmarks.length ; x++) { - benchmarks[x].TearDown(); - } + for (var it = 0; it < iters + 1; it++) { + //every iteration must take a minimum of 10 secs + var ops = 0; + var elapsed = 0; + var start = new Date; + do { + for (var i = 0; i < len; i++) { + benchmarks[i].run(); + //important - no timing here like elapsed = new Date() - start, as in the + //original harness. This will make timing very non-deterministic. + //NOTHING else must live in this loop + } + ops += len; + elapsed = new Date - start; + } while (elapsed < min_time * 1000); - for (var x = 1; x < iters + 1 ; x++) { - mean_score += scores[x]; - min_score = Math.min(min_score, scores[x]); - max_score = Math.max(max_score, scores[x]); - } - mean_score /= iters; + var score = ops / elapsed * 1000 * 60; + scores.push(score); + var name = it == 0 ? "warmup" : "iteration " + it; + print_verbose(arg, name + " finished " + score.toFixed(0) + " ops/minute"); + } + + for (var x = 0; x < benchmarks.length ; x++) { + benchmarks[x].TearDown(); + } + + for (var x = 1; x < iters + 1 ; x++) { + mean_score += scores[x]; + min_score = Math.min(min_score, scores[x]); + max_score = Math.max(max_score, scores[x]); + } + mean_score /= iters; } catch (e) { - print_always(arg, "*** Aborted and setting score to zero. Reason: " + e); - if (e instanceof java.lang.Throwable) { - e.printStackTrace(); - } - mean_score = min_score = max_score = 0; - scores = [0]; + print_always(arg, "*** Aborted and setting score to zero. Reason: " + e); + if (e instanceof java.lang.Throwable) { + e.printStackTrace(); + } + mean_score = min_score = max_score = 0; + scores = [0]; } var res = mean_score.toFixed(0); if (verbose) { - res += " ops/minute (" + min_score.toFixed(0) + "-" + max_score.toFixed(0) + "), warmup=" + scores[0].toFixed(0); + res += " ops/minute (" + min_score.toFixed(0) + "-" + max_score.toFixed(0) + "), warmup=" + scores[0].toFixed(0); } print_always(arg, res); } @@ -191,13 +191,13 @@ function print_verbose(arg, x) { if (verbose) { - print_always(arg, x) + print_always(arg, x) } } function run_suite(tests, iters) { for (var idx = 0; idx < tests.length; idx++) { - run_one_benchmark(tests[idx], iters); + run_one_benchmark(tests[idx], iters); } } @@ -207,18 +207,18 @@ args = $ARGS; } else if (typeof arguments !== 'undefined' && arguments.length != 0) { args = arguments; -} +} var new_args = []; for (i in args) { if (args[i].toString().indexOf(' ') != -1) { - args[i] = args[i].replace(/\/$/, ''); - var s = args[i].split(' '); - for (j in s) { - new_args.push(s[j]); - } + args[i] = args[i].replace(/\/$/, ''); + var s = args[i].split(' '); + for (j in s) { + new_args.push(s[j]); + } } else { - new_args.push(args[i]); + new_args.push(args[i]); } } @@ -230,51 +230,51 @@ var iters = undefined; var min_time = 5; -for (var i = 0; i < args.length; i++) { +for (var i = 0; i < args.length; i++) { arg = args[i]; if (arg == "--iterations") { - iters = +args[++i]; - if (isNaN(iters)) { - throw "'--iterations' must be followed by integer"; - } + iters = +args[++i]; + if (isNaN(iters)) { + throw "'--iterations' must be followed by integer"; + } } else if (arg == "--runtime") { - runtime = args[++i]; + runtime = args[++i]; } else if (arg == "--verbose") { - verbose = true; + verbose = true; } else if (arg == "--min-time") { - min_time = +args[++i]; - if (isNaN(iters)) { - throw "'--min-time' must be followed by integer"; - } + min_time = +args[++i]; + if (isNaN(iters)) { + throw "'--min-time' must be followed by integer"; + } } else if (arg == "") { - continue; //skip + continue; //skip } else { - var found = false; - for (j in tests) { - if (tests[j].name === arg) { - tests_found.push(tests[j]); - found = true; - break; - } - } - if (!found) { - var str = "unknown test name: '" + arg + "' -- valid names are: "; - for (j in tests) { - if (j != 0) { - str += ", "; - } - str += "'" + tests[j].name + "'"; - } - throw str; - } + var found = false; + for (j in tests) { + if (tests[j].name === arg) { + tests_found.push(tests[j]); + found = true; + break; + } + } + if (!found) { + var str = "unknown test name: '" + arg + "' -- valid names are: "; + for (j in tests) { + if (j != 0) { + str += ", "; + } + str += "'" + tests[j].name + "'"; + } + throw str; + } } } -if (tests_found.length == 0) { +if (tests_found.length == 0) { for (i in tests) { - tests_found.push(tests[i]); + tests_found.push(tests[i]); } -} +} // returns false for rhino, v8 and all other javascript runtimes, true for Nashorn function is_this_nashorn() { @@ -283,21 +283,21 @@ if (is_this_nashorn()) { try { - read = readFully; + read = readFully; } catch (e) { - print("ABORTING: Cannot find 'readFully'. You must have scripting enabled to use this test harness. (-scripting)"); - throw e; + print("ABORTING: Cannot find 'readFully'. You must have scripting enabled to use this test harness. (-scripting)"); + throw e; } } // run tests in alphabetical order by name tests_found.sort(function(a, b) { if (a.name < b.name) { - return -1; + return -1; } else if (a.name > b.name) { - return 1; + return 1; } else { - return 0; + return 0; } });
--- a/test/script/basic/runsunspider.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/runsunspider.js Wed Jun 04 13:08:57 2014 +0200 @@ -41,7 +41,7 @@ function pprint(x) { if (verbose_run) { - print(x); + print(x); } } @@ -97,14 +97,14 @@ if (args[i] === '--verbose') { verbose_run = true; } else if (args[i] === '--times') { - i++; - rtimes = +args[i]; + i++; + rtimes = +args[i]; } else if (args[i] === '--single') { - i++; - single = args[i]; + i++; + single = args[i]; } else if (args[i] === '--runall') { - i++; - runall = true; + i++; + runall = true; } } @@ -114,7 +114,7 @@ var oldRandom = Math.random; try { - for (var n = 0; n < tests.length; n++) { + for (var n = 0; n < tests.length; n++) { try { path = dir + '../external/sunspider/tests/sunspider-1.0.2/' + tests[n].name @@ -135,13 +135,13 @@ var elemsPerPercent = to / 100; var po = 0|(to / 10); - pprint("Doing warmup."); + pprint("Doing warmup."); for (times = 0; times < to; times++) { initrandom(); tests[n].rerun(); } - pprint("Doing hot runs."); + pprint("Doing hot runs."); for (times = 0; times < to; times++) { initrandom(); tests[n].rerun(); @@ -170,35 +170,35 @@ } } } catch (e) { - print("FAIL!"); - throw e; + print("FAIL!"); + throw e; // no scripting or something, silently fail } finally { - Math.random = oldRandom; + Math.random = oldRandom; } - for (var n = 0; n < tests.length; n++) { - - var time = "" + res[n]; - while (time.length < 6) { - time = " " + time; - } - time += " ms"; - if (res[n] == -1) { - time = "<couldn't be rerun>"; - } - var str = tests[n].name; - for (var spaces = str.length; spaces < 32; spaces++) { - str += " "; - } - str += " "; - str += time; + for (var n = 0; n < tests.length; n++) { - if (tests[n].times > 0) { - str += " ["; - str += tests[n].times + " reruns]"; - } - pprint(str); + var time = "" + res[n]; + while (time.length < 6) { + time = " " + time; + } + time += " ms"; + if (res[n] == -1) { + time = "<couldn't be rerun>"; + } + var str = tests[n].name; + for (var spaces = str.length; spaces < 32; spaces++) { + str += " "; + } + str += " "; + str += time; + + if (tests[n].times > 0) { + str += " ["; + str += tests[n].times + " reruns]"; + } + pprint(str); } return changed; @@ -219,10 +219,10 @@ { name: 'regexp-dna.js', actual: function() { - return dnaOutputString + dnaInput; + return dnaOutputString + dnaInput; }, expected: function() { - return expectedDNAOutputString + expectedDNAInput; + return expectedDNAOutputString + expectedDNAInput; }, }, @@ -235,28 +235,28 @@ }, times: rtimes, rerun: function() { - toBinaryTable = [ - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, - 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, - 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1, - -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, - 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 - ]; - var str = ""; - for (var i = 0; i < 8192; i++) + toBinaryTable = [ + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, + 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, + 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1, + -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, + 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 + ]; + var str = ""; + for (var i = 0; i < 8192; i++) str += String.fromCharCode((25 * Math.random()) + 97); - - for (var i = 8192; i <= 16384; i *= 2) { - var base64; - base64 = toBase64(str); - var encoded = base64ToString(base64); - str += str; - } - toBinaryTable = null; + for (var i = 8192; i <= 16384; i *= 2) { + var base64; + base64 = toBase64(str); + var encoded = base64ToString(base64); + + str += str; + } + toBinaryTable = null; } }, { name: 'date-format-xparb.js', @@ -268,14 +268,14 @@ }, times: rtimes, rerun: function() { - date = new Date("1/1/2007 1:11:11"); - for (i = 0; i < 4000; ++i) { - var shortFormat = date.dateFormat("Y-m-d"); - var longFormat = date.dateFormat("l, F d, Y g:i:s A"); - date.setTime(date.getTime() + 84266956); - } + date = new Date("1/1/2007 1:11:11"); + for (i = 0; i < 4000; ++i) { + var shortFormat = date.dateFormat("Y-m-d"); + var longFormat = date.dateFormat("l, F d, Y g:i:s A"); + date.setTime(date.getTime() + 84266956); } - + } + }, { name: 'string-validate-input.js', actual: function() { @@ -286,8 +286,8 @@ }, times: rtimes, rerun: function() { - doTest(); - }, + doTest(); + }, }, { name: '3d-morph.js', actual: function() { @@ -298,18 +298,18 @@ return true; }, times: rtimes, - rerun: function() { - a = Array() - for (var i=0; i < nx*nz*3; ++i) - a[i] = 0 - for (var i = 0; i < loops; ++i) { - morph(a, i/loops) - } - testOutput = 0; - for (var i = 0; i < nx; i++) - testOutput += a[3*(i*nx+i)+1]; - a = null; - + rerun: function() { + a = Array() + for (var i=0; i < nx*nz*3; ++i) + a[i] = 0 + for (var i = 0; i < loops; ++i) { + morph(a, i/loops) + } + testOutput = 0; + for (var i = 0; i < nx; i++) + testOutput += a[3*(i*nx+i)+1]; + a = null; + } }, { name: 'crypto-aes.js', @@ -321,9 +321,9 @@ }, times: rtimes, rerun: function() { - cipherText = AESEncryptCtr(plainText, password, 256); - decryptedText = AESDecryptCtr(cipherText, password, 256); - + cipherText = AESEncryptCtr(plainText, password, 256); + decryptedText = AESDecryptCtr(cipherText, password, 256); + } }, { name: 'crypto-md5.js', @@ -335,7 +335,7 @@ }, times: rtimes, rerun: function() { - md5Output = hex_md5(plainText); + md5Output = hex_md5(plainText); } }, @@ -348,7 +348,7 @@ }, times: rtimes, rerun: function() { - sha1Output = hex_sha1(plainText); + sha1Output = hex_sha1(plainText); } }, @@ -361,11 +361,11 @@ }, times: rtimes, rerun: function() { - bitwiseAndValue = 4294967296; - for (var i = 0; i < 600000; i++) { - bitwiseAndValue = bitwiseAndValue & i; - } - result = bitwiseAndValue; + bitwiseAndValue = 4294967296; + for (var i = 0; i < 600000; i++) { + bitwiseAndValue = bitwiseAndValue & i; + } + result = bitwiseAndValue; } }, @@ -378,7 +378,7 @@ }, times: rtimes, rerun: function() { - result = TimeFunc(bitsinbyte); + result = TimeFunc(bitsinbyte); } }, @@ -396,7 +396,7 @@ }, times: rtimes, rerun: function() { - result = sieve(); + result = sieve(); } }, @@ -409,7 +409,7 @@ }, times: rtimes, rerun: function() { - sum = TimeFunc(fast3bitlookup); + sum = TimeFunc(fast3bitlookup); } }, @@ -422,21 +422,21 @@ }, times: rtimes, rerun: function() { - var ret = 0; - for (var n = 3; n <= 24; n *= 2) { - (function(){ - var bodies = new NBodySystem( Array( - Sun(),Jupiter(),Saturn(),Uranus(),Neptune() - )); - var max = n * 100; - - ret += bodies.energy(); - for (var i=0; i<max; i++){ - bodies.advance(0.01); - } - ret += bodies.energy(); - })(); - } + var ret = 0; + for (var n = 3; n <= 24; n *= 2) { + (function(){ + var bodies = new NBodySystem( Array( + Sun(),Jupiter(),Saturn(),Uranus(),Neptune() + )); + var max = n * 100; + + ret += bodies.energy(); + for (var i=0; i<max; i++){ + bodies.advance(0.01); + } + ret += bodies.energy(); + })(); + } } }, @@ -449,28 +449,28 @@ }, times: rtimes, rerun: function() { - ret = 0; - - for (var n = 4; n <= 7; n += 1) { - var minDepth = 4; - var maxDepth = Math.max(minDepth + 2, n); - var stretchDepth = maxDepth + 1; - - var check = bottomUpTree(0,stretchDepth).itemCheck(); - - var longLivedTree = bottomUpTree(0,maxDepth); - for (var depth=minDepth; depth<=maxDepth; depth+=2){ - var iterations = 1 << (maxDepth - depth + minDepth); - - check = 0; - for (var i=1; i<=iterations; i++){ - check += bottomUpTree(i,depth).itemCheck(); - check += bottomUpTree(-i,depth).itemCheck(); - } - } - - ret += longLivedTree.itemCheck(); - } + ret = 0; + + for (var n = 4; n <= 7; n += 1) { + var minDepth = 4; + var maxDepth = Math.max(minDepth + 2, n); + var stretchDepth = maxDepth + 1; + + var check = bottomUpTree(0,stretchDepth).itemCheck(); + + var longLivedTree = bottomUpTree(0,maxDepth); + for (var depth=minDepth; depth<=maxDepth; depth+=2){ + var iterations = 1 << (maxDepth - depth + minDepth); + + check = 0; + for (var i=1; i<=iterations; i++){ + check += bottomUpTree(i,depth).itemCheck(); + check += bottomUpTree(-i,depth).itemCheck(); + } + } + + ret += longLivedTree.itemCheck(); + } } }, @@ -483,8 +483,8 @@ }, times: rtimes, rerun: function() { - n = 8; - ret = fannkuch(n); + n = 8; + ret = fannkuch(n); } }, @@ -501,10 +501,10 @@ }, times: rtimes, rerun: function() { - total = 0; - for (var i = 6; i <= 48; i *= 2) { - total += spectralnorm(i); - } + total = 0; + for (var i = 6; i <= 48; i *= 2) { + total += spectralnorm(i); + } } }, @@ -517,7 +517,7 @@ }, times: rtimes, rerun: function() { - testOutput = arrayToCanvasCommands(raytraceScene()); + testOutput = arrayToCanvasCommands(raytraceScene()); } }, @@ -530,8 +530,8 @@ }, times: rtimes, rerun: function() { - total = 0; - cordic(25000); + total = 0; + cordic(25000); } }, @@ -550,12 +550,12 @@ }, times: rtimes, rerun: function() { - result = 0; - for (var i = 3; i <= 5; i++) { - result += ack(3,i); - result += fib(17.0+i); - result += tak(3*i+3,2*i+2,i+1); - } + result = 0; + for (var i = 3; i <= 5; i++) { + result += ack(3,i); + result += fib(17.0+i); + result += tak(3*i+3,2*i+2,i+1); + } } }, @@ -568,12 +568,12 @@ }, times: rtimes, rerun: function() { - date = new Date("1/1/2007 1:11:11"); - for (i = 0; i < 500; ++i) { - var shortFormat = date.formatDate("Y-m-d"); - var longFormat = date.formatDate("l, F d, Y g:i:s A"); - date.setTime(date.getTime() + 84266956); - } + date = new Date("1/1/2007 1:11:11"); + for (i = 0; i < 500; ++i) { + var shortFormat = date.formatDate("Y-m-d"); + var longFormat = date.formatDate("l, F d, Y g:i:s A"); + date.setTime(date.getTime() + 84266956); + } } }, @@ -588,53 +588,53 @@ return 295906; }, times: rtimes, - rerun: function() { - tagInfo = tagInfoJSON.parseJSON(function(a, b) { if (a == "popularity") { return Math.log(b) / log2; } else {return b; } }); - tagcloud = makeTagCloud(tagInfo); + rerun: function() { + tagInfo = tagInfoJSON.parseJSON(function(a, b) { if (a == "popularity") { return Math.log(b) / log2; } else {return b; } }); + tagcloud = makeTagCloud(tagInfo); } }, { name: 'math-partial-sums.js', actual: function() { - return total; + return total; }, expected: function() { - return 60.08994194659945; + return 60.08994194659945; }, times: rtimes, rerun: function() { - total = 0; - for (var i = 1024; i <= 16384; i *= 2) { - total += partial(i); - } + total = 0; + for (var i = 1024; i <= 16384; i *= 2) { + total += partial(i); + } } }, { name: 'access-nsieve.js', actual: function() { - return result; + return result; }, expected: function() { - return 14302; + return 14302; }, times: rtimes, rerun: function() { - result = sieve(); + result = sieve(); } }, { name: '3d-cube.js', times: rtimes, rerun: function() { - Q = new Array(); - MTrans = new Array(); // transformation matrix - MQube = new Array(); // position information of qube - I = new Array(); // entity matrix - Origin = new Object(); - Testing = new Object(); - for ( var i = 20; i <= 160; i *= 2 ) { - Init(i); - } + Q = new Array(); + MTrans = new Array(); // transformation matrix + MQube = new Array(); // position information of qube + I = new Array(); // entity matrix + Origin = new Object(); + Testing = new Object(); + for ( var i = 20; i <= 160; i *= 2 ) { + Init(i); + } } }, @@ -642,11 +642,11 @@ { name: 'string-fasta.js', times: rtimes, rerun: function() { - ret = 0; - count = 7; - fastaRepeat(2*count*100000, ALU); - fastaRandom(3*count*1000, IUB); - fastaRandom(5*count*1000, HomoSap); + ret = 0; + count = 7; + fastaRepeat(2*count*100000, ALU); + fastaRandom(3*count*1000, IUB); + fastaRandom(5*count*1000, HomoSap); } }, @@ -659,7 +659,7 @@ decompressedMochiKit[82556] == '>'; }, expected: function() { - return true; + return true; }, }, @@ -668,14 +668,14 @@ tests.sort(function(a,b) { return a.name.localeCompare(b.name); }); if (typeof single !== 'undefined') { for (i in tests) { - if (tests[i].name === single) { - singleTest = tests[i]; - tests = [singleTest]; - break; - } + if (tests[i].name === single) { + singleTest = tests[i]; + tests = [singleTest]; + break; + } } if (tests.length != 1) { - throw "unknown single test '" + single + "'"; + throw "unknown single test '" + single + "'"; } }
--- a/test/script/basic/samfunc.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/samfunc.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -34,7 +34,7 @@ var t1 = new java.lang.Thread(function() { print("thread t1.run"); -}); +}); // make sure that we can pass interface implementation as well. var t2 = new java.lang.Thread(new java.lang.Runnable() {
--- a/test/script/basic/scripting.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/scripting.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/scripting.js.EXPECTED Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/scripting.js.EXPECTED Wed Jun 04 13:08:57 2014 +0200 @@ -22,21 +22,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/sealfreeze.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/sealfreeze.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/setlength.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/setlength.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -27,7 +27,7 @@ * @test * @run */ - + var a = ["a", "b", "c", "d", "e"]; print(a.length); print(a);
--- a/test/script/basic/splitter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/splitter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/stdin.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/stdin.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/strings.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/strings.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/throws.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/throws.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/tosource.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/tosource.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/tostring.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/tostring.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/try.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/try.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,12 +25,12 @@ * Try throw test. * * @test - * @run + * @run */ function A() { print("before try"); - + try { print("before throw"); throw "a string"; @@ -41,7 +41,7 @@ } finally { print("finally"); } - + return "incorrect"; }
--- a/test/script/basic/try2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/try2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,21 +25,21 @@ * Try throw test - nest finally * * @test - * @run + * @run */ function f() { print("a"); try { - print("b"); + print("b"); } finally { - print("c"); - try { - print("d"); - } finally { - print("e"); - } - print("f"); + print("c"); + try { + print("d"); + } finally { + print("e"); + } + print("f"); } print("g"); }
--- a/test/script/basic/trybreakcont.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/trybreakcont.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/trycatch.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/trycatch.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * try catch test. * * @test - * @run + * @run */ var actual = ''; @@ -35,13 +35,13 @@ function test() { expect = true; - + try { actual = true; } catch(ex) { actual = ex + ''; } - + print(actual); }
--- a/test/script/basic/trycatchfor.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/trycatchfor.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ try { for(var i =0; i < 10; i++) { - } + } } catch (e) { }
--- a/test/script/basic/tryfinallyreturn.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/tryfinallyreturn.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/tryforbreak.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/tryforbreak.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -31,8 +31,8 @@ try { for(i = 0; i < 3; i++) { break; - }; -} catch (e) { + }; +} catch (e) { } print("done");
--- a/test/script/basic/typechange.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/typechange.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * This test crashes with VerifyError (bad type on stack). - * + * * @test * @run */
--- a/test/script/basic/typecoerce.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/typecoerce.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,9 +24,9 @@ /** * There was a bug in the old Lower that didn't fully propagate type information * by way of assignment. 'q' in the example below would have finished a double - * even though it can get an object value through the assignment 'q = l' - * - * Furthermore, this caused type coercion to be done at q = l, and not a q = q * 2, + * even though it can get an object value through the assignment 'q = l' + * + * Furthermore, this caused type coercion to be done at q = l, and not a q = q * 2, * which is a bug. This test ensures it happens in the correct order * * @test @@ -42,11 +42,11 @@ var l = 1.2; //number var q = 2.3; //number for (var i = 0; i < 2; i++) { - q = l; // q = toNumber(l), no coercion here - print("assignment done"); - q = q * 2; // q = q * 2, coercion here - print("multiplication done"); - l = createObject(); + q = l; // q = toNumber(l), no coercion here + print("assignment done"); + q = q * 2; // q = q * 2, coercion here + print("multiplication done"); + l = createObject(); } }
--- a/test/script/basic/typedarrays.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/typedarrays.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,20 +25,20 @@ * typedarray test. * * @test - * @run + * @run */ var typeDefinitions = [ -Int8Array, -Uint8Array, -Uint8ClampedArray, -Int16Array, -Uint16Array, -Int32Array, -Uint32Array, -Float32Array, -Float64Array, +Int8Array, +Uint8Array, +Uint8ClampedArray, +Int16Array, +Uint16Array, +Int32Array, +Uint32Array, +Float32Array, +Float64Array, ]; var mem1 = new ArrayBuffer(1024); @@ -55,17 +55,17 @@ typeDefinitions.forEach(function(arrayDef) { var p = arrayDef.prototype; var sub = []; - sub.push(new arrayDef(mem1, arrayDef.BYTES_PER_ELEMENT, 3)); + sub.push(new arrayDef(mem1, arrayDef.BYTES_PER_ELEMENT, 3)); sub.push(new arrayDef(size)); sub.push(new arrayDef(arr)); //push the instances, they will be reused to do instance based construction partial.push({ - instances:sub, + instances:sub, type:arrayDef }); - + all.concat(all, sub); - + }); partial.forEach(function(inst) { @@ -85,9 +85,9 @@ var val = instance[p]; if(!isNaN(p)) { val[p] = 99; - } + } }); - + instance.set(instance, 0); instance.set(instance); instance.set(arr2);
--- a/test/script/basic/typedarrays2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/typedarrays2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/typeof.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/typeof.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Typeof test. * * @test - * @run + * @run */ var x = { a: 1, b: "string", c: [1, 2, 3], d: function() {} };
--- a/test/script/basic/typeof2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/typeof2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/undefined.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/undefined.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/underscore.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/underscore.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * NASHORN-466 : corpus parse test for underscore - * + * * @test * @runif external.underscore */
--- a/test/script/basic/varargs.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/varargs.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * Var args test. * * @test - * @run + * @run */ function varFunc(a, b, c) { print(a, b, c);
--- a/test/script/basic/void.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/void.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/with.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/with.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * With test. * * @test - * @run + * @run */ var x = {a: 10, b: 20, c: 30}; @@ -38,12 +38,12 @@ with (x) { print(b); print(x.b); - + b = false; - + print(b); print(x.b); - + y = 200; } @@ -52,10 +52,10 @@ for (i in x) print(i, x[i]); -var obj = { +var obj = { __noSuchProperty__: function(name) { return name.toUpperCase(); - } + } }; with(obj) {
--- a/test/script/basic/withprimitive.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/withprimitive.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,7 +24,7 @@ /** * Using "with" statement with primitive typed value as scope object. * Results in VerifyError: Bad type on operand stack. - * + * * @test * @run */
--- a/test/script/basic/writable_relink.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/writable_relink.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/basic/xorassign.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/xorassign.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * The following crashes with VerifyError. + * The following crashes with VerifyError. * * @test * @run
--- a/test/script/basic/yui.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/basic/yui.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,23 +23,23 @@ /** * NASHORN-469 : corpus parse test for yahoo ui library / yahoo ui library min - * + * * @test * @runif external.yui */ var names = [ "yui-min.js", "yui.js" ]; -for each (name in names) { +for each (name in names) { try { - try { + try { var file = __DIR__ + "../external/yui/" + name; - load(__DIR__ + "../external/yui/" + name); - } catch (e) { - print(e); - } + load(__DIR__ + "../external/yui/" + name); } catch (e) { - print("error: " + e); + print(e); + } + } catch (e) { + print("error: " + e); } print("parsed and compiled ok " + name); }
--- a/test/script/currently-failing/JDK-8006191.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/JDK-8006191.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * - Neither the name of Oracle nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -28,14 +28,14 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + /** * JDK-8006191 - `cmd` -> exec("cmd") in script mode * * @test * @option -scripting * @argument ArgumentFromCommandLine - * @run + * @run */ #!/usr/bin/jjs
--- a/test/script/currently-failing/apply_to_call_bench.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/apply_to_call_bench.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,9 +30,9 @@ var Class = { create: function() { - return function() { //vararg - this.initialize.apply(this, arguments); - } + return function() { //vararg + this.initialize.apply(this, arguments); + } } }; @@ -40,9 +40,9 @@ Color.prototype = { red: 0, green: 0, blue: 0, initialize: function(r,g,b) { - this.red = r; - this.green = g; - this.blue = b; + this.red = r; + this.green = g; + this.blue = b; } }; @@ -61,7 +61,7 @@ var d = new Date; var colors = new Array(16); for (var i=0;i<1e8;i++) { - colors[i & 0xf] = new Color(1,2,3); + colors[i & 0xf] = new Color(1,2,3); } var t = new Date - d; set_time(t);
--- a/test/script/currently-failing/clone_ir.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/clone_ir.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -41,12 +41,12 @@ var System = Java.type("java.lang.System"); var toArrayMethod = ASTWriter.class.getMethod("toArray"); -var parseMethod = Parser.class.getMethod("parse"); +var parseMethod = Parser.class.getMethod("parse"); function toString(obj) { var output = "{ "; for (property in obj) { - output += property + ': ' + obj[property]+'; '; + output += property + ': ' + obj[property]+'; '; } return output + '}' } @@ -54,11 +54,11 @@ function flatten(func) { var writer = new ASTWriter(func); var funcList = toArrayMethod.invoke(writer); - + var res = []; for each (x in funcList) { - res.push({ name: x.getClass().getName(), id: System.identityHashCode(x) }); - } + res.push({ name: x.getClass().getName(), id: System.identityHashCode(x) }); + } return res; } @@ -80,20 +80,20 @@ print(f2.map(toString)); if (f1.length != f2.length) { - print("length difference between original and clone " + f1.length + " != " + f2.length); - return false; + print("length difference between original and clone " + f1.length + " != " + f2.length); + return false; } for (var i = 0; i < f1.length; i++) { - if (f1[i].name !== f2[i].name) { - print("name conflict at " + i + " " + f1[i].name + " != " + f2[i].name); - return false; - } else if (f1[i].id === f2[i].id) { - print("id problem at " + i + " " + toString(f1[i]) + " was not deep copied to " + toString(f2[i]) + " became " + f1[i].id + " != " + f2[i].id); - return false; - } + if (f1[i].name !== f2[i].name) { + print("name conflict at " + i + " " + f1[i].name + " != " + f2[i].name); + return false; + } else if (f1[i].id === f2[i].id) { + print("id problem at " + i + " " + toString(f1[i]) + " was not deep copied to " + toString(f2[i]) + " became " + f1[i].id + " != " + f2[i].id); + return false; } - + } + return true; }
--- a/test/script/currently-failing/gettersetter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/gettersetter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/currently-failing/logcoverage.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/logcoverage.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * mh_coverage.js - * Screen scrape various logs to ensure that we cover enough functionality, + * Screen scrape various logs to ensure that we cover enough functionality, * e.g. method handle instrumentation * * @test @@ -44,25 +44,25 @@ var fac = new NashornScriptEngineFactory(); // get current System.err var oldErr = System.err; - var oldOut = System.out; + var oldOut = System.out; var baosErr = new ByteArrayOutputStream(); var newErr = new PrintStream(baosErr); var baosOut = new ByteArrayOutputStream(); - var newOut = new PrintStream(baosOut); + var newOut = new PrintStream(baosOut); try { // set new standard err System.setErr(newErr); System.setOut(newOut); var engine = fac.getScriptEngine(Java.to(opts, "java.lang.String[]")); - var reader = new java.io.FileReader(name); + var reader = new java.io.FileReader(name); engine.eval(reader); newErr.flush(); - newOut.flush(); + newOut.flush(); return new java.lang.String(baosErr.toByteArray()); } finally { // restore System.err to old value System.setErr(oldErr); - System.setOut(oldOut); + System.setOut(oldOut); } } } @@ -70,27 +70,27 @@ var str; var methodsCalled = [ - 'asCollector', - 'asType', - 'bindTo', - 'dropArguments', - 'explicitCastArguments', - 'filterArguments', - 'filterReturnValue', - 'findStatic', - 'findVirtual', - 'foldArguments', - 'getter', - 'guardWithTest', - 'insertArguments', - 'methodType', + 'asCollector', + 'asType', + 'bindTo', + 'dropArguments', + 'explicitCastArguments', + 'filterArguments', + 'filterReturnValue', + 'findStatic', + 'findVirtual', + 'foldArguments', + 'getter', + 'guardWithTest', + 'insertArguments', + 'methodType', 'setter' ]; function check(str, strs) { for each (s in strs) { if (str.indexOf(s) !== -1) { - continue; + continue; } print(s + " not found"); return;
--- a/test/script/currently-failing/optimistic_check_type_cases.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/optimistic_check_type_cases.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -39,4 +39,4 @@ print(inspect(b-=b, "global int substraction assignment global int")) print(inspect(c*=a, "global int multiplication assignment global int")) print(inspect(a/=a, "global int division assignment global int")) -print(inspect(c%=c, "global int modulo assignment global int")) \ No newline at end of file +print(inspect(c%=c, "global int modulo assignment global int"))
--- a/test/script/currently-failing/property_delete.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/currently-failing/property_delete.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8008814-1.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8008814-1.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8008814-2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8008814-2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8016522.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8016522.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8020437-2.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8020437-2.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8020437.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8020437.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8026039.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8026039.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,4 +29,4 @@ function public() {"use strict"} -function f(public) {"use strict"} +function f(public) {"use strict"}
--- a/test/script/error/JDK-8026039.js.EXPECTED Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8026039.js.EXPECTED Wed Jun 04 13:08:57 2014 +0200 @@ -2,7 +2,7 @@ function public() {"use strict"} ^ test/script/error/JDK-8026039.js:32:11 Expected ident but found public -function f(public) {"use strict"} +function f(public) {"use strict"} ^ test/script/error/JDK-8026039.js:33:0 Expected } but found eof
--- a/test/script/error/JDK-8027933.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8027933.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/JDK-8039047.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/JDK-8039047.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-154/function_mult_params_in_strict.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/function_mult_params_in_strict.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,8 +24,8 @@ /** * Early error reporting. * - * The occurrence of an Identifier value appearing more than once within a - * FormalParameterList of an individual strict mode FunctionDeclaration or + * The occurrence of an Identifier value appearing more than once within a + * FormalParameterList of an individual strict mode FunctionDeclaration or * FunctionExpression * * @test/compile-error
--- a/test/script/error/NASHORN-154/improper_return_break_continue.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/improper_return_break_continue.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-154/invalid_lvalue.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/invalid_lvalue.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,8 +24,8 @@ /** * Early error reporting. * - * Attempts to call PutValue on any value for which an early determination can - * be made that the value is not a Reference (for example, executing the + * Attempts to call PutValue on any value for which an early determination can + * be made that the value is not a Reference (for example, executing the * assignment statement 3=4). * * @test/compile-error
--- a/test/script/error/NASHORN-154/literal_data_and_accessor.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/literal_data_and_accessor.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-154/literal_mult_getters.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/literal_mult_getters.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,8 +24,8 @@ /** * Early error reporting. * - * Attempts to define an ObjectLiteral that has multiple get property - * assignments with the same name or multiple set property assignments with + * Attempts to define an ObjectLiteral that has multiple get property + * assignments with the same name or multiple set property assignments with * the same name. * * @test/compile-error
--- a/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,7 +24,7 @@ /** * Early error reporting. * - * Attempts in strict mode code to define an ObjectLiteral that has multiple + * Attempts in strict mode code to define an ObjectLiteral that has multiple * data property assignments with the same name. * * @test/compile-error
--- a/test/script/error/NASHORN-154/with_in_strict.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-154/with_in_strict.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-214.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-214.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-35.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-35.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-39.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-39.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -29,5 +29,5 @@ // line terminator here should result in compiler error. -throw +throw 1;
--- a/test/script/error/NASHORN-568.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-568.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-57.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-57.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/NASHORN-668.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/NASHORN-668.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/quotemissing.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/quotemissing.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/error/strictmode.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/error/strictmode.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/jfx/kaleidoscope.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/jfx/kaleidoscope.js Wed Jun 04 13:08:57 2014 +0200 @@ -52,99 +52,99 @@ var isFrameRendered = false; function renderFrame() { - if (!isFrameRendered) { + if (!isFrameRendered) { a=0.2*angle; - b=0.7*angle; - r=0; - fade=32; - for(var i=0;i<6;i++) - { - c[i]=1.0/(i+1)/2; - d[i]=1.0/(i+1)/2; - } - radius=Math.round((WIDTH+HEIGHT)/8); - e=radius*0.2; - p_x=Math.round(WIDTH/2); - p_y=Math.round(HEIGHT/2); - x=(radius*c[0])*Math.cos(a*d[1])+(radius*c[2])*Math.sin(a*d[3])+(radius*c[4])*Math.sin(a*d[5]); - y=(radius*c[5])*Math.sin(a*d[4])+(radius*c[3])*Math.cos(a*d[2])+(radius*c[1])*Math.cos(a*d[0]); + b=0.7*angle; + r=0; + fade=32; + for(var i=0;i<6;i++) + { + c[i]=1.0/(i+1)/2; + d[i]=1.0/(i+1)/2; + } + radius=Math.round((WIDTH+HEIGHT)/8); + e=radius*0.2; + p_x=Math.round(WIDTH/2); + p_y=Math.round(HEIGHT/2); + x=(radius*c[0])*Math.cos(a*d[1])+(radius*c[2])*Math.sin(a*d[3])+(radius*c[4])*Math.sin(a*d[5]); + y=(radius*c[5])*Math.sin(a*d[4])+(radius*c[3])*Math.cos(a*d[2])+(radius*c[1])*Math.cos(a*d[0]); isFrameRendered = true; } anim(); } function anim() { - var a1=Math.cos(a*2); - var a2=Math.cos(a*4); - var a3=Math.cos(a); - var a4=Math.sin(a); - if(b>limit1&&b<limit2) { - r+=radius*0.02*a1; - prv_x=x; - prv_y=y; - x=prv_x2+r*a3; - y=prv_y2+r*a4; - } else { - prv_x=x; - prv_y=y; - prv_x2=x; - prv_y2=y; - x=(radius*c[0])*Math.cos(a*d[1])+(radius*c[2])*Math.sin(a*d[3])+(radius*c[4])*Math.sin(a*d[5]); - y=(radius*c[5])*Math.sin(a*d[4])+(radius*c[3])*Math.cos(a*d[2])+(radius*c[1])*Math.cos(a*d[0]); - } - var c3=16*Math.cos(a*10); - var c1=Math.floor(56*Math.cos(a*angle*4)+c3); - var c2=Math.floor(56*Math.sin(a*angle*4)-c3); - context.lineCap=StrokeLineCap.ROUND; - context.setStroke(Paint.valueOf('rgba('+(192+c1)+','+(192+c2)+','+(192-c1)+','+(0.01-0.005*-a1)+')')); - context.lineWidth=e*1.4+e*0.8*a3; - draw_line(p_x,p_y,prv_x,prv_y,x,y); - context.lineWidth=e+e*0.8*a3; - draw_line(p_x,p_y,prv_x,prv_y,x,y); - context.setStroke(Paint.valueOf('rgba('+(192+c1)+','+(192+c2)+','+(192-c1)+','+(0.06-0.03*-a1)+')')); - context.lineWidth=e*0.6+e*0.35*a3; - draw_line(p_x,p_y,prv_x,prv_y,x,y); - context.setStroke(Paint.valueOf('rgba(0,0,0,0.06)')); - context.lineWidth=e*0.4+e*0.225*a3; - draw_line(p_x,p_y,prv_x,prv_y,x,y); - context.setStroke(Paint.valueOf('rgba('+(192+c1)+','+(192+c2)+','+(192-c1)+','+(0.1-0.075*-a1)+')')); - context.lineWidth=e*0.2+e*0.1*a3; - draw_line(p_x,p_y,prv_x,prv_y,x,y); - context.setStroke(Paint.valueOf('rgba(255,255,255,0.4)')); - context.lineWidth=e*(0.1-0.05*-a2); - draw_line(p_x,p_y,prv_x,prv_y,x,y); - a+=angle*Math.cos(b); - b+=angle*0.1; + var a1=Math.cos(a*2); + var a2=Math.cos(a*4); + var a3=Math.cos(a); + var a4=Math.sin(a); + if(b>limit1&&b<limit2) { + r+=radius*0.02*a1; + prv_x=x; + prv_y=y; + x=prv_x2+r*a3; + y=prv_y2+r*a4; + } else { + prv_x=x; + prv_y=y; + prv_x2=x; + prv_y2=y; + x=(radius*c[0])*Math.cos(a*d[1])+(radius*c[2])*Math.sin(a*d[3])+(radius*c[4])*Math.sin(a*d[5]); + y=(radius*c[5])*Math.sin(a*d[4])+(radius*c[3])*Math.cos(a*d[2])+(radius*c[1])*Math.cos(a*d[0]); + } + var c3=16*Math.cos(a*10); + var c1=Math.floor(56*Math.cos(a*angle*4)+c3); + var c2=Math.floor(56*Math.sin(a*angle*4)-c3); + context.lineCap=StrokeLineCap.ROUND; + context.setStroke(Paint.valueOf('rgba('+(192+c1)+','+(192+c2)+','+(192-c1)+','+(0.01-0.005*-a1)+')')); + context.lineWidth=e*1.4+e*0.8*a3; + draw_line(p_x,p_y,prv_x,prv_y,x,y); + context.lineWidth=e+e*0.8*a3; + draw_line(p_x,p_y,prv_x,prv_y,x,y); + context.setStroke(Paint.valueOf('rgba('+(192+c1)+','+(192+c2)+','+(192-c1)+','+(0.06-0.03*-a1)+')')); + context.lineWidth=e*0.6+e*0.35*a3; + draw_line(p_x,p_y,prv_x,prv_y,x,y); + context.setStroke(Paint.valueOf('rgba(0,0,0,0.06)')); + context.lineWidth=e*0.4+e*0.225*a3; + draw_line(p_x,p_y,prv_x,prv_y,x,y); + context.setStroke(Paint.valueOf('rgba('+(192+c1)+','+(192+c2)+','+(192-c1)+','+(0.1-0.075*-a1)+')')); + context.lineWidth=e*0.2+e*0.1*a3; + draw_line(p_x,p_y,prv_x,prv_y,x,y); + context.setStroke(Paint.valueOf('rgba(255,255,255,0.4)')); + context.lineWidth=e*(0.1-0.05*-a2); + draw_line(p_x,p_y,prv_x,prv_y,x,y); + a+=angle*Math.cos(b); + b+=angle*0.1; } function draw_line(x,y,x1,y1,x2,y2) { - context.beginPath(); - context.moveTo(x+x1,y+y1); - context.lineTo(x+x2,y+y2); - context.moveTo(x-x1,y+y1); - context.lineTo(x-x2,y+y2); - context.moveTo(x-x1,y-y1); - context.lineTo(x-x2,y-y2); - context.moveTo(x+x1,y-y1); - context.lineTo(x+x2,y-y2); - context.moveTo(x+y1,y+x1); - context.lineTo(x+y2,y+x2); - context.moveTo(x-y1,y+x1); - context.lineTo(x-y2,y+x2); - context.moveTo(x-y1,y-x1); - context.lineTo(x-y2,y-x2); - context.moveTo(x+y1,y-x1); - context.lineTo(x+y2,y-x2); - context.moveTo(x,y+x2); - context.lineTo(x,y+x1); - context.moveTo(x,y-x2); - context.lineTo(x,y-x1); - context.moveTo(x+x2,y); - context.lineTo(x+x1,y); - context.moveTo(x-x2,y); - context.lineTo(x-x1,y); - context.stroke(); - context.closePath(); + context.beginPath(); + context.moveTo(x+x1,y+y1); + context.lineTo(x+x2,y+y2); + context.moveTo(x-x1,y+y1); + context.lineTo(x-x2,y+y2); + context.moveTo(x-x1,y-y1); + context.lineTo(x-x2,y-y2); + context.moveTo(x+x1,y-y1); + context.lineTo(x+x2,y-y2); + context.moveTo(x+y1,y+x1); + context.lineTo(x+y2,y+x2); + context.moveTo(x-y1,y+x1); + context.lineTo(x-y2,y+x2); + context.moveTo(x-y1,y-x1); + context.lineTo(x-y2,y-x2); + context.moveTo(x+y1,y-x1); + context.lineTo(x+y2,y-x2); + context.moveTo(x,y+x2); + context.lineTo(x,y+x1); + context.moveTo(x,y-x2); + context.lineTo(x,y-x1); + context.moveTo(x+x2,y); + context.lineTo(x+x1,y); + context.moveTo(x-x2,y); + context.lineTo(x-x1,y); + context.stroke(); + context.closePath(); } var stack = new StackPane();
--- a/test/script/jfx/spread.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/jfx/spread.js Wed Jun 04 13:08:57 2014 +0200 @@ -211,7 +211,7 @@ var timer = new AnimationTimerExtend() { handle: function handle(now) { if (frame < 200) { - draw_frame(); + draw_frame(); } else { checkImageAndExit(); timer.stop();
--- a/test/script/maptests/builtins.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/builtins.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/constructor.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/constructor.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/maputil.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/maputil.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/object_create.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/object_create.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/object_literals.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/object_literals.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/point.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/point.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/property_add.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/property_add.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/maptests/proto.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/maptests/proto.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -24,8 +24,8 @@ /** * Base library for Showdown markdown engine Nashorn testing. * @subtest - * - * + * + * */ load(__DIR__ + "external/showdown/showdown.js");
--- a/test/script/markdown/anchors-by-reference.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/anchors-by-reference.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/automatic-anchors.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/automatic-anchors.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/blockquote-nested-markdown.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/blockquote-nested-markdown.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/blockquote.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/blockquote.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/code-block-html-escape.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/code-block-html-escape.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/code-block.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/code-block.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/doubline-list.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/doubline-list.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/emphasis.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/emphasis.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/escaped-number-period.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/escaped-number-period.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/escaping.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/escaping.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/github-style-at-start.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/github-style-at-start.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/github-style-codeblock.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/github-style-codeblock.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/github-style-linebreaks.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/github-style-linebreaks.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h1-with-double-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h1-with-double-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h1-with-equals.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h1-with-equals.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h1-with-single-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h1-with-single-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h2-with-dashes.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h2-with-dashes.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h2-with-double-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h2-with-double-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h2-with-single-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h2-with-single-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h3-with-double-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h3-with-double-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h3-with-single-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h3-with-single-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h4-with-single-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h4-with-single-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h5-with-single-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h5-with-single-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/h6-with-single-hash.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/h6-with-single-hash.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/horizontal-rules.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/horizontal-rules.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/html5-strutural-tags.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/html5-strutural-tags.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/images.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/images.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/implicit-anchors.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/implicit-anchors.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/inline-anchors.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/inline-anchors.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/inline-code.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/inline-code.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/inline-style-tag.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/inline-style-tag.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/lazy-blockquote.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/lazy-blockquote.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/list-with-blockquote.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/list-with-blockquote.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/list-with-code.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/list-with-code.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/multi-paragraph-list.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/multi-paragraph-list.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/multiline-unordered-list.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/multiline-unordered-list.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/nested-blockquote.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/nested-blockquote.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/ordered-list-same-number.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/ordered-list-same-number.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/ordered-list-wrong-numbers.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/ordered-list-wrong-numbers.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/ordered-list.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/ordered-list.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/relative-anchors.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/relative-anchors.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/simple-paragraph.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/simple-paragraph.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/strong.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/strong.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/table-basic.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/table-basic.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/table-large.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/table-large.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/table-with-equals.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/table-with-equals.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/unordered-list-asterisk.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/unordered-list-asterisk.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/unordered-list-minus.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/unordered-list-minus.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/unordered-list-plus.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/unordered-list-plus.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/markdown/url-with-parenthesis.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/markdown/url-with-parenthesis.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/nosecurity/nosecurity.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/nosecurity/nosecurity.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * 8043443: Test framework changes to run script tests without security manager + * 8043443: Test framework changes to run script tests without security manager * @test * @run */
--- a/test/script/sandbox/JDK-8031106.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/JDK-8031106.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/NASHORN-525.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/NASHORN-525.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,28 +1,28 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. */ /** - * NASHORN-525 : nashorn misses security access checks + * NASHORN-525 : nashorn misses security access checks * * @test * @run
--- a/test/script/sandbox/arrayclass.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/arrayclass.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/classbind.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/classbind.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/classloader.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/classloader.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/doprivileged.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/doprivileged.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -48,11 +48,11 @@ check(e); } - try { - var prop = java.lang.System.getProperty("user.dir"); + try { + var prop = java.lang.System.getProperty("user.dir"); fail("can get user.dir " + prop); - } catch(e) { + } catch(e) { print(e); - } + } } });
--- a/test/script/sandbox/engine.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/engine.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/env.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/env.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/exec.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/exec.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/exit.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/exit.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/file.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/file.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/interfaceimpl.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/interfaceimpl.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/javaextend.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/javaextend.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -30,7 +30,7 @@ return Java.type("jdk.nashorn.test.models." + n) } -// Can't extend a final class +// Can't extend a final class try { Java.extend(model("FinalClass")) } catch(e) {
--- a/test/script/sandbox/jsadapter.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/jsadapter.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/loadLibrary.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/loadLibrary.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/loadcompat.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/loadcompat.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/nashorninternals.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/nashorninternals.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** - * Test to check that nashorn "internal" classes in codegen, parser, ir + * Test to check that nashorn "internal" classes in codegen, parser, ir * packages cannot * be accessed from sandbox scripts. * * @test
--- a/test/script/sandbox/net.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/net.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/property.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/property.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/reflection.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/reflection.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -38,5 +38,5 @@ try { var cl = java.lang.Class.class; } catch(e) { - check(e); + check(e); }
--- a/test/script/sandbox/runnable.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/runnable.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/sandbox/unsafe.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/sandbox/unsafe.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -43,7 +43,7 @@ } try { - var unsafe = Java.type("sun.misc.Unsafe"); + var unsafe = Java.type("sun.misc.Unsafe"); fail("No SecurityException for Java.type sun.misc.Unsafe"); } catch (e) { check(e);
--- a/test/script/test262.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/test262.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/test262_single.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/test262_single.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/JDK-8006424.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8006424.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/JDK-8006529.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8006529.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -33,7 +33,7 @@ * This test script depends on nashorn Compiler internals. It uses reflection * to get access to private field and many public methods of Compiler and * FunctionNode classes. Note that this is trusted code and access to such - * internal package classes and methods is okay. But, if you modify any + * internal package classes and methods is okay. But, if you modify any * Compiler or FunctionNode class, you may have to revisit this script. * We cannot use direct Java class (via dynalink bean linker) to Compiler * and FunctionNode because of package-access check and so reflective calls. @@ -108,8 +108,8 @@ return findFunction(rhsMethod.invoke(node)) } else if(node instanceof BinaryNode) { return findFunction(lhsMethod.invoke(node)) || findFunction(binaryRhsMethod.invoke(node)) - } else if(node instanceof ExpressionStatement) { - return findFunction(getExpressionMethod.invoke(node)) + } else if(node instanceof ExpressionStatement) { + return findFunction(getExpressionMethod.invoke(node)) } else if(node instanceof FunctionNode) { return node } @@ -122,8 +122,8 @@ var ParserConstructor = Parser.class.getConstructor(ScriptEnvironment.class, Source.class, ErrorManager.class) var CompilerConstructor = Compiler.class.getConstructor(Context.class, ScriptEnvironment.class, CodeInstaller.class, Source.class, String.class, boolean.class); -// compile(script) -- compiles a script specified as a string with its -// source code, returns a jdk.nashorn.internal.ir.FunctionNode object +// compile(script) -- compiles a script specified as a string with its +// source code, returns a jdk.nashorn.internal.ir.FunctionNode object // representing it. function compile(source, phases) { var source = sourceForMethod.invoke(null, "<no name>", source); @@ -203,7 +203,7 @@ // A function defining "arguments" as a local variable will be vararg. testFirstFn("function f() { var arguments; arguments; }", 'isVarArg', 'needsCallee') -// A self-referencing function defined as a statement doesn't need a self +// A self-referencing function defined as a statement doesn't need a self // symbol, as it'll rather obtain itself from the parent scope. testFirstFn("function f() { f() }", 'needsCallee', 'needsParentScope') @@ -223,7 +223,7 @@ // scope in parent testFirstFn("(function f() { function g() { x } })", 'needsParentScope', 'needsCallee') -// A child function redefining a local variable from its parent should not +// A child function redefining a local variable from its parent should not // affect the parent function in any way testFirstFn("(function f() { var x; function g() { var x; x } })")
--- a/test/script/trusted/JDK-8008305.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8008305.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/JDK-8008305_subtest.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8008305_subtest.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/JDK-8020809.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8020809.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * JDK-8020809: Java adapter should not allow overriding of caller sensitive methods - * + * * @test * @run */
--- a/test/script/trusted/JDK-8021129.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8021129.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -25,7 +25,7 @@ * JDK-8021129: Test prevention of access to members of restricted classes. * Note that even though the script runs as trusted, we still don't allow * access to non-public portions of restricted classes. - * + * * @test * @run */
--- a/test/script/trusted/JDK-8021189.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8021189.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -23,7 +23,7 @@ /** * JDK-8021189: Prevent access to constructors of restricted classes - * + * * @test * @run */
--- a/test/script/trusted/JDK-8025629.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8025629.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/JDK-8032060.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/JDK-8032060.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/NASHORN-638.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/NASHORN-638.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/NASHORN-653.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/NASHORN-653.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. @@ -35,37 +35,37 @@ \ function b() { \ while (x) { \ - return true; \ + return true; \ } \ } \ \ function c() { \ while (true) { \ - return true; \ + return true; \ } \ } \ \ function d() { \ do { \ - return true; \ + return true; \ } while (x); \ } \ \ function f() { \ for (;;) { \ - return true; \ + return true; \ } \ } \ \ function e() { \ for (;;) { \ - return true; \ + return true; \ } \ } \ \ function g() { \ for(;;) { \ - print('goes on and on and on ... '); \ + print('goes on and on and on ... '); \ } \ print('x'); \ } \
--- a/test/script/trusted/event_queue.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/event_queue.js Wed Jun 04 13:08:57 2014 +0200 @@ -23,8 +23,8 @@ /** * Debug.eventqueue test - instead of screen scraping, test the concept of asking Debug for - * an event log of favourable events. - * + * an event log of favourable events. + * * @test * @fork * @option -Dnashorn.debug=true @@ -37,8 +37,8 @@ var forName = java.lang.Class["forName(String)"]; var RuntimeEvent = forName("jdk.nashorn.internal.runtime.events.RuntimeEvent").static; -var getValue = RuntimeEvent.class.getMethod("getValue"); -var getValueClass = RuntimeEvent.class.getMethod("getValueClass"); +var getValue = RuntimeEvent.class.getMethod("getValue"); +var getValueClass = RuntimeEvent.class.getMethod("getValueClass"); print(RuntimeEvent); @@ -51,7 +51,7 @@ function f() { var sum = 2; for (var i = 0; i < a.length; i++) { - sum *= a[i]; + sum *= a[i]; } return sum; } @@ -59,7 +59,7 @@ function g() { var diff = 17; for (var i = 0; i < a.length; i++) { - diff -= a[i]; + diff -= a[i]; } return diff; }
--- a/test/script/trusted/getenv.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/getenv.js Wed Jun 04 13:08:57 2014 +0200 @@ -1,21 +1,21 @@ /* * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. - * + * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). - * + * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * + * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions.
--- a/test/script/trusted/optimistic_recompilation.js Wed Jun 04 13:55:21 2014 +0530 +++ b/test/script/trusted/optimistic_recompilation.js Wed Jun 04 13:08:57 2014 +0200 @@ -21,8 +21,8 @@ * questions. */ -/** - * Ask Debug for an event log of favourable events instead of using --log flags printing to screen +/** + * Ask Debug for an event log of favourable events instead of using --log flags printing to screen * @test * @bug 8037086,8038398 * @fork @@ -46,13 +46,13 @@ print(f()); events = Debug.getRuntimeEvents(); //make sure we got runtime events - print("events = " + (events.toString().indexOf("RuntimeEvent") != -1)); + print("events = " + (events.toString().indexOf("RuntimeEvent") != -1)); if (events.length == expectedValues.length) { for (var i in events) { var e = events[i]; var returnValue = getReturnValue.invoke(e); if (typeof returnValue != 'undefined') { - setReturnTypeAndValue[i] = [getReturnType.invoke(getValue.invoke(e)), returnValue]; + setReturnTypeAndValue[i] = [getReturnType.invoke(getValue.invoke(e)), returnValue]; } else { returnValue = "undefined"; setReturnTypeAndValue[i] = [getReturnType.invoke(getValue.invoke(e)), returnValue]; @@ -62,22 +62,22 @@ } } } else { - fail("Number of Deoptimizing recompilation is not correct, expected: " + expectedValues.length + " and found: " + events.length + " in test case: " + f); - } + fail("Number of Deoptimizing recompilation is not correct, expected: " + expectedValues.length + " and found: " + events.length + " in test case: " + f); + } } -checkExpectedRecompilation(function divisionByZeroTest() {var x = { a: 2, b:1 }; x.a = Number.POSITIVE_INFINITY; x.b = 0; print(x.a/x.b); return 1;}, +checkExpectedRecompilation(function divisionByZeroTest() {var x = { a: 2, b:1 }; x.a = Number.POSITIVE_INFINITY; x.b = 0; print(x.a/x.b); return 1;}, expectedValues =[['double', 'Infinity']]); checkExpectedRecompilation(function divisionWithRemainderTest() {var x = { a: 7, b:2 }; print(x.a/x.b); return 1;}, expectedValues =[['double', '3.5']]); -checkExpectedRecompilation(function infinityMultiplicationTest() {var x = { a: Number.POSITIVE_INFINITY, b: Number.POSITIVE_INFINITY}; print(x.a*x.b); return 1;}, +checkExpectedRecompilation(function infinityMultiplicationTest() {var x = { a: Number.POSITIVE_INFINITY, b: Number.POSITIVE_INFINITY}; print(x.a*x.b); return 1;}, expectedValues =[['double', 'Infinity']]); -checkExpectedRecompilation(function maxValueMultiplicationTest() {var x = { a: Number.MAX_VALUE, b: Number.MAX_VALUE}; print(x.a*x.b); return 1;}, +checkExpectedRecompilation(function maxValueMultiplicationTest() {var x = { a: Number.MAX_VALUE, b: Number.MAX_VALUE}; print(x.a*x.b); return 1;}, expectedValues =[['double', '1.7976931348623157e+308']]); -checkExpectedRecompilation(function divisionByInfinityTest() {var x = { a: -1, b: Number.POSITIVE_INFINITY}; print(x.a/x.b); return 1;}, +checkExpectedRecompilation(function divisionByInfinityTest() {var x = { a: -1, b: Number.POSITIVE_INFINITY}; print(x.a/x.b); return 1;}, expectedValues =[['double', 'Infinity']]); -checkExpectedRecompilation(function divisionByStringTest() {var x = { a: Number.POSITIVE_INFINITY, b: 'Hello'}; print(x.a/x.b); return 1;}, +checkExpectedRecompilation(function divisionByStringTest() {var x = { a: Number.POSITIVE_INFINITY, b: 'Hello'}; print(x.a/x.b); return 1;}, expectedValues =[['double', 'Infinity']]); -checkExpectedRecompilation(function nestedFunctionTest() {var a=3,b,c; function f() {var x = 2, y =1; function g(){var y = x; var z = a; z = x*y; print(a*b)} g()}f(); return 1;}, +checkExpectedRecompilation(function nestedFunctionTest() {var a=3,b,c; function f() {var x = 2, y =1; function g(){var y = x; var z = a; z = x*y; print(a*b)} g()}f(); return 1;}, expectedValues =[['object', 'undefined']]); checkExpectedRecompilation(function functionTest(a,b,c) { d = (a + b) * c; print(d); return 1;}, expectedValues =[['double', 'NaN']]); checkExpectedRecompilation(function andTest(a,b) { d = a && b; print(d); return 1;}, expectedValues =[['object', 'undefined']]);
--- a/test/src/jdk/nashorn/api/NashornSQLDriver.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/NashornSQLDriver.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,7 +25,12 @@ package jdk.nashorn.api; -import java.sql.*; +import java.sql.Connection; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.DriverPropertyInfo; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.Properties; import java.util.logging.Logger; @@ -36,18 +41,18 @@ static { try { DriverManager.registerDriver(new NashornSQLDriver(), null); - } catch (SQLException se) { + } catch (final SQLException se) { throw new RuntimeException(se); } } @Override - public boolean acceptsURL(String url) { + public boolean acceptsURL(final String url) { return url.startsWith("jdbc:nashorn:"); } @Override - public Connection connect(String url, Properties info) { + public Connection connect(final String url, final Properties info) { throw new UnsupportedOperationException("I am a dummy!!"); } @@ -62,7 +67,7 @@ } @Override - public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) { + public DriverPropertyInfo[] getPropertyInfo(final String url, final Properties info) { return new DriverPropertyInfo[0]; }
--- a/test/src/jdk/nashorn/api/javaaccess/ArrayConversionTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/javaaccess/ArrayConversionTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -111,25 +111,25 @@ e.eval("Java.type('" + ArrayConversionTest.class.getName() + "')." + testMethodName + "(" + argument + ")"); } - public static void assertNullIntArray(int[] array) { + public static void assertNullIntArray(final int[] array) { assertNull(array); } - public static void assertNullIntIntArray(int[][] array) { + public static void assertNullIntIntArray(final int[][] array) { assertNull(array); } - public static void assertEmptyIntArray(int[] array) { + public static void assertEmptyIntArray(final int[] array) { assertEquals(0, array.length); } - public static void assertSingle42IntArray(int[] array) { + public static void assertSingle42IntArray(final int[] array) { assertEquals(1, array.length); assertEquals(42, array[0]); } - public static void assertIntArrayConversions(int[] array) { + public static void assertIntArrayConversions(final int[] array) { assertEquals(13, array.length); assertEquals(0, array[0]); // false assertEquals(1, array[1]); // true @@ -146,21 +146,21 @@ assertEquals(0, array[12]); // [1, 2] } - public static void assertEmptyIntIntArray(int[][] array) { + public static void assertEmptyIntIntArray(final int[][] array) { assertEquals(0, array.length); } - public static void assertSingleEmptyIntIntArray(int[][] array) { + public static void assertSingleEmptyIntIntArray(final int[][] array) { assertEquals(1, array.length); assertTrue(Arrays.equals(new int[0], array[0])); } - public static void assertSingleNullIntIntArray(int[][] array) { + public static void assertSingleNullIntIntArray(final int[][] array) { assertEquals(1, array.length); assertNull(null, array[0]); } - public static void assertLargeIntIntArray(int[][] array) { + public static void assertLargeIntIntArray(final int[][] array) { assertEquals(5, array.length); assertTrue(Arrays.equals(new int[] { 0 }, array[0])); assertTrue(Arrays.equals(new int[] { 1 }, array[1])); @@ -169,7 +169,7 @@ assertTrue(Arrays.equals(new int[] { 7, 8 }, array[4])); } - public static void assertLargeObjectObjectArray(Object[][] array) throws ScriptException { + public static void assertLargeObjectObjectArray(final Object[][] array) throws ScriptException { assertEquals(4, array.length); assertTrue(Arrays.equals(new Object[] { Boolean.FALSE }, array[0])); assertTrue(Arrays.equals(new Object[] { 1 }, array[1])); @@ -179,7 +179,7 @@ assertEquals(17, e.eval("obj.x")); } - public static void assertBooleanArrayConversions(boolean[] array) { + public static void assertBooleanArrayConversions(final boolean[] array) { assertEquals(16, array.length); assertFalse(array[0]); // false assertTrue(array[1]); // true @@ -199,26 +199,26 @@ assertFalse(array[15]); // undefined } - public static void assertListArray(List<?>[] array) { + public static void assertListArray(final List<?>[] array) { assertEquals(2, array.length); assertEquals(Arrays.asList("foo", "bar"), array[0]); assertEquals(Arrays.asList("apple", "orange"), array[1]); } - public static void assertVarArg_42_17(Object... args) throws ScriptException { + public static void assertVarArg_42_17(final Object... args) throws ScriptException { assertEquals(2, args.length); assertEquals(42, ((Number)args[0]).intValue()); assertEquals(17, ((Number)args[1]).intValue()); } - public static void assertVarArg_array_17(Object... args) throws ScriptException { + public static void assertVarArg_array_17(final Object... args) throws ScriptException { assertEquals(2, args.length); e.getBindings(ScriptContext.ENGINE_SCOPE).put("arr", args[0]); assertTrue((Boolean)e.eval("arr instanceof Array && arr.length == 1 && arr[0] == 42")); assertEquals(18, ((Number)args[1]).intValue()); } - public static void assertVarArg_function(Object... args) throws ScriptException { + public static void assertVarArg_function(final Object... args) throws ScriptException { assertEquals(1, args.length); e.getBindings(ScriptContext.ENGINE_SCOPE).put("fn", args[0]); assertEquals("Hello", e.eval("fn()")); @@ -226,10 +226,10 @@ - public static void x(String y) { + public static void x(final String y) { assertEquals("abc", y); } - public static void x(String[] y) { + public static void x(final String[] y) { assertTrue(Arrays.equals(new String[] { "foo", "bar"}, y)); } }
--- a/test/src/jdk/nashorn/api/javaaccess/ConsStringTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/javaaccess/ConsStringTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -88,7 +88,7 @@ public static class ArrayHolder { private Object[] array; - public void setArray(Object[] array) { + public void setArray(final Object[] array) { this.array = array; }
--- a/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -180,7 +180,7 @@ assertEquals(Short.valueOf((short)18), o.publicShortBox); } - private static void assertEqualsInt(Number n, String name) { + private static void assertEqualsInt(final Number n, final String name) { if(optimistic) { assertEquals(n.intValue(), e.get(name)); } else { @@ -275,7 +275,7 @@ assertEquals(Float.NEGATIVE_INFINITY, o.publicFloatBox, 1e-10); } - private static void assertEqualsFloat(Float n, String name) { + private static void assertEqualsFloat(final Float n, final String name) { if(optimistic) { assertEquals(n, ((Number)e.get(name)).floatValue()); } else {
--- a/test/src/jdk/nashorn/api/javaaccess/SharedObject.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/javaaccess/SharedObject.java Wed Jun 04 13:08:57 2014 +0200 @@ -162,7 +162,7 @@ return engine; } - public void setEngine(ScriptEngine engine) { + public void setEngine(final ScriptEngine engine) { this.engine = engine; } @@ -414,51 +414,51 @@ t.start(); } - public String overloadedMethodDoubleVSint(int arg) { + public String overloadedMethodDoubleVSint(final int arg) { return "int"; } - public String overloadedMethodDoubleVSint(double arg) { + public String overloadedMethodDoubleVSint(final double arg) { return "double"; } - public int overloadedMethod(int arg) { + public int overloadedMethod(final int arg) { return arg*2; } - public int overloadedMethod(String arg) { + public int overloadedMethod(final String arg) { return arg.length(); } - public int overloadedMethod(boolean arg) { + public int overloadedMethod(final boolean arg) { return (arg) ? 1 : 0; } - public int overloadedMethod(Person arg) { + public int overloadedMethod(final Person arg) { return arg.id*2; } - public int firstLevelMethodInt(int arg) throws ScriptException, NoSuchMethodException { + public int firstLevelMethodInt(final int arg) throws ScriptException, NoSuchMethodException { return (int) ((Invocable)engine).invokeFunction("secondLevelMethodInt", arg); } - public int thirdLevelMethodInt(int arg) { + public int thirdLevelMethodInt(final int arg) { return arg*5; } - public int firstLevelMethodInteger(Integer arg) throws ScriptException, NoSuchMethodException { + public int firstLevelMethodInteger(final Integer arg) throws ScriptException, NoSuchMethodException { return (int) ((Invocable)engine).invokeFunction("secondLevelMethodInteger", arg); } - public int thirdLevelMethodInteger(Integer arg) { + public int thirdLevelMethodInteger(final Integer arg) { return arg*10; } - public Person firstLevelMethodObject(Person p) throws ScriptException, NoSuchMethodException { + public Person firstLevelMethodObject(final Person p) throws ScriptException, NoSuchMethodException { return (Person) ((Invocable)engine).invokeFunction("secondLevelMethodObject", p); } - public Person thirdLevelMethodObject(Person p) { + public Person thirdLevelMethodObject(final Person p) { p.id *= 10; return p; }
--- a/test/src/jdk/nashorn/api/scripting/InvocableTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/scripting/InvocableTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,6 +25,9 @@ package jdk.nashorn.api.scripting; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.fail; + import java.util.Objects; import java.util.function.Function; import javax.script.Invocable; @@ -34,8 +37,6 @@ import javax.script.ScriptException; import javax.script.SimpleScriptContext; import org.testng.Assert; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; import org.testng.annotations.Test; /** @@ -43,7 +44,7 @@ */ public class InvocableTest { - private void log(String msg) { + private void log(final String msg) { org.testng.Reporter.log(msg, true); } @@ -69,12 +70,12 @@ * evaluating script with different Context set. */ public void invokeMethodDifferentContextTest() { - ScriptEngineManager m = new ScriptEngineManager(); - ScriptEngine e = m.getEngineByName("nashorn"); + final ScriptEngineManager m = new ScriptEngineManager(); + final ScriptEngine e = m.getEngineByName("nashorn"); try { // define an object with method on it - Object obj = e.eval("({ hello: function() { return 'Hello World!'; } })"); + final Object obj = e.eval("({ hello: function() { return 'Hello World!'; } })"); final ScriptContext ctxt = new SimpleScriptContext(); ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE); @@ -180,7 +181,7 @@ final ScriptEngine engine2 = m.getEngineByName("nashorn"); try { - Object obj = engine1.eval("({ run: function() {} })"); + final Object obj = engine1.eval("({ run: function() {} })"); // pass object from engine1 to engine2 as 'thiz' for invokeMethod ((Invocable) engine2).invokeMethod(obj, "run"); fail("should have thrown IllegalArgumentException"); @@ -211,7 +212,7 @@ // try interface on specific script object try { e.eval("var obj = { run: function() { print('run from obj'); } };"); - Object obj = e.get("obj"); + final Object obj = e.get("obj"); final Runnable runnable = inv.getInterface(obj, Runnable.class); runnable.run(); } catch (final Exception exp) { @@ -307,17 +308,17 @@ * switching to use different ScriptContext. */ public void getInterfaceDifferentContext() { - ScriptEngineManager m = new ScriptEngineManager(); - ScriptEngine e = m.getEngineByName("nashorn"); + final ScriptEngineManager m = new ScriptEngineManager(); + final ScriptEngine e = m.getEngineByName("nashorn"); try { - Object obj = e.eval("({ run: function() { } })"); + final Object obj = e.eval("({ run: function() { } })"); // change script context - ScriptContext ctxt = new SimpleScriptContext(); + final ScriptContext ctxt = new SimpleScriptContext(); ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE); e.setContext(ctxt); - Runnable r = ((Invocable) e).getInterface(obj, Runnable.class); + final Runnable r = ((Invocable) e).getInterface(obj, Runnable.class); r.run(); } catch (final Exception exp) { exp.printStackTrace(); @@ -376,7 +377,7 @@ final ScriptEngine engine2 = m.getEngineByName("nashorn"); try { - Object obj = engine1.eval("({ run: function() {} })"); + final Object obj = engine1.eval("({ run: function() {} })"); // pass object from engine1 to engine2 as 'thiz' for getInterface ((Invocable) engine2).getInterface(obj, Runnable.class); fail("should have thrown IllegalArgumentException"); @@ -433,12 +434,12 @@ * Bindings. */ public void invokeFunctionDifferentContextTest() { - ScriptEngineManager m = new ScriptEngineManager(); - ScriptEngine e = m.getEngineByName("nashorn"); + final ScriptEngineManager m = new ScriptEngineManager(); + final ScriptEngine e = m.getEngineByName("nashorn"); try { // define an object with method on it - Object obj = e.eval("function hello() { return 'Hello World!'; }"); + final Object obj = e.eval("function hello() { return 'Hello World!'; }"); final ScriptContext ctxt = new SimpleScriptContext(); ctxt.setBindings(e.createBindings(), ScriptContext.ENGINE_SCOPE); // change engine's current context @@ -531,8 +532,8 @@ final ScriptEngine e = m.getEngineByName("nashorn"); final Invocable inv = (Invocable) e; - Object obj = e.eval("({ apply: function(arg) { return arg.toUpperCase(); }})"); - Function<String, String> func = inv.getInterface(obj, Function.class); + final Object obj = e.eval("({ apply: function(arg) { return arg.toUpperCase(); }})"); + final Function<String, String> func = inv.getInterface(obj, Function.class); assertEquals(func.apply("hello"), "HELLO"); } }
--- a/test/src/jdk/nashorn/api/scripting/PluggableJSObjectTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/scripting/PluggableJSObjectTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,6 +25,10 @@ package jdk.nashorn.api.scripting; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.fail; + import java.nio.IntBuffer; import java.util.Collection; import java.util.HashMap; @@ -32,11 +36,6 @@ import java.util.Set; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; -import javax.script.ScriptException; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.fail; import org.testng.annotations.Test; /** @@ -54,22 +53,22 @@ } @Override - public Object getMember(String name) { + public Object getMember(final String name) { return map.get(name); } @Override - public void setMember(String name, Object value) { + public void setMember(final String name, final Object value) { map.put(name, value); } @Override - public boolean hasMember(String name) { + public boolean hasMember(final String name) { return map.containsKey(name); } @Override - public void removeMember(String name) { + public void removeMember(final String name) { map.remove(name); } @@ -112,7 +111,7 @@ public static class BufferObject extends AbstractJSObject { private final IntBuffer buf; - public BufferObject(int size) { + public BufferObject(final int size) { buf = IntBuffer.allocate(size); } @@ -121,22 +120,22 @@ } @Override - public Object getMember(String name) { + public Object getMember(final String name) { return name.equals("length")? buf.capacity() : null; } @Override - public boolean hasSlot(int i) { + public boolean hasSlot(final int i) { return i > -1 && i < buf.capacity(); } @Override - public Object getSlot(int i) { + public Object getSlot(final int i) { return buf.get(i); } @Override - public void setSlot(int i, Object value) { + public void setSlot(final int i, final Object value) { buf.put(i, ((Number)value).intValue()); } @@ -172,9 +171,9 @@ public static class Adder extends AbstractJSObject { @Override - public Object call(Object thiz, Object... args) { + public Object call(final Object thiz, final Object... args) { double res = 0.0; - for (Object arg : args) { + for (final Object arg : args) { res += ((Number)arg).doubleValue(); } return res; @@ -204,7 +203,7 @@ public static class Factory extends AbstractJSObject { @Override - public Object newObject(Object... args) { + public Object newObject(final Object... args) { return new HashMap<Object, Object>(); }
--- a/test/src/jdk/nashorn/api/scripting/ScopeTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/scripting/ScopeTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -24,6 +24,11 @@ */ package jdk.nashorn.api.scripting; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import javax.script.Bindings; import javax.script.ScriptContext; import javax.script.ScriptEngine; @@ -32,10 +37,6 @@ import javax.script.SimpleBindings; import javax.script.SimpleScriptContext; import org.testng.Assert; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import org.testng.annotations.Test; /**
--- a/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -27,8 +27,8 @@ import static org.testng.Assert.fail; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; import java.util.Objects; import javax.script.Invocable;
--- a/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -55,7 +55,7 @@ */ public class ScriptEngineTest { - private void log(String msg) { + private void log(final String msg) { org.testng.Reporter.log(msg, true); } @@ -64,11 +64,11 @@ final ScriptEngineManager m = new ScriptEngineManager(); final ScriptEngine e = m.getEngineByName("nashorn"); - String[] args = new String[] { "hello", "world" }; + final String[] args = new String[] { "hello", "world" }; try { e.put("arguments", args); - Object arg0 = e.eval("arguments[0]"); - Object arg1 = e.eval("arguments[1]"); + final Object arg0 = e.eval("arguments[0]"); + final Object arg1 = e.eval("arguments[1]"); assertEquals(args[0], arg0); assertEquals(args[1], arg1); } catch (final Exception exp) { @@ -82,12 +82,12 @@ final ScriptEngineManager m = new ScriptEngineManager(); final ScriptEngine e = m.getEngineByName("nashorn"); - String[] args = new String[] { "hello", "world" }; + final String[] args = new String[] { "hello", "world" }; try { e.put("arguments", args); - Object arg0 = e.eval("var imports = new JavaImporter(java.io); " + + final Object arg0 = e.eval("var imports = new JavaImporter(java.io); " + " with(imports) { arguments[0] }"); - Object arg1 = e.eval("var imports = new JavaImporter(java.util, java.io); " + + final Object arg1 = e.eval("var imports = new JavaImporter(java.util, java.io); " + " with(imports) { arguments[1] }"); assertEquals(args[0], arg0); assertEquals(args[1], arg1); @@ -128,18 +128,18 @@ assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript"); boolean seenJS = false; - for (String ext : fac.getExtensions()) { + for (final String ext : fac.getExtensions()) { if (ext.equals("js")) { seenJS = true; } } assertEquals(seenJS, true); - String str = fac.getMethodCallSyntax("obj", "foo", "x"); + final String str = fac.getMethodCallSyntax("obj", "foo", "x"); assertEquals(str, "obj.foo(x)"); boolean seenNashorn = false, seenJavaScript = false, seenECMAScript = false; - for (String name : fac.getNames()) { + for (final String name : fac.getNames()) { switch (name) { case "nashorn": seenNashorn = true; break; case "javascript": seenJavaScript = true; break; @@ -152,7 +152,7 @@ assertTrue(seenECMAScript); boolean seenAppJS = false, seenAppECMA = false, seenTextJS = false, seenTextECMA = false; - for (String mime : fac.getMimeTypes()) { + for (final String mime : fac.getMimeTypes()) { switch (mime) { case "application/javascript": seenAppJS = true; break; case "application/ecmascript": seenAppECMA = true; break; @@ -547,7 +547,7 @@ new Class[] { Runnable.class }, new InvocationHandler() { @Override - public Object invoke(Object p, Method m, Object[] a) { + public Object invoke(final Object p, final Method m, final Object[] a) { reached[0] = true; return null; } @@ -595,7 +595,7 @@ private static void checkProperty(final ScriptEngine e, final String name) throws ScriptException { - String value = System.getProperty(name); + final String value = System.getProperty(name); e.put("name", name); assertEquals(value, e.eval("java.lang.System.getProperty(name)")); }
--- a/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,6 +25,11 @@ package jdk.nashorn.api.scripting; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; @@ -34,10 +39,6 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import org.testng.annotations.Test; /** @@ -133,7 +134,7 @@ final ScriptEngine e = m.getEngineByName("nashorn"); try { e.eval("var obj = { '1': 'world', func: function() { return this.bar; }, bar: 'hello' }"); - ScriptObjectMirror obj = (ScriptObjectMirror) e.get("obj"); + final ScriptObjectMirror obj = (ScriptObjectMirror) e.get("obj"); // try basic get on existing properties if (!obj.getMember("bar").equals("hello")) { @@ -190,7 +191,7 @@ final ScriptEngineManager m = new ScriptEngineManager(); final ScriptEngine e = m.getEngineByName("nashorn"); try { - Object obj = e.eval("new TypeError('wrong type')"); + final Object obj = e.eval("new TypeError('wrong type')"); assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value"); } catch (final Throwable t) { t.printStackTrace(); @@ -198,7 +199,7 @@ } try { - Object obj = e.eval("function func() { print('hello'); }"); + final Object obj = e.eval("function func() { print('hello'); }"); assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value"); } catch (final Throwable t) { t.printStackTrace();
--- a/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -56,7 +56,7 @@ public boolean exclude(File file, String content); } - private void log(String msg) { + private void log(final String msg) { org.testng.Reporter.log(msg, true); }
--- a/test/src/jdk/nashorn/internal/performance/OctaneTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/performance/OctaneTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -111,7 +111,7 @@ try { final String mainScript = "test/script/basic/run-octane.js"; final String benchmarkScript = "test/script/external/octane/benchmarks/"+benchmark.toLowerCase() + ".js"; - String[] args = { + final String[] args = { "--", benchmarkScript, "--verbose" @@ -136,16 +136,17 @@ } } - public Double genericNashornTest(final String benchmark, final String testPath, String[] args) throws Throwable { + public Double genericNashornTest(final String benchmark, final String testPath, final String[] args) throws Throwable { try { final PerformanceWrapper wrapper = new PerformanceWrapper(); final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final PrintStream ps = new PrintStream(baos); - java.io.File test=new java.io.File(testPath); - File absoluteFile=test.getAbsoluteFile(); + final java.io.File test=new java.io.File(testPath); + final File absoluteFile=test.getAbsoluteFile(); @SuppressWarnings("deprecation") + final URL testURL=absoluteFile.toURL(); wrapper.runExecuteOnlyTest(testPath, 0, 0, testURL.toString(), ps, System.err, args); @@ -153,7 +154,7 @@ final byte[] output = baos.toByteArray(); final List<String> result = outputToStrings(output); - Double _result = filterBenchmark(result, benchmark); + final Double _result = filterBenchmark(result, benchmark); return _result; } catch (final Throwable e) { @@ -265,7 +266,7 @@ if (v8 != null && rhino != 0) { nashornToV8 = nashorn.doubleValue() / v8.doubleValue(); } - String normalizedBenchmark=benchmark.replace("-", ""); + final String normalizedBenchmark=benchmark.replace("-", ""); System.out.println("benchmark-" + normalizedBenchmark + "-nashorn=" + nashorn); AuroraWrapper.addResults(AuroraWrapper.createOrOpenDocument(), "benchmark-" + normalizedBenchmark + "-nashorn", nashorn.toString());
--- a/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java Wed Jun 04 13:08:57 2014 +0200 @@ -72,8 +72,8 @@ } - protected void runExecuteOnlyTest(final String name, final int numberOfIterations, final int runsPerIteration, final String testURL, final OutputStream out, final OutputStream err, String[] newargs) throws Throwable { - String[] args=new String[newargs.length+1]; + protected void runExecuteOnlyTest(final String name, final int numberOfIterations, final int runsPerIteration, final String testURL, final OutputStream out, final OutputStream err, final String[] newargs) throws Throwable { + final String[] args=new String[newargs.length+1]; System.arraycopy(newargs, 0, args, 1, newargs.length); args[0]=name;
--- a/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -96,8 +96,8 @@ final String codeCache = "build/nashorn_code_cache"; final String oldUserDir = System.getProperty("user.dir"); - public void checkCompiledScripts(DirectoryStream<Path> stream, int numberOfScripts) throws IOException { - for (Path file : stream) { + public void checkCompiledScripts(final DirectoryStream<Path> stream, int numberOfScripts) throws IOException { + for (final Path file : stream) { numberOfScripts--; } stream.close(); @@ -108,16 +108,16 @@ public void pathHandlingTest() throws ScriptException, IOException { assertFalse(ScriptEnvironment.globalOptimistic()); System.setProperty("nashorn.persistent.code.cache", codeCache); - String[] options = new String[]{"--persistent-code-cache"}; - NashornScriptEngineFactory fac = new NashornScriptEngineFactory(); - ScriptEngine e = fac.getScriptEngine(options); - Path expectedCodeCachePath = FileSystems.getDefault().getPath(oldUserDir + File.separator + codeCache); - Path actualCodeCachePath = FileSystems.getDefault().getPath(System.getProperty( + final String[] options = new String[]{"--persistent-code-cache"}; + final NashornScriptEngineFactory fac = new NashornScriptEngineFactory(); + final ScriptEngine e = fac.getScriptEngine(options); + final Path expectedCodeCachePath = FileSystems.getDefault().getPath(oldUserDir + File.separator + codeCache); + final Path actualCodeCachePath = FileSystems.getDefault().getPath(System.getProperty( "nashorn.persistent.code.cache")).toAbsolutePath(); // Check that nashorn code cache is created in current working directory assertEquals(actualCodeCachePath, expectedCodeCachePath); // Check that code cache dir exists and it's not empty - File file = new File(actualCodeCachePath.toUri()); + final File file = new File(actualCodeCachePath.toUri()); assertFalse(!file.isDirectory(), "No code cache directory was created!"); assertFalse(file.list().length == 0, "Code cache directory is empty!"); } @@ -126,18 +126,18 @@ public void changeUserDirTest() throws ScriptException, IOException { assertFalse(ScriptEnvironment.globalOptimistic()); System.setProperty("nashorn.persistent.code.cache", codeCache); - String[] options = new String[]{"--persistent-code-cache"}; - NashornScriptEngineFactory fac = new NashornScriptEngineFactory(); - ScriptEngine e = fac.getScriptEngine(options); - Path codeCachePath = FileSystems.getDefault().getPath(System.getProperty( + final String[] options = new String[]{"--persistent-code-cache"}; + final NashornScriptEngineFactory fac = new NashornScriptEngineFactory(); + final ScriptEngine e = fac.getScriptEngine(options); + final Path codeCachePath = FileSystems.getDefault().getPath(System.getProperty( "nashorn.persistent.code.cache")).toAbsolutePath(); - String newUserDir = "build/newUserDir"; + final String newUserDir = "build/newUserDir"; // Now changing current working directory System.setProperty("user.dir", System.getProperty("user.dir") + File.separator + newUserDir); try { // Check that a new compiled script is stored in existing code cache e.eval(code1); - DirectoryStream<Path> stream = Files.newDirectoryStream(codeCachePath); + final DirectoryStream<Path> stream = Files.newDirectoryStream(codeCachePath); // Already one compiled script has been stored in the cache during initialization checkCompiledScripts(stream, 2); // Setting to default current working dir @@ -150,17 +150,17 @@ public void codeCacheTest() throws ScriptException, IOException { assertFalse(ScriptEnvironment.globalOptimistic()); System.setProperty("nashorn.persistent.code.cache", codeCache); - String[] options = new String[]{"--persistent-code-cache"}; - NashornScriptEngineFactory fac = new NashornScriptEngineFactory(); - ScriptEngine e = fac.getScriptEngine(options); - Path codeCachePath = FileSystems.getDefault().getPath(System.getProperty( + final String[] options = new String[]{"--persistent-code-cache"}; + final NashornScriptEngineFactory fac = new NashornScriptEngineFactory(); + final ScriptEngine e = fac.getScriptEngine(options); + final Path codeCachePath = FileSystems.getDefault().getPath(System.getProperty( "nashorn.persistent.code.cache")).toAbsolutePath(); e.eval(code1); e.eval(code2); e.eval(code3);// less than minimum size for storing // Already one compiled script has been stored in the cache during initialization // adding code1 and code2. - DirectoryStream<Path> stream = Files.newDirectoryStream(codeCachePath); + final DirectoryStream<Path> stream = Files.newDirectoryStream(codeCachePath); checkCompiledScripts(stream, 3); } }
--- a/test/src/jdk/nashorn/internal/runtime/ExceptionsNotSerializable.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/ExceptionsNotSerializable.java Wed Jun 04 13:08:57 2014 +0200 @@ -67,9 +67,9 @@ try { new ObjectOutputStream(new ByteArrayOutputStream()).writeObject(obj); fail(); - } catch (NotSerializableException e) { + } catch (final NotSerializableException e) { assertEquals(e.getMessage(), obj.getClass().getName()); - } catch (IOException e) { + } catch (final IOException e) { fail("", e); }
--- a/test/src/jdk/nashorn/internal/runtime/NoPersistenceCachingTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/NoPersistenceCachingTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -24,13 +24,12 @@ */ package jdk.nashorn.internal.runtime; +import static org.testng.Assert.fail; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.testng.Assert.fail; -import org.testng.annotations.Test; - import javax.script.ScriptContext; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; @@ -39,6 +38,7 @@ import jdk.nashorn.api.scripting.NashornScriptEngineFactory; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; /** * @test
--- a/test/src/jdk/nashorn/internal/runtime/SourceTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/SourceTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,8 +25,10 @@ package jdk.nashorn.internal.runtime; -import jdk.nashorn.api.scripting.URLReader; -import org.testng.annotations.Test; +import static jdk.nashorn.internal.runtime.Source.sourceFor; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import java.io.File; import java.io.IOException; @@ -34,11 +36,8 @@ import java.io.Reader; import java.net.URL; import java.util.Arrays; - -import static jdk.nashorn.internal.runtime.Source.sourceFor; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; +import jdk.nashorn.api.scripting.URLReader; +import org.testng.annotations.Test; /** * Tests different Source representations.
--- a/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,10 +29,10 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import javax.script.ScriptContext; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; import javax.script.ScriptEngineManager; -import javax.script.ScriptContext; import javax.script.ScriptException; import javax.script.SimpleScriptContext; import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
--- a/test/src/jdk/nashorn/internal/runtime/regexp/JdkRegExpTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/regexp/JdkRegExpTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,7 +29,6 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import jdk.nashorn.internal.runtime.ParserException; import org.testng.annotations.Test; /** @@ -45,8 +44,8 @@ */ @Test public void testMatcher() { - RegExp regexp = new RegExpFactory().compile("f(o)o", ""); - RegExpMatcher matcher = regexp.match("foo"); + final RegExp regexp = new RegExpFactory().compile("f(o)o", ""); + final RegExpMatcher matcher = regexp.match("foo"); assertNotNull(matcher); assertTrue(matcher.search(0)); assertEquals(matcher.getInput(), "foo");
--- a/test/src/jdk/nashorn/internal/runtime/regexp/joni/JoniTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/runtime/regexp/joni/JoniTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -25,9 +25,6 @@ package jdk.nashorn.internal.runtime.regexp.joni; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import org.testng.annotations.Test; /**
--- a/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java Wed Jun 04 13:08:57 2014 +0200 @@ -155,7 +155,7 @@ // VM options when a @fork test is executed by a separate process protected static final String[] forkJVMOptions; static { - String vmOptions = System.getProperty(TestConfig.TEST_FORK_JVM_OPTIONS); + final String vmOptions = System.getProperty(TestConfig.TEST_FORK_JVM_OPTIONS); forkJVMOptions = (vmOptions != null)? vmOptions.split(" ") : new String[0]; }
--- a/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java Wed Jun 04 13:08:57 2014 +0200 @@ -34,7 +34,7 @@ */ public class JSJUnitReportReporter extends JUnitReportReporter { @Override - protected String getTestName(ITestResult tr) { + protected String getTestName(final ITestResult tr) { final String testName = tr.getTestName(); return (testName != null && testName.endsWith(".js"))? testName : super.getTestName(tr); }
--- a/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java Wed Jun 04 13:08:57 2014 +0200 @@ -72,7 +72,7 @@ public void runTest() throws IOException { try { super.runTest(); - } catch(AssertionError e) { + } catch(final AssertionError e) { throw new AssertionError("Failed executing test " + testFile, e); } } @@ -88,7 +88,7 @@ // avoid direct System.out.println - use reporter to capture @Override - protected void log(String msg) { + protected void log(final String msg) { org.testng.Reporter.log(msg, true); } @@ -176,7 +176,7 @@ cmd.add(System.getProperty("java.home") + separator + "bin" + separator + "java"); cmd.add("-Djava.ext.dirs=dist"); - for (String str : forkJVMOptions) { + for (final String str : forkJVMOptions) { if(!str.isEmpty()) { cmd.add(str); }
--- a/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java Wed Jun 04 13:08:57 2014 +0200 @@ -63,7 +63,7 @@ } @Override - public void log(String msg) { + public void log(final String msg) { org.testng.Reporter.log(msg, true); } };
--- a/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java Wed Jun 04 13:08:57 2014 +0200 @@ -74,21 +74,21 @@ } @Override - public void write(byte[] b) throws IOException { + public void write(final byte[] b) throws IOException { underlying.write(b); } @Override - public void write(byte[] b, int off, int len) throws IOException { + public void write(final byte[] b, final int off, final int len) throws IOException { underlying.write(b, off, len); } @Override - public void write(int b) throws IOException { + public void write(final int b) throws IOException { underlying.write(b); } - void setDelegatee(OutputStream stream) { + void setDelegatee(final OutputStream stream) { this.underlying = stream; } } @@ -100,11 +100,11 @@ public SharedContextEvaluator(final String[] args) { this.ctxOut = new DelegatingOutputStream(System.out); this.ctxErr = new DelegatingOutputStream(System.err); - PrintWriter wout = new PrintWriter(ctxOut, true); - PrintWriter werr = new PrintWriter(ctxErr, true); - Options options = new Options("nashorn", werr); + final PrintWriter wout = new PrintWriter(ctxOut, true); + final PrintWriter werr = new PrintWriter(ctxErr, true); + final Options options = new Options("nashorn", werr); options.process(args); - ErrorManager errors = new ErrorManager(werr); + final ErrorManager errors = new ErrorManager(werr); this.context = new Context(options, errors, wout, werr, Thread.currentThread().getContextClassLoader()); } @@ -125,7 +125,7 @@ continue; } final File file = new File(fileName); - ScriptFunction script = context.compileScript(sourceFor(fileName, file.toURI().toURL()), global); + final ScriptFunction script = context.compileScript(sourceFor(fileName, file.toURI().toURL()), global); if (script == null || errors.getNumberOfErrors() != 0) { return COMPILATION_ERROR;
--- a/test/src/jdk/nashorn/internal/test/framework/TestFinder.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/TestFinder.java Wed Jun 04 13:08:57 2014 +0200 @@ -92,7 +92,7 @@ final String testList = System.getProperty(TEST_JS_LIST); final String failedTestFileName = System.getProperty(TEST_FAILED_LIST_FILE); if(failedTestFileName != null) { - File failedTestFile = new File(failedTestFileName); + final File failedTestFile = new File(failedTestFileName); if(failedTestFile.exists() && failedTestFile.length() > 0L) { try(final BufferedReader r = new BufferedReader(new FileReader(failedTestFile))) { for(;;) { @@ -195,7 +195,7 @@ return false; } - private static <T> void handleOneTest(final String framework, final Path testFile, final List<T> tests, final Set<String> orphans, TestFactory<T> factory) throws Exception { + private static <T> void handleOneTest(final String framework, final Path testFile, final List<T> tests, final Set<String> orphans, final TestFactory<T> factory) throws Exception { final String name = testFile.getFileName().toString(); assert name.lastIndexOf(".js") > 0 : "not a JavaScript: " + name;
--- a/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java Wed Jun 04 13:08:57 2014 +0200 @@ -38,7 +38,7 @@ */ public final class TestReorderInterceptor implements IMethodInterceptor { @Override - public List<IMethodInstance> intercept(List<IMethodInstance> methods, ITestContext context) { + public List<IMethodInstance> intercept(final List<IMethodInstance> methods, final ITestContext context) { Collections.sort(methods, new Comparator<IMethodInstance>() { @Override public int compare(final IMethodInstance mi1, final IMethodInstance mi2) {
--- a/test/src/jdk/nashorn/test/models/ConstructorWithArgument.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/ConstructorWithArgument.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,7 @@ public abstract class ConstructorWithArgument { private final String token; - protected ConstructorWithArgument(String token) { + protected ConstructorWithArgument(final String token) { this.token = token; }
--- a/test/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,11 +26,11 @@ package jdk.nashorn.test.models; public class DessertToppingFloorWaxDriver { - public void decorateDessert(DessertTopping dt) { + public void decorateDessert(final DessertTopping dt) { dt.pourOnDessert(); } - public void waxFloor(FloorWax fw) { + public void waxFloor(final FloorWax fw) { fw.shineUpTheFloor(); } }
--- a/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,11 +26,11 @@ public class IntFloatOverloadSelection { - public static String overloadedMethod(int i) { + public static String overloadedMethod(final int i) { return "int"; } - public static String overloadedMethod(float f) { + public static String overloadedMethod(final float f) { return "float"; } }
--- a/test/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,18 +30,18 @@ */ public class Jdk8011362TestSubject { // This is selected for overloaded("", null) - public String overloaded(String a, String b) { + public String overloaded(final String a, final String b) { return "overloaded(String, String)"; } // This is selected for overloaded(0, null) - public String overloaded(Double a, Double b) { + public String overloaded(final Double a, final Double b) { return "overloaded(Double, Double)"; } // This method is added to test that null will not match a primitive type, that is overloaded(0, null) will always // select the (Double, Double) over (Double, double). - public String overloaded(Double a, double b) { + public String overloaded(final Double a, final double b) { return "overloaded(Double, double)"; } }
--- a/test/src/jdk/nashorn/test/models/Nashorn401TestSubject.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/Nashorn401TestSubject.java Wed Jun 04 13:08:57 2014 +0200 @@ -26,31 +26,31 @@ package jdk.nashorn.test.models; public class Nashorn401TestSubject { - public String method2(int arg) { + public String method2(final int arg) { return "int method 2"; } - public String method2(double arg) { + public String method2(final double arg) { return "double method 2"; } - public String method2(String arg) { + public String method2(final String arg) { return "string method 2"; } - public String method3(double arg) { + public String method3(final double arg) { return "double method 3: " + arg; } - public String method3(int arg) { + public String method3(final int arg) { return "int method 3: " + arg; } - public String method4(Double arg) { + public String method4(final Double arg) { return "double method 4: " + arg; } - public String method4(int arg) { + public String method4(final int arg) { return "int method 4: " + arg; }
--- a/test/src/jdk/nashorn/test/models/OuterClass.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/OuterClass.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,7 +28,7 @@ public class OuterClass { private final String value; - public OuterClass(String value) { + public OuterClass(final String value) { this.value = value; } @@ -39,7 +39,7 @@ private final String value; - public InnerStaticClass(String value) { + public InnerStaticClass(final String value) { this.value = value; } @@ -52,7 +52,7 @@ public class InnerNonStaticClass { private final String value; - public InnerNonStaticClass(String value) { + public InnerNonStaticClass(final String value) { this.value = value; }
--- a/test/src/jdk/nashorn/test/models/OverrideObject.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/OverrideObject.java Wed Jun 04 13:08:57 2014 +0200 @@ -37,7 +37,7 @@ } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { // TODO: add a FindBugs annotation to ignore EQ_ALWAYS_FALSE here. This is just a test. return false; }
--- a/test/src/jdk/nashorn/test/models/PropertyBind.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/PropertyBind.java Wed Jun 04 13:08:57 2014 +0200 @@ -37,14 +37,14 @@ public final int publicFinalInt = 42; private int readWrite; - private int readOnly = 123; + private final int readOnly = 123; private int writeOnly; public int getReadWrite() { return readWrite; } - public void setReadWrite(int readWrite) { + public void setReadWrite(final int readWrite) { this.readWrite = readWrite; } @@ -52,7 +52,7 @@ return readOnly; } - public void setWriteOnly(int writeOnly) { + public void setWriteOnly(final int writeOnly) { this.writeOnly = writeOnly; } @@ -64,7 +64,7 @@ return staticReadWrite; } - public static void setStaticReadWrite(int staticReadWrite) { + public static void setStaticReadWrite(final int staticReadWrite) { PropertyBind.staticReadWrite = staticReadWrite; } @@ -72,7 +72,7 @@ return staticReadOnly; } - public static void setStaticWriteOnly(int staticWriteOnly) { + public static void setStaticWriteOnly(final int staticWriteOnly) { PropertyBind.staticWriteOnly = staticWriteOnly; }
--- a/test/src/jdk/nashorn/test/models/StringArgs.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/StringArgs.java Wed Jun 04 13:08:57 2014 +0200 @@ -29,8 +29,8 @@ public class StringArgs { - public static void checkString(List<?> list) { - for (Object s : list) { + public static void checkString(final List<?> list) { + for (final Object s : list) { if (!(s instanceof String)) { throw new AssertionError("Not a String: " + s); }
--- a/test/src/jdk/nashorn/test/models/VarArgConstructor.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/models/VarArgConstructor.java Wed Jun 04 13:08:57 2014 +0200 @@ -30,11 +30,11 @@ public class VarArgConstructor { private final String indicator; - public VarArgConstructor(int x, boolean y, List<String> z) { + public VarArgConstructor(final int x, final boolean y, final List<String> z) { indicator = "non-vararg"; } - public VarArgConstructor(int x, boolean y, String... z) { + public VarArgConstructor(final int x, final boolean y, final String... z) { indicator = "vararg"; }
--- a/test/src/jdk/nashorn/test/tools/StaticTypeInspector.java Wed Jun 04 13:55:21 2014 +0530 +++ b/test/src/jdk/nashorn/test/tools/StaticTypeInspector.java Wed Jun 04 13:08:57 2014 +0200 @@ -28,27 +28,27 @@ public class StaticTypeInspector { - public static String inspect(boolean x, String w) { + public static String inspect(final boolean x, final String w) { return w + ": boolean"; } - public static String inspect(int x, String w) { + public static String inspect(final int x, final String w) { return w + ": int"; } - public static String inspect(long x, String w) { + public static String inspect(final long x, final String w) { return w + ": long"; } - public static String inspect(double x, String w) { + public static String inspect(final double x, final String w) { return w + ": double"; } - public static String inspect(Undefined x, String w) { + public static String inspect(final Undefined x, final String w) { return w + ": undefined"; } - public static String inspect(Object x, String w) { + public static String inspect(final Object x, final String w) { return w + ": object"; } -} \ No newline at end of file +}