# HG changeset patch
# User hannesw
# Date 1520444181 -3600
# Node ID 2854589fd8530e9e0b47ff4e11313623df875659
# Parent 71bc133f25ea38ef2469000ee9aafe1edbf773a8
8199236: Nashorn uses deprecated HTML tags in Javadoc
Reviewed-by: jlaskey, sundar
diff -r 71bc133f25ea -r 2854589fd853 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java Tue Mar 06 23:03:50 2018 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java Wed Mar 07 18:36:21 2018 +0100
@@ -101,7 +101,7 @@
}
/**
- * Retrieve the top count types on the stack without modifying it.
+ * Retrieve the top count
types on the stack without modifying it.
*
* @param count number of types to return
* @return array of Types
diff -r 71bc133f25ea -r 2854589fd853 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java Tue Mar 06 23:03:50 2018 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java Wed Mar 07 18:36:21 2018 +0100
@@ -2057,7 +2057,7 @@
}
/**
- * Retrieve the top count types on the stack without modifying it.
+ * Retrieve the top count
types on the stack without modifying it.
*
* @param count number of types to return
* @return array of Types
diff -r 71bc133f25ea -r 2854589fd853 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java Tue Mar 06 23:03:50 2018 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java Wed Mar 07 18:36:21 2018 +0100
@@ -257,7 +257,7 @@
}
/**
- * Test if this block represents a catch block in a try statement.
+ * Test if this block represents a catch
block in a try
statement.
* This is used by the Splitter as catch blocks are not be subject to splitting.
*
* @return true if this block represents a catch block in a try statement.
diff -r 71bc133f25ea -r 2854589fd853 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java Tue Mar 06 23:03:50 2018 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java Wed Mar 07 18:36:21 2018 +0100
@@ -41,7 +41,7 @@
* of different formats.
*
*
This class is neither thread-safe nor reusable. Calling the - * parse() method more than once will yield undefined results.
+ *parse()
method more than once will yield undefined results.
*/
public class DateParser {
@@ -118,7 +118,7 @@
}
/**
- * Construct a new DateParser instance for parsing the given string.
+ * Construct a new DateParser
instance for parsing the given string.
* @param string the string to be parsed
*/
public DateParser(final String string) {
@@ -130,7 +130,7 @@
/**
* Try parsing the given string as date according to the extended ISO 8601 format
* specified in ES5 15.9.1.15. Fall back to legacy mode if that fails.
- * This method returns true if the string could be parsed.
+ * This method returns true
if the string could be parsed.
* @return true if the string could be parsed as date
*/
public boolean parse() {
@@ -143,8 +143,8 @@
*
* [('-'|'+')yy]yyyy[-MM[-dd]][Thh:mm[:ss[.sss]][Z|(+|-)hh:mm]]* - *
If the string does not contain a time zone offset, the TIMEZONE field - * is set to 0 (GMT).
+ *If the string does not contain a time zone offset, the TIMEZONE
field
+ * is set to 0
(GMT).
Numbers separated by ':' are treated as time values, optionally followed by a - * millisecond value separated by '.'. Other number values are treated as date values. + *
Numbers separated by ':'
are treated as time values, optionally followed by a
+ * millisecond value separated by '.'
. Other number values are treated as date values.
* The exact sequence of day, month, and year values to apply is determined heuristically.
English month names and selected time zone names as well as AM/PM markers are recognized - * and handled properly. Additionally, numeric time zone offsets such as (+|-)hh:mm or - * (+|-)hhmm are recognized. If the string does not contain a time zone offset - * the TIMEZONEfield is left undefined, meaning the local time zone should be applied.
+ * and handled properly. Additionally, numeric time zone offsets such as(+|-)hh:mm
or
+ * (+|-)hhmm
are recognized. If the string does not contain a time zone offset
+ * the TIMEZONE
field is left undefined, meaning the local time zone should be applied.
*
* English weekday names are recognized but ignored. All text in parentheses is ignored as well. * All other text causes parsing to fail.
@@ -331,10 +331,10 @@ } /** - * Get the parsed date and time fields as an array of Integers. + * Get the parsed date and time fields as an array ofIntegers
.
*
* If parsing was successful, all fields are guaranteed to be set except for the
- * TIMEZONE field which may be null, meaning that local time zone
+ * TIMEZONE
field which may be null
, meaning that local time zone
* offset should be applied.
true
, otherwise return false.
*
* @param token the token.
* @param startTokenType the token type.
diff -r 71bc133f25ea -r 2854589fd853 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java Tue Mar 06 23:03:50 2018 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java Wed Mar 07 18:36:21 2018 +0100
@@ -32,7 +32,7 @@
/**
* This class represents a string composed of two parts which may themselves be
- * instances of ConsString or {@link String}. Copying of characters to
+ * instances of ConsString
or {@link String}. Copying of characters to
* a proper string is delayed until it becomes necessary.
*/
public final class ConsString implements CharSequence {
diff -r 71bc133f25ea -r 2854589fd853 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java Tue Mar 06 23:03:50 2018 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java Wed Mar 07 18:36:21 2018 +0100
@@ -60,15 +60,15 @@
* Dangerous characters are the union of all characters forbidden
* or otherwise restricted by the JVM specification,
* plus their mates, if they are brackets
- * ([
and ]
,
- * <
and >
),
- * plus, arbitrarily, the colon character :
.
+ * ([
and ]
,
+ * <
and >
),
+ * plus, arbitrarily, the colon character :
.
* There is no distinction between type, method, and field names.
* This makes it easier to convert between mangled names of different
* types, since they do not need to be decoded (demangled).
*
*
- * The escape character is backslash \
+ * The escape character is backslash \
* (also known as reverse solidus).
* This character is, until now, unheard of in bytecode names,
* but traditional in the proposed role.
@@ -92,32 +92,32 @@
*
* The dangerous characters are
- * /
(forward slash, used to delimit package components),
- * .
(dot, also a package delimiter),
- * ;
(semicolon, used in signatures),
- * $
(dollar, used in inner classes and synthetic members),
- * <
(left angle),
- * >
(right angle),
- * [
(left square bracket, used in array types),
- * ]
(right square bracket, reserved in this scheme for language use),
- * and :
(colon, reserved in this scheme for language use).
+ * /
(forward slash, used to delimit package components),
+ * .
(dot, also a package delimiter),
+ * ;
(semicolon, used in signatures),
+ * $
(dollar, used in inner classes and synthetic members),
+ * <
(left angle),
+ * >
(right angle),
+ * [
(left square bracket, used in array types),
+ * ]
(right square bracket, reserved in this scheme for language use),
+ * and :
(colon, reserved in this scheme for language use).
* Their replacements are, respectively,
- * |
(vertical bar),
- * ,
(comma),
- * ?
(question mark),
- * %
(percent),
- * ^
(caret),
- * _
(underscore), and
- * {
(left curly bracket),
- * }
(right curly bracket),
- * !
(exclamation mark).
+ * |
(vertical bar),
+ * ,
(comma),
+ * ?
(question mark),
+ * %
(percent),
+ * ^
(caret),
+ * _
(underscore), and
+ * {
(left curly bracket),
+ * }
(right curly bracket),
+ * !
(exclamation mark).
* In addition, the replacement character for the escape character itself is
- * -
(hyphen),
+ * -
(hyphen),
* and the replacement character for the null prefix is
- * =
(equal sign).
+ * =
(equal sign).
*
- * An escape character \
+ * An escape character \
* followed by any of these replacement characters
* is an escape sequence, and there are no other escape sequences.
* An equal sign is only part of an escape sequence
@@ -135,16 +135,16 @@
* string can contain accidental escapes, apparent escape
* sequences which must not be interpreted as manglings.
* These are disabled by replacing their leading backslash with an
- * escape sequence (\-
). To mangle a string, three logical steps
+ * escape sequence (\-
). To mangle a string, three logical steps
* are required, though they may be carried out in one pass:
*
\-
).\-
).
* \|
for /
, etc.).\|
for /
, etc.).
* \=
).\=
).
* \=foo
,
- * \-bar
, and baz\!
, which demangle to foo
, \bar
, and
- * baz\!
, but then remangle to foo
, \bar
, and \=baz\-!
.
+ * Three examples of invalidly mangled strings are \=foo
,
+ * \-bar
, and baz\!
, which demangle to foo
, \bar
, and
+ * baz\!
, but then remangle to foo
, \bar
, and \=baz\-!
.
* If a language back-end or runtime is using mangled names,
* it should never present an invalidly mangled bytecode
* name to the JVM. If the runtime encounters one,
@@ -237,10 +237,10 @@
*
*
* For example, an HTML-like spelling
- * <pre>
mangles to
- * \^pre\_
and could
+ * <pre>
mangles to
+ * \^pre\_
and could
* display more cleanly as
- * '<pre>'
,
+ * '<pre>'
,
* with the quotes included.
* Such string-like conventions are not suitable
* for mangled bytecode names, in part because
@@ -256,11 +256,11 @@
* which contain dangerous characters (like dots in field
* names or brackets in method names) should not be
* simply quoted. The bytecode names
- * \=phase\,1
and
- * phase.1
are distinct,
+ * \=phase\,1
and
+ * phase.1
are distinct,
* and in demangled displays they should be presented as
- * 'phase.1'
and something like
- * 'phase'.1
, respectively.
+ * 'phase.1'
and something like
+ * 'phase'.1
, respectively.
*