Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1392:5efd65e18b71
8073613: Here documents: how to avoid string interpolation?
Summary: support heredoc end marker quoting like in bash
Reviewed-by: attila, hannesw
author | mhaupt |
---|---|
date | Wed, 26 Aug 2015 09:59:29 +0200 |
parents | 4577d801c522 |
children | d61744c0d1d2 |
files | src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties test/script/nosecurity/JDK-8073613.js test/script/nosecurity/JDK-8073613.js.EXPECTED |
diffstat | 4 files changed, 77 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java Tue Aug 25 18:16:10 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java Wed Aug 26 09:59:29 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015, 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 @@ -1451,9 +1451,22 @@ skip(3); } - // Scan identifier. + // Scan identifier. It might be quoted, indicating that no string editing should take place. + final char quoteChar = ch0; + final boolean noStringEditing = isStringDelimiter(quoteChar); + if (noStringEditing) { + skip(1); + } final int identStart = position; final int identLength = scanIdentifier(); + if (noStringEditing) { + if (ch0 != quoteChar) { + error(Lexer.message("here.non.matching.delimiter"), last, position, position); + restoreState(saved); + return false; + } + skip(1); + } // Check for identifier. if (identLength == 0) { @@ -1523,7 +1536,7 @@ } // Edit string if appropriate. - if (scripting && !stringState.isEmpty()) { + if (!noStringEditing && !stringState.isEmpty()) { editString(STRING, stringState); } else { // Add here string.
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties Tue Aug 25 18:16:10 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties Wed Aug 26 09:59:29 2015 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, 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 @@ -31,6 +31,7 @@ lexer.error.json.invalid.number=Invalid JSON number format lexer.error.invalid.escape.char=Invalid escape character lexer.error.illegal.identifier.character=Illegal character in identifier +lexer.error.here.non.matching.delimiter=Quoted here string end marker must have matching delimiters parser.error.illegal.continue.stmt=Illegal continue statement parser.error.illegal.break.stmt=Illegal break statement
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/JDK-8073613.js Wed Aug 26 09:59:29 2015 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2015, 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-8073613: Here documents: how to avoid string interpolation? + * + * @test + * @option -scripting + * @run + */ + +var a = 2, + b = 3 + +print(<<EOD) +${a}${b} +EOD + +print(<<"EOD") +${a}${b} +EOD + +print(<<'EOM') +${a}${b} +EOM + +print(<<`EOM`) +${c} +EOM + +print(<<"EOM") +$\{a} +EOM +