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

8168049: Fix Performance of Lexer.isJSWhitespace

Browse Source 
Reviewed-by: sundar, attila
This commit is contained in:
Hannes Wallnöfer 2016-11-11 18:56:37 +01:00
parent 1406cd4347
commit 8a2f4e80e4
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
View File

@ -102,19 +102,9 @@ public class Lexer extends Scanner {
private int templateExpressionOpenBraces;
private static final String SPACETAB = " \t"; // ASCII space and tab
private static final String LFCR = "\n\r"; // line feed and carriage return (ctrl-m)
private static final String JAVASCRIPT_WHITESPACE_EOL =
LFCR +
private static final String JAVASCRIPT_OTHER_WHITESPACE =
"\u2028" + // line separator
"\u2029" // paragraph separator
;
private static final String JAVASCRIPT_WHITESPACE =
SPACETAB +
JAVASCRIPT_WHITESPACE_EOL +
"\u000b" + // tabulation line
"\u000c" + // ff (ctrl-l)
"\u2029" + // paragraph separator
"\u00a0" + // Latin-1 space
"\u1680" + // Ogham space mark
"\u180e" + // separator, Mongolian vowel
@ -384,7 +374,13 @@ public class Lexer extends Scanner {
* @return true if valid JavaScript whitespace
*/
public static boolean isJSWhitespace(final char ch) {
return JAVASCRIPT_WHITESPACE.indexOf(ch) != -1;
return ch == ' ' // space
|| ch >= '\t' && ch <= '\r' // 0x09..0x0d: tab, line feed, tabulation line, ff, carriage return
|| ch >= 160 && isOtherJSWhitespace(ch);
}
private static boolean isOtherJSWhitespace(final char ch) {
return JAVASCRIPT_OTHER_WHITESPACE.indexOf(ch) != -1;
}
/**
@ -393,7 +389,10 @@ public class Lexer extends Scanner {
* @return true if valid JavaScript end of line
*/
public static boolean isJSEOL(final char ch) {
return JAVASCRIPT_WHITESPACE_EOL.indexOf(ch) != -1;
return ch == '\n' // line feed
|| ch == '\r' // carriage return (ctrl-m)
|| ch == '\u2028' // line separator
|| ch == '\u2029'; // paragraph separator
}
/**