stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2017-04-27 21:16:59 +00:00
commit 5d80be2e14
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/StandardOperation.java
View File

@ -95,8 +95,8 @@ public enum StandardOperation implements Operation {
/** /**
* Get the value from a namespace defined on an object. Call sites with this * Get the value from a namespace defined on an object. Call sites with this
* operation should have a signature of * operation should have a signature of
* <tt>(receiver,&nbsp;name)&rarr;value</tt> or * <code>(receiver,&nbsp;name)&rarr;value</code> or
* <tt>(receiver)&rarr;value</tt> when used with {@link NamedOperation}, with * <code>(receiver)&rarr;value</code> when used with {@link NamedOperation}, with
* all parameters and return type being of any type (either primitive or * 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}. * reference). This operation must always be used as part of a {@link NamespaceOperation}.
*/ */
@ -104,21 +104,21 @@ public enum StandardOperation implements Operation {
/** /**
* Set the value in a namespace defined on an object. Call sites with this * Set the value in a namespace defined on an object. Call sites with this
* operation should have a signature of * operation should have a signature of
* <tt>(receiver,&nbsp;name,&nbsp;value)&rarr;void</tt> or * <code>(receiver,&nbsp;name,&nbsp;value)&rarr;void</code> or
* <tt>(receiver,&nbsp;value)&rarr;void</tt> when used with {@link NamedOperation}, * <code>(receiver,&nbsp;value)&rarr;void</code> when used with {@link NamedOperation},
* with all parameters and return type being of any type (either primitive * 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}. * or reference). This operation must always be used as part of a {@link NamespaceOperation}.
*/ */
SET, SET,
/** /**
* Call a callable object. Call sites with this operation should have a * Call a callable object. Call sites with this operation should have a
* signature of <tt>(callable,&nbsp;receiver,&nbsp;arguments...)&rarr;value</tt>, * signature of <code>(callable,&nbsp;receiver,&nbsp;arguments...)&rarr;value</code>,
* with all parameters and return type being of any type (either primitive or * 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 * 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. * 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 * If a callable has no concept of a receiver, it is free to ignore the value of the
* receiver argument. * receiver argument.
* The <tt>CALL</tt> 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 * {@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 * a named operation won't affect its signature; the name is solely meant to
* be used as a diagnostic description for error messages. * be used as a diagnostic description for error messages.
@ -126,9 +126,9 @@ public enum StandardOperation implements Operation {
CALL, CALL,
/** /**
* Call a constructor object. Call sites with this operation should have a * Call a constructor object. Call sites with this operation should have a
* signature of <tt>(constructor,&nbsp;arguments...)&rarr;value</tt>, with all * signature of <code>(constructor,&nbsp;arguments...)&rarr;value</code>, with all
* parameters and return type being of any type (either primitive or * parameters and return type being of any type (either primitive or
* reference). The <tt>NEW</tt> 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 * {@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 * a named operation won't affect its signature; the name is solely meant to
* be used as a diagnostic description for error messages. * be used as a diagnostic description for error messages.

4
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardingTypeConverterFactory.java
View File

@ -108,8 +108,8 @@ public interface GuardingTypeConverterFactory {
* language's objects to Java interfaces and classes by generating adapters * language's objects to Java interfaces and classes by generating adapters
* for them. * for them.
* <p> * <p>
* The type of the invocation is <tt>(sourceType)&rarr;targetType</tt>, while the * The type of the invocation is <code>(sourceType)&rarr;targetType</code>, while the
* type of the guard is <tt>(sourceType)&rarr;boolean</tt>. You are allowed to * type of the guard is <code>(sourceType)&rarr;boolean</code>. You are allowed to
* return unconditional invocations (with no guard) if the source type is * return unconditional invocations (with no guard) if the source type is
* specific to your runtime and your runtime only. * specific to your runtime and your runtime only.
* <p>Note that this method will never be invoked for * <p>Note that this method will never be invoked for

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java
View File

@ -30,7 +30,7 @@ package jdk.nashorn.api.tree;
* Classes implementing this interface are used to operate * Classes implementing this interface are used to operate
* on a tree when the kind of tree is unknown at compile time. * 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 * When a visitor is passed to an tree's {@link Tree#accept
* accept} method, the <tt>visit<i>XYZ</i></tt> method most applicable * accept} method, the <code>visit<i>Xyz</i></code> method most applicable
* to that tree is invoked. * to that tree is invoked.
* *
* <p> Classes implementing this interface may or may not throw a * <p> Classes implementing this interface may or may not throw a