# HG changeset patch # User lana # Date 1493327819 0 # Node ID 0f81cde5a1f75786f381dbfb59b9afbab70174c7 # Parent 98935976d88c224d0d0fc39d20f32a5537cab982# Parent a3022cc65b1735663c0562b9253116cf62c69790 Merge diff -r 98935976d88c -r 0f81cde5a1f7 src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java --- a/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java Thu Apr 27 16:07:59 2017 +0000 +++ b/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java Thu Apr 27 21:16:59 2017 +0000 @@ -95,8 +95,8 @@ /** * Get the value from a namespace defined on an object. Call sites with this * operation should have a signature of - * (receiver, name)→value or - * (receiver)→value when used with {@link NamedOperation}, with + * (receiver, name)→value or + * (receiver)→value when used with {@link NamedOperation}, with * all parameters and return type being of any type (either primitive or * reference). This operation must always be used as part of a {@link NamespaceOperation}. */ @@ -104,21 +104,21 @@ /** * Set the value in a namespace defined on an object. Call sites with this * operation should have a signature of - * (receiver, name, value)→void or - * (receiver, value)→void when used with {@link NamedOperation}, + * (receiver, name, value)→void or + * (receiver, value)→void when used with {@link NamedOperation}, * with all parameters and return type being of any type (either primitive * or reference). This operation must always be used as part of a {@link NamespaceOperation}. */ SET, /** * Call a callable object. Call sites with this operation should have a - * signature of (callable, receiver, arguments...)→value, + * signature of (callable, receiver, arguments...)→value, * with all parameters and return type being of any type (either primitive or * reference). Typically, the callables are presumed to be methods of an object, so * an explicit receiver value is always passed to the callable before the arguments. * If a callable has no concept of a receiver, it is free to ignore the value of the * receiver argument. - * The CALL operation is allowed to be used with a + * The {@code CALL} operation is allowed to be used with a * {@link NamedOperation} even though it does not take a name. Using it with * a named operation won't affect its signature; the name is solely meant to * be used as a diagnostic description for error messages. @@ -126,9 +126,9 @@ CALL, /** * Call a constructor object. Call sites with this operation should have a - * signature of (constructor, arguments...)→value, with all + * signature of (constructor, arguments...)→value, with all * parameters and return type being of any type (either primitive or - * reference). The NEW operation is allowed to be used with a + * reference). The {@code NEW} operation is allowed to be used with a * {@link NamedOperation} even though it does not take a name. Using it with * a named operation won't affect its signature; the name is solely meant to * be used as a diagnostic description for error messages. diff -r 98935976d88c -r 0f81cde5a1f7 src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java --- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java Thu Apr 27 16:07:59 2017 +0000 +++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java Thu Apr 27 21:16:59 2017 +0000 @@ -108,8 +108,8 @@ * language's objects to Java interfaces and classes by generating adapters * for them. *

- * The type of the invocation is (sourceType)→targetType, while the - * type of the guard is (sourceType)→boolean. You are allowed to + * The type of the invocation is (sourceType)→targetType, while the + * type of the guard is (sourceType)→boolean. You are allowed to * return unconditional invocations (with no guard) if the source type is * specific to your runtime and your runtime only. *

Note that this method will never be invoked for diff -r 98935976d88c -r 0f81cde5a1f7 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java Thu Apr 27 16:07:59 2017 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java Thu Apr 27 21:16:59 2017 +0000 @@ -30,7 +30,7 @@ * Classes implementing this interface are used to operate * on a tree when the kind of tree is unknown at compile time. * When a visitor is passed to an tree's {@link Tree#accept - * accept} method, the visitXYZ method most applicable + * accept} method, the visitXyz method most applicable * to that tree is invoked. * *

Classes implementing this interface may or may not throw a