changeset 16215:92f00bfd6059

8007523: VerifyError on script that uses regular expression literals with ternary operator Reviewed-by: lagergren
author sundar
date Tue, 05 Feb 2013 22:07:04 +0530
parents 299e3d0ec77e
children 46ed48fd84d3
files nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java nashorn/test/script/basic/JDK-8007522.js nashorn/test/script/basic/JDK-8007523.js
diffstat 3 files changed, 64 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java	Tue Feb 05 21:00:04 2013 +0530
+++ b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java	Tue Feb 05 22:07:04 2013 +0530
@@ -494,6 +494,11 @@
         }
 
         @Override
+        public Type getType() {
+            return Type.OBJECT;
+        }
+
+        @Override
         public void toString(final StringBuilder sb) {
             sb.append(value.toString());
         }
--- a/nashorn/test/script/basic/JDK-8007522.js	Tue Feb 05 21:00:04 2013 +0530
+++ b/nashorn/test/script/basic/JDK-8007522.js	Tue Feb 05 22:07:04 2013 +0530
@@ -1,3 +1,26 @@
+/*
+ * 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-8007522: IllegalStateException thrown from String.prototype.search function
  *
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8007523.js	Tue Feb 05 22:07:04 2013 +0530
@@ -0,0 +1,36 @@
+/*
+ * 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-8007523: VerifyError on script that uses regular expression literals with ternary operator 
+ *
+ * @test
+ * @run
+ */
+
+var flag = true;
+
+// used to throw VerifyError because of the following ternary operator
+if (String(flag? /bar1/ : /bar2/) != '/bar1/') {
+    fail("ternary operator failed to pass right value");
+}