Mercurial > hg > icedtea9-forest > nashorn
changeset 345:18362e95e638
8016522: Numeric literal must not be followed by IdentifierStart
Reviewed-by: lagergren, sundar
| author | hannesw |
|---|---|
| date | Thu, 13 Jun 2013 14:02:43 +0200 |
| parents | 6d6133ef1fd5 |
| children | fe80eda7b57e |
| files | src/jdk/nashorn/internal/parser/Lexer.java src/jdk/nashorn/internal/runtime/resources/Messages.properties test/script/error/JDK-8016522.js test/script/error/JDK-8016522.js.EXPECTED |
| diffstat | 4 files changed, 38 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/parser/Lexer.java Thu Jun 13 12:52:09 2013 +0200 +++ b/src/jdk/nashorn/internal/parser/Lexer.java Thu Jun 13 14:02:43 2013 +0200 @@ -1115,6 +1115,10 @@ } } + if (Character.isJavaIdentifierStart(ch0)) { + error(Lexer.message("missing.space.after.number"), type, position, 1); + } + // Add number token. add(type, start); }
--- a/src/jdk/nashorn/internal/runtime/resources/Messages.properties Thu Jun 13 12:52:09 2013 +0200 +++ b/src/jdk/nashorn/internal/runtime/resources/Messages.properties Thu Jun 13 14:02:43 2013 +0200 @@ -25,8 +25,8 @@ lexer.error.edit.string.missing.brace=Edit string expression missing closing brace lexer.error.here.missing.end.marker=Here string missing end marker "{0}" lexer.error.missing.close.quote=Missing close quote +lexer.error.missing.space.after.number=Missing space after numeric literal lexer.error.invalid.hex=Invalid hex digit -lexer.error.invalid.octal=Invalid octal digit lexer.error.strict.no.octal=cannot use octal escapes in strict mode lexer.error.json.invalid.number=Invalid JSON number format lexer.error.invalid.escape.char=Invalid escape character
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/error/JDK-8016522.js Thu Jun 13 14:02:43 2013 +0200 @@ -0,0 +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. + */ + +/** + * JDK-8016522: Numeric literal must not be followed by IdentifierStart + * + * @test/compile-error + */ + +3in {};