changeset 1992:545d7d2a70a8

8073640: Nashorn scripting: here document with only whitespace gives error Summary: Added support for handling trailing blank lines in here-doc string parsing Reviewed-by: hannesw, jlaskey Contributed-by: srinivas.dama@oracle.com
author sdama
date Fri, 01 Sep 2017 07:07:11 +0530
parents ce5973feed58
children bd933afd9e2e
files src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java test/script/basic/JDK-8073640.js test/script/basic/JDK-8073640.js.EXPECTED
diffstat 3 files changed, 84 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java	Fri Sep 01 06:01:08 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java	Fri Sep 01 07:07:11 2017 +0530
@@ -1605,6 +1605,10 @@
                 // Skip any whitespace.
                 skipWhitespace(false);
 
+                //handle trailing blank lines
+                lastLinePosition = position;
+                stringEnd = position;
+
                 if (hasHereMarker(identStart, identLength)) {
                     break;
                 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8073640.js	Fri Sep 01 07:07:11 2017 +0530
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2017, 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-8073640: Nashorn scripting: here document with only whitespace gives error
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+/*case 1*/
+print(<<EOD);
+
+EOD
+
+/*case 2*/
+print(<<EOD);
+
+line2
+line3
+EOD
+
+/*case 3*/
+print(<<EOD);
+line1
+
+line3
+EOD
+
+/*case 4*/
+print(<<EOD);
+line1
+line2
+
+EOD
+
+/*case 5*/
+print(<<EOD);
+
+line2
+
+line4
+
+EOD
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8073640.js.EXPECTED	Fri Sep 01 07:07:11 2017 +0530
@@ -0,0 +1,15 @@
+
+
+line2
+line3
+line1
+
+line3
+line1
+line2
+
+
+line2
+
+line4
+