Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1213:b2b332e64b7b jdk9-b55
Merge
| author | lana |
|---|---|
| date | Thu, 12 Mar 2015 21:14:04 -0700 |
| parents | 251d509b32ab (current diff) 1ed2c1f65ec7 (diff) |
| children | 9eea9ff74d7c 78f82d897305 |
| files | |
| diffstat | 203 files changed, 20120 insertions(+), 488 deletions(-) [+] |
line wrap: on
line diff
--- a/make/BuildNashorn.gmk Thu Mar 12 13:35:18 2015 -0700 +++ b/make/BuildNashorn.gmk Thu Mar 12 21:14:04 2015 -0700 @@ -105,8 +105,8 @@ # Create nashorn.jar from the final classes dir $(eval $(call SetupArchive,BUILD_NASHORN_JAR, \ - $(NASGEN_RUN_FILE) \ - $(VERSION_FILE), \ + DEPENDENCIES := $(NASGEN_RUN_FILE) \ + $(VERSION_FILE), \ SRCS := $(NASHORN_CLASSES_DIR), \ SUFFIXES := .class .js .properties Factory, \ MANIFEST := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF, \
--- a/make/build-nasgen.xml Thu Mar 12 13:35:18 2015 -0700 +++ b/make/build-nasgen.xml Thu Mar 12 21:14:04 2015 -0700 @@ -35,11 +35,10 @@ <classpath> <pathelement location="${basedir}/jcov2/lib/jcov_j2se_rt.jar"/> <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/> - <pathelement path="${basedir}/build/classes"/> <pathelement location="${dist.dir}/nasgen.jar"/> <pathelement path="${build.dir}/classes"/> </classpath> - <jvmarg value="${boot.class.path}"/> + <jvmarg value="-Xbootclasspath/p:${basedir}/build/classes"/> <arg value="${build.dir}/classes"/> <arg value="jdk.nashorn.internal.objects"/> <arg value="${build.dir}/classes"/> @@ -52,8 +51,8 @@ <java classname="jdk.nashorn.internal.tools.nasgen.Main" fork="true" failonerror="true"> <classpath> <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/> - <pathelement path="${basedir}/build/eclipse"/> </classpath> + <jvmarg value="-Xbootclasspath/p:${basedir}/build/eclipse"/> <arg value="${basedir}/build/eclipse"/> <arg value="jdk.nashorn.internal.objects"/> <arg value="${basedir}/build/eclipse/.nasgentmp"/>
--- a/make/build.xml Thu Mar 12 13:35:18 2015 -0700 +++ b/make/build.xml Thu Mar 12 21:14:04 2015 -0700 @@ -98,7 +98,7 @@ <fail message="Unsupported Java version: ${ant.java.version}. Please use Java version 1.8 or greater." unless="jdk1.8+"> </fail> </target> - + <target name="init" depends="check-ant-version, check-java-version, init-conditions, init-cc"> <!-- extends jvm args --> <property name="run.test.jvmargs" value="${run.test.jvmargs.main} ${run.test.cc.jvmargs} ${jfr.options}"/> @@ -209,7 +209,7 @@ </target> <target name="javadoc" depends="jar"> - <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" + <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}" additionalparam="-quiet" failonerror="true"> <classpath> @@ -227,7 +227,7 @@ <!-- generate javadoc only for nashorn extension api classes --> <target name="javadocapi" depends="jar"> - <javadoc destdir="${dist.javadoc.dir}" use="yes" extdirs="${nashorn.ext.path}" + <javadoc destdir="${dist.javadoc.dir}" use="yes" extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name}" additionalparam="-quiet" failonerror="true"> <classpath> <pathelement location="${build.classes.dir}"/> @@ -314,6 +314,15 @@ permission java.security.AllPermission; }; +grant codeBase "file:/${basedir}/${nashorn.api.tests.jar}" { + permission java.util.PropertyPermission "parserapitest.*", "read"; + permission java.util.PropertyPermission "test.*", "read"; + permission java.util.PropertyPermission "test262.*", "read"; + permission java.io.FilePermission "${basedir}/test/-","read"; + permission java.io.FilePermission "$${user.dir}", "read"; + permission java.util.PropertyPermission "user.dir", "read"; +}; + grant codeBase "file:/${basedir}/${file.reference.testng.jar}" { permission java.security.AllPermission; }; @@ -395,6 +404,7 @@ <fileset id="test.classes" dir="${build.test.classes.dir}"> <include name="**/api/javaaccess/*Test.class"/> <include name="**/api/scripting/*Test.class"/> + <include name="**/api/tree/*Test.class"/> <include name="**/codegen/*Test.class"/> <include name="**/parser/*Test.class"/> <include name="**/runtime/*Test.class"/> @@ -440,7 +450,7 @@ <delete dir="${build.dir}/nashorn_code_cache"/> <property name="debug.test.jvmargs" value=""/> <testng outputdir="${build.test.results.dir}/${testResultsSubDir}" classfilesetref="test.classes" - verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> + verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}"> <jvmarg line="${boot.class.path}"/> <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs} -Dbuild.dir=${build.dir}"/> <jvmarg line="${debug.test.jvmargs}"/> @@ -466,7 +476,7 @@ <antcall target="-test-nosecurity" inheritRefs="true"> <param name="optimistic" value="true"/> <param name="testResultsSubDir" value="optimistic"/> - </antcall> + </antcall> <antcall target="-test-security" inheritRefs="true"> <param name="optimistic" value="true"/> <param name="testResultsSubDir" value="optimistic"/> @@ -478,7 +488,7 @@ <antcall target="-test-nosecurity" inheritRefs="true"> <param name="optimistic" value="false"/> <param name="testResultsSubDir" value="pessimistic"/> - </antcall> + </antcall> <antcall target="-test-security" inheritRefs="true"> <param name="optimistic" value="false"/> <param name="testResultsSubDir" value="pessimistic"/>
--- a/make/nbproject/project.xml Thu Mar 12 13:35:18 2015 -0700 +++ b/make/nbproject/project.xml Thu Mar 12 21:14:04 2015 -0700 @@ -2,21 +2,21 @@ <!-- 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. @@ -155,7 +155,7 @@ </view> <subprojects/> </general-data> - <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3"> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4"> <compilation-unit> <package-root>../test/src</package-root> <unit-tests/>
--- a/make/project.properties Thu Mar 12 13:35:18 2015 -0700 +++ b/make/project.properties Thu Mar 12 21:14:04 2015 -0700 @@ -1,21 +1,21 @@ # # Copyright (c) 2010, 2014, 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. @@ -81,8 +81,8 @@ file.reference.testng.jar=test/lib/testng.jar # Set testng verbose level -# From TestNG docs: "the verbosity level (0 to 10 where 10 is most detailed) -# Actually, this is a lie: you can specify -1 and this will put TestNG in +# From TestNG docs: "the verbosity level (0 to 10 where 10 is most detailed) +# Actually, this is a lie: you can specify -1 and this will put TestNG in # debug mode (no longer slicing off stack traces and all)." testng.verbose=2 @@ -134,6 +134,10 @@ test-sys-prop.test262.suite.dir=${test262.suite.dir} test-sys-prop.es5conform.testcases.dir=${test.external.dir}/ES5Conform/TestCases test-sys-prop.test.basic.dir=${test.basic.dir} +test-sys-prop.test.external.dir=${test.external.dir} +test-sys-prop.test.maptests.dir=${test.maptests.dir} +test-sys-prop.test.sandbox.dir=${test.sandbox.dir} +test-sys-prop.test.trusted.dir=${test.trusted.dir} test-sys-prop-no-security.test.dir=${test.dir} test-sys-prop-no-security.test.js.roots=${test.nosecurity.dir} @@ -147,9 +151,11 @@ # turn on/off scripting mode for parser tests test-sys-prop.parsertest.scripting=true +test-sys-prop.parserapitest.verbose=false # turn on/off test262 scripts for parser tests test-sys-prop.parsertest.test262=false +test-sys-prop.parserapitest.test262=false # Control the verbosity of the CompilerTest test-sys-prop.compilertest.verbose=false @@ -289,19 +295,19 @@ # Extra jvmargs that might be useful for debugging # and performance improvements/monitoring # -# -XX:+UnlockDiagnosticVMOptions +# -XX:+UnlockDiagnosticVMOptions # # turn off compressed class pointers in metaspace -# -XX:-UseCompressedKlassPointers +# -XX:-UseCompressedKlassPointers # # dump the heap after every GC # -XX:+PrintHeapAtGC # -# manually set a metaspace size for class data +# manually set a metaspace size for class data # -XX:ClassMetaspaceSize=300M # # print out methods compiled -# -XX:+PrintCompilation +# -XX:+PrintCompilation # # print all compiled nmethods with oopmaps and lots of other info # -XX:+PrintNMethods @@ -311,7 +317,7 @@ # feature in HotSpot - for example, the uncommon trap placement fix # was hidden behind this flag before it became the default # -# -XX:+UnlockDiagnosticVMOptions -XX:+UseNewCode +# -XX:+UnlockDiagnosticVMOptions -XX:+UseNewCode # # Crank up the type profile level to 222, which has some warmup # penalties, but produces much better code for JavaScript, where better @@ -342,7 +348,7 @@ octane.iterations=25 # List of octane tests to run, as properties prefixed with -# "octane.benchmark." mapping to the benchmark name in +# "octane.benchmark." mapping to the benchmark name in # the test harness # # Octane tests that are disabled should have their entire line
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/breakcontinue_in_tryfinally.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// Find break or continue inside try..finally in all scripts +// in a given directory (recursively). If no directory is specified +// the current working directory is scanned for scripts. + +if (arguments.length == 0) { + arguments[0] = "."; +} + +var File = Java.type("java.io.File"); +var file = new File(arguments[0]); +if (!file.exists()) { + print(arguments[0] + " is neither a directory nor a file"); + exit(1); +} + +var Files = Java.type("java.nio.file.Files"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); + +var parser = Parser.create("-scripting", "--const-as-var"); + +function checkFile(file) { + // print("checking " + file); + var ast = parser.parse(file, print); + if (!ast) { + return; + } + + // locate 'break/continue' inside try..finally + ast.accept(visitor = new (Java.extend(SimpleTreeVisitor)) { + lineMap: null, + inTryFinally: false, + + printWarning: function(node, msg) { + var pos = node.startPosition; + var line = this.lineMap.getLineNumber(pos); + var column = this.lineMap.getColumnNumber(pos); + print(msg + " found in " + file + " @ " + line + ":" + column); + }, + + visitBreak: function(node, extra) { + if (this.inTryFinally) { + this.printWarning(node, "break"); + } + }, + + visitContinue: function(node, extra) { + if (this.inTryFinally) { + this.printWarning(node, "continue"); + } + }, + + visitCompilationUnit: function(node, extra) { + this.lineMap = node.lineMap; + Java.super(visitor).visitCompilationUnit(node, extra); + }, + + visitFunctionDeclaration: function(node, extra) { + var oldInTryFinally = this.inTryFinally; + this.inTryFinally = false; + try { + Java.super(visitor).visitFunctionDeclaration(node, extra); + } finally { + this.inTryFinally = oldInTryFinally; + } + }, + + visitFunctionExpression: function(node, extra) { + var oldInTryFinally = this.inTryFinally; + this.inTryFinally = false; + try { + Java.super(visitor).visitFunctionExpression(node, extra); + } finally { + this.inTryFinally = oldInTryFinally; + } + }, + + visitTry: function(node, extra) { + var oldInTryFinally = this.inTryFinally; + this.inTryFinally = (node.finallyBlock != null); + try { + Java.super(visitor).visitTry(node, extra); + } finally { + this.inTryFinally = oldInTryFinally; + } + } + }, null); +} + + +if (file.isDirectory()) { + Files.walk(file.toPath()) + .filter(function(p) Files.isRegularFile(p)) + .filter(function(p) p.toFile().name.endsWith('.js')) + .forEach(checkFile); +} else { + checkFile(file); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/cricket.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,140 @@ +#// Usage: jjs -scripting cricket.js + +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// Example that demonstrates reading XML Rss feed. +// XML DOM Document element is wrapped by script +// "proxy" (JSAdapter constructor) + +// Java classes used +var DocBuilderFac = Java.type("javax.xml.parsers.DocumentBuilderFactory"); +var Node = Java.type("org.w3c.dom.Node"); + +// constants from Node class +var ELEMENT_NODE = Node.ELEMENT_NODE; +var TEXT_NODE = Node.TEXT_NODE; + +// parse XML from uri and return Document +function parseXML(uri) { + var docBuilder = DocBuilderFac.newInstance().newDocumentBuilder(); + return docBuilder["parse(java.lang.String)"](uri); +} + +// get child Elements of given name of the parent element given +function getChildElements(elem, name) { + var nodeList = elem.childNodes; + var childElems = []; + var len = nodeList.length; + for (var i = 0; i < len; i++) { + var node = nodeList.item(i); + if (node.nodeType == ELEMENT_NODE && + node.tagName == name) { + childElems.push(wrapElement(node)); + } + } + + return childElems; +} + +// get concatenated child text content of an Element +function getElemText(elem) { + var nodeList = elem.childNodes; + var len = nodeList.length; + var text = ''; + for (var i = 0; i < len; i++) { + var node = nodeList.item(i); + if (node.nodeType == TEXT_NODE) { + text += node.nodeValue; + } + } + + return text; +} + +// Wrap DOM Element object as a convenient script object +// using JSAdapter. JSAdapter is like java.lang.reflect.Proxy +// in that it allows property access, method calls be trapped +// by 'magic' methods like __get__, __call__. +function wrapElement(elem) { + if (! elem) { + return elem; + } + return new JSAdapter() { + // getter to expose child elements and attributes by name + __get__: function(name) { + if (typeof name == 'string') { + if (name.startsWith('@')) { + var attr = elem.getAttributeNode(name.substring(1)); + return !attr? undefined : attr.value; + } + + var arr = getChildElements(elem, name); + if (arr.length == 1) { + // single child element, expose as single element + return arr[0]; + } else { + // multiple children of given name, expose as array + return arr; + } + } + return undefined; + }, + + __call__: function(name) { + // toString override to get text content of this Element + if (name == 'toString' || name == 'valueOf') { + return getElemText(elem); + } + return undefined; + } + } +} + +function printCricketScore() { + var doc = parseXML("http://static.cricinfo.com/rss/livescores.xml"); + // wrap document root Element as script convenient object + var rss = wrapElement(doc.documentElement); + print("rss file version " + rss['@version']); + + print(rss.channel.title); + print(rss.channel.description); + print(rss.channel.pubDate); + + print("====================="); + + var items = rss.channel.item; + for each (var i in items) { + print(i.description); + } +} + +printCricketScore();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/evalcheck.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +// Simple demo of Nashorn Parser API + +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); +var IdentifierTree = Java.type("jdk.nashorn.api.tree.IdentifierTree"); + +var parser = Parser.create(); +var ast = parser.parse("t", "eval('hello');\n eval(2 + 3)", print); +// locate 'eval' calls in the script +ast.accept(visitor = new (Java.extend(SimpleTreeVisitor)) { + lineMap: null, + visitCompilationUnit: function(node, extra) { + this.lineMap = node.lineMap; + Java.super(visitor).visitCompilationUnit(node, extra); + }, + + visitFunctionCall: function(node, extra) { + var func = node.functionSelect; + if (func instanceof IdentifierTree && func.name == "eval") { + var pos = node.startPosition; + var line = this.lineMap.getLineNumber(pos); + var column = this.lineMap.getColumnNumber(pos); + print("eval call found @ " + line + ":" + column); + } + } +}, null);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/findproto.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// __proto__ magic property is non-standard. Use Object.getPrototypeOf +// and Object.setPrototypeOf instead. This script finds __proto__ +// usage in scripts a given directory (recursively). If no directory +// is specified the current working directory is scanned for scripts. + +if (arguments.length == 0) { + arguments[0] = "."; +} + +var File = Java.type("java.io.File"); +var file = new File(arguments[0]); +if (!file.exists()) { + print(arguments[0] + " is neither a file nor a directory"); + exit(1); +} + +var Files = Java.type("java.nio.file.Files"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); + +var parser = Parser.create("-scripting", "--const-as-var"); +var protoFound = false; + +function checkFile(file) { + // print("checking " + file); + var ast = parser.parse(file, print); + if (!ast) { + return; + } + + // locate __proto__ usage and warn + ast.accept(visitor = new (Java.extend(SimpleTreeVisitor)) { + lineMap: null, + + printWarning: function(node) { + var pos = node.startPosition; + var line = this.lineMap.getLineNumber(pos); + var column = this.lineMap.getColumnNumber(pos); + print("WARNING: __proto__ usage in " + file + " @ " + line + ":" + column); + }, + + checkProto: function(node, name) { + if (name == "__proto__") { + protoFound = true; + this.printWarning(node); + } + }, + + visitCompilationUnit: function(node, extra) { + this.lineMap = node.lineMap; + Java.super(visitor).visitCompilationUnit(node, extra); + }, + + visitIdentifier: function(node, extra) { + this.checkProto(node, node.name); + Java.super(visitor).visitIdentifier(node, extra); + }, + + visitMemberSelect: function(node, extra) { + this.checkProto(node, node.identifier); + Java.super(visitor).visitMemberSelect(node, extra); + }, + + visitProperty: function(node, extra) { + this.checkProto(node, node.key); + Java.super(visitor).visitProperty(node, extra); + } + }, null); +} + +if (file.isDirectory()) { + Files.walk(file.toPath()) + .filter(function(p) Files.isRegularFile(p)) + .filter(function(p) p.toFile().name.endsWith('.js')) + .forEach(checkFile); +} else { + checkFile(file); +} + +if (protoFound) { + print("__proto__ is non-standard. Use Object.get/setPrototypeOf instead"); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/findvardelete.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// delete of scope vars is reported as error in strict mode. +// This script finds scripts that such deletes. Scripts in +// the specified directory are scanned. If no directory is +// specified, the current directory is scanned. + +if (arguments.length == 0) { + arguments[0] = "."; +} + +var File = Java.type("java.io.File"); +var file = new File(arguments[0]); +if (!file.exists()) { + print(arguments[0] + " is neither a directory nor a file"); + exit(1); +} + +var Files = Java.type("java.nio.file.Files"); +var IdentifierTree = Java.type("jdk.nashorn.api.tree.IdentifierTree"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); +var Tree = Java.type("jdk.nashorn.api.tree.Tree"); + +var parser = Parser.create("-scripting", "--const-as-var"); + +function checkFile(file) { + // print("checking " + file); + var ast = parser.parse(file, print); + if (!ast) { + return; + } + + // locate __proto__ usage and warn + ast.accept(visitor = new (Java.extend(SimpleTreeVisitor)) { + lineMap: null, + + printWarning: function(node, varName) { + var pos = node.startPosition; + var line = this.lineMap.getLineNumber(pos); + var column = this.lineMap.getColumnNumber(pos); + print("WARNING: delete " + varName + " in " + file + " @ " + line + ":" + column); + }, + + visitCompilationUnit: function(node, extra) { + this.lineMap = node.lineMap; + Java.super(visitor).visitCompilationUnit(node, extra); + }, + + visitUnary: function(node, extra) { + if (node.kind == Tree.Kind.DELETE && + node.expression instanceof IdentifierTree) { + this.printWarning(node, node.expression.name); + } + Java.super(visitor).visitUnary(node, extra); + }, + + }, null); +} + +if (file.isDirectory()) { + Files.walk(file.toPath()) + .filter(function(p) Files.isRegularFile(p)) + .filter(function(p) p.toFile().name.endsWith('.js')) + .forEach(checkFile); +} else { + checkFile(file); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/findwith.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// 'with' statement is not considered a good practive. In strict mode, +// with statements result in early error being thrown. + +// This script finds 'with' usage in scripts a given directory (recursively). +// If no directory is specified the current working directory is scanned +// for scripts. + +if (arguments.length == 0) { + arguments[0] = "."; +} + +var File = Java.type("java.io.File"); +var file = new File(arguments[0]); +if (!file.exists()) { + print(arguments[0] + " is neither a directory nor a file"); + exit(1); +} + +var Files = Java.type("java.nio.file.Files"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); + +var parser = Parser.create("-scripting", "--const-as-var"); +var protoFound = false; + +function checkFile(file) { + // print("checking " + file); + var ast = parser.parse(file, print); + if (!ast) { + return; + } + + // locate __proto__ usage and warn + ast.accept(visitor = new (Java.extend(SimpleTreeVisitor)) { + lineMap: null, + + printWarning: function(node) { + var pos = node.startPosition; + var line = this.lineMap.getLineNumber(pos); + var column = this.lineMap.getColumnNumber(pos); + print("WARNING: 'with' usage in " + file + " @ " + line + ":" + column); + }, + + visitCompilationUnit: function(node, extra) { + this.lineMap = node.lineMap; + Java.super(visitor).visitCompilationUnit(node, extra); + }, + + visitWith: function(node, extra) { + this.printWarning(node); + Java.super(visitor).visitWith(node, extra); + } + }, null); +} + +if (file.isDirectory()) { + Files.walk(file.toPath()) + .filter(function(p) Files.isRegularFile(p)) + .filter(function(p) p.toFile().name.endsWith('.js')) + .forEach(checkFile); +} else { + checkFile(file); +} + +if (protoFound) { + print("__proto__ is non-standard. Use Object.get/setPrototypeOf instead"); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/nashornastviewer.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,113 @@ +#// Usage: jjs -scripting -fx nashornastviewer.js -- <scriptfile> + +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +# NOTE: This script requires JDK 9 build to run + +if (!$OPTIONS._fx) { + print("Usage: jjs -scripting -fx nashornastviewer.js -- <.js file>"); + exit(1); +} + +// Using JavaFX from Nashorn. See also: +// http://docs.oracle.com/javase/8/docs/technotes/guides/scripting/nashorn/javafx.html + +// This example shows AST of a script file as a JavaFX +// tree view in a window. If no file is specified, AST of +// this script file is shown. This script demonstrates +// Nashorn Parser API too - http://openjdk.java.net/jeps/236 + +// JavaFX classes used +var StackPane = Java.type("javafx.scene.layout.StackPane"); +var Scene = Java.type("javafx.scene.Scene"); +var TreeItem = Java.type("javafx.scene.control.TreeItem"); +var TreeView = Java.type("javafx.scene.control.TreeView"); + +// Java classes used +var Enum = Java.type("java.lang.Enum"); +var File = Java.type("java.io.File"); +var List = Java.type("java.util.List"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var Tree = Java.type("jdk.nashorn.api.tree.Tree"); + +// Create a javafx TreeItem to view a AST node +function treeItemForASTNode(ast, name) { + var item = new TreeItem(name); + // make an iteratable script object from a Tree + ast = Object.bindProperties({}, ast); + for (var prop in ast) { + var node = ast[prop]; + var type = typeof node; + + if (node == null || type == "function") { + // skip nulls and Java methods + continue; + } + + var subitem = null; + if (node instanceof Tree) { + subitem = treeItemForASTNode(node, prop); + } else if (node instanceof List) { + var len = node.size(); + subitem = new TreeItem(prop); + for (var i = 0; i < len; i++) { + var li = treeItemForASTNode(node.get(i), String(i)); + subitem.children.add(li); + } + } else if (node instanceof Enum || type != 'object') { + subitem = new TreeItem(prop + ": " + node); + } + + if (subitem) { + item.children.add(subitem); + } + } + return item; +} + +// do we have a script file passed? if not, use current script +var sourceName = arguments.length == 0? __FILE__ : arguments[0]; + +var parser = Parser.create("-scripting"); +// parse script to get CompilationUnitTree of it +var ast = parser.parse(new File(sourceName), null); + +// JavaFX start method +function start(stage) { + stage.title = "AST Viewer"; + var rootItem = treeItemForASTNode(ast, sourceName); + var tree = new TreeView(rootItem); + var root = new StackPane(); + root.children.add(tree); + stage.scene = new Scene(root, 300, 450); + stage.show(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/withcheck.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +// Simple demo of Nashorn Parser API + +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var parser = Parser.create("-strict"); +// you'll get diagnostic message for 'with' +parser.parse("t", "with({}){}", print);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/xmlviewer.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,103 @@ +#jjs -fx xmlviewer.js [-- <url-of-xml-doc>] + +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +if (! $OPTIONS._fx) { + print("Usage: jjs -fx xmlviewer.js [-- <url-of-xml-doc>]"); + exit(1); +} + +// Using JavaFX from Nashorn. See also: +// http://docs.oracle.com/javase/8/docs/technotes/guides/scripting/nashorn/javafx.html + +// Simple sample to view a XML document as a JavaFX tree. + +// JavaFX classes used +var StackPane = Java.type("javafx.scene.layout.StackPane"); +var Scene = Java.type("javafx.scene.Scene"); +var TreeItem = Java.type("javafx.scene.control.TreeItem"); +var TreeView = Java.type("javafx.scene.control.TreeView"); + +// XML DocumentBuilderFactory +var DocBuilderFac = Java.type("javax.xml.parsers.DocumentBuilderFactory"); +var Attr = Java.type("org.w3c.dom.Attr"); +var Element = Java.type("org.w3c.dom.Element"); +var Text = Java.type("org.w3c.dom.Text"); + +// parse XML from uri and return Document +function parseXML(uri) { + var docBuilder = DocBuilderFac.newInstance().newDocumentBuilder(); + docBuilder.validating = false; + return docBuilder["parse(java.lang.String)"](uri); +} + +// Create a javafx TreeItem to view a XML element +function treeItemForObject(element, name) { + var item = new TreeItem(name); + item.expanded = true; + var attrs = element.attributes; + var numAttrs = attrs.length; + for (var a = 0; a < numAttrs; a++) { + var attr = attrs.item(a); + var subitem = new TreeItem(attr.name + " = " + attr.value); + item.children.add(subitem); + } + + var childNodes = element.childNodes; + var numNodes = childNodes.length; + for (var n = 0; n < numNodes; n++) { + var node = childNodes.item(n); + if (node instanceof Element) { + var subitem = treeItemForObject(node, node.tagName); + item.children.add(subitem); + } + } + + return item; +} + +// Ofcourse, the best default URL is cricket score :) +var DEFAULT_URL = "http://synd.cricbuzz.com/j2me/1.0/livematches.xml"; + +var url = arguments.length == 0? DEFAULT_URL : arguments[0]; +var element = parseXML(url).getDocumentElement(); + +// JavaFX start method +function start(stage) { + stage.title = "XML Viewer: " + url; + var rootItem = treeItemForObject(element, element.tagName); + var tree = new TreeView(rootItem); + var root = new StackPane(); + root.children.add(tree); + stage.scene = new Scene(root, 300, 450); + stage.show(); +}
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java Thu Mar 12 21:14:04 2015 -0700 @@ -161,9 +161,8 @@ * @return set of property names */ @Override - @SuppressWarnings("unchecked") public Set<String> keySet() { - return Collections.EMPTY_SET; + return Collections.emptySet(); } /** @@ -172,9 +171,8 @@ * @return set of property values. */ @Override - @SuppressWarnings("unchecked") public Collection<Object> values() { - return Collections.EMPTY_SET; + return Collections.emptySet(); } // JavaScript instanceof check @@ -249,9 +247,27 @@ * Returns this object's numeric value. * * @return this object's numeric value. + * @deprecated use {@link #getDefaultValue(Class)} with {@link Number} hint instead. */ - @Override + @Override @Deprecated public double toNumber() { return Double.NaN; } + + /** + * When passed an {@link AbstractJSObject}, invokes its {@link #getDefaultValue(Class)} method. When passed any + * other {@link JSObject}, it will obtain its {@code [[DefaultValue]]} method as per ECMAScript 5.1 section + * 8.6.2. + * + * @param jsobj the {@link JSObject} whose {@code [[DefaultValue]]} is obtained. + * @param hint the type hint. Should be either {@code null}, {@code Number.class} or {@code String.class}. + * @return this object's default value. + * @throws UnsupportedOperationException if the conversion can't be performed. The engine will convert this + * exception into a JavaScript {@code TypeError}. + * @deprecated use {@link JSObject#getDefaultValue(Class)} instead. + */ + @Deprecated + public static Object getDefaultValue(final JSObject jsobj, final Class<?> hint) { + return jsobj.getDefaultValue(hint); + } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java Thu Mar 12 21:14:04 2015 -0700 @@ -813,7 +813,7 @@ } } - @Override + @Override @Deprecated public double toNumber() { return inGlobal(new Callable<Double>() { @Override public Double call() { @@ -823,7 +823,7 @@ } @Override - public Object getDefaultValue(Class<?> hint) { + public Object getDefaultValue(final Class<?> hint) { return inGlobal(new Callable<Object>() { @Override public Object call() { try {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an array access expression. + * + * For example: + * <pre> + * <em>expression</em> [ <em>index</em> ] + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ArrayAccessTree extends ExpressionTree { + /** + * Returns the array that is accessed. + * + * @return the array that is accessed + */ + ExpressionTree getExpression(); + + /** + * Returns the index of the array element accessed. + * + * @return the index expression + */ + ExpressionTree getIndex(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.Expression; + +final class ArrayAccessTreeImpl extends ExpressionTreeImpl implements ArrayAccessTree { + + private final ExpressionTree base, index; + + ArrayAccessTreeImpl(final Expression node, final ExpressionTree base, final ExpressionTree index) { + super(node); + this.base = base; + this.index = index; + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.ARRAY_ACCESS; + } + + @Override + public ExpressionTree getExpression() { + return base; + } + + @Override + public ExpressionTree getIndex() { + return index; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitArrayAccess(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,43 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * Represents ECMAScript array literal expression. + * + * @since 1.9 + */ +@jdk.Exported +public interface ArrayLiteralTree extends ExpressionTree { + /** + * Returns the list of Array element expressions. + * + * @return array element expressions + */ + public List<? extends ExpressionTree> getElements(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.LiteralNode; + +final class ArrayLiteralTreeImpl extends ExpressionTreeImpl + implements ArrayLiteralTree { + private final List<? extends ExpressionTree> elements; + ArrayLiteralTreeImpl(final LiteralNode<?> node, final List<? extends ExpressionTree> elements) { + super(node); + this.elements = elements; + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.ARRAY_LITERAL; + } + + @Override + public List<? extends ExpressionTree> getElements() { + return elements; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitArrayLiteral(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an assignment expression. + * + * For example: + * <pre> + * <em>variable</em> = <em>expression</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface AssignmentTree extends ExpressionTree { + /** + * Returns the left hand side (LHS) of this assignment. + * + * @return left hand side (LHS) expression + */ + ExpressionTree getVariable(); + + /** + * Returns the right hand side (RHS) of this assignment. + * + * @return right hand side (RHS) expression + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,61 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.BinaryNode; + +final class AssignmentTreeImpl extends ExpressionTreeImpl implements AssignmentTree { + private final Tree.Kind kind; + private final ExpressionTree var, expr; + + AssignmentTreeImpl(final BinaryNode node, final ExpressionTree left, final ExpressionTree right) { + super(node); + assert node.isAssignment() : "assignment node expected"; + this.var = left; + this.expr = right; + this.kind = getOperator(node.tokenType()); + } + + @Override + public Tree.Kind getKind() { + return kind; + } + + @Override + public ExpressionTree getVariable() { + return var; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitAssignment(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a binary expression. + * Use {@link #getKind getKind} to determine the kind of operator. + * + * For example: + * <pre> + * <em>leftOperand</em> <em>operator</em> <em>rightOperand</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface BinaryTree extends ExpressionTree { + /** + * Returns left hand side (LHS) of this binary expression. + * + * @return left hand side (LHS) of this binary expression + */ + ExpressionTree getLeftOperand(); + + /** + * Returns right hand side (RHS) of this binary expression. + * + * @return right hand side (RHS) of this binary expression + */ + ExpressionTree getRightOperand(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,61 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.BinaryNode; + +class BinaryTreeImpl extends ExpressionTreeImpl implements BinaryTree { + private final Tree.Kind kind; + private final ExpressionTree left, right; + + BinaryTreeImpl(final BinaryNode node, final ExpressionTree left, final ExpressionTree right) { + super(node); + assert !node.isAssignment() : "assignment node"; + this.left = left; + this.right = right; + this.kind = getOperator(node.tokenType()); + } + + @Override + public Tree.Kind getKind() { + return kind; + } + + @Override + public ExpressionTree getLeftOperand() { + return left; + } + + @Override + public ExpressionTree getRightOperand() { + return right; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitBinary(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,50 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a statement block. + * + * For example: + * <pre> + * { } + * + * { <em>statements</em> } + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface BlockTree extends StatementTree { + /** + * Returns the list of statements in this block. + * + * @return the list of statements in this block + */ + List<? extends StatementTree> getStatements(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.Block; +import jdk.nashorn.internal.ir.BlockStatement; + +final class BlockTreeImpl extends StatementTreeImpl implements BlockTree { + private final List<? extends StatementTree> statements; + + BlockTreeImpl(final BlockStatement node, final List<? extends StatementTree> statements) { + super(node); + this.statements = statements; + } + + BlockTreeImpl(final Block node, final List<? extends StatementTree> statements) { + super(node); + this.statements = statements; + } + + @Override + public Kind getKind() { + return Kind.BLOCK; + } + + @Override + public List<? extends StatementTree> getStatements() { + return statements; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitBlock(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,50 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'break' statement. + * + * For example: + * <pre> + * break; + * + * break <em>label</em> ; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface BreakTree extends GotoTree { + /** + * Label associated with this break statement. This is null + * if there is no label associated with this break statement. + * + * @return label associated with this break statement. + */ + @Override + String getLabel(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,52 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.BreakNode; + +final class BreakTreeImpl extends StatementTreeImpl implements BreakTree { + private final String label; + + BreakTreeImpl(final BreakNode node) { + super(node); + this.label = node.getLabelName(); + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.BREAK; + } + + @Override + public String getLabel() { + return label; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitBreak(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a 'case' in a 'switch' statement. + * + * For example: + * <pre> + * case <em>expression</em> : + * <em>statements</em> + * + * default : + * <em>statements</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface CaseTree extends Tree { + /** + * Case expression of this 'case' statement. + * + * @return null if and only if this Case is {@code default:} + */ + ExpressionTree getExpression(); + + /** + * Return the list of statements for this 'case'. + * + * @return list of statements for this 'case' + */ + List<? extends StatementTree> getStatements(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,62 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.CaseNode; + +final class CaseTreeImpl extends TreeImpl implements CaseTree { + private final ExpressionTree expression; + private final List<? extends StatementTree> statements; + + public CaseTreeImpl(final CaseNode node, + final ExpressionTree expression, + final List<? extends StatementTree> statements) { + super(node); + this.expression = expression; + this.statements = statements; + } + + @Override + public Kind getKind() { + return Kind.CASE; + } + + @Override + public ExpressionTree getExpression() { + return expression; + } + + @Override + public List<? extends StatementTree> getStatements() { + return statements; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitCase(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,62 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'catch' block in a 'try' statement. + * + * For example: + * <pre> + * catch ( <em>parameter</em> ) + * <em>block</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface CatchTree extends Tree { + /** + * Returns the catch parameter identifier of the exception caught. + * + * @return the catch parameter identifier + */ + IdentifierTree getParameter(); + + /** + * Returns the code block of this catch block. + * + * @return the code block + */ + BlockTree getBlock(); + + /** + * Returns the optional catch condition expression. This is null + * if this is an unconditional catch statement. + * + * @return the optional catch condition expression. + */ + ExpressionTree getCondition(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,69 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.CatchNode; + +final class CatchTreeImpl extends TreeImpl implements CatchTree { + private final IdentifierTree param; + private final BlockTree block; + private final ExpressionTree condition; + + CatchTreeImpl(final CatchNode node, + final IdentifierTree param, + final BlockTree block, + final ExpressionTree condition) { + super(node); + this.param = param; + this.block = block; + this.condition = condition; + } + + @Override + public Kind getKind() { + return Kind.CATCH; + } + + @Override + public IdentifierTree getParameter() { + return param; + } + + @Override + public BlockTree getBlock() { + return block; + } + + @Override + public ExpressionTree getCondition() { + return condition; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitCatch(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,66 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * Represents the abstract syntax tree for compilation units (source + * files) + * + * @since 1.9 + */ +@jdk.Exported +public interface CompilationUnitTree extends Tree { + /** + * Return the list of source elements in this compilation unit. + * + * @return the list of source elements in this compilation unit + */ + List<? extends Tree> getSourceElements(); + + /** + * Return the source name of this script compilation unit. + * + * @return the source name of this script compilation unit + */ + String getSourceName(); + + /** + * Returns if this is a ECMAScript "strict" compilation unit or not. + * + * @return true if this compilation unit is declared "strict" + */ + boolean isStrict(); + + /** + * Returns the line map for this compilation unit, if available. + * Returns null if the line map is not available. + * + * @return the line map for this compilation unit + */ + LineMap getLineMap(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,73 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.FunctionNode; + +final class CompilationUnitTreeImpl extends TreeImpl + implements CompilationUnitTree { + private final FunctionNode funcNode; + private final List<? extends Tree> elements; + + CompilationUnitTreeImpl(final FunctionNode node, + final List<? extends Tree> elements) { + super(node); + this.funcNode = node; + assert funcNode.getKind() == FunctionNode.Kind.SCRIPT : "script function expected"; + this.elements = elements; + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.COMPILATION_UNIT; + } + + @Override + public List<? extends Tree> getSourceElements() { + return elements; + } + + @Override + public String getSourceName() { + return funcNode.getSourceName(); + } + + @Override + public boolean isStrict() { + return funcNode.isStrict(); + } + + @Override + public LineMap getLineMap() { + return new LineMapImpl(funcNode.getSource()); + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitCompilationUnit(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for compound assignment operator. + * Use {@link #getKind getKind} to determine the kind of operator. + * + * For example: + * <pre> + * <em>variable</em> <em>operator</em> <em>expression</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface CompoundAssignmentTree extends ExpressionTree { + /** + * Returns the left hand side (LHS) of this assignment. + * + * @return left hand side (LHS) expression + */ + ExpressionTree getVariable(); + + /** + * Returns the right hand side (RHS) of this assignment. + * + * @return right hand side (RHS) expression + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,63 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.BinaryNode; + +final class CompoundAssignmentTreeImpl extends ExpressionTreeImpl implements CompoundAssignmentTree { + + private final ExpressionTree var, expr; + private final Kind kind; + + CompoundAssignmentTreeImpl(final BinaryNode node, final ExpressionTree left, final ExpressionTree right) { + super(node); + assert node.isAssignment() : "not an assignment node"; + this.var = left; + this.expr = right; + this.kind = getOperator(node.tokenType()); + assert kind != Tree.Kind.ASSIGNMENT : "compound assignment expected"; + } + + @Override + public Kind getKind() { + return kind; + } + + @Override + public ExpressionTree getVariable() { + return var; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitCompoundAssignment(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,60 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for the conditional operator ? :. + * + * For example: + * <pre> + * <em>condition</em> ? <em>trueExpression</em> : <em>falseExpression</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ConditionalExpressionTree extends ExpressionTree { + /** + * Returns the condition expression of this ternary expression. + * + * @return the condition expression + */ + ExpressionTree getCondition(); + + /** + * Returns the true part of this ternary expression. + * + * @return the 'true' part expression + */ + ExpressionTree getTrueExpression(); + + /** + * Returns the false part of this ternary expression. + * + * @return the 'false' part expression + */ + ExpressionTree getFalseExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,67 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.TernaryNode; + +final class ConditionalExpressionTreeImpl extends ExpressionTreeImpl implements ConditionalExpressionTree { + private final ExpressionTree condExpr, trueExpr, falseExpr; + + ConditionalExpressionTreeImpl(final TernaryNode node, + final ExpressionTree condExpr, final ExpressionTree trueExpr, + final ExpressionTree falseExpr) { + super(node); + this.condExpr = condExpr; + this.trueExpr = trueExpr; + this.falseExpr = falseExpr; + + } + + @Override + public Kind getKind() { + return Kind.CONDITIONAL_EXPRESSION; + } + + @Override + public ExpressionTree getCondition() { + return condExpr; + } + + @Override + public ExpressionTree getTrueExpression() { + return trueExpr; + } + + @Override + public ExpressionTree getFalseExpression() { + return falseExpr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitConditionalExpression(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,41 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A mixin for conditional "loop" statements. + * + * @since 1.9 + */ +@jdk.Exported +public interface ConditionalLoopTree extends LoopTree { + /** + * Returns the condition expression of this 'loop' statement. + * + * @return the condition expression + */ + ExpressionTree getCondition(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,49 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'continue' statement. + * + * For example: + * <pre> + * continue; + * continue <em>label</em> ; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ContinueTree extends GotoTree { + /** + * Label associated with this continue statement. This is null + * if there is no label associated with this continue statement. + * + * @return label associated with this continue statement. + */ + @Override + String getLabel(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,52 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ContinueNode; + +final class ContinueTreeImpl extends StatementTreeImpl implements ContinueTree { + private final String label; + + ContinueTreeImpl(final ContinueNode node) { + super(node); + this.label = node.getLabelName(); + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.CONTINUE; + } + + @Override + public String getLabel() { + return label; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitContinue(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,40 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'debugger' statement. + * + * For example: + * <pre> + * <em>debugger;</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface DebuggerTree extends StatementTree { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,44 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.DebuggerNode; + +final class DebuggerTreeImpl extends StatementTreeImpl implements DebuggerTree { + DebuggerTreeImpl(final DebuggerNode node) { + super(node); + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.DEBUGGER; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitDebugger(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,151 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * Interface for diagnostics from tools. A diagnostic usually reports + * a problem at a specific position in a source file. However, not + * all diagnostics are associated with a position or a file. + * + * <p>A position is a zero-based character offset from the beginning of + * a file. Negative values (except {@link #NOPOS}) are not valid + * positions. + * + * <p>Line and column numbers begin at 1. Negative values (except + * {@link #NOPOS}) and 0 are not valid line or column numbers. + * + * <p>Line terminator is as defined in ECMAScript specification which is one + * of { \u000A, \u000B, \u2028, \u2029 }. + * + * @since 1.9 + */ +@jdk.Exported +public interface Diagnostic { + + /** + * Kinds of diagnostics, for example, error or warning. + * + * The kind of a diagnostic can be used to determine how the + * diagnostic should be presented to the user. For example, + * errors might be colored red or prefixed with the word "Error", + * while warnings might be colored yellow or prefixed with the + * word "Warning". There is no requirement that the Kind + * should imply any inherent semantic meaning to the message + * of the diagnostic: for example, a tool might provide an + * option to report all warnings as errors. + */ + enum Kind { + /** + * Problem which prevents the tool's normal completion. + */ + ERROR, + /** + * Problem which does not usually prevent the tool from + * completing normally. + */ + WARNING, + /** + * Problem similar to a warning, but is mandated by the tool's + * specification. For example, the Java™ Language + * Specification mandates warnings on certain + * unchecked operations and the use of deprecated methods. + */ + MANDATORY_WARNING, + /** + * Informative message from the tool. + */ + NOTE, + /** + * Diagnostic which does not fit within the other kinds. + */ + OTHER, + } + + /** + * Used to signal that no position is available. + */ + public final static long NOPOS = -1; + + /** + * Gets the kind of this diagnostic, for example, error or + * warning. + * @return the kind of this diagnostic + */ + Kind getKind(); + + /** + * Gets a character offset from the beginning of the source object + * associated with this diagnostic that indicates the location of + * the problem. In addition, the following must be true: + * + * <p>{@code getStartPostion() <= getPosition()} + * <p>{@code getPosition() <= getEndPosition()} + * + * @return character offset from beginning of source; {@link + * #NOPOS} if no location is suitable + */ + long getPosition(); + + /** + * Gets the source file name. + * + * @return the file name or null if not available + */ + String getFileName(); + + /** + * Gets the line number of the character offset returned by + * {@linkplain #getPosition()}. + * + * @return a line number or {@link #NOPOS} if and only if {@link + * #getPosition()} returns {@link #NOPOS} + */ + long getLineNumber(); + + /** + * Gets the column number of the character offset returned by + * {@linkplain #getPosition()}. + * + * @return a column number or {@link #NOPOS} if and only if {@link + * #getPosition()} returns {@link #NOPOS} + */ + long getColumnNumber(); + + /** + * Gets a diagnostic code indicating the type of diagnostic. The + * code is implementation-dependent and might be {@code null}. + * + * @return a diagnostic code + */ + String getCode(); + + /** + * Gets a message for this diagnostic. + * + * @return a message + */ + String getMessage(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,80 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.parser.Token; +import jdk.nashorn.internal.runtime.ParserException; + +final class DiagnosticImpl implements Diagnostic { + private final ParserException exp; + private final Kind kind; + + DiagnosticImpl(final ParserException exp, final Kind kind) { + this.exp = exp; + this.kind = kind; + } + + @Override + public Kind getKind() { + return kind; + } + + @Override + public long getPosition() { + return exp.getPosition(); + } + + @Override + public String getFileName() { + return exp.getFileName(); + } + + @Override + public long getLineNumber() { + return exp.getLineNumber(); + } + + @Override + public long getColumnNumber() { + return exp.getColumnNumber(); + } + + @Override + public String getCode() { + final long token = exp.getToken(); + return (token < 0)? null : Token.toString(null, token, true); + } + + @Override + public String getMessage() { + return exp.getMessage(); + } + + @Override + public String toString() { + return getMessage(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,42 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * Interface for receiving diagnostics from Nashorn parser. + * + * @since 1.9 + */ +@jdk.Exported +@FunctionalInterface +public interface DiagnosticListener { + /** + * Invoked whenever a parsing problem is found. + * + * @param diagnostic additional information errors, warnings detected during parsing. + */ + void report(Diagnostic diagnostic); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,55 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'do' statement. + * + * For example: + * <pre> + * do + * <em>statement</em> + * while ( <em>expression</em> ); + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface DoWhileLoopTree extends ConditionalLoopTree { + /** + * Returns the condition expression of this do-while statement. + * + * @return the condition expression + */ + ExpressionTree getCondition(); + + /** + * The statement contained within this do-while statement. + * + * @return the statement + */ + StatementTree getStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,60 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.WhileNode; + +final class DoWhileLoopTreeImpl extends StatementTreeImpl implements DoWhileLoopTree { + private final ExpressionTree cond; + private final StatementTree stat; + + DoWhileLoopTreeImpl(final WhileNode node, final ExpressionTree cond, final StatementTree stat) { + super(node); + assert node.isDoWhile() : "do while expected"; + this.cond = cond; + this.stat = stat; + } + + @Override + public Kind getKind() { + return Kind.DO_WHILE_LOOP; + } + + @Override + public ExpressionTree getCondition() { + return cond; + } + + @Override + public StatementTree getStatement() { + return stat; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitDoWhileLoop(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,39 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an empty (skip) statement. + * + * For example: + * <pre> + * ; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface EmptyStatementTree extends StatementTree {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,44 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.EmptyNode; + +final class EmptyStatementTreeImpl extends StatementTreeImpl implements EmptyStatementTree { + EmptyStatementTreeImpl(final EmptyNode node) { + super(node); + } + + @Override + public Kind getKind() { + return Kind.EMPTY_STATEMENT; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitEmptyStatement(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,35 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node to stand in for a malformed expression. + * + * @since 1.9 + */ +@jdk.Exported +public interface ErroneousTree extends ExpressionTree { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,44 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ErrorNode; + +final class ErroneousTreeImpl extends ExpressionTreeImpl implements ErroneousTree { + ErroneousTreeImpl(final ErrorNode errorNode) { + super(errorNode); + } + + @Override + public Kind getKind() { + return Kind.ERROR; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitErroneous(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,46 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an expression statement. + * + * For example: + * <pre> + * <em>expression</em> ; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ExpressionStatementTree extends StatementTree { + /** + * Returns the expression of this expression statement. + * + * @return the expression + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,52 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ExpressionStatement; + +final class ExpressionStatementTreeImpl extends StatementTreeImpl implements ExpressionStatementTree { + private final ExpressionTree expr; + + ExpressionStatementTreeImpl(final ExpressionStatement es, final ExpressionTree expr) { + super(es); + this.expr = expr; + } + + @Override + public Kind getKind() { + return Kind.EXPRESSION_STATEMENT; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitExpressionStatement(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,35 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node used as the base class for the different types of + * expressions. + * + * @since 1.9 + */ +@jdk.Exported +public interface ExpressionTree extends Tree {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,34 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.Expression; + +abstract class ExpressionTreeImpl extends TreeImpl implements ExpressionTree { + ExpressionTreeImpl(final Expression expr) { + super(expr); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,68 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for for..in statement + * + * For example: + * <pre> + * for ( <em>variable</em> in <em>expression</em> ) + * <em>statement</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ForInLoopTree extends LoopTree { + /** + * The for..in left hand side expression. + * + * @return the left hand side expression + */ + ExpressionTree getVariable(); + + /** + * The object or array being whose properties are iterated. + * + * @return the object or array expression being iterated + */ + ExpressionTree getExpression(); + + /** + * The statement contained in this for..in statement. + * + * @return the statement + */ + StatementTree getStatement(); + + /** + * Returns if this is a for..each..in statement or not. + * + * @return true if this is a for..each..in statement + */ + boolean isForEach(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,77 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ForNode; + +final class ForInLoopTreeImpl extends StatementTreeImpl implements ForInLoopTree { + private final ExpressionTree lhsExpr; + private final ExpressionTree expr; + private final StatementTree stat; + private final boolean forEach; + + ForInLoopTreeImpl(final ForNode node, + final ExpressionTree lhsExpr, + final ExpressionTree expr, + final StatementTree stat) { + super(node); + assert node.isForIn() : "for ..in expected"; + this.lhsExpr = lhsExpr; + this.expr = expr; + this.stat = stat; + this.forEach = node.isForEach(); + } + + @Override + public Kind getKind() { + return Kind.FOR_IN_LOOP; + } + + @Override + public ExpressionTree getVariable() { + return lhsExpr; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public StatementTree getStatement() { + return stat; + } + + @Override + public boolean isForEach() { + return forEach; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitForInLoop(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,70 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a basic 'for' loop statement. + * + * For example: + * <pre> + * for ( <em>initializer</em> ; <em>condition</em> ; <em>update</em> ) + * <em>statement</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ForLoopTree extends ConditionalLoopTree { + /** + * Returns the initializer expression of this 'for' statement. + * + * @return the initializer expression + */ + ExpressionTree getInitializer(); + + /** + * Returns the condition expression of this 'for' statement. + * + * @return the condition expression + */ + @Override + ExpressionTree getCondition(); + + /** + * Returns the update expression of this 'for' statement. + * + * @return the update expression + */ + ExpressionTree getUpdate(); + + /** + * Returns the statement contained in this 'for' statement. + * + * @return the statement + */ + @Override + StatementTree getStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,78 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ForNode; + +final class ForLoopTreeImpl extends StatementTreeImpl implements ForLoopTree { + private final ExpressionTree init; + private final ExpressionTree cond; + private final ExpressionTree update; + private final StatementTree stat; + + ForLoopTreeImpl(final ForNode node, + final ExpressionTree init, + final ExpressionTree cond, + final ExpressionTree update, + final StatementTree stat) { + super(node); + assert !node.isForIn() : "for statement expected"; + this.init = init; + this.cond = cond; + this.update = update; + this.stat = stat; + } + + @Override + public Kind getKind() { + return Kind.FOR_LOOP; + } + + @Override + public ExpressionTree getInitializer() { + return init; + } + + @Override + public ExpressionTree getCondition() { + return cond; + } + + @Override + public ExpressionTree getUpdate() { + return update; + } + + @Override + public StatementTree getStatement() { + return stat; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitForLoop(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,57 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a function call expression. + * + * For example: + * <pre> + * <em>identifier</em> ( <em>arguments</em> ) + * + * this . <em>identifier</em> ( <em>arguments</em> ) + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface FunctionCallTree extends ExpressionTree { + /** + * Returns the function being called. + * + * @return the function being called + */ + ExpressionTree getFunctionSelect(); + + /** + * Returns the list of arguments being passed to this function call. + * + * @return the list of argument expressions + */ + List<? extends ExpressionTree> getArguments(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,61 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.CallNode; + +class FunctionCallTreeImpl extends ExpressionTreeImpl implements FunctionCallTree { + private final List<? extends ExpressionTree> arguments; + private final ExpressionTree function; + FunctionCallTreeImpl(final CallNode node, + final ExpressionTree function, + final List<? extends ExpressionTree> arguments) { + super(node); + this.function = function; + this.arguments = arguments; + } + + @Override + public Kind getKind() { + return Kind.FUNCTION_INVOCATION; + } + + @Override + public ExpressionTree getFunctionSelect() { + return function; + } + + @Override + public List<? extends ExpressionTree> getArguments() { + return arguments; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitFunctionCall(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,71 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a function declaration. + * + * For example: + * <pre> + * <em>function</em> <em>name</em> + * ( <em>parameters</em> ) + * <em>body</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface FunctionDeclarationTree extends StatementTree { + /** + * Returns the name of the function being declared. + * + * @return name the function declared + */ + String getName(); + + /** + * Returns the parameters of this function. + * + * @return the list of parameters + */ + List<? extends ExpressionTree> getParameters(); + + /** + * Returns the body of code of this function. + * + * @return the body of code + */ + BlockTree getBody(); + + /** + * Is this a strict function? + * + * @return true if this function is strict + */ + boolean isStrict(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,80 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.FunctionNode; +import jdk.nashorn.internal.ir.VarNode; + +final class FunctionDeclarationTreeImpl extends StatementTreeImpl + implements FunctionDeclarationTree { + private final FunctionNode funcNode; + private final String funcName; + private final List<? extends ExpressionTree> params; + private final BlockTree body; + + FunctionDeclarationTreeImpl(final VarNode node, + final List<? extends ExpressionTree> params, + final BlockTree body) { + super(node); + assert node.getInit() instanceof FunctionNode : "function expected"; + funcNode = (FunctionNode)node.getInit(); + assert funcNode.isDeclared() : "function declaration expected"; + funcName = node.getName().getName(); + this.params = params; + this.body = body; + } + + @Override + public Kind getKind() { + return Kind.FUNCTION; + } + + @Override + public String getName() { + return funcName; + } + + @Override + public List<? extends ExpressionTree> getParameters() { + return params; + } + + @Override + public BlockTree getBody() { + return body; + } + + @Override + public boolean isStrict() { + return funcNode.isStrict(); + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitFunctionDeclaration(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,71 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a function expression. + * + * For example: + * <pre> + * <em>var</em> func = <em>function</em> + * ( <em>parameters</em> ) + * <em>body</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface FunctionExpressionTree extends ExpressionTree { + /** + * Returns the name of the function being declared. + * + * @return name the function declared + */ + String getName(); + + /** + * Returns the parameters of this function. + * + * @return the list of parameters + */ + List<? extends ExpressionTree> getParameters(); + + /** + * Returns the body of code of this function. + * + * @return the body of code + */ + BlockTree getBody(); + + /** + * Is this a strict function? + * + * @return true if this function is strict + */ + boolean isStrict(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,85 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.FunctionNode; + +final class FunctionExpressionTreeImpl extends ExpressionTreeImpl + implements FunctionExpressionTree { + private final FunctionNode funcNode; + private final String funcName; + private final List<? extends ExpressionTree> params; + private final BlockTree body; + + FunctionExpressionTreeImpl(final FunctionNode node, + final List<? extends ExpressionTree> params, + final BlockTree body) { + super(node); + funcNode = node; + assert !funcNode.isDeclared() : "function expression expected"; + + final FunctionNode.Kind kind = node.getKind(); + if (node.isAnonymous() || kind == FunctionNode.Kind.GETTER || kind == FunctionNode.Kind.SETTER) { + funcName = null; + } else { + funcName = node.getIdent().getName(); + } + + this.params = params; + this.body = body; + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.FUNCTION_EXPRESSION; + } + + @Override + public String getName() { + return funcName; + } + + @Override + public List<? extends ExpressionTree> getParameters() { + return params; + } + + @Override + public BlockTree getBody() { + return body; + } + + @Override + public boolean isStrict() { + return funcNode.isStrict(); + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitFunctionExpression(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,45 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a statement that jumps to a target. Note that + * ECMAScript does not support a goto statement. But, this Tree + * type serves as a super interface for {@link BreakTree} and + * {@link ContinueTree}. + * + * @since 1.9 + */ +@jdk.Exported +public interface GotoTree extends StatementTree { + /** + * Label associated with this goto statement. This is null + * if there is no label associated with this goto statement. + * + * @return label associated with this goto statement. + */ + String getLabel(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,517 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ +package jdk.nashorn.api.tree; + +import java.util.ArrayList; +import java.util.List; +import jdk.nashorn.internal.ir.AccessNode; +import jdk.nashorn.internal.ir.BinaryNode; +import jdk.nashorn.internal.ir.Block; +import jdk.nashorn.internal.ir.BlockStatement; +import jdk.nashorn.internal.ir.BreakNode; +import jdk.nashorn.internal.ir.CallNode; +import jdk.nashorn.internal.ir.CaseNode; +import jdk.nashorn.internal.ir.CatchNode; +import jdk.nashorn.internal.ir.ContinueNode; +import jdk.nashorn.internal.ir.DebuggerNode; +import jdk.nashorn.internal.ir.EmptyNode; +import jdk.nashorn.internal.ir.ErrorNode; +import jdk.nashorn.internal.ir.Expression; +import jdk.nashorn.internal.ir.ExpressionStatement; +import jdk.nashorn.internal.ir.ForNode; +import jdk.nashorn.internal.ir.FunctionNode; +import jdk.nashorn.internal.ir.IdentNode; +import jdk.nashorn.internal.ir.IfNode; +import jdk.nashorn.internal.ir.IndexNode; +import jdk.nashorn.internal.ir.LabelNode; +import jdk.nashorn.internal.ir.LexicalContext; +import jdk.nashorn.internal.ir.LiteralNode; +import jdk.nashorn.internal.ir.Node; +import jdk.nashorn.internal.ir.ObjectNode; +import jdk.nashorn.internal.ir.PropertyNode; +import jdk.nashorn.internal.ir.ReturnNode; +import jdk.nashorn.internal.ir.RuntimeNode; +import jdk.nashorn.internal.ir.SplitNode; +import jdk.nashorn.internal.ir.Statement; +import jdk.nashorn.internal.ir.SwitchNode; +import jdk.nashorn.internal.ir.TernaryNode; +import jdk.nashorn.internal.ir.ThrowNode; +import jdk.nashorn.internal.ir.TryNode; +import jdk.nashorn.internal.ir.UnaryNode; +import jdk.nashorn.internal.ir.VarNode; +import jdk.nashorn.internal.ir.WhileNode; +import jdk.nashorn.internal.ir.WithNode; +import jdk.nashorn.internal.ir.visitor.NodeVisitor; +import jdk.nashorn.internal.parser.Lexer; +import jdk.nashorn.internal.parser.TokenType; + +/** + * This class translates from nashorn IR Node objects + * to nashorn parser API Tree objects. + */ +final class IRTranslator extends NodeVisitor<LexicalContext> { + + public IRTranslator() { + super(new LexicalContext()); + } + + // currently translated Statement + private StatementTreeImpl curStat; + // currently translated Expression + private ExpressionTreeImpl curExpr; + + // entry point for translator + CompilationUnitTree translate(final FunctionNode node) { + if (node == null) { + return null; + } + + assert (node.getKind() == FunctionNode.Kind.SCRIPT) : "script function expected"; + + final Block body = node.getBody(); + return new CompilationUnitTreeImpl(node, + translateStats(body != null? body.getStatements() : null)); + } + + @Override + public boolean enterAccessNode(final AccessNode accessNode) { + curExpr = new MemberSelectTreeImpl(accessNode, translateExpr(accessNode.getBase())); + return false; + } + + @Override + public boolean enterBlock(final Block block) { + // FIXME: revisit this! + if (block.isSynthetic()) { + final int statCount = block.getStatementCount(); + switch (statCount) { + case 0: { + final EmptyNode emptyNode = new EmptyNode(-1, block.getToken(), block.getFinish()); + curStat = new EmptyStatementTreeImpl(emptyNode); + return false; + } + case 1: { + curStat = translateStat(block.getStatements().get(0)); + return false; + } + } + } + + curStat = new BlockTreeImpl(block, + translateStats(block.getStatements())); + return false; + } + + @Override + public boolean enterBinaryNode(final BinaryNode binaryNode) { + if (binaryNode.isAssignment()) { + final ExpressionTree srcTree = translateExpr(binaryNode.getAssignmentSource()); + final ExpressionTree destTree = translateExpr(binaryNode.getAssignmentDest()); + + if (binaryNode.tokenType() == TokenType.ASSIGN) { + curExpr = new AssignmentTreeImpl(binaryNode, destTree, srcTree); + } else { + curExpr = new CompoundAssignmentTreeImpl(binaryNode, destTree, srcTree); + } + } else { + final ExpressionTree leftTree = translateExpr(binaryNode.lhs()); + final ExpressionTree rightTree = translateExpr(binaryNode.rhs()); + + if (binaryNode.tokenType() == TokenType.INSTANCEOF) { + curExpr = new InstanceOfTreeImpl(binaryNode, leftTree, rightTree); + } else { + curExpr = new BinaryTreeImpl(binaryNode, leftTree, rightTree); + } + } + + return false; + } + + @Override + public boolean enterBreakNode(final BreakNode breakNode) { + curStat = new BreakTreeImpl(breakNode); + return false; + } + + @Override + public boolean enterCallNode(final CallNode callNode) { + curExpr = null; + callNode.getFunction().accept(this); + final ExpressionTree funcTree = curExpr; + final List<? extends ExpressionTree> argTrees = translateExprs(callNode.getArgs()); + curExpr = new FunctionCallTreeImpl(callNode, funcTree, argTrees); + return false; + } + + @Override + public boolean enterCaseNode(final CaseNode caseNode) { + assert false : "should not reach here!"; + return false; + } + + @Override + public boolean enterCatchNode(final CatchNode catchNode) { + assert false : "should not reach here"; + return false; + } + + @Override + public boolean enterContinueNode(final ContinueNode continueNode) { + curStat = new ContinueTreeImpl(continueNode); + return false; + } + + @Override + public boolean enterDebuggerNode(final DebuggerNode debuggerNode) { + curStat = new DebuggerTreeImpl(debuggerNode); + return false; + } + + @Override + public boolean enterEmptyNode(final EmptyNode emptyNode) { + curStat = new EmptyStatementTreeImpl(emptyNode); + return false; + } + + @Override + public boolean enterErrorNode(final ErrorNode errorNode) { + curExpr = new ErroneousTreeImpl(errorNode); + return false; + } + + @Override + public boolean enterExpressionStatement(final ExpressionStatement expressionStatement) { + curStat = new ExpressionStatementTreeImpl(expressionStatement, + translateExpr(expressionStatement.getExpression())); + return false; + } + + @Override + public boolean enterBlockStatement(final BlockStatement blockStatement) { + final Block block = blockStatement.getBlock(); + if (blockStatement.isSynthetic()) { + assert block != null && block.getStatements() != null && block.getStatements().size() == 1; + curStat = translateStat(block.getStatements().get(0)); + } else { + curStat = new BlockTreeImpl(blockStatement, + translateStats(block != null? block.getStatements() : null)); + } + return false; + } + + @Override + public boolean enterForNode(final ForNode forNode) { + if (forNode.isForIn()) { + curStat = new ForInLoopTreeImpl(forNode, + translateExpr(forNode.getInit()), + translateExpr(forNode.getModify()), + translateBlock(forNode.getBody())); + } else { + curStat = new ForLoopTreeImpl(forNode, + translateExpr(forNode.getInit()), + translateExpr(forNode.getTest()), + translateExpr(forNode.getModify()), + translateBlock(forNode.getBody())); + } + + return false; + } + + @Override + public boolean enterFunctionNode(final FunctionNode functionNode) { + assert !functionNode.isDeclared() : "should not reach here for function declaration"; + + final List<? extends ExpressionTree> paramTrees + = translateExprs(functionNode.getParameters()); + final BlockTree blockTree = (BlockTree) translateBlock(functionNode.getBody()); + curExpr = new FunctionExpressionTreeImpl(functionNode, paramTrees, blockTree); + + return false; + } + + @Override + public boolean enterIdentNode(final IdentNode identNode) { + curExpr = new IdentifierTreeImpl(identNode); + return false; + } + + @Override + public boolean enterIfNode(final IfNode ifNode) { + curStat = new IfTreeImpl(ifNode, + translateExpr(ifNode.getTest()), + translateBlock(ifNode.getPass()), + translateBlock(ifNode.getFail())); + return false; + } + + @Override + public boolean enterIndexNode(final IndexNode indexNode) { + curExpr = new ArrayAccessTreeImpl(indexNode, + translateExpr(indexNode.getBase()), + translateExpr(indexNode.getIndex())); + return false; + } + + @Override + public boolean enterLabelNode(final LabelNode labelNode) { + curStat = new LabeledStatementTreeImpl(labelNode, + translateBlock(labelNode.getBody())); + return false; + } + + @Override + public boolean enterLiteralNode(final LiteralNode<?> literalNode) { + final Object value = literalNode.getValue(); + if (value instanceof Lexer.RegexToken) { + curExpr = new RegExpLiteralTreeImpl(literalNode); + } else if (literalNode.isArray()) { + final List<Expression> exprNodes = literalNode.getElementExpressions(); + final List<ExpressionTreeImpl> exprTrees = new ArrayList<>(exprNodes.size()); + for (final Node node : exprNodes) { + if (node == null) { + exprTrees.add(null); + } else { + curExpr = null; + node.accept(this); + assert curExpr != null : "null for " + node; + exprTrees.add(curExpr); + } + } + curExpr = new ArrayLiteralTreeImpl(literalNode, exprTrees); + } else { + curExpr = new LiteralTreeImpl(literalNode); + } + + return false; + } + + @Override + public boolean enterObjectNode(final ObjectNode objectNode) { + final List<PropertyNode> propNodes = objectNode.getElements(); + final List<PropertyTreeImpl> propTrees = new ArrayList<>(propNodes.size()); + for (final PropertyNode propNode : propNodes) { + propTrees.add(new PropertyTreeImpl(propNode, + translateExpr(propNode.getKey()), + translateExpr(propNode.getValue()), + (FunctionExpressionTree) translateExpr(propNode.getGetter()), + (FunctionExpressionTree) translateExpr(propNode.getSetter()))); + } + curExpr = new ObjectLiteralTreeImpl(objectNode, propTrees); + return false; + } + + @Override + public boolean enterPropertyNode(final PropertyNode propertyNode) { + assert false : "should not reach here!"; + return false; + } + + @Override + public boolean enterReturnNode(final ReturnNode returnNode) { + curStat = new ReturnTreeImpl(returnNode, + translateExpr(returnNode.getExpression())); + return false; + } + + @Override + public boolean enterRuntimeNode(final RuntimeNode runtimeNode) { + assert false : "should not reach here: RuntimeNode"; + return false; + } + + @Override + public boolean enterSplitNode(final SplitNode splitNode) { + assert false : "should not reach here!"; + return false; + } + + @Override + public boolean enterSwitchNode(final SwitchNode switchNode) { + final List<CaseNode> caseNodes = switchNode.getCases(); + final List<CaseTreeImpl> caseTrees = new ArrayList<>(caseNodes.size()); + for (final CaseNode caseNode : caseNodes) { + final Block body = caseNode.getBody(); + caseTrees.add( + new CaseTreeImpl(caseNode, + translateExpr(caseNode.getTest()), + translateStats(body != null? body.getStatements() : null))); + } + + curStat = new SwitchTreeImpl(switchNode, + translateExpr(switchNode.getExpression()), + caseTrees); + return false; + } + + @Override + public boolean enterTernaryNode(final TernaryNode ternaryNode) { + curExpr = new ConditionalExpressionTreeImpl(ternaryNode, + translateExpr(ternaryNode.getTest()), + translateExpr(ternaryNode.getTrueExpression()), + translateExpr(ternaryNode.getFalseExpression())); + return false; + } + + @Override + public boolean enterThrowNode(final ThrowNode throwNode) { + curStat = new ThrowTreeImpl(throwNode, + translateExpr(throwNode.getExpression())); + return false; + } + + @Override + public boolean enterTryNode(final TryNode tryNode) { + final List<? extends CatchNode> catchNodes = tryNode.getCatches(); + final List<CatchTreeImpl> catchTrees = new ArrayList<>(catchNodes.size()); + for (final CatchNode catchNode : catchNodes) { + catchTrees.add(new CatchTreeImpl(catchNode, + translateIdent(catchNode.getException()), + (BlockTree) translateBlock(catchNode.getBody()), + translateExpr(catchNode.getExceptionCondition()))); + } + + curStat = new TryTreeImpl(tryNode, + (BlockTree) translateBlock(tryNode.getBody()), + catchTrees, + (BlockTree) translateBlock(tryNode.getFinallyBody())); + + return false; + } + + @Override + public boolean enterUnaryNode(final UnaryNode unaryNode) { + if (unaryNode.tokenType() == TokenType.NEW) { + curExpr = new NewTreeImpl(unaryNode, + translateExpr(unaryNode.getExpression())); + } else { + curExpr = new UnaryTreeImpl(unaryNode, + translateExpr(unaryNode.getExpression())); + } + return false; + } + + @Override + public boolean enterVarNode(final VarNode varNode) { + final Expression initNode = varNode.getInit(); + if (initNode instanceof FunctionNode && ((FunctionNode)initNode).isDeclared()) { + final FunctionNode funcNode = (FunctionNode) initNode; + + final List<? extends ExpressionTree> paramTrees + = translateExprs(funcNode.getParameters()); + final BlockTree blockTree = (BlockTree) translateBlock(funcNode.getBody()); + curStat = new FunctionDeclarationTreeImpl(varNode, paramTrees, blockTree); + } else { + curStat = new VariableTreeImpl(varNode, translateExpr(initNode)); + } + + return false; + } + + @Override + public boolean enterWhileNode(final WhileNode whileNode) { + final ExpressionTree condTree = translateExpr(whileNode.getTest()); + final StatementTree statTree = translateBlock(whileNode.getBody()); + + if (whileNode.isDoWhile()) { + curStat = new DoWhileLoopTreeImpl(whileNode, condTree, statTree); + } else { + curStat = new WhileLoopTreeImpl(whileNode, condTree, statTree); + } + + return false; + } + + @Override + public boolean enterWithNode(final WithNode withNode) { + curStat = new WithTreeImpl(withNode, + translateExpr(withNode.getExpression()), + translateBlock(withNode.getBody())); + + return false; + } + + private StatementTree translateBlock(final Block blockNode) { + if (blockNode == null) { + return null; + } + curStat = null; + blockNode.accept(this); + return curStat; + } + + private List<? extends StatementTree> translateStats(final List<? extends Statement> stats) { + if (stats == null) { + return null; + } + final List<StatementTreeImpl> statTrees = new ArrayList<>(stats.size()); + for (final Statement stat : stats) { + curStat = null; + stat.accept(this); + assert curStat != null; + statTrees.add(curStat); + } + return statTrees; + } + + private List<? extends ExpressionTree> translateExprs(final List<? extends Expression> exprs) { + if (exprs == null) { + return null; + } + final List<ExpressionTreeImpl> exprTrees = new ArrayList<>(exprs.size()); + for (final Expression expr : exprs) { + curExpr = null; + expr.accept(this); + assert curExpr != null; + exprTrees.add(curExpr); + } + return exprTrees; + } + + private ExpressionTreeImpl translateExpr(final Expression expr) { + if (expr == null) { + return null; + } + + curExpr = null; + expr.accept(this); + assert curExpr != null : "null for " + expr; + return curExpr; + } + + private StatementTreeImpl translateStat(final Statement stat) { + if (stat == null) { + return null; + } + + curStat = null; + stat.accept(this); + assert curStat != null : "null for " + stat; + return curStat; + } + + private IdentifierTree translateIdent(final IdentNode ident) { + return new IdentifierTreeImpl(ident); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,46 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an identifier expression. + * + * For example: + * <pre> + * <em>name</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface IdentifierTree extends ExpressionTree { + /** + * Returns the name of this identifier. + * + * @return the name of this identifier + */ + String getName(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.IdentNode; + +final class IdentifierTreeImpl extends ExpressionTreeImpl implements IdentifierTree { + private final String name; + + IdentifierTreeImpl(final IdentNode node) { + super(node); + this.name = node.getName(); + } + + @Override + public Kind getKind() { + return Kind.IDENTIFIER; + } + + @Override + public String getName() { + return name; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitIdentifier(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,67 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an 'if' statement. + * + * For example: + * <pre> + * if ( <em>condition</em> ) + * <em>thenStatement</em> + * + * if ( <em>condition</em> ) + * <em>thenStatement</em> + * else + * <em>elseStatement</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface IfTree extends StatementTree { + /** + * Returns the condition expression of this 'if' statement. + * + * @return the condition expression + */ + ExpressionTree getCondition(); + + /** + * Returns the 'then' statement of this 'if' statement. + * + * @return the 'then' statement + */ + StatementTree getThenStatement(); + + /** + * Returns the then statement of this 'if' statement. + * null if this if statement has no else branch. + * + * @return the 'else' statement + */ + StatementTree getElseStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,69 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.IfNode; + +final class IfTreeImpl extends StatementTreeImpl implements IfTree { + private final ExpressionTree cond; + private final StatementTree thenStat; + private final StatementTree elseStat; + IfTreeImpl(final IfNode node, final ExpressionTree cond, + final StatementTree thenStat, final StatementTree elseStat) { + super(node); + this.cond = cond; + this.thenStat = thenStat; + this.elseStat = elseStat; + } + + @Override + public Kind getKind() { + return Kind.IF; + } + + @Override + public ExpressionTree getCondition() { + return cond; + } + + @Override + public StatementTree getThenStatement() { + return thenStat; + } + + /** + * @return null if this if statement has no else branch. + */ + @Override + public StatementTree getElseStatement() { + return elseStat; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitIf(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for an 'instanceof' expression. + * + * For example: + * <pre> + * <em>expression</em> instanceof <em>type</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface InstanceOfTree extends ExpressionTree { + /** + * Returns the expression whose type is being checked. + * + * @return the expression whose type is being checked + */ + ExpressionTree getExpression(); + + /** + * Returns the type expression. + * + * @return the type expression + */ + Tree getType(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,58 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.BinaryNode; +import jdk.nashorn.internal.parser.TokenType; + +final class InstanceOfTreeImpl extends BinaryTreeImpl implements InstanceOfTree { + InstanceOfTreeImpl(final BinaryNode node, + final ExpressionTree expr, + final ExpressionTree type) { + super(node, expr, type); + assert node.tokenType() == TokenType.INSTANCEOF : "instanceof expected"; + } + + @Override + public Kind getKind() { + return Kind.INSTANCE_OF; + } + + @Override + public ExpressionTree getExpression() { + return getLeftOperand(); + } + + @Override + public Tree getType() { + return getRightOperand(); + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitInstanceOf(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a labeled statement. + * + * For example: + * <pre> + * <em>label</em> : <em>statement</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface LabeledStatementTree extends StatementTree { + /** + * Returns the label associated with this statement. + * + * @return the label + */ + String getLabel(); + + /** + * Returns the statement being labeled. + * + * @return the statement labeled + */ + StatementTree getStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,60 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.LabelNode; + +final class LabeledStatementTreeImpl extends StatementTreeImpl + implements LabeledStatementTree { + private final String name; + private final StatementTree stat; + + LabeledStatementTreeImpl(final LabelNode node, final StatementTree stat) { + super(node); + this.name = node.getLabelName(); + this.stat = stat; + } + + @Override + public Kind getKind() { + return Kind.LABELED_STATEMENT; + } + + @Override + public String getLabel() { + return name; + } + + @Override + public StatementTree getStatement() { + return stat; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitLabeledStatement(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java Thu Mar 12 21:14:04 2015 -0700 @@ -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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * Provides methods to convert between character positions and line numbers + * for a compilation unit. + * + * @since 1.9 + */ +@jdk.Exported +public interface LineMap { + /** + * Find the line containing a position; a line termination + * character is on the line it terminates. + * + * @param pos character offset of the position + * @return the line number of pos (first line is 1) + */ + long getLineNumber(long pos); + + /** + * Find the column for a character position. + * Tab characters preceding the position on the same line + * will be expanded when calculating the column number. + * + * @param pos character offset of the position + * @return the tab-expanded column number of pos (first column is 1) + */ + long getColumnNumber(long pos); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,46 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.runtime.Source; + +final class LineMapImpl implements LineMap { + private final Source source; + + LineMapImpl(final Source source) { + this.source = source; + } + + @Override + public long getLineNumber(long pos) { + return source.getLine((int)pos); + } + + @Override + public long getColumnNumber(long pos) { + return source.getColumn((int)pos); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,47 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a literal expression. + * Use {@link #getKind getKind} to determine the kind of literal. + * + * For example: + * <pre> + * <em>value</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface LiteralTree extends ExpressionTree { + /** + * Returns the value of this literal. + * + * @return the value of this literal + */ + Object getValue(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,67 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.LiteralNode; + +final class LiteralTreeImpl extends ExpressionTreeImpl implements LiteralTree { + private final Object value; + private final Kind kind; + LiteralTreeImpl(final LiteralNode<?> node) { + super(node); + this.kind = literalKind(node); + this.value = node.getValue(); + } + + @Override + public Kind getKind() { + return kind; + } + + @Override + public Object getValue() { + return value; + } + + private static Kind literalKind(final LiteralNode<?> node) { + if (node.isBoolean()) { + return Kind.BOOLEAN_LITERAL; + } else if (node.isNumeric()) { + return Kind.NUMBER_LITERAL; + } else if (node.isString()) { + return Kind.STRING_LITERAL; + } else if (node.isNull()) { + return Kind.NULL_LITERAL; + } else { + throw new AssertionError("should not reach here: " + node.getValue()); + } + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitLiteral(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,41 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A mixin for "loop" statements. + * + * @since 1.9 + */ +@jdk.Exported +public interface LoopTree extends StatementTree { + /** + * Returns the statement contained in this 'loop' statement. + * + * @return the statement + */ + StatementTree getStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a member access expression. + * + * For example: + * <pre> + * <em>expression</em> . <em>identifier</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface MemberSelectTree extends ExpressionTree { + /** + * The object expression whose member is being selected. + * + * @return the object whose member is selected + */ + ExpressionTree getExpression(); + + /** + * Returns the name of the property. + * + * @return the name of the property + */ + String getIdentifier(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.AccessNode; + +final class MemberSelectTreeImpl extends ExpressionTreeImpl + implements MemberSelectTree { + private final String ident; + private final ExpressionTree expr; + MemberSelectTreeImpl(final AccessNode node, final ExpressionTree expr) { + super(node); + this.ident = node.getProperty(); + this.expr = expr; + } + + @Override + public Kind getKind() { + return Kind.MEMBER_SELECT; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public String getIdentifier() { + return ident; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitMemberSelect(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,48 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node to declare a new instance of a class. + * + * For example: + * <pre> + * new <em>identifier</em> ( ) + * + * new <em>identifier</em> ( <em>arguments</em> ) + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface NewTree extends ExpressionTree { + /** + * Returns the constructor expression of this 'new' expression. + * + * @return the constructor expression of this 'new' expression + */ + ExpressionTree getConstructorExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.UnaryNode; +import jdk.nashorn.internal.parser.TokenType; + +final class NewTreeImpl extends ExpressionTreeImpl implements NewTree { + private final ExpressionTree constrExpr; + + NewTreeImpl(final UnaryNode node, final ExpressionTree constrExpr) { + super(node); + assert (node.tokenType() == TokenType.NEW) : "new expected"; + this.constrExpr = constrExpr; + } + + @Override + public Kind getKind() { + return Kind.NEW; + } + + @Override + public ExpressionTree getConstructorExpression() { + return constrExpr; + } + + @Override + public <R, D> R accept(TreeVisitor<R, D> visitor, D data) { + return visitor.visitNew(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,43 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * Represents ECMAScript object literal expression. + * + * @since 1.9 + */ +@jdk.Exported +public interface ObjectLiteralTree extends ExpressionTree { + /** + * Returns the list of properties of this object literal. + * + * @return the list of properties of this object literal + */ + public List<? extends PropertyTree> getProperties(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.ObjectNode; + +final class ObjectLiteralTreeImpl extends ExpressionTreeImpl + implements ObjectLiteralTree { + private final List<? extends PropertyTree> props; + ObjectLiteralTreeImpl(final ObjectNode node, final List<? extends PropertyTree> props) { + super(node); + this.props = props; + } + + @Override + public Kind getKind() { + return Kind.OBJECT_LITERAL; + } + + @Override + public List<? extends PropertyTree> getProperties() { + return props; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitObjectLiteral(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,47 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a parenthesized expression. Note: parentheses + * not be preserved by the parser. + * + * For example: + * <pre> + * ( <em>expression</em> ) + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ParenthesizedTree extends ExpressionTree { + /** + * Returns the expression within the parenthesis. + * + * @return the expression within the parenthesis + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,160 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.net.URL; +import java.nio.file.Path; +import jdk.nashorn.api.scripting.NashornException; +import jdk.nashorn.api.scripting.ScriptObjectMirror; + +/** + * Represents nashorn ECMAScript parser instance. + * + * @since 1.9 + */ +@jdk.Exported +public interface Parser { + /** + * Parses the source file and returns compilation unit tree + * + * @param file source file to parse + * @param listener to receive diagnostic messages from the parser. This can be null. + * if null is passed, a NashornException is thrown on the first parse error. + * @return compilation unit tree + * @throws NullPointerException if file is null + * @throws IOException if parse source read fails + * @throws NashornException is thrown if no listener is supplied and parser encounters error + */ + public CompilationUnitTree parse(final File file, final DiagnosticListener listener) throws IOException, NashornException; + + /** + * Parses the source Path and returns compilation unit tree + * + * @param path source Path to parse + * @param listener to receive diagnostic messages from the parser. This can be null. + * if null is passed, a NashornException is thrown on the first parse error. + * @return compilation unit tree + * @throws NullPointerException if path is null + * @throws IOException if parse source read fails + * @throws NashornException is thrown if no listener is supplied and parser encounters error + */ + public CompilationUnitTree parse(final Path path, final DiagnosticListener listener) throws IOException, NashornException; + + /** + * Parses the source url and returns compilation unit tree + * + * @param url source file to parse + * @param listener to receive diagnostic messages from the parser. This can be null. + * if null is passed, a NashornException is thrown on the first parse error. + * @return compilation unit tree + * @throws NullPointerException if url is null + * @throws IOException if parse source read fails + * @throws NashornException is thrown if no listener is supplied and parser encounters error + */ + public CompilationUnitTree parse(final URL url, final DiagnosticListener listener) throws IOException, NashornException; + + /** + * Parses the readerand returns compilation unit tree + * + * @param name name of the source file to parse + * @param reader from which source is read + * @param listener to receive diagnostic messages from the parser. This can be null. + * if null is passed, a NashornException is thrown on the first parse error. + * @return compilation unit tree + * @throws NullPointerException if name or reader is null + * @throws IOException if parse source read fails + * @throws NashornException is thrown if no listener is supplied and parser encounters error + */ + public CompilationUnitTree parse(final String name, Reader reader, final DiagnosticListener listener) throws IOException, NashornException; + + /** + * Parses the string source and returns compilation unit tree + * + * @param name of the source + * @param code string source + * @param listener to receive diagnostic messages from the parser. This can be null. + * if null is passed, a NashornException is thrown on the first parse error. + * @return compilation unit tree + * @throws NullPointerException if name or code is null + * @throws NashornException is thrown if no listener is supplied and parser encounters error + */ + public CompilationUnitTree parse(final String name, String code, final DiagnosticListener listener) throws NashornException; + + /** + * Parses the source from script object and returns compilation unit tree + * + * @param scriptObj script object whose script and name properties are used for script source + * @param listener to receive diagnostic messages from the parser. This can be null. + * if null is passed, a NashornException is thrown on the first parse error. + * @return compilation unit tree + * @throws NullPointerException if scriptObj is null + * @throws NashornException is thrown if no listener is supplied and parser encounters error + */ + public CompilationUnitTree parse(final ScriptObjectMirror scriptObj, final DiagnosticListener listener) throws NashornException; + + /** + * Factory method to create a new instance of Parser. + * + * @param options configuration options to initialize the Parser. + * Currently the following options are supported: + * + * <dl> + * <dt>"--const-as-var"</dt><dd>treat "const" declaration as "var"</dd> + * <dt>"-dump-on-error" or "-doe"</dt><dd>dump stack trace on error</dd> + * <dt>"--empty-statements"</dt><dd>include empty statement nodes</dd> + * <dt>"--no-syntax-extensions" or "-nse"</dt><dd>disable ECMAScript syntax extensions</dd> + * <dt>"-scripting"</dt><dd>enable scripting mode extensions</dd> + * <dt>"-strict"</dt><dd>enable ECMAScript strict mode</dd> + * </dl> + * + * @throws NullPointerException if options arrry or any of it's element is null + * @throws IllegalArgumentException on unsupported option value. + * @return a new Parser instance. + */ + public static Parser create(final String... options) throws IllegalArgumentException { + options.getClass(); + for (String opt : options) { + switch (opt) { + case "--const-as-var": + case "-dump-on-error": + case "-doe": + case "--empty-statements": + case "--no-syntax-extensions": + case "-nse": + case "-scripting": + case "-strict": + break; + default: + throw new IllegalArgumentException(opt); + } + } + + return new ParserImpl(options); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,145 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Reader; +import java.net.URL; +import java.nio.file.Path; +import java.util.Map; +import java.util.Objects; +import jdk.nashorn.api.scripting.NashornException; +import jdk.nashorn.api.scripting.ScriptObjectMirror; +import jdk.nashorn.internal.ir.FunctionNode; +import jdk.nashorn.internal.runtime.Context; +import jdk.nashorn.internal.runtime.ErrorManager; +import jdk.nashorn.internal.runtime.JSType; +import jdk.nashorn.internal.runtime.ParserException; +import jdk.nashorn.internal.runtime.ScriptEnvironment; +import jdk.nashorn.internal.runtime.Source; +import jdk.nashorn.internal.runtime.options.Options; + +final class ParserImpl implements Parser { + + private final ScriptEnvironment env; + + ParserImpl(final String... args) throws IllegalArgumentException { + Objects.requireNonNull(args); + Options options = new Options("nashorn"); + options.process(args); + this.env = new ScriptEnvironment(options, + new PrintWriter(System.out), new PrintWriter(System.err)); + } + + @Override + public CompilationUnitTree parse(final File file, final DiagnosticListener listener) throws IOException, NashornException { + Objects.requireNonNull(file); + final Source src = Source.sourceFor(file.getName(), file); + return translate(makeParser(src, listener).parse()); + } + + @Override + public CompilationUnitTree parse(final Path path, final DiagnosticListener listener) throws IOException, NashornException { + Objects.requireNonNull(path); + final Source src = Source.sourceFor(path.toString(), path); + return translate(makeParser(src, listener).parse()); + } + + @Override + public CompilationUnitTree parse(final URL url, final DiagnosticListener listener) throws IOException, NashornException { + final Source src = Source.sourceFor(url.toString(), url); + return translate(makeParser(src, listener).parse()); + } + + @Override + public CompilationUnitTree parse(final String name, final Reader reader, final DiagnosticListener listener) throws IOException, NashornException { + Objects.requireNonNull(name); + Objects.requireNonNull(reader); + final Source src = Source.sourceFor(name, reader); + return translate(makeParser(src, listener).parse()); + } + + @Override + public CompilationUnitTree parse(final String name, final String code, final DiagnosticListener listener) throws NashornException { + final Source src = Source.sourceFor(name, code); + return translate(makeParser(src, listener).parse()); + } + + @Override + public CompilationUnitTree parse(final ScriptObjectMirror scriptObj, final DiagnosticListener listener) throws NashornException { + Objects.requireNonNull(scriptObj); + final Map<?,?> map = scriptObj; + if (map.containsKey("script") && map.containsKey("name")) { + final String script = JSType.toString(map.get("script")); + final String name = JSType.toString(map.get("name")); + final Source src = Source.sourceFor(name, script); + return translate(makeParser(src, listener).parse()); + } else { + throw new IllegalArgumentException("can't find 'script' and 'name' properties"); + } + } + + private jdk.nashorn.internal.parser.Parser makeParser(final Source source, final DiagnosticListener listener) { + final ErrorManager errMgr = listener != null? new ListenerErrorManager(listener) : new Context.ThrowErrorManager(); + return new jdk.nashorn.internal.parser.Parser(env, source, errMgr); + } + + private static class ListenerErrorManager extends ErrorManager { + private final DiagnosticListener listener; + + ListenerErrorManager(final DiagnosticListener listener) { + // null check + listener.getClass(); + this.listener = listener; + } + + @Override + public void error(final String msg) { + error(new ParserException(msg)); + } + + @Override + public void error(final ParserException e) { + listener.report(new DiagnosticImpl(e, Diagnostic.Kind.ERROR)); + } + + @Override + public void warning(final String msg) { + warning(new ParserException(msg)); + } + + @Override + public void warning(final ParserException e) { + listener.report(new DiagnosticImpl(e, Diagnostic.Kind.WARNING)); + } + } + + private CompilationUnitTree translate(final FunctionNode node) { + return new IRTranslator().translate(node); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,64 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * To represent property setting in an object literal tree. + * + * @since 1.9 + */ +@jdk.Exported +public interface PropertyTree extends Tree { + /** + * Returns the name of this property. + * + * @return the name of the property + */ + public ExpressionTree getKey(); + + /** + * Returns the value of this property. This is null for accessor properties. + * + * @return the value of the property + */ + public ExpressionTree getValue(); + + /** + * Returns the setter function of this property if this + * is an accessor property. This is null for data properties. + * + * @return the setter function of the property + */ + public FunctionExpressionTree getGetter(); + + /** + * Returns the getter function of this property if this + * is an accessor property. This is null for data properties. + * + * @return the getter function of the property + */ + public FunctionExpressionTree getSetter(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,76 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.PropertyNode; + +final class PropertyTreeImpl extends TreeImpl implements PropertyTree { + private final ExpressionTree key; + private final ExpressionTree value; + private final FunctionExpressionTree getter; + private final FunctionExpressionTree setter; + PropertyTreeImpl(final PropertyNode node, + final ExpressionTree key, + final ExpressionTree value, + final FunctionExpressionTree getter, + final FunctionExpressionTree setter) { + super(node); + this.key = key; + this.value = value; + this.getter = getter; + this.setter = setter; + } + + @Override + public Kind getKind() { + return Kind.PROPERTY; + } + + @Override + public ExpressionTree getKey() { + return key; + } + + @Override + public ExpressionTree getValue() { + return value; + } + + @Override + public FunctionExpressionTree getGetter() { + return getter; + } + + @Override + public FunctionExpressionTree getSetter() { + return setter; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitProperty(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,48 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * Represents regular expression literal in the source code. + * + * @since 1.9 + */ +@jdk.Exported +public interface RegExpLiteralTree extends Tree { + /** + * Regular expression pattern to match. + * + * @return regular expression patten + */ + public String getPattern(); + + /** + * Regular expression matching options. + * + * @return options like "i" for ignoreCase used + */ + public String getOptions(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,62 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.LiteralNode; +import jdk.nashorn.internal.parser.Lexer; + +final class RegExpLiteralTreeImpl extends ExpressionTreeImpl + implements RegExpLiteralTree { + private final String pattern; + private final String options; + RegExpLiteralTreeImpl(final LiteralNode<?> node) { + super(node); + assert node.getValue() instanceof Lexer.RegexToken : "regexp expected"; + final Lexer.RegexToken regex = (Lexer.RegexToken) node.getValue(); + this.pattern = regex.getExpression(); + this.options = regex.getOptions(); + } + + @Override + public Kind getKind() { + return Kind.REGEXP_LITERAL; + } + + @Override + public String getPattern() { + return pattern; + } + + @Override + public String getOptions() { + return options; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitRegExpLiteral(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,48 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'return' statement. + * + * For example: + * <pre> + * return; + * return <em>expression</em>; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ReturnTree extends StatementTree { + /** + * Returns the expression being returned. This is null if no value + * is being returned. i.e., empty return statement. + * + * @return the returned expression + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,52 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ReturnNode; + +final class ReturnTreeImpl extends StatementTreeImpl implements ReturnTree { + private final ExpressionTree expr; + + ReturnTreeImpl(final ReturnNode returnNode, final ExpressionTree expr) { + super(returnNode); + this.expr = expr; + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.RETURN; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitReturn(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,390 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A simple implementation of the TreeVisitor for ECMAScript edition 5.1. + * + * <p>The visit methods corresponding to ES 5.1 language constructs walk the + * "components" of the given tree by calling accept method passing the + * current visitor and the additional parameter. + * + * <p>For constructs introduced in later versions, {@code visitUnknown} + * is called instead which throws {@link UnknownTreeException}. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + */ +public class SimpleTreeVisitorES5_1<R, P> implements TreeVisitor<R, P> { + @Override + public R visitAssignment(AssignmentTree node, P r) { + node.getVariable().accept(this, r); + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitCompoundAssignment(CompoundAssignmentTree node, P r) { + node.getVariable().accept(this, r); + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitBinary(BinaryTree node, P r) { + node.getLeftOperand().accept(this, r); + node.getRightOperand().accept(this, r); + return null; + } + + @Override + public R visitBlock(BlockTree node, P r) { + node.getStatements().forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitBreak(BreakTree node, P r) { + return null; + } + + @Override + public R visitCase(CaseTree node, P r) { + final Tree caseVal = node.getExpression(); + if (caseVal != null) { + caseVal.accept(this, r); + } + + node.getStatements().forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitCatch(CatchTree node, P r) { + final Tree cond = node.getCondition(); + if (cond != null) { + cond.accept(this, r); + } + node.getParameter().accept(this, r); + node.getBlock().accept(this, r); + return null; + } + + @Override + public R visitConditionalExpression(ConditionalExpressionTree node, P r) { + node.getCondition().accept(this, r); + node.getTrueExpression().accept(this, r); + node.getFalseExpression().accept(this, r); + return null; + } + + @Override + public R visitContinue(ContinueTree node, P r) { + return null; + } + + @Override + public R visitDebugger(DebuggerTree node, P r) { + return null; + } + + @Override + public R visitDoWhileLoop(DoWhileLoopTree node, P r) { + node.getStatement().accept(this, r); + node.getCondition().accept(this, r); + return null; + } + + @Override + public R visitErroneous(ErroneousTree node, P r) { + return null; + } + + @Override + public R visitExpressionStatement(ExpressionStatementTree node, P r) { + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitForLoop(ForLoopTree node, P r) { + final Tree init = node.getInitializer(); + if (init != null) { + init.accept(this, r); + } + + final Tree cond = node.getCondition(); + if (cond != null) { + cond.accept(this, r); + } + + final Tree update = node.getUpdate(); + if (update != null) { + update.accept(this, r); + } + + node.getStatement().accept(this, r); + return null; + } + + @Override + public R visitForInLoop(ForInLoopTree node, P r) { + node.getVariable().accept(this, r); + node.getExpression().accept(this, r); + final StatementTree stat = node.getStatement(); + if (stat != null) { + stat.accept(this, r); + } + return null; + } + + @Override + public R visitFunctionCall(FunctionCallTree node, P r) { + node.getFunctionSelect().accept(this, r); + node.getArguments().forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitFunctionDeclaration(FunctionDeclarationTree node, P r) { + node.getParameters().forEach((tree) -> { + tree.accept(this, r); + }); + node.getBody().accept(this, r); + return null; + } + + @Override + public R visitFunctionExpression(FunctionExpressionTree node, P r) { + node.getParameters().forEach((tree) -> { + tree.accept(this, r); + }); + node.getBody().accept(this, r); + return null; + } + + @Override + public R visitIdentifier(IdentifierTree node, P r) { + return null; + } + + @Override + public R visitIf(IfTree node, P r) { + node.getCondition().accept(this, r); + node.getThenStatement().accept(this, r); + final Tree elseStat = node.getElseStatement(); + if (elseStat != null) { + elseStat.accept(this, r); + } + return null; + } + + @Override + public R visitArrayAccess(ArrayAccessTree node, P r) { + node.getExpression().accept(this, r); + node.getIndex().accept(this, r); + return null; + } + + @Override + public R visitArrayLiteral(ArrayLiteralTree node, P r) { + node.getElements().stream().filter((tree) -> (tree != null)).forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitLabeledStatement(LabeledStatementTree node, P r) { + node.getStatement().accept(this, r); + return null; + } + + @Override + public R visitLiteral(LiteralTree node, P r) { + return null; + } + + @Override + public R visitParenthesized(ParenthesizedTree node, P r) { + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitReturn(ReturnTree node, P r) { + final Tree retExpr = node.getExpression(); + if (retExpr != null) { + retExpr.accept(this, r); + } + return null; + } + + @Override + public R visitMemberSelect(MemberSelectTree node, P r) { + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitNew(NewTree node, P r) { + node.getConstructorExpression().accept(this, r); + return null; + } + + @Override + public R visitObjectLiteral(ObjectLiteralTree node, P r) { + node.getProperties().forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitProperty(PropertyTree node, P r) { + FunctionExpressionTree getter = node.getGetter(); + if (getter != null) { + getter.accept(this, r); + } + ExpressionTree key = node.getKey(); + if (key != null) { + key.accept(this, r); + } + + FunctionExpressionTree setter = node.getSetter(); + if (setter != null) { + setter.accept(this, r); + } + + ExpressionTree value = node.getValue(); + if (value != null) { + value.accept(this, r); + } + return null; + } + + @Override + public R visitRegExpLiteral(RegExpLiteralTree node, P r) { + return null; + } + + @Override + public R visitEmptyStatement(EmptyStatementTree node, P r) { + return null; + } + + @Override + public R visitSwitch(SwitchTree node, P r) { + node.getExpression().accept(this, r); + node.getCases().forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitThrow(ThrowTree node, P r) { + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitCompilationUnit(CompilationUnitTree node, P r) { + node.getSourceElements().forEach((tree) -> { + tree.accept(this, r); + }); + return null; + } + + @Override + public R visitTry(TryTree node, P r) { + node.getBlock().accept(this, r); + node.getCatches().forEach((tree) -> { + tree.accept(this, r); + }); + + final Tree finallyBlock = node.getFinallyBlock(); + if (finallyBlock != null) { + finallyBlock.accept(this, r); + } + return null; + } + + @Override + public R visitInstanceOf(InstanceOfTree node, P r) { + node.getType().accept(this, r); + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitUnary(UnaryTree node, P r) { + node.getExpression().accept(this, r); + return null; + } + + @Override + public R visitVariable(VariableTree node, P r) { + if (node.getInitializer() != null) { + node.getInitializer().accept(this, r); + } + return null; + } + + @Override + public R visitWhileLoop(WhileLoopTree node, P r) { + node.getCondition().accept(this, r); + node.getStatement().accept(this, r); + return null; + } + + @Override + public R visitWith(WithTree node, P r) { + node.getScope().accept(this, r); + node.getStatement().accept(this, r); + return null; + } + + @Override + public R visitUnknown(Tree node, P r) { + // unknown in ECMAScript 5.1 edition + throw new UnknownTreeException(node, r); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,36 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node used as the base class for the different kinds of + * statements. + * + * @since 1.9 + */ +@jdk.Exported +public interface StatementTree extends Tree { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,39 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.Block; +import jdk.nashorn.internal.ir.Statement; + +abstract class StatementTreeImpl extends TreeImpl implements StatementTree { + StatementTreeImpl(final Statement stat) { + super(stat); + } + + StatementTreeImpl(final Block stat) { + super(stat); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,58 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a 'switch' statement. + * + * For example: + * <pre> + * switch ( <em>expression</em> ) { + * <em>cases</em> + * } + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface SwitchTree extends StatementTree { + /** + * Returns the expression on which this statement switches. + * + * @return the switch expression + */ + ExpressionTree getExpression(); + + + /** + * Returns the list of 'case' statements. + * + * @return the 'case' statements + */ + List<? extends CaseTree> getCases(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,61 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.SwitchNode; + +final class SwitchTreeImpl extends StatementTreeImpl implements SwitchTree { + private final ExpressionTree expr; + private final List<? extends CaseTree> cases; + SwitchTreeImpl(final SwitchNode node, + final ExpressionTree expr, + List<? extends CaseTree> cases) { + super(node); + this.expr = expr; + this.cases = cases; + } + + @Override + public Kind getKind() { + return Kind.SWITCH; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public List<? extends CaseTree> getCases() { + return cases; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitSwitch(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,46 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'throw' statement. + * + * For example: + * <pre> + * throw <em>expression</em>; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface ThrowTree extends StatementTree { + /** + * Returns the expression being thrown. + * + * @return the expression being thrown. + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,51 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.ThrowNode; + +final class ThrowTreeImpl extends StatementTreeImpl implements ThrowTree { + private final ExpressionTree expr; + ThrowTreeImpl(final ThrowNode node, final ExpressionTree expr) { + super(node); + this.expr = expr; + } + + @Override + public Kind getKind() { + return Kind.THROW; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitThrow(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,603 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * Common interface for all nodes in an abstract syntax tree. + * + * <p><b>WARNING:</b> This interface and its sub-interfaces are + * subject to change as the ECMAScript programming language evolves. + * + * @since 1.9 + */ +@jdk.Exported +public interface Tree { + + /** + * Enumerates all kinds of trees. + */ + @jdk.Exported + public enum Kind { + /** + * Used for instances of {@link ArrayAccessTree}. + */ + ARRAY_ACCESS(ArrayAccessTree.class), + + /** + * Used for instances of {@link ArrayLiteralTree}. + */ + ARRAY_LITERAL(ArrayLiteralTree.class), + + /** + * Used for instances of {@link AssignmentTree}. + */ + ASSIGNMENT(AssignmentTree.class), + + /** + * Used for instances of {@link BlockTree}. + */ + BLOCK(BlockTree.class), + + /** + * Used for instances of {@link BreakTree}. + */ + BREAK(BreakTree.class), + + /** + * Used for instances of {@link CaseTree}. + */ + CASE(CaseTree.class), + + /** + * Used for instances of {@link CatchTree}. + */ + CATCH(CatchTree.class), + + /** + * Used for instances of {@link CompilationUnitTree}. + */ + COMPILATION_UNIT(CompilationUnitTree.class), + + /** + * Used for instances of {@link ConditionalExpressionTree}. + */ + CONDITIONAL_EXPRESSION(ConditionalExpressionTree.class), + + /** + * Used for instances of {@link ContinueTree}. + */ + CONTINUE(ContinueTree.class), + + /** + * Used for instances of {@link DoWhileLoopTree}. + */ + DO_WHILE_LOOP(DoWhileLoopTree.class), + + /** + * Used for instances of {@link DebuggerTree}. + */ + DEBUGGER(DebuggerTree.class), + + /** + * Used for instances of {@link ForInLoopTree}. + */ + FOR_IN_LOOP(ForInLoopTree.class), + + /** + * Used for instances of {@link FunctionExpressionTree}. + */ + FUNCTION_EXPRESSION(FunctionExpressionTree.class), + + /** + * Used for instances of {@link ErroneousTree}. + */ + ERROR(ErroneousTree.class), + + /** + * Used for instances of {@link ExpressionStatementTree}. + */ + EXPRESSION_STATEMENT(ExpressionStatementTree.class), + + /** + * Used for instances of {@link MemberSelectTree}. + */ + MEMBER_SELECT(MemberSelectTree.class), + + /** + * Used for instances of {@link ForLoopTree}. + */ + FOR_LOOP(ForLoopTree.class), + + /** + * Used for instances of {@link IdentifierTree}. + */ + IDENTIFIER(IdentifierTree.class), + + /** + * Used for instances of {@link IfTree}. + */ + IF(IfTree.class), + + /** + * Used for instances of {@link InstanceOfTree}. + */ + INSTANCE_OF(InstanceOfTree.class), + + /** + * Used for instances of {@link LabeledStatementTree}. + */ + LABELED_STATEMENT(LabeledStatementTree.class), + + /** + * Used for instances of {@link FunctionDeclarationTree}. + */ + FUNCTION(FunctionDeclarationTree.class), + + /** + * Used for instances of {@link FunctionCallTree}. + */ + FUNCTION_INVOCATION(FunctionCallTree.class), + + /** + * Used for instances of {@link NewTree}. + */ + NEW(NewTree.class), + + /** + * Used for instances of {@link ObjectLiteralTree}. + */ + OBJECT_LITERAL(ObjectLiteralTree.class), + + /** + * Used for instances of {@link ParenthesizedTree}. + */ + PARENTHESIZED(ParenthesizedTree.class), + + /** + * Used for instances of {@link PropertyTree}. + */ + PROPERTY(PropertyTree.class), + + /** + * Used for instances of {@link RegExpLiteralTree}. + */ + REGEXP_LITERAL(RegExpLiteralTree.class), + + /** + * Used for instances of {@link ReturnTree}. + */ + RETURN(ReturnTree.class), + + /** + * Used for instances of {@link EmptyStatementTree}. + */ + EMPTY_STATEMENT(EmptyStatementTree.class), + + /** + * Used for instances of {@link SwitchTree}. + */ + SWITCH(SwitchTree.class), + + /** + * Used for instances of {@link ThrowTree}. + */ + THROW(ThrowTree.class), + + /** + * Used for instances of {@link TryTree}. + */ + TRY(TryTree.class), + + /** + * Used for instances of {@link VariableTree}. + */ + VARIABLE(VariableTree.class), + + /** + * Used for instances of {@link WhileLoopTree}. + */ + WHILE_LOOP(WhileLoopTree.class), + + /** + * Used for instances of {@link WithTree}. + */ + WITH(WithTree.class), + + /** + * Used for instances of {@link UnaryTree} representing postfix + * increment operator {@code ++}. + */ + POSTFIX_INCREMENT(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing postfix + * decrement operator {@code --}. + */ + POSTFIX_DECREMENT(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing prefix + * increment operator {@code ++}. + */ + PREFIX_INCREMENT(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing prefix + * decrement operator {@code --}. + */ + PREFIX_DECREMENT(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing unary plus + * operator {@code +}. + */ + UNARY_PLUS(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing unary minus + * operator {@code -}. + */ + UNARY_MINUS(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing bitwise + * complement operator {@code ~}. + */ + BITWISE_COMPLEMENT(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing logical + * complement operator {@code !}. + */ + LOGICAL_COMPLEMENT(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing logical + * delete operator {@code delete}. + */ + DELETE(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing logical + * typeof operator {@code typeof}. + */ + TYPEOF(UnaryTree.class), + + /** + * Used for instances of {@link UnaryTree} representing logical + * void operator {@code typeof}. + */ + VOID(UnaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * comma {@code ,}. + */ + COMMA(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * multiplication {@code *}. + */ + MULTIPLY(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * division {@code /}. + */ + DIVIDE(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * remainder {@code %}. + */ + REMAINDER(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * addition or string concatenation {@code +}. + */ + PLUS(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * subtraction {@code -}. + */ + MINUS(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * left shift {@code <<}. + */ + LEFT_SHIFT(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * right shift {@code >>}. + */ + RIGHT_SHIFT(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * unsigned right shift {@code >>>}. + */ + UNSIGNED_RIGHT_SHIFT(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * less-than {@code <}. + */ + LESS_THAN(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * greater-than {@code >}. + */ + GREATER_THAN(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * less-than-equal {@code <=}. + */ + LESS_THAN_EQUAL(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * greater-than-equal {@code >=}. + */ + GREATER_THAN_EQUAL(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * in operator {@code in}. + */ + IN(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * equal-to {@code ==}. + */ + EQUAL_TO(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * not-equal-to {@code !=}. + */ + NOT_EQUAL_TO(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * equal-to {@code ===}. + */ + STRICT_EQUAL_TO(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * not-equal-to {@code !==}. + */ + STRICT_NOT_EQUAL_TO(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * bitwise and logical "and" {@code &}. + */ + AND(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * bitwise and logical "xor" {@code ^}. + */ + XOR(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * bitwise and logical "or" {@code |}. + */ + OR(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * conditional-and {@code &&}. + */ + CONDITIONAL_AND(BinaryTree.class), + + /** + * Used for instances of {@link BinaryTree} representing + * conditional-or {@code ||}. + */ + CONDITIONAL_OR(BinaryTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * multiplication assignment {@code *=}. + */ + MULTIPLY_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * division assignment {@code /=}. + */ + DIVIDE_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * remainder assignment {@code %=}. + */ + REMAINDER_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * addition or string concatenation assignment {@code +=}. + */ + PLUS_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * subtraction assignment {@code -=}. + */ + MINUS_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * left shift assignment {@code <<=}. + */ + LEFT_SHIFT_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * right shift assignment {@code >>=}. + */ + RIGHT_SHIFT_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * unsigned right shift assignment {@code >>>=}. + */ + UNSIGNED_RIGHT_SHIFT_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * bitwise and logical "and" assignment {@code &=}. + */ + AND_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * bitwise and logical "xor" assignment {@code ^=}. + */ + XOR_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link CompoundAssignmentTree} representing + * bitwise and logical "or" assignment {@code |=}. + */ + OR_ASSIGNMENT(CompoundAssignmentTree.class), + + /** + * Used for instances of {@link LiteralTree} representing + * a number literal expression of type {@code double}. + */ + NUMBER_LITERAL(LiteralTree.class), + + /** + * Used for instances of {@link LiteralTree} representing + * a boolean literal expression of type {@code boolean}. + */ + BOOLEAN_LITERAL(LiteralTree.class), + + /** + * Used for instances of {@link LiteralTree} representing + * a string literal expression of type {@link String}. + */ + STRING_LITERAL(LiteralTree.class), + + /** + * Used for instances of {@link LiteralTree} representing + * the use of {@code null}. + */ + NULL_LITERAL(LiteralTree.class), + + /** + * An implementation-reserved node. This is the not the node + * you are looking for. + */ + OTHER(null); + + Kind(Class<? extends Tree> intf) { + associatedInterface = intf; + } + + /** + * Returns the associated interface type that uses this kind. + * @return the associated interface + */ + public Class<? extends Tree> asInterface() { + return associatedInterface; + } + + /** + * Returns if this is a literal tree kind or not. + * + * @return true if this is a literal tree kind, false otherwise + */ + public boolean isLiteral() { + return associatedInterface == LiteralTree.class; + } + + /** + * Returns if this is an expression tree kind or not. + * + * @return true if this is an expression tree kind, false otherwise + */ + public boolean isExpression() { + return ExpressionTree.class.isAssignableFrom(associatedInterface); + } + + /** + * Returns if this is a statement tree kind or not. + * + * @return true if this is a statement tree kind, false otherwise + */ + public boolean isStatement() { + return StatementTree.class.isAssignableFrom(associatedInterface); + } + + private final Class<? extends Tree> associatedInterface; + } + + /** + * Start character offset of this Tree within the source. + * + * @return the position + */ + long getStartPosition(); + + /** + * End character offset of this Tree within the source. + * + * @return the position + */ + long getEndPosition(); + + /** + * Gets the kind of this tree. + * + * @return the kind of this tree. + */ + Kind getKind(); + + /** + * Accept method used to implement the visitor pattern. The + * visitor pattern is used to implement operations on trees. + * + * @param <R> result type of this operation. + * @param <D> type of additional data. + * @param visitor tree visitor + * @param data additional data passed to visitor methods + * @return the value from visitor's visit methods + */ + <R,D> R accept(TreeVisitor<R,D> visitor, D data); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,154 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.Node; + +import jdk.nashorn.internal.parser.TokenType; + +abstract class TreeImpl implements Tree { + protected final Node node; + + TreeImpl(final Node node) { + this.node = node; + } + + @Override + public long getStartPosition() { + return node.getStart(); + } + + @Override + public long getEndPosition() { + return node.getFinish(); + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitUnknown(this, data); + } + + static Kind getOperator(final TokenType tt) { + switch(tt) { + case NEW: + return Kind.NEW; + case NOT: + return Kind.LOGICAL_COMPLEMENT; + case NE: + return Kind.NOT_EQUAL_TO; + case NE_STRICT: + return Kind.STRICT_NOT_EQUAL_TO; + case MOD: + return Kind.REMAINDER; + case ASSIGN_MOD: + return Kind.REMAINDER_ASSIGNMENT; + case BIT_AND: + return Kind.AND; + case AND: + return Kind.CONDITIONAL_AND; + case ASSIGN_BIT_AND: + return Kind.AND_ASSIGNMENT; + case MUL: + return Kind.MULTIPLY; + case ASSIGN_MUL: + return Kind.MULTIPLY_ASSIGNMENT; + case ADD: + return Kind.PLUS; + case INCPREFIX: + return Kind.PREFIX_INCREMENT; + case INCPOSTFIX: + return Kind.POSTFIX_INCREMENT; + case ASSIGN_ADD: + return Kind.PLUS_ASSIGNMENT; + case SUB: + return Kind.MINUS; + case DECPREFIX: + return Kind.PREFIX_DECREMENT; + case DECPOSTFIX: + return Kind.POSTFIX_DECREMENT; + case ASSIGN_SUB: + return Kind.MINUS_ASSIGNMENT; + case DIV: + return Kind.DIVIDE; + case ASSIGN_DIV: + return Kind.DIVIDE_ASSIGNMENT; + case LT: + return Kind.LESS_THAN; + case SHL: + return Kind.LEFT_SHIFT; + case ASSIGN_SHL: + return Kind.LEFT_SHIFT_ASSIGNMENT; + case LE: + return Kind.LESS_THAN_EQUAL; + case ASSIGN: + return Kind.ASSIGNMENT; + case EQ: + return Kind.EQUAL_TO; + case EQ_STRICT: + return Kind.STRICT_EQUAL_TO; + case GT: + return Kind.GREATER_THAN; + case GE: + return Kind.GREATER_THAN_EQUAL; + case SAR: + return Kind.RIGHT_SHIFT; + case ASSIGN_SAR: + return Kind.RIGHT_SHIFT_ASSIGNMENT; + case SHR: + return Kind.UNSIGNED_RIGHT_SHIFT; + case ASSIGN_SHR: + return Kind.UNSIGNED_RIGHT_SHIFT_ASSIGNMENT; + case TERNARY: + return Kind.CONDITIONAL_EXPRESSION; + case BIT_XOR: + return Kind.XOR; + case ASSIGN_BIT_XOR: + return Kind.XOR_ASSIGNMENT; + case BIT_OR: + return Kind.OR; + case ASSIGN_BIT_OR: + return Kind.OR_ASSIGNMENT; + case OR: + return Kind.CONDITIONAL_OR; + case BIT_NOT: + return Kind.BITWISE_COMPLEMENT; + case DELETE: + return Kind.DELETE; + case TYPEOF: + return Kind.TYPEOF; + case VOID: + return Kind.VOID; + case IN: + return Kind.IN; + case INSTANCEOF: + return Kind.INSTANCE_OF; + case COMMARIGHT: + return Kind.COMMA; + default: + throw new AssertionError("should not reach here: " + tt); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,438 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A visitor of trees, in the style of the visitor design pattern. + * Classes implementing this interface are used to operate + * on a tree when the kind of tree is unknown at compile time. + * When a visitor is passed to an tree's {@link Tree#accept + * accept} method, the <tt>visit<i>XYZ</i></tt> method most applicable + * to that tree is invoked. + * + * <p> Classes implementing this interface may or may not throw a + * {@code NullPointerException} if the additional parameter {@code p} + * is {@code null}; see documentation of the implementing class for + * details. + * + * <p> <b>WARNING:</b> It is possible that methods will be added to + this interface to accommodate new, currently unknown, language + structures added to future versions of the ECMAScript programming + language. When new visit methods are added for new Tree subtypes, + default method bodies will be introduced which will call visitUnknown + method as a fallback. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @since 1.9 + */ +@jdk.Exported +public interface TreeVisitor<R,P> { + /** + * Visit assignment tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitAssignment(AssignmentTree node, P p); + + /** + * Visit compound assignment tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitCompoundAssignment(CompoundAssignmentTree node, P p); + + /** + * Visit binary expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitBinary(BinaryTree node, P p); + + /** + * Visit block statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitBlock(BlockTree node, P p); + + /** + * Visit break statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitBreak(BreakTree node, P p); + + /** + * Visit case statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitCase(CaseTree node, P p); + + /** + * Visit catch block statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitCatch(CatchTree node, P p); + + /** + * Visit conditional expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitConditionalExpression(ConditionalExpressionTree node, P p); + + /** + * Visit continue statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitContinue(ContinueTree node, P p); + + /** + * Visit debugger statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitDebugger(DebuggerTree node, P p); + + /** + * Visit do-while statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitDoWhileLoop(DoWhileLoopTree node, P p); + + /** + * Visit error expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitErroneous(ErroneousTree node, P p); + + /** + * Visit expression statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitExpressionStatement(ExpressionStatementTree node, P p); + + /** + * Visit 'for' statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitForLoop(ForLoopTree node, P p); + + /** + * Visit for..in statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitForInLoop(ForInLoopTree node, P p); + + /** + * Visit function call expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitFunctionCall(FunctionCallTree node, P p); + + /** + * Visit function declaration tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitFunctionDeclaration(FunctionDeclarationTree node, P p); + + /** + * Visit function expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitFunctionExpression(FunctionExpressionTree node, P p); + + /** + * Visit identifier tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitIdentifier(IdentifierTree node, P p); + + /** + * Visit 'if' statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitIf(IfTree node, P p); + + /** + * Visit array access expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitArrayAccess(ArrayAccessTree node, P p); + + /** + * Visit array literal expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitArrayLiteral(ArrayLiteralTree node, P p); + + /** + * Visit labeled statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitLabeledStatement(LabeledStatementTree node, P p); + + /** + * Visit literal expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitLiteral(LiteralTree node, P p); + + /** + * Visit parenthesized expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitParenthesized(ParenthesizedTree node, P p); + + /** + * Visit return statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitReturn(ReturnTree node, P p); + + /** + * Visit member select expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitMemberSelect(MemberSelectTree node, P p); + + /** + * Visit 'new' expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitNew(NewTree node, P p); + + /** + * Visit object literal tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitObjectLiteral(ObjectLiteralTree node, P p); + + /** + * Visit a property of an object literal expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitProperty(PropertyTree node, P p); + + /** + * Visit regular expression literal tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitRegExpLiteral(RegExpLiteralTree node, P p); + + /** + * Visit an empty statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitEmptyStatement(EmptyStatementTree node, P p); + + /** + * Visit 'switch' statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitSwitch(SwitchTree node, P p); + + /** + * Visit 'throw' expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitThrow(ThrowTree node, P p); + + /** + * Visit compilation unit tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitCompilationUnit(CompilationUnitTree node, P p); + + /** + * Visit 'try' statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitTry(TryTree node, P p); + + /** + * Visit 'instanceof' expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitInstanceOf(InstanceOfTree node, P p); + + /** + * Visit unary expression tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitUnary(UnaryTree node, P p); + + /** + * Visit variable declaration tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitVariable(VariableTree node, P p); + + /** + * Visit 'while' statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitWhileLoop(WhileLoopTree node, P p); + + /** + * Visit 'with' statement tree. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitWith(WithTree node, P p); + + /** + * Visit unknown expression/statement tree. This fallback will be + * called if new Tree subtypes are introduced in future. A specific + * implementation may throw {{@linkplain UnknownTreeException unknown tree exception} + * if the visitor implementation was for an older language version. + * + * @param node node being visited + * @param p extra parameter passed to the visitor + * @return value from the visitor + */ + R visitUnknown(Tree node, P p); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,67 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; + +/** + * A tree node for a 'try' statement. + * + * For example: + * <pre> + * try + * <em>block</em> + * <em>catches</em> + * finally + * <em>finallyBlock</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface TryTree extends StatementTree { + /** + * Returns the 'try' block of this 'try' statement. + * + * @return the 'try' block + */ + BlockTree getBlock(); + + /** + * Returns the list of 'catch' statements associated with this 'try'. + * + * @return the list of 'catch' statements associated with this 'try'. + */ + List<? extends CatchTree> getCatches(); + + /** + * Returns the 'finally' block associated with this 'try'. This is + * null if there is no 'finally' block associated with this 'try'. + * + * @return the 'finally' block associated with this 'try'. + */ + BlockTree getFinallyBlock(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,69 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import java.util.List; +import jdk.nashorn.internal.ir.TryNode; + +final class TryTreeImpl extends StatementTreeImpl implements TryTree { + private final BlockTree block; + private final List<? extends CatchTree> catches; + private final BlockTree finallyBlock; + TryTreeImpl(final TryNode node, + final BlockTree block, + final List<? extends CatchTree> catches, + final BlockTree finallyBlock) { + super(node); + this.block = block; + this.catches = catches; + this.finallyBlock = finallyBlock; + } + + @Override + public Kind getKind() { + return Kind.TRY; + } + + @Override + public BlockTree getBlock() { + return block; + } + + @Override + public List<? extends CatchTree> getCatches() { + return catches; + } + + @Override + public BlockTree getFinallyBlock() { + return finallyBlock; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitTry(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,49 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for postfix and unary expressions. + * Use {@link #getKind getKind} to determine the kind of operator. + * + * For example: + * <pre> + * <em>operator</em> <em>expression</em> + * + * <em>expression</em> <em>operator</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface UnaryTree extends ExpressionTree { + /** + * Returns the expression operated by the unary operator. + * + * @return The expression operated by the unary operator. + */ + ExpressionTree getExpression(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,53 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.UnaryNode; + +class UnaryTreeImpl extends ExpressionTreeImpl implements UnaryTree { + private final ExpressionTree expr; + private final Kind kind; + UnaryTreeImpl(final UnaryNode node, final ExpressionTree expr) { + super(node); + this.expr = expr; + this.kind = getOperator(node.tokenType()); + } + + @Override + public Kind getKind() { + return kind; + } + + @Override + public ExpressionTree getExpression() { + return expr; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitUnary(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,83 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + + +/** + * Indicates that an unknown kind of Tree was encountered. This + * can occur if the language evolves and new kinds of Trees are + * added to the {@code Tree} hierarchy. May be thrown by a + * {@linkplain TreeVisitor tree visitor} to indicate that the + * visitor was created for a prior version of the language. + * + * @since 1.9 + */ +@jdk.Exported +public class UnknownTreeException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + private transient final Tree tree; + private transient final Object parameter; + + /** + * Creates a new {@code UnknownTreeException}. The {@code p} + * parameter may be used to pass in an additional argument with + * information about the context in which the unknown element was + * encountered; for example, the visit methods of {@link + * TreeVisitor} may pass in their additional parameter. + * + * @param t the unknown tree, may be {@code null} + * @param p an additional parameter, may be {@code null} + */ + public UnknownTreeException(Tree t, Object p) { + super("Unknown tree: " + t); + this.tree = t; + this.parameter = p; + } + + /** + * Returns the unknown tree. + * The value may be unavailable if this exception has been + * serialized and then read back in. + * + * @return the unknown element, or {@code null} if unavailable + */ + public Tree getUnknownTree() { + return tree; + } + + /** + * Returns the additional argument. + * The value may be unavailable if this exception has been + * serialized and then read back in. + * + * @return the additional argument + */ + public Object getArgument() { + return parameter; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a variable declaration. + * + * For example: + * <pre> + * <em>var</em> <em>name</em> <em>initializer</em> ; + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface VariableTree extends StatementTree { + /** + * Returns the name of this variable. + * + * @return the name of this variable + */ + String getName(); + + /** + * Returns the initial value expression for this variable. This is + * null if no initial value for this variable. + * + * @return the initial value expression + */ + ExpressionTree getInitializer(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.VarNode; + +final class VariableTreeImpl extends StatementTreeImpl implements VariableTree { + private final String name; + private final ExpressionTree init; + + VariableTreeImpl(final VarNode node, final ExpressionTree init) { + super(node); + this.name = node.getName().getName(); + this.init = init; + } + + @Override + public Kind getKind() { + return Kind.VARIABLE; + } + + @Override + public String getName() { + return name; + } + + @Override + public ExpressionTree getInitializer() { + return init; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitVariable(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'while' loop statement. + * + * For example: + * <pre> + * while ( <em>condition</em> ) + * <em>statement</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface WhileLoopTree extends ConditionalLoopTree { + /** + * The condition expression of this 'while' statement. + * + * @return the condition expression + */ + ExpressionTree getCondition(); + + /** + * The statement contained in this 'while' statement. + * + * @return the statement contained + */ + StatementTree getStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,60 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.WhileNode; + +final class WhileLoopTreeImpl extends StatementTreeImpl implements WhileLoopTree { + private final ExpressionTree cond; + private final StatementTree stat; + + WhileLoopTreeImpl(final WhileNode node, final ExpressionTree cond, final StatementTree stat) { + super(node); + assert !node.isDoWhile() : "while expected"; + this.cond = cond; + this.stat = stat; + } + + @Override + public Tree.Kind getKind() { + return Tree.Kind.WHILE_LOOP; + } + + @Override + public ExpressionTree getCondition() { + return cond; + } + + @Override + public StatementTree getStatement() { + return stat; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitWhileLoop(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java Thu Mar 12 21:14:04 2015 -0700 @@ -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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +/** + * A tree node for a 'with' statement. + * + * For example: + * <pre> + * with ( <em>scope</em> ) + * <em>statement</em> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +public interface WithTree extends StatementTree { + /** + * The scope object expression for this 'with' statement. + * + * @return the scope object + */ + ExpressionTree getScope(); + + /** + * The statement contained in this 'with' statement. + * + * @return the statement contained + */ + StatementTree getStatement(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.api.tree; + +import jdk.nashorn.internal.ir.WithNode; + +final class WithTreeImpl extends StatementTreeImpl implements WithTree { + private final ExpressionTree scope; + private final StatementTree stat; + WithTreeImpl(final WithNode node, final ExpressionTree scope, + final StatementTree stat) { + super(node); + this.scope = scope; + this.stat = stat; + } + + @Override + public Kind getKind() { + return Kind.WITH; + } + + @Override + public ExpressionTree getScope() { + return scope; + } + + @Override + public StatementTree getStatement() { + return stat; + } + + @Override + public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + return visitor.visitWith(this, data); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,75 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/** + * <p> + * Nashorn parser API provides interfaces to represent ECMAScript source code + * as abstract syntax trees (AST) and Parser to parse ECMAScript source scripts. + * </p> + * <p> + * Using parser API user can write Java code to access parse tree + * representation of ECMAScript source. Script source may be a file, + * a URL or a String. Unless stated otherwise null argument in methods of this + * package result in NullPointerException being thrown. + * </p> + * + * <pre> + * <code> + * import jdk.nashorn.api.tree.*; + * import java.io.File; + * + * // Simple example that prints warning on 'with' statements + * public class Main { + * public static void main(String[] args) throws Exception { + * // Create a new parser instance + * Parser parser = Parser.create(); + * File sourceFile = new File(args[0]); + * + * // Parse given source File using parse method. + * // Pass a diagnostic listener to print error messages. + * CompilationUnitTree cut = parser.parse(sourceFile, + * (d) -> { System.out.println(d); }); + * + * if (cut != null) { + * // call Tree.accept method passing a SimpleTreeVisitor + * cut.accept(new SimpleTreeVisitor<Void, Void>() { + * // visit method for 'with' statement + * public Void visitWith(WithTree wt, Void v) { + * // print warning on 'with' statement + * System.out.println("Warning: using 'with' statement!"); + * return null; + * } + * }, null); + * } + * } + * } + * </code> + * </pre> + * + * @since 1.9 + */ +@jdk.Exported +package jdk.nashorn.api.tree; +
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Mar 12 21:14:04 2015 -0700 @@ -836,7 +836,7 @@ */ final CodeGenerator codegen = this; - final Node currentDiscard = codegen.lc.getCurrentDiscard(); + final boolean isCurrentDiscard = codegen.lc.isCurrentDiscard(expr); expr.accept(new NodeOperatorVisitor<LexicalContext>(new LexicalContext()) { @Override public boolean enterIdentNode(final IdentNode identNode) { @@ -1192,7 +1192,7 @@ @Override public boolean enterJoinPredecessorExpression(final JoinPredecessorExpression joinExpr) { - loadExpression(joinExpr.getExpression(), resultBounds); + loadMaybeDiscard(joinExpr, joinExpr.getExpression(), resultBounds); return false; } @@ -1209,7 +1209,7 @@ throw new AssertionError(otherNode.getClass().getName()); } }); - if(currentDiscard != expr) { + if(!isCurrentDiscard) { coerceStackTop(resultBounds); } return method; @@ -3648,7 +3648,7 @@ // TODO: move checks for discarding to actual expression load code (e.g. as we do with void). That way we might // be able to eliminate even more checks. if(expr instanceof PrimitiveLiteralNode | isLocalVariable(expr)) { - assert lc.getCurrentDiscard() != expr; + assert !lc.isCurrentDiscard(expr); // Don't bother evaluating expressions without side effects. Typical usage is "void 0" for reliably generating // undefined. return; @@ -3656,11 +3656,37 @@ lc.pushDiscard(expr); loadExpression(expr, TypeBounds.UNBOUNDED); - if (lc.getCurrentDiscard() == expr) { + if (lc.popDiscardIfCurrent(expr)) { assert !expr.isAssignment(); // NOTE: if we had a way to load with type void, we could avoid popping method.pop(); - lc.popDiscard(); + } + } + + /** + * Loads the expression with the specified type bounds, but if the parent expression is the current discard, + * then instead loads and discards the expression. + * @param parent the parent expression that's tested for being the current discard + * @param expr the expression that's either normally loaded or discard-loaded + * @param resultBounds result bounds for when loading the expression normally + */ + private void loadMaybeDiscard(final Expression parent, final Expression expr, final TypeBounds resultBounds) { + loadMaybeDiscard(lc.popDiscardIfCurrent(parent), expr, resultBounds); + } + + /** + * Loads the expression with the specified type bounds, or loads and discards the expression, depending on the + * value of the discard flag. Useful as a helper for expressions with control flow where you often can't combine + * testing for being the current discard and loading the subexpressions. + * @param discard if true, the expression is loaded and discarded + * @param expr the expression that's either normally loaded or discard-loaded + * @param resultBounds result bounds for when loading the expression normally + */ + private void loadMaybeDiscard(final boolean discard, final Expression expr, final TypeBounds resultBounds) { + if (discard) { + loadAndDiscard(expr); + } else { + loadExpression(expr, resultBounds); } } @@ -3717,9 +3743,7 @@ public void loadVOID(final UnaryNode unaryNode, final TypeBounds resultBounds) { loadAndDiscard(unaryNode.getExpression()); - if(lc.getCurrentDiscard() == unaryNode) { - lc.popDiscard(); - } else { + if (!lc.popDiscardIfCurrent(unaryNode)) { method.loadUndefined(resultBounds.widest); } } @@ -3752,16 +3776,23 @@ private void loadAND_OR(final BinaryNode binaryNode, final TypeBounds resultBounds, final boolean isAnd) { final Type narrowestOperandType = Type.widestReturnType(binaryNode.lhs().getType(), binaryNode.rhs().getType()); + final boolean isCurrentDiscard = lc.popDiscardIfCurrent(binaryNode); + final Label skip = new Label("skip"); if(narrowestOperandType == Type.BOOLEAN) { // optimize all-boolean logical expressions final Label onTrue = new Label("andor_true"); emitBranch(binaryNode, onTrue, true); - method.load(false); - method._goto(skip); - method.label(onTrue); - method.load(true); - method.label(skip); + if (isCurrentDiscard) { + method.label(onTrue); + method.pop(); + } else { + method.load(false); + method._goto(skip); + method.label(onTrue); + method.load(true); + method.label(skip); + } return; } @@ -3770,7 +3801,11 @@ final boolean lhsConvert = LocalVariableConversion.hasLiveConversion(lhs); final Label evalRhs = lhsConvert ? new Label("eval_rhs") : null; - loadExpression(lhs, outBounds).dup().convert(Type.BOOLEAN); + loadExpression(lhs, outBounds); + if (!isCurrentDiscard) { + method.dup(); + } + method.convert(Type.BOOLEAN); if (isAnd) { if(lhsConvert) { method.ifne(evalRhs); @@ -3789,9 +3824,11 @@ method.label(evalRhs); } - method.pop(); + if (!isCurrentDiscard) { + method.pop(); + } final JoinPredecessorExpression rhs = (JoinPredecessorExpression)binaryNode.rhs(); - loadExpression(rhs, outBounds); + loadMaybeDiscard(isCurrentDiscard, rhs, outBounds); method.beforeJoinPoint(rhs); method.label(skip); } @@ -3813,9 +3850,8 @@ // Detect dead assignments if(lhs instanceof IdentNode) { final Symbol symbol = ((IdentNode)lhs).getSymbol(); - if(!symbol.isScope() && !symbol.hasSlotFor(rhsType) && lc.getCurrentDiscard() == binaryNode) { + if(!symbol.isScope() && !symbol.hasSlotFor(rhsType) && lc.popDiscardIfCurrent(binaryNode)) { loadAndDiscard(rhs); - lc.popDiscard(); method.markDeadLocalVariable(symbol); return; } @@ -4069,11 +4105,11 @@ private void loadCOMMARIGHT(final BinaryNode binaryNode, final TypeBounds resultBounds) { loadAndDiscard(binaryNode.lhs()); - loadExpression(binaryNode.rhs(), resultBounds); + loadMaybeDiscard(binaryNode, binaryNode.rhs(), resultBounds); } private void loadCOMMALEFT(final BinaryNode binaryNode, final TypeBounds resultBounds) { - loadExpression(binaryNode.lhs(), resultBounds); + loadMaybeDiscard(binaryNode, binaryNode.lhs(), resultBounds); loadAndDiscard(binaryNode.rhs()); } @@ -4173,13 +4209,14 @@ emitBranch(test, falseLabel, false); - loadExpression(trueExpr.getExpression(), outBounds); - assert Type.generic(method.peekType()) == outBounds.narrowest; + final boolean isCurrentDiscard = lc.popDiscardIfCurrent(ternaryNode); + loadMaybeDiscard(isCurrentDiscard, trueExpr.getExpression(), outBounds); + assert isCurrentDiscard || Type.generic(method.peekType()) == outBounds.narrowest; method.beforeJoinPoint(trueExpr); method._goto(exitLabel); method.label(falseLabel); - loadExpression(falseExpr.getExpression(), outBounds); - assert Type.generic(method.peekType()) == outBounds.narrowest; + loadMaybeDiscard(isCurrentDiscard, falseExpr.getExpression(), outBounds); + assert isCurrentDiscard || Type.generic(method.peekType()) == outBounds.narrowest; method.beforeJoinPoint(falseExpr); method.label(exitLabel); } @@ -4365,9 +4402,8 @@ // store the result that "lives on" after the op, e.g. "i" in i++ postfix. protected void storeNonDiscard() { - if (lc.getCurrentDiscard() == assignNode) { + if (lc.popDiscardIfCurrent(assignNode)) { assert assignNode.isAssignment(); - lc.popDiscard(); return; }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java Thu Mar 12 21:14:04 2015 -0700 @@ -34,6 +34,7 @@ import jdk.nashorn.internal.IntDeque; import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.ir.Block; +import jdk.nashorn.internal.ir.Expression; import jdk.nashorn.internal.ir.FunctionNode; import jdk.nashorn.internal.ir.LexicalContext; import jdk.nashorn.internal.ir.LexicalContextNode; @@ -59,9 +60,11 @@ /** Method emitter stack - every time we start a sub method (e.g. a split) we push one */ private final Deque<MethodEmitter> methodEmitters = new ArrayDeque<>(); - /** The discard stack - whenever we enter a discard node we keep track of its return value status - - * i.e. should we keep it or throw it away */ - private final Deque<Node> discard = new ArrayDeque<>(); + /** The discard stack - whenever we evaluate an expression that will be discarded, we push it on this stack. Various + * implementations of expression code emitter can choose to emit code that'll discard the expression themselves, or + * ignore it in which case CodeGenerator.loadAndDiscard() will explicitly emit a pop instruction. */ + private final Deque<Expression> discard = new ArrayDeque<>(); + private final Deque<Map<String, Collection<Label>>> unwarrantedOptimismHandlers = new ArrayDeque<>(); private final Deque<StringBuilder> slotTypesDescriptors = new ArrayDeque<>(); @@ -270,16 +273,20 @@ } } - void pushDiscard(final Node node) { - discard.push(node); + void pushDiscard(final Expression expr) { + discard.push(expr); } - Node popDiscard() { - return discard.pop(); + boolean popDiscardIfCurrent(final Expression expr) { + if (isCurrentDiscard(expr)) { + discard.pop(); + return true; + } + return false; } - Node getCurrentDiscard() { - return discard.peek(); + boolean isCurrentDiscard(final Expression expr) { + return discard.peek() == expr; } int quickSlot(final Type type) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java Thu Mar 12 21:14:04 2015 -0700 @@ -32,7 +32,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import jdk.nashorn.internal.codegen.ObjectClassGenerator.AllocatorDescriptor; import jdk.nashorn.internal.ir.Block; import jdk.nashorn.internal.ir.FunctionNode; import jdk.nashorn.internal.ir.FunctionNode.CompilationState; @@ -208,7 +207,7 @@ final RecompilableScriptFunctionData data = new RecompilableScriptFunctionData( newFunctionNode, compiler.getCodeInstaller(), - new AllocatorDescriptor(newFunctionNode.getThisProperties()), + ObjectClassGenerator.createAllocationStrategy(newFunctionNode.getThisProperties()), nestedFunctions, externalSymbolDepths.get(fnId), internalSymbols.get(fnId),
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java Thu Mar 12 21:14:04 2015 -0700 @@ -206,7 +206,6 @@ // continuations (since RewriteException's byteCodeSlots carries an array and not a name-value map). symbolIsConverted(symbol, branchLvarType, targetType); - //symbolIsUsed(symbol, branchLvarType); return new LocalVariableConversion(symbol, branchLvarType.type, targetType.type, next); } @@ -229,7 +228,7 @@ for(final Symbol symbol: commonSymbols) { final LvarType type1 = types1.get(symbol); final LvarType type2 = types2.get(symbol); - final LvarType widest = widestLvarType(type1, type2); + final LvarType widest = widestLvarType(type1, type2); if(widest != type1 && matches1) { matches1 = false; if(!matches2) { @@ -242,7 +241,7 @@ union = cloneMap(types2); } } - if(!(matches1 || matches2) && union != null) { //remove overly enthusiastic "union can be null" warning + if(!(matches1 || matches2)) { assert union != null; union.put(symbol, widest); } @@ -711,8 +710,13 @@ @Override public boolean enterIfNode(final IfNode ifNode) { + processIfNode(ifNode); + return false; + } + + private void processIfNode(final IfNode ifNode) { if(!reachable) { - return false; + return; } final Expression test = ifNode.getTest(); @@ -721,48 +725,48 @@ visitExpressionOnEmptyStack(test); - final Map<Symbol, LvarType> afterTestLvarTypes = localVariableTypes; - if(!isAlwaysFalse(test)) { + final Map<Symbol, LvarType> passLvarTypes; + final boolean reachableFromPass; + final boolean isTestAlwaysTrue = isAlwaysTrue(test); + if(isAlwaysFalse(test)) { + passLvarTypes = null; + reachableFromPass = false; + } else { + final Map<Symbol, LvarType> afterTestLvarTypes = localVariableTypes; pass.accept(this); assertTypeStackIsEmpty(); + if (isTestAlwaysTrue) { + return; + } + passLvarTypes = localVariableTypes; + reachableFromPass = reachable; + localVariableTypes = afterTestLvarTypes; + reachable = true; } - final Map<Symbol, LvarType> passLvarTypes = localVariableTypes; - final boolean reachableFromPass = reachable; - reachable = true; - localVariableTypes = afterTestLvarTypes; - if(!isAlwaysTrue(test) && fail != null) { + // If we get here, then we need to consider the case where pass block is not executed + assert !isTestAlwaysTrue; + + if (fail != null) { fail.accept(this); assertTypeStackIsEmpty(); - final boolean reachableFromFail = reachable; - reachable |= reachableFromPass; - if(!reachable) { - return false; - } - - if(reachableFromFail) { - if(reachableFromPass) { - final Map<Symbol, LvarType> failLvarTypes = localVariableTypes; - localVariableTypes = getUnionTypes(passLvarTypes, failLvarTypes); - setConversion(pass, passLvarTypes, localVariableTypes); - setConversion(fail, failLvarTypes, localVariableTypes); - } - return false; - } } - if(reachableFromPass) { - localVariableTypes = getUnionTypes(afterTestLvarTypes, passLvarTypes); - // IfNode itself is associated with conversions that might need to be performed after the test if there's no - // else branch. E.g. - // if(x = 1, cond) { x = 1.0 } must widen "x = 1" to a double. - setConversion(pass, passLvarTypes, localVariableTypes); - setConversion(ifNode, afterTestLvarTypes, localVariableTypes); - } else { - localVariableTypes = afterTestLvarTypes; + if(reachable) { + if(reachableFromPass) { + final Map<Symbol, LvarType> failLvarTypes = localVariableTypes; + localVariableTypes = getUnionTypes(passLvarTypes, failLvarTypes); + setConversion(pass, passLvarTypes, localVariableTypes); + // IfNode itself is associated with conversions that might need to be performed after the test if + // there's no else branch. E.g. + // if(x = 1, cond) { x = 1.0 } must widen "x = 1" to a double. + setConversion(fail != null ? fail : ifNode, failLvarTypes, localVariableTypes); + } + } else if (reachableFromPass) { + assert passLvarTypes != null; + localVariableTypes = passLvarTypes; + reachable = true; } - - return false; } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java Thu Mar 12 21:14:04 2015 -0700 @@ -45,6 +45,7 @@ import jdk.nashorn.internal.ir.CallNode; import jdk.nashorn.internal.ir.CaseNode; import jdk.nashorn.internal.ir.CatchNode; +import jdk.nashorn.internal.ir.DebuggerNode; import jdk.nashorn.internal.ir.ContinueNode; import jdk.nashorn.internal.ir.EmptyNode; import jdk.nashorn.internal.ir.Expression; @@ -185,6 +186,15 @@ } @Override + public boolean enterDebuggerNode(final DebuggerNode debuggerNode) { + final int line = debuggerNode.getLineNumber(); + final long token = debuggerNode.getToken(); + final int finish = debuggerNode.getFinish(); + addStatement(new ExpressionStatement(line, token, finish, new RuntimeNode(token, finish, RuntimeNode.Request.DEBUGGER, new ArrayList<Expression>()))); + return false; + } + + @Override public boolean enterJumpToInlinedFinally(final JumpToInlinedFinally jumpToInlinedFinally) { addStatement(jumpToInlinedFinally); return false;
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java Thu Mar 12 21:14:04 2015 -0700 @@ -100,15 +100,16 @@ for (final MapTuple<T> tuple : tuples) { final String key = tuple.key; final Symbol symbol = tuple.symbol; + final Class<?> initialType = tuple.getValueType(); - //TODO initial type is object here no matter what. Is that right? if (symbol != null && !isValidArrayIndex(getArrayIndex(key))) { final int flags = getPropertyFlags(symbol, hasArguments, false); properties.add( new SpillProperty( key, flags, - spillIndex++)); + spillIndex++, + initialType)); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java Thu Mar 12 21:14:04 2015 -0700 @@ -56,6 +56,7 @@ import jdk.nashorn.internal.codegen.ClassEmitter.Flag; import jdk.nashorn.internal.codegen.types.Type; import jdk.nashorn.internal.runtime.AccessorProperty; +import jdk.nashorn.internal.runtime.AllocationStrategy; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.FunctionScope; import jdk.nashorn.internal.runtime.JSType; @@ -826,44 +827,13 @@ } /** - * Describes the allocator class name and property map for a constructor function with the specified + * Creates the allocator class name and property map for a constructor function with the specified * number of "this" properties that it initializes. - * + * @param thisProperties number of properties assigned to "this" + * @return the allocation strategy */ - public static class AllocatorDescriptor { - private final String allocatorClassName; - private final PropertyMap allocatorMap; - - /** - * Creates a new allocator descriptor - * @param thisProperties the number of "this" properties that the function initializes - */ - public AllocatorDescriptor(final int thisProperties) { - final int paddedFieldCount = getPaddedFieldCount(thisProperties); - this.allocatorClassName = Compiler.binaryName(getClassName(paddedFieldCount)); - this.allocatorMap = PropertyMap.newMap(null, allocatorClassName, 0, paddedFieldCount, 0); - } - - /** - * Returns the name of the class that the function allocates - * @return the name of the class that the function allocates - */ - public String getAllocatorClassName() { - return allocatorClassName; - } - - /** - * Returns the allocator map for the function. - * @return the allocator map for the function. - */ - public PropertyMap getAllocatorMap() { - return allocatorMap; - } - - @Override - public String toString() { - return "AllocatorDescriptor[allocatorClassName=" + allocatorClassName + ", allocatorMap.size=" + - allocatorMap.size() + "]"; - } + static AllocationStrategy createAllocationStrategy(final int thisProperties) { + final int paddedFieldCount = getPaddedFieldCount(thisProperties); + return new AllocationStrategy(paddedFieldCount); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java Thu Mar 12 21:14:04 2015 -0700 @@ -56,7 +56,7 @@ /** Break label. */ private final Label breakLabel; - /** Does the block/function need a new scope? */ + /** Does the block/function need a new scope? Is this synthetic? */ protected final int flags; /** @@ -80,6 +80,11 @@ public static final int IS_GLOBAL_SCOPE = 1 << 3; /** + * Is this block a synthetic one introduced by Parser? + */ + public static final int IS_SYNTHETIC = 1 << 4; + + /** * Constructor * * @param token The first token of the block @@ -108,7 +113,7 @@ * @param statements All statements in the block */ public Block(final long token, final int finish, final Statement...statements){ - this(token, finish, 0, statements); + this(token, finish, IS_SYNTHETIC, statements); } /** @@ -119,7 +124,7 @@ * @param statements All statements in the block */ public Block(final long token, final int finish, final List<Statement> statements){ - this(token, finish, 0, statements); + this(token, finish, IS_SYNTHETIC, statements); } /** @@ -366,6 +371,15 @@ return (flags & NEEDS_SCOPE) == NEEDS_SCOPE; } + /** + * Check whether this block is synthetic or not. + * + * @return true if this is a synthetic block + */ + public boolean isSynthetic() { + return (flags & IS_SYNTHETIC) == IS_SYNTHETIC; + } + @Override public Block setFlags(final LexicalContext lc, final int flags) { if (this.flags == flags) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java Thu Mar 12 21:14:04 2015 -0700 @@ -90,6 +90,15 @@ return block.isTerminal(); } + /** + * Tells if this is a synthetic block statement or not. + * + * @return true if this is a synthetic statement + */ + public boolean isSynthetic() { + return block.isSynthetic(); + } + @Override public Node accept(final NodeVisitor<? extends LexicalContext> visitor) { if (visitor.enterBlockStatement(this)) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2014, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.internal.ir; + +import jdk.nashorn.internal.ir.annotations.Immutable; +import jdk.nashorn.internal.ir.visitor.NodeVisitor; + +/** + * IR representation for a debugger statement. + */ +@Immutable +public final class DebuggerNode extends Statement { + private static final long serialVersionUID = 1L; + + /** + * Constructor + * + * @param lineNumber line number + * @param token token + * @param finish finish + */ + public DebuggerNode(final int lineNumber, final long token, final int finish) { + super(lineNumber, token, finish); + } + + @Override + public Node accept(final NodeVisitor<? extends LexicalContext> visitor) { + if (visitor.enterDebuggerNode(this)) { + return visitor.leaveDebuggerNode(this); + } + + return this; + } + + @Override + public void toString(final StringBuilder sb, final boolean printType) { + sb.append("debugger"); + } +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2014, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.nashorn.internal.ir; + +import jdk.nashorn.internal.codegen.types.Type; +import jdk.nashorn.internal.ir.annotations.Immutable; +import jdk.nashorn.internal.ir.visitor.NodeVisitor; + +/** + * IR representation for an error expression. + */ +@Immutable +public final class ErrorNode extends Expression { + private static final long serialVersionUID = 1L; + + /** + * Constructor + * + * @param token token + * @param finish finish + */ + public ErrorNode(final long token, final int finish) { + super(token, finish); + } + + @Override + public Type getType() { + return Type.OBJECT; + } + + @Override + public Node accept(final NodeVisitor<? extends LexicalContext> visitor) { + if (visitor.enterErrorNode(this)) { + return visitor.leaveErrorNode(this); + } + + return this; + } + + @Override + public void toString(final StringBuilder sb, final boolean printType) { + sb.append("<error>"); + } +} +
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java Thu Mar 12 21:14:04 2015 -0700 @@ -181,6 +181,28 @@ } /** + * Test if the value is an array + * + * @return True if value is an array + */ + public boolean isArray() { + return false; + } + + public List<Expression> getElementExpressions() { + return null; + } + + /** + * Test if the value is a boolean. + * + * @return True if value is a boolean. + */ + public boolean isBoolean() { + return value instanceof Boolean; + } + + /** * Test if the value is a string. * * @return True if value is a string. @@ -607,6 +629,12 @@ /** Sub units with indexes ranges, in which to split up code generation, for large literals */ private final List<ArrayUnit> units; + @Override + public boolean isArray() { + return true; + } + + /** * An ArrayUnit is a range in an ArrayLiteral. ArrayLiterals can * be split if they are too large, for bytecode generation reasons @@ -834,6 +862,7 @@ * null. * @return a list of array element expressions. */ + @Override public List<Expression> getElementExpressions() { return Collections.unmodifiableList(Arrays.asList(value)); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java Thu Mar 12 21:14:04 2015 -0700 @@ -38,6 +38,7 @@ import jdk.nashorn.internal.ir.CaseNode; import jdk.nashorn.internal.ir.CatchNode; import jdk.nashorn.internal.ir.ContinueNode; +import jdk.nashorn.internal.ir.DebuggerNode; import jdk.nashorn.internal.ir.EmptyNode; import jdk.nashorn.internal.ir.Expression; import jdk.nashorn.internal.ir.ExpressionStatement; @@ -289,6 +290,13 @@ } @Override + public boolean enterDebuggerNode(final DebuggerNode debuggerNode) { + enterDefault(debuggerNode); + type("DebuggerStatement"); + return leave(); + } + + @Override public boolean enterEmptyNode(final EmptyNode emptyNode) { enterDefault(emptyNode); @@ -302,7 +310,7 @@ // handle debugger statement final Node expression = expressionStatement.getExpression(); if (expression instanceof RuntimeNode) { - expression.accept(this); + assert false : "should not reach here: RuntimeNode"; return false; } @@ -319,14 +327,18 @@ @Override public boolean enterBlockStatement(final BlockStatement blockStatement) { + if (blockStatement.isSynthetic()) { + final Block blk = blockStatement.getBlock(); + blk.getStatements().get(0).accept(this); + return false; + } + enterDefault(blockStatement); type("BlockStatement"); comma(); - property("block"); - blockStatement.getBlock().accept(this); - + array("body", blockStatement.getBlock().getStatements()); return leave(); } @@ -677,19 +689,13 @@ @Override public boolean enterRuntimeNode(final RuntimeNode runtimeNode) { - final RuntimeNode.Request req = runtimeNode.getRequest(); - - if (req == RuntimeNode.Request.DEBUGGER) { - enterDefault(runtimeNode); - type("DebuggerStatement"); - return leave(); - } - + assert false : "should not reach here: RuntimeNode"; return false; } @Override public boolean enterSplitNode(final SplitNode splitNode) { + assert false : "should not reach here: SplitNode"; return false; }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java Thu Mar 12 21:14:04 2015 -0700 @@ -34,7 +34,9 @@ import jdk.nashorn.internal.ir.CaseNode; import jdk.nashorn.internal.ir.CatchNode; import jdk.nashorn.internal.ir.ContinueNode; +import jdk.nashorn.internal.ir.DebuggerNode; import jdk.nashorn.internal.ir.EmptyNode; +import jdk.nashorn.internal.ir.ErrorNode; import jdk.nashorn.internal.ir.ExpressionStatement; import jdk.nashorn.internal.ir.ForNode; import jdk.nashorn.internal.ir.FunctionNode; @@ -293,6 +295,27 @@ return leaveDefault(continueNode); } + + /** + * Callback for entering a DebuggerNode + * + * @param debuggerNode the node + * @return true if traversal should continue and node children be traversed, false otherwise + */ + public boolean enterDebuggerNode(final DebuggerNode debuggerNode) { + return enterDefault(debuggerNode); + } + + /** + * Callback for leaving a DebuggerNode + * + * @param debuggerNode the node + * @return processed node, which will replace the original one, or the original node + */ + public Node leaveDebuggerNode(final DebuggerNode debuggerNode) { + return leaveDefault(debuggerNode); + } + /** * Callback for entering an EmptyNode * @@ -314,6 +337,26 @@ } /** + * Callback for entering an ErrorNode + * + * @param errorNode the node + * @return true if traversal should continue and node children be traversed, false otherwise + */ + public boolean enterErrorNode(final ErrorNode errorNode) { + return enterDefault(errorNode); + } + + /** + * Callback for leaving an ErrorNode + * + * @param errorNode the node + * @return processed node, which will replace the original one, or the original node + */ + public Node leaveErrorNode(final ErrorNode errorNode) { + return leaveDefault(errorNode); + } + + /** * Callback for entering an ExpressionStatement * * @param expressionStatement the node
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java Thu Mar 12 21:14:04 2015 -0700 @@ -305,7 +305,7 @@ final ScriptFunction typeErrorThrower = global.getTypeErrorThrower(); if (findProperty("arguments", true) != null) { initUserAccessors("arguments", Property.NOT_CONFIGURABLE | Property.NOT_ENUMERABLE, typeErrorThrower, typeErrorThrower); - } + } if (findProperty("caller", true) != null) { initUserAccessors("caller", Property.NOT_CONFIGURABLE | Property.NOT_ENUMERABLE, typeErrorThrower, typeErrorThrower); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java Thu Mar 12 21:14:04 2015 -0700 @@ -244,20 +244,15 @@ private static PropertyMap addObjectProperty(final PropertyMap propertyMap, final List<Object> values, final String id, final Object value) { final Property oldProperty = propertyMap.findProperty(id); - final Property newProperty; final PropertyMap newMap; final Class<?> type = ObjectClassGenerator.OBJECT_FIELDS_ONLY ? Object.class : getType(value); if (oldProperty != null) { values.set(oldProperty.getSlot(), value); - newProperty = new SpillProperty(id, 0, oldProperty.getSlot()); - newProperty.setType(type); - newMap = propertyMap.replaceProperty(oldProperty, newProperty);; + newMap = propertyMap.replaceProperty(oldProperty, new SpillProperty(id, 0, oldProperty.getSlot(), type));; } else { values.add(value); - newProperty = new SpillProperty(id, 0, propertyMap.size()); - newProperty.setType(type); - newMap = propertyMap.addProperty(newProperty); + newMap = propertyMap.addProperty(new SpillProperty(id, 0, propertyMap.size(), type)); } return newMap;
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java Thu Mar 12 21:14:04 2015 -0700 @@ -77,7 +77,9 @@ import jdk.nashorn.internal.ir.CaseNode; import jdk.nashorn.internal.ir.CatchNode; import jdk.nashorn.internal.ir.ContinueNode; +import jdk.nashorn.internal.ir.DebuggerNode; import jdk.nashorn.internal.ir.EmptyNode; +import jdk.nashorn.internal.ir.ErrorNode; import jdk.nashorn.internal.ir.Expression; import jdk.nashorn.internal.ir.ExpressionStatement; import jdk.nashorn.internal.ir.ForNode; @@ -356,7 +358,8 @@ restoreBlock(body); body.setFlag(Block.NEEDS_SCOPE); - final Block functionBody = new Block(functionToken, source.getLength() - 1, body.getFlags(), body.getStatements()); + final Block functionBody = new Block(functionToken, source.getLength() - 1, + body.getFlags() | Block.IS_SYNTHETIC, body.getStatements()); lc.pop(function); expect(EOF); @@ -540,7 +543,8 @@ expect(RBRACE); } - return new Block(blockToken, finish, newBlock.getFlags(), newBlock.getStatements()); + final int flags = newBlock.getFlags() | (needsBraces? 0 : Block.IS_SYNTHETIC); + return new Block(blockToken, finish, flags, newBlock.getStatements()); } @@ -559,7 +563,7 @@ } finally { restoreBlock(newBlock); } - return new Block(newBlock.getToken(), finish, newBlock.getFlags(), newBlock.getStatements()); + return new Block(newBlock.getToken(), finish, newBlock.getFlags() | Block.IS_SYNTHETIC, newBlock.getStatements()); } /** @@ -712,7 +716,7 @@ restoreBlock(body); body.setFlag(Block.NEEDS_SCOPE); - final Block programBody = new Block(functionToken, functionLine, body.getFlags(), body.getStatements()); + final Block programBody = new Block(functionToken, functionLine, body.getFlags() | Block.IS_SYNTHETIC, body.getStatements()); lc.pop(script); script.setLastToken(token); @@ -826,8 +830,13 @@ } } } catch (final Exception e) { + final int errorLine = line; + final long errorToken = token; //recover parsing recover(e); + final ErrorNode errorExpr = new ErrorNode(errorToken, finish); + final ExpressionStatement expressionStatement = new ExpressionStatement(errorLine, errorToken, finish, errorExpr); + appendStatement(expressionStatement); } // No backtracking from here on. @@ -1853,7 +1862,7 @@ appendStatement(catchNode); } finally { restoreBlock(catchBlock); - catchBlocks.add(new Block(catchBlock.getToken(), finish, catchBlock.getFlags(), catchBlock.getStatements())); + catchBlocks.add(new Block(catchBlock.getToken(), finish, catchBlock.getFlags() | Block.IS_SYNTHETIC, catchBlock.getStatements())); } // If unconditional catch then should to be the end. @@ -1883,7 +1892,7 @@ restoreBlock(outer); } - appendStatement(new BlockStatement(startLine, new Block(tryToken, finish, outer.getFlags(), outer.getStatements()))); + appendStatement(new BlockStatement(startLine, new Block(tryToken, finish, outer.getFlags() | Block.IS_SYNTHETIC, outer.getStatements()))); } /** @@ -1901,7 +1910,7 @@ // DEBUGGER tested in caller. next(); endOfLine(); - appendStatement(new ExpressionStatement(debuggerLine, debuggerToken, finish, new RuntimeNode(debuggerToken, finish, RuntimeNode.Request.DEBUGGER, Collections.<Expression>emptyList()))); + appendStatement(new DebuggerNode(debuggerLine, debuggerToken, finish)); } /** @@ -2882,7 +2891,6 @@ Block functionBody; int bodyFinish = 0; - final boolean parseBody; Object endParserState = null; try {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java Thu Mar 12 21:14:04 2015 -0700 @@ -29,55 +29,52 @@ import java.io.Serializable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; +import jdk.nashorn.internal.codegen.Compiler; import jdk.nashorn.internal.codegen.CompilerConstants; -import jdk.nashorn.internal.codegen.ObjectClassGenerator.AllocatorDescriptor; +import jdk.nashorn.internal.codegen.ObjectClassGenerator; /** - * Encapsulates the allocation strategy for a function when used as a constructor. Basically the same as - * {@link AllocatorDescriptor}, but with an additionally cached resolved method handle. There is also a - * canonical default allocation strategy for functions that don't assign any "this" properties (vast majority - * of all functions), therefore saving some storage space in {@link RecompilableScriptFunctionData} that would - * otherwise be lost to identical tuples of (map, className, handle) fields. + * Encapsulates the allocation strategy for a function when used as a constructor. */ -final class AllocationStrategy implements Serializable { +final public class AllocationStrategy implements Serializable { private static final long serialVersionUID = 1L; private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); - private static final AllocationStrategy DEFAULT_STRATEGY = new AllocationStrategy(new AllocatorDescriptor(0)); - - /** Allocator map from allocator descriptor */ - private final PropertyMap allocatorMap; + /** Number of fields in the allocated object */ + private final int fieldCount; /** Name of class where allocator function resides */ - private final String allocatorClassName; + private transient String allocatorClassName; /** lazily generated allocator */ private transient MethodHandle allocator; - private AllocationStrategy(final AllocatorDescriptor desc) { - this.allocatorMap = desc.getAllocatorMap(); - // These classes get loaded, so an interned variant of their name is most likely around anyway. - this.allocatorClassName = desc.getAllocatorClassName().intern(); + /** + * Construct an allocation strategy with the given map and class name. + * @param fieldCount number of fields in the allocated object + */ + public AllocationStrategy(final int fieldCount) { + this.fieldCount = fieldCount; } - private boolean matches(final AllocatorDescriptor desc) { - return desc.getAllocatorMap().size() == allocatorMap.size() && - desc.getAllocatorClassName().equals(allocatorClassName); - } - - static AllocationStrategy get(final AllocatorDescriptor desc) { - return DEFAULT_STRATEGY.matches(desc) ? DEFAULT_STRATEGY : new AllocationStrategy(desc); + private String getAllocatorClassName() { + if (allocatorClassName == null) { + // These classes get loaded, so an interned variant of their name is most likely around anyway. + allocatorClassName = Compiler.binaryName(ObjectClassGenerator.getClassName(fieldCount)).intern(); + } + return allocatorClassName; } PropertyMap getAllocatorMap() { - return allocatorMap; + // Create a new map for each function instance + return PropertyMap.newMap(null, getAllocatorClassName(), 0, fieldCount, 0); } ScriptObject allocate(final PropertyMap map) { try { if (allocator == null) { - allocator = MH.findStatic(LOOKUP, Context.forStructureClass(allocatorClassName), + allocator = MH.findStatic(LOOKUP, Context.forStructureClass(getAllocatorClassName()), CompilerConstants.ALLOCATE.symbolName(), MH.type(ScriptObject.class, PropertyMap.class)); } return (ScriptObject)allocator.invokeExact(map); @@ -88,17 +85,8 @@ } } - private Object readResolve() { - if(allocatorMap.size() == DEFAULT_STRATEGY.allocatorMap.size() && - allocatorClassName.equals(DEFAULT_STRATEGY.allocatorClassName)) { - return DEFAULT_STRATEGY; - } - return this; - } - @Override public String toString() { - return "AllocationStrategy[allocatorClassName=" + allocatorClassName + ", allocatorMap.size=" + - allocatorMap.size() + "]"; + return "AllocationStrategy[fieldCount=" + fieldCount + "]"; } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java Thu Mar 12 21:14:04 2015 -0700 @@ -27,6 +27,7 @@ import static jdk.nashorn.internal.lookup.Lookup.MH; import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT; import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid; + import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -594,7 +595,7 @@ * switchpoint has been invalidated by a {@code RewriteException} triggered on another thread for this function. * This is not a problem, though, as these switch points are always used to produce call sites that fall back to * relinking when they are invalidated, and in this case the execution will end up here again. What this method - * basically does is minimize such busy-loop relinking while the function is being recompiled on a different thread. + * basically does is reduce such busy-loop relinking while the function is being recompiled on a different thread. * @param invocationSupplier the supplier that constructs the actual invocation method handle; should use the * {@code CompiledFunction} method itself in some capacity. * @return a tuple object containing the method handle as created by the supplier and an optimistic assumptions @@ -602,20 +603,27 @@ * function can't be further deoptimized). */ private synchronized HandleAndAssumptions getValidOptimisticInvocation(final Supplier<MethodHandle> invocationSupplier) { - for(;;) { + for(int i = 0; i < 2; ++i) { final MethodHandle handle = invocationSupplier.get(); final SwitchPoint assumptions = canBeDeoptimized() ? optimismInfo.optimisticAssumptions : null; - if(assumptions != null && assumptions.hasBeenInvalidated()) { + if(i == 0 && assumptions != null && assumptions.hasBeenInvalidated()) { // We can be in a situation where one thread is in the middle of a deoptimizing compilation when we hit // this and thus, it has invalidated the old switch point, but hasn't created the new one yet. Note that // the behavior of invalidating the old switch point before recompilation, and only creating the new one - // after recompilation is by design. If we didn't wait here for the recompilation to complete, we would - // be busy looping through the fallback path of the invalidated switch point, relinking the call site - // again with the same invalidated switch point, invoking the fallback, etc. stealing CPU cycles from - // the recompilation task we're dependent on. This can still happen if the switch point gets invalidated - // after we grabbed it here, in which case we'll indeed do one busy relink immediately. + // after recompilation is by design. If we didn't wait here, we would be busy looping through the + // fallback path of the invalidated switch point, relinking the call site again with the same + // invalidated switch point, invoking the fallback, etc. stealing CPU cycles from the recompilation + // task we're dependent on. This can still happen if the switch point gets invalidated after we grabbed + // it here, in which case we'll indeed do one busy relink immediately. + // On the other hand, in order to avoid a rare livelock, we aren't doing an infinite loop, and we + // aren't wait()-ing indefinitely. We'll do at most one, at most 1000ms long wait after which we'll + // return the current handle even if it's invalidated (and which'll then trigger one loop through the + // relink mechanism). We therefore strike a balance between busy looping and a livelock risk by making + // sure that there's at most one iteration of busy loop per second. It is theoretically possible to + // correctly implement this without ever risking a livelock, but using this heuristic we eliminate the + // chance of the livelock, while still maintaining a good enough busy-looping prevention. try { - wait(); + wait(1000L); } catch (final InterruptedException e) { // Intentionally ignored. There's nothing meaningful we can do if we're interrupted } @@ -623,6 +631,7 @@ return new HandleAndAssumptions(handle, assumptions); } } + throw new AssertionError(); // never reached } private static void relinkComposableInvoker(final CallSite cs, final CompiledFunction inv, final boolean constructor) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java Thu Mar 12 21:14:04 2015 -0700 @@ -43,7 +43,6 @@ import jdk.nashorn.internal.codegen.CompilerConstants; import jdk.nashorn.internal.codegen.FunctionSignature; import jdk.nashorn.internal.codegen.Namespace; -import jdk.nashorn.internal.codegen.ObjectClassGenerator.AllocatorDescriptor; import jdk.nashorn.internal.codegen.OptimisticTypesPersistence; import jdk.nashorn.internal.codegen.TypeMap; import jdk.nashorn.internal.codegen.types.Type; @@ -126,7 +125,7 @@ * * @param functionNode functionNode that represents this function code * @param installer installer for code regeneration versions of this function - * @param allocationDescriptor descriptor for the allocation behavior when this function is used as a constructor + * @param allocationStrategy strategy for the allocation behavior when this function is used as a constructor * @param nestedFunctions nested function map * @param externalScopeDepths external scope depths * @param internalSymbols internal symbols to method, defined in its scope @@ -135,7 +134,7 @@ public RecompilableScriptFunctionData( final FunctionNode functionNode, final CodeInstaller<ScriptEnvironment> installer, - final AllocatorDescriptor allocationDescriptor, + final AllocationStrategy allocationStrategy, final Map<Integer, RecompilableScriptFunctionData> nestedFunctions, final Map<String, Integer> externalScopeDepths, final Set<String> internalSymbols, @@ -153,7 +152,7 @@ this.endParserState = functionNode.getEndParserState(); this.token = tokenFor(functionNode); this.installer = installer; - this.allocationStrategy = AllocationStrategy.get(allocationDescriptor); + this.allocationStrategy = allocationStrategy; this.nestedFunctions = smallMap(nestedFunctions); this.externalScopeDepths = smallMap(externalScopeDepths); this.internalSymbols = smallSet(new HashSet<>(internalSymbols));
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java Thu Mar 12 21:14:04 2015 -0700 @@ -143,7 +143,6 @@ this.data = data; this.scope = scope; - this.allocatorMap = data.getAllocatorMap(); } @Override @@ -253,7 +252,7 @@ assert !isBoundFunction(); // allocate never invoked on bound functions - final ScriptObject object = data.allocate(allocatorMap); + final ScriptObject object = data.allocate(getAllocatorMap()); if (object != null) { final Object prototype = getPrototype(); @@ -269,6 +268,13 @@ return object; } + private PropertyMap getAllocatorMap() { + if (allocatorMap == null) { + allocatorMap = data.getAllocatorMap(); + } + return allocatorMap; + } + /** * Return Object.prototype - used by "allocate" * @return Object.prototype
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java Thu Mar 12 21:14:04 2015 -0700 @@ -484,6 +484,30 @@ * Constructor * * @param name source name + * @param path path from which source can be loaded + * + * @return source instance + * + * @throws IOException if source cannot be loaded + */ + public static Source sourceFor(final String name, final Path path) throws IOException { + File file = null; + try { + file = path.toFile(); + } catch (final UnsupportedOperationException uoe) { + } + + if (file != null) { + return sourceFor(name, file); + } else { + return sourceFor(name, Files.newBufferedReader(path)); + } + } + + /** + * Constructor + * + * @param name source name * @param file file from which source can be loaded * @param cs Charset used to convert bytes to chars * @@ -601,7 +625,7 @@ /** * Get explicit source URL. - * @return URL set vial sourceURL directive + * @return URL set via sourceURL directive */ public String getExplicitURL() { return explicitURL;
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java Thu Mar 12 21:14:04 2015 -0700 @@ -164,7 +164,14 @@ assert !OBJECT_FIELDS_ONLY || getLocalType() == Object.class; } - SpillProperty(final String key, final int flags, final int slot, final Class<?> initialType) { + /** + * Constructor for spill properties with an initial type. + * @param key the property key + * @param flags the property flags + * @param slot spill slot + * @param initialType initial type + */ + public SpillProperty(final String key, final int flags, final int slot, final Class<?> initialType) { this(key, flags, slot); setType(OBJECT_FIELDS_ONLY ? Object.class : initialType); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java Thu Mar 12 13:35:18 2015 -0700 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java Thu Mar 12 21:14:04 2015 -0700 @@ -429,6 +429,7 @@ while (!argList.isEmpty()) { final String arg = argList.remove(0); + Objects.requireNonNull(arg); // skip empty args if (arg.isEmpty()) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8074545.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,1038 @@ +/* + * 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-8074545: Undefined object values in object literals with spill properties + * + * @test + * @run + */ + +var obj = { + "p0": { "x" : 0 }, + "p1": { "x" : 1 }, + "p2": { "x" : 2 }, + "p3": { "x" : 3 }, + "p4": { "x" : 4 }, + "p5": { "x" : 5 }, + "p6": { "x" : 6 }, + "p7": { "x" : 7 }, + "p8": { "x" : 8 }, + "p9": { "x" : 9 }, + "p10": { "x" : 10 }, + "p11": { "x" : 11 }, + "p12": { "x" : 12 }, + "p13": { "x" : 13 }, + "p14": { "x" : 14 }, + "p15": { "x" : 15 }, + "p16": { "x" : 16 }, + "p17": { "x" : 17 }, + "p18": { "x" : 18 }, + "p19": { "x" : 19 }, + "p20": { "x" : 20 }, + "p21": { "x" : 21 }, + "p22": { "x" : 22 }, + "p23": { "x" : 23 }, + "p24": { "x" : 24 }, + "p25": { "x" : 25 }, + "p26": { "x" : 26 }, + "p27": { "x" : 27 }, + "p28": { "x" : 28 }, + "p29": { "x" : 29 }, + "p30": { "x" : 30 }, + "p31": { "x" : 31 }, + "p32": { "x" : 32 }, + "p33": { "x" : 33 }, + "p34": { "x" : 34 }, + "p35": { "x" : 35 }, + "p36": { "x" : 36 }, + "p37": { "x" : 37 }, + "p38": { "x" : 38 }, + "p39": { "x" : 39 }, + "p40": { "x" : 40 }, + "p41": { "x" : 41 }, + "p42": { "x" : 42 }, + "p43": { "x" : 43 }, + "p44": { "x" : 44 }, + "p45": { "x" : 45 }, + "p46": { "x" : 46 }, + "p47": { "x" : 47 }, + "p48": { "x" : 48 }, + "p49": { "x" : 49 }, + "p50": { "x" : 50 }, + "p51": { "x" : 51 }, + "p52": { "x" : 52 }, + "p53": { "x" : 53 }, + "p54": { "x" : 54 }, + "p55": { "x" : 55 }, + "p56": { "x" : 56 }, + "p57": { "x" : 57 }, + "p58": { "x" : 58 }, + "p59": { "x" : 59 }, + "p60": { "x" : 60 }, + "p61": { "x" : 61 }, + "p62": { "x" : 62 }, + "p63": { "x" : 63 }, + "p64": { "x" : 64 }, + "p65": { "x" : 65 }, + "p66": { "x" : 66 }, + "p67": { "x" : 67 }, + "p68": { "x" : 68 }, + "p69": { "x" : 69 }, + "p70": { "x" : 70 }, + "p71": { "x" : 71 }, + "p72": { "x" : 72 }, + "p73": { "x" : 73 }, + "p74": { "x" : 74 }, + "p75": { "x" : 75 }, + "p76": { "x" : 76 }, + "p77": { "x" : 77 }, + "p78": { "x" : 78 }, + "p79": { "x" : 79 }, + "p80": { "x" : 80 }, + "p81": { "x" : 81 }, + "p82": { "x" : 82 }, + "p83": { "x" : 83 }, + "p84": { "x" : 84 }, + "p85": { "x" : 85 }, + "p86": { "x" : 86 }, + "p87": { "x" : 87 }, + "p88": { "x" : 88 }, + "p89": { "x" : 89 }, + "p90": { "x" : 90 }, + "p91": { "x" : 91 }, + "p92": { "x" : 92 }, + "p93": { "x" : 93 }, + "p94": { "x" : 94 }, + "p95": { "x" : 95 }, + "p96": { "x" : 96 }, + "p97": { "x" : 97 }, + "p98": { "x" : 98 }, + "p99": { "x" : 99 }, + "p100": { "x" : 100 }, + "p101": { "x" : 101 }, + "p102": { "x" : 102 }, + "p103": { "x" : 103 }, + "p104": { "x" : 104 }, + "p105": { "x" : 105 }, + "p106": { "x" : 106 }, + "p107": { "x" : 107 }, + "p108": { "x" : 108 }, + "p109": { "x" : 109 }, + "p110": { "x" : 110 }, + "p111": { "x" : 111 }, + "p112": { "x" : 112 }, + "p113": { "x" : 113 }, + "p114": { "x" : 114 }, + "p115": { "x" : 115 }, + "p116": { "x" : 116 }, + "p117": { "x" : 117 }, + "p118": { "x" : 118 }, + "p119": { "x" : 119 }, + "p120": { "x" : 120 }, + "p121": { "x" : 121 }, + "p122": { "x" : 122 }, + "p123": { "x" : 123 }, + "p124": { "x" : 124 }, + "p125": { "x" : 125 }, + "p126": { "x" : 126 }, + "p127": { "x" : 127 }, + "p128": { "x" : 128 }, + "p129": { "x" : 129 }, + "p130": { "x" : 130 }, + "p131": { "x" : 131 }, + "p132": { "x" : 132 }, + "p133": { "x" : 133 }, + "p134": { "x" : 134 }, + "p135": { "x" : 135 }, + "p136": { "x" : 136 }, + "p137": { "x" : 137 }, + "p138": { "x" : 138 }, + "p139": { "x" : 139 }, + "p140": { "x" : 140 }, + "p141": { "x" : 141 }, + "p142": { "x" : 142 }, + "p143": { "x" : 143 }, + "p144": { "x" : 144 }, + "p145": { "x" : 145 }, + "p146": { "x" : 146 }, + "p147": { "x" : 147 }, + "p148": { "x" : 148 }, + "p149": { "x" : 149 }, + "p150": { "x" : 150 }, + "p151": { "x" : 151 }, + "p152": { "x" : 152 }, + "p153": { "x" : 153 }, + "p154": { "x" : 154 }, + "p155": { "x" : 155 }, + "p156": { "x" : 156 }, + "p157": { "x" : 157 }, + "p158": { "x" : 158 }, + "p159": { "x" : 159 }, + "p160": { "x" : 160 }, + "p161": { "x" : 161 }, + "p162": { "x" : 162 }, + "p163": { "x" : 163 }, + "p164": { "x" : 164 }, + "p165": { "x" : 165 }, + "p166": { "x" : 166 }, + "p167": { "x" : 167 }, + "p168": { "x" : 168 }, + "p169": { "x" : 169 }, + "p170": { "x" : 170 }, + "p171": { "x" : 171 }, + "p172": { "x" : 172 }, + "p173": { "x" : 173 }, + "p174": { "x" : 174 }, + "p175": { "x" : 175 }, + "p176": { "x" : 176 }, + "p177": { "x" : 177 }, + "p178": { "x" : 178 }, + "p179": { "x" : 179 }, + "p180": { "x" : 180 }, + "p181": { "x" : 181 }, + "p182": { "x" : 182 }, + "p183": { "x" : 183 }, + "p184": { "x" : 184 }, + "p185": { "x" : 185 }, + "p186": { "x" : 186 }, + "p187": { "x" : 187 }, + "p188": { "x" : 188 }, + "p189": { "x" : 189 }, + "p190": { "x" : 190 }, + "p191": { "x" : 191 }, + "p192": { "x" : 192 }, + "p193": { "x" : 193 }, + "p194": { "x" : 194 }, + "p195": { "x" : 195 }, + "p196": { "x" : 196 }, + "p197": { "x" : 197 }, + "p198": { "x" : 198 }, + "p199": { "x" : 199 }, + "p200": { "x" : 200 }, + "p201": { "x" : 201 }, + "p202": { "x" : 202 }, + "p203": { "x" : 203 }, + "p204": { "x" : 204 }, + "p205": { "x" : 205 }, + "p206": { "x" : 206 }, + "p207": { "x" : 207 }, + "p208": { "x" : 208 }, + "p209": { "x" : 209 }, + "p210": { "x" : 210 }, + "p211": { "x" : 211 }, + "p212": { "x" : 212 }, + "p213": { "x" : 213 }, + "p214": { "x" : 214 }, + "p215": { "x" : 215 }, + "p216": { "x" : 216 }, + "p217": { "x" : 217 }, + "p218": { "x" : 218 }, + "p219": { "x" : 219 }, + "p220": { "x" : 220 }, + "p221": { "x" : 221 }, + "p222": { "x" : 222 }, + "p223": { "x" : 223 }, + "p224": { "x" : 224 }, + "p225": { "x" : 225 }, + "p226": { "x" : 226 }, + "p227": { "x" : 227 }, + "p228": { "x" : 228 }, + "p229": { "x" : 229 }, + "p230": { "x" : 230 }, + "p231": { "x" : 231 }, + "p232": { "x" : 232 }, + "p233": { "x" : 233 }, + "p234": { "x" : 234 }, + "p235": { "x" : 235 }, + "p236": { "x" : 236 }, + "p237": { "x" : 237 }, + "p238": { "x" : 238 }, + "p239": { "x" : 239 }, + "p240": { "x" : 240 }, + "p241": { "x" : 241 }, + "p242": { "x" : 242 }, + "p243": { "x" : 243 }, + "p244": { "x" : 244 }, + "p245": { "x" : 245 }, + "p246": { "x" : 246 }, + "p247": { "x" : 247 }, + "p248": { "x" : 248 }, + "p249": { "x" : 249 }, + "p250": { "x" : 250 }, + "p251": { "x" : 251 }, + "p252": { "x" : 252 }, + "p253": { "x" : 253 }, + "p254": { "x" : 254 }, + "p255": { "x" : 255 }, + "p256": { "x" : 256 }, + "p257": { "x" : 257 }, + "p258": { "x" : 258 }, + "p259": { "x" : 259 }, + "p260": { "x" : 260 }, + "p261": { "x" : 261 }, + "p262": { "x" : 262 }, + "p263": { "x" : 263 }, + "p264": { "x" : 264 }, + "p265": { "x" : 265 }, + "p266": { "x" : 266 }, + "p267": { "x" : 267 }, + "p268": { "x" : 268 }, + "p269": { "x" : 269 }, + "p270": { "x" : 270 }, + "p271": { "x" : 271 }, + "p272": { "x" : 272 }, + "p273": { "x" : 273 }, + "p274": { "x" : 274 }, + "p275": { "x" : 275 }, + "p276": { "x" : 276 }, + "p277": { "x" : 277 }, + "p278": { "x" : 278 }, + "p279": { "x" : 279 }, + "p280": { "x" : 280 }, + "p281": { "x" : 281 }, + "p282": { "x" : 282 }, + "p283": { "x" : 283 }, + "p284": { "x" : 284 }, + "p285": { "x" : 285 }, + "p286": { "x" : 286 }, + "p287": { "x" : 287 }, + "p288": { "x" : 288 }, + "p289": { "x" : 289 }, + "p290": { "x" : 290 }, + "p291": { "x" : 291 }, + "p292": { "x" : 292 }, + "p293": { "x" : 293 }, + "p294": { "x" : 294 }, + "p295": { "x" : 295 }, + "p296": { "x" : 296 }, + "p297": { "x" : 297 }, + "p298": { "x" : 298 }, + "p299": { "x" : 299 }, + "p300": { "x" : 300 }, + "p301": { "x" : 301 }, + "p302": { "x" : 302 }, + "p303": { "x" : 303 }, + "p304": { "x" : 304 }, + "p305": { "x" : 305 }, + "p306": { "x" : 306 }, + "p307": { "x" : 307 }, + "p308": { "x" : 308 }, + "p309": { "x" : 309 }, + "p310": { "x" : 310 }, + "p311": { "x" : 311 }, + "p312": { "x" : 312 }, + "p313": { "x" : 313 }, + "p314": { "x" : 314 }, + "p315": { "x" : 315 }, + "p316": { "x" : 316 }, + "p317": { "x" : 317 }, + "p318": { "x" : 318 }, + "p319": { "x" : 319 }, + "p320": { "x" : 320 }, + "p321": { "x" : 321 }, + "p322": { "x" : 322 }, + "p323": { "x" : 323 }, + "p324": { "x" : 324 }, + "p325": { "x" : 325 }, + "p326": { "x" : 326 }, + "p327": { "x" : 327 }, + "p328": { "x" : 328 }, + "p329": { "x" : 329 }, + "p330": { "x" : 330 }, + "p331": { "x" : 331 }, + "p332": { "x" : 332 }, + "p333": { "x" : 333 }, + "p334": { "x" : 334 }, + "p335": { "x" : 335 }, + "p336": { "x" : 336 }, + "p337": { "x" : 337 }, + "p338": { "x" : 338 }, + "p339": { "x" : 339 }, + "p340": { "x" : 340 }, + "p341": { "x" : 341 }, + "p342": { "x" : 342 }, + "p343": { "x" : 343 }, + "p344": { "x" : 344 }, + "p345": { "x" : 345 }, + "p346": { "x" : 346 }, + "p347": { "x" : 347 }, + "p348": { "x" : 348 }, + "p349": { "x" : 349 }, + "p350": { "x" : 350 }, + "p351": { "x" : 351 }, + "p352": { "x" : 352 }, + "p353": { "x" : 353 }, + "p354": { "x" : 354 }, + "p355": { "x" : 355 }, + "p356": { "x" : 356 }, + "p357": { "x" : 357 }, + "p358": { "x" : 358 }, + "p359": { "x" : 359 }, + "p360": { "x" : 360 }, + "p361": { "x" : 361 }, + "p362": { "x" : 362 }, + "p363": { "x" : 363 }, + "p364": { "x" : 364 }, + "p365": { "x" : 365 }, + "p366": { "x" : 366 }, + "p367": { "x" : 367 }, + "p368": { "x" : 368 }, + "p369": { "x" : 369 }, + "p370": { "x" : 370 }, + "p371": { "x" : 371 }, + "p372": { "x" : 372 }, + "p373": { "x" : 373 }, + "p374": { "x" : 374 }, + "p375": { "x" : 375 }, + "p376": { "x" : 376 }, + "p377": { "x" : 377 }, + "p378": { "x" : 378 }, + "p379": { "x" : 379 }, + "p380": { "x" : 380 }, + "p381": { "x" : 381 }, + "p382": { "x" : 382 }, + "p383": { "x" : 383 }, + "p384": { "x" : 384 }, + "p385": { "x" : 385 }, + "p386": { "x" : 386 }, + "p387": { "x" : 387 }, + "p388": { "x" : 388 }, + "p389": { "x" : 389 }, + "p390": { "x" : 390 }, + "p391": { "x" : 391 }, + "p392": { "x" : 392 }, + "p393": { "x" : 393 }, + "p394": { "x" : 394 }, + "p395": { "x" : 395 }, + "p396": { "x" : 396 }, + "p397": { "x" : 397 }, + "p398": { "x" : 398 }, + "p399": { "x" : 399 }, + "p400": { "x" : 400 }, + "p401": { "x" : 401 }, + "p402": { "x" : 402 }, + "p403": { "x" : 403 }, + "p404": { "x" : 404 }, + "p405": { "x" : 405 }, + "p406": { "x" : 406 }, + "p407": { "x" : 407 }, + "p408": { "x" : 408 }, + "p409": { "x" : 409 }, + "p410": { "x" : 410 }, + "p411": { "x" : 411 }, + "p412": { "x" : 412 }, + "p413": { "x" : 413 }, + "p414": { "x" : 414 }, + "p415": { "x" : 415 }, + "p416": { "x" : 416 }, + "p417": { "x" : 417 }, + "p418": { "x" : 418 }, + "p419": { "x" : 419 }, + "p420": { "x" : 420 }, + "p421": { "x" : 421 }, + "p422": { "x" : 422 }, + "p423": { "x" : 423 }, + "p424": { "x" : 424 }, + "p425": { "x" : 425 }, + "p426": { "x" : 426 }, + "p427": { "x" : 427 }, + "p428": { "x" : 428 }, + "p429": { "x" : 429 }, + "p430": { "x" : 430 }, + "p431": { "x" : 431 }, + "p432": { "x" : 432 }, + "p433": { "x" : 433 }, + "p434": { "x" : 434 }, + "p435": { "x" : 435 }, + "p436": { "x" : 436 }, + "p437": { "x" : 437 }, + "p438": { "x" : 438 }, + "p439": { "x" : 439 }, + "p440": { "x" : 440 }, + "p441": { "x" : 441 }, + "p442": { "x" : 442 }, + "p443": { "x" : 443 }, + "p444": { "x" : 444 }, + "p445": { "x" : 445 }, + "p446": { "x" : 446 }, + "p447": { "x" : 447 }, + "p448": { "x" : 448 }, + "p449": { "x" : 449 }, + "p450": { "x" : 450 }, + "p451": { "x" : 451 }, + "p452": { "x" : 452 }, + "p453": { "x" : 453 }, + "p454": { "x" : 454 }, + "p455": { "x" : 455 }, + "p456": { "x" : 456 }, + "p457": { "x" : 457 }, + "p458": { "x" : 458 }, + "p459": { "x" : 459 }, + "p460": { "x" : 460 }, + "p461": { "x" : 461 }, + "p462": { "x" : 462 }, + "p463": { "x" : 463 }, + "p464": { "x" : 464 }, + "p465": { "x" : 465 }, + "p466": { "x" : 466 }, + "p467": { "x" : 467 }, + "p468": { "x" : 468 }, + "p469": { "x" : 469 }, + "p470": { "x" : 470 }, + "p471": { "x" : 471 }, + "p472": { "x" : 472 }, + "p473": { "x" : 473 }, + "p474": { "x" : 474 }, + "p475": { "x" : 475 }, + "p476": { "x" : 476 }, + "p477": { "x" : 477 }, + "p478": { "x" : 478 }, + "p479": { "x" : 479 }, + "p480": { "x" : 480 }, + "p481": { "x" : 481 }, + "p482": { "x" : 482 }, + "p483": { "x" : 483 }, + "p484": { "x" : 484 }, + "p485": { "x" : 485 }, + "p486": { "x" : 486 }, + "p487": { "x" : 487 }, + "p488": { "x" : 488 }, + "p489": { "x" : 489 }, + "p490": { "x" : 490 }, + "p491": { "x" : 491 }, + "p492": { "x" : 492 }, + "p493": { "x" : 493 }, + "p494": { "x" : 494 }, + "p495": { "x" : 495 }, + "p496": { "x" : 496 }, + "p497": { "x" : 497 }, + "p498": { "x" : 498 }, + "p499": { "x" : 499 }, + "p500": { "x" : 500 }, + "p501": { "x" : 501 }, + "p502": { "x" : 502 }, + "p503": { "x" : 503 }, + "p504": { "x" : 504 }, + "p505": { "x" : 505 }, + "p506": { "x" : 506 }, + "p507": { "x" : 507 }, + "p508": { "x" : 508 }, + "p509": { "x" : 509 }, + "p510": { "x" : 510 }, + "p511": { "x" : 511 }, + "p512": { "x" : 512 }, + "p513": { "x" : 513 }, + "p514": { "x" : 514 }, + "p515": { "x" : 515 }, + "p516": { "x" : 516 }, + "p517": { "x" : 517 }, + "p518": { "x" : 518 }, + "p519": { "x" : 519 }, + "p520": { "x" : 520 }, + "p521": { "x" : 521 }, + "p522": { "x" : 522 }, + "p523": { "x" : 523 }, + "p524": { "x" : 524 }, + "p525": { "x" : 525 }, + "p526": { "x" : 526 }, + "p527": { "x" : 527 }, + "p528": { "x" : 528 }, + "p529": { "x" : 529 }, + "p530": { "x" : 530 }, + "p531": { "x" : 531 }, + "p532": { "x" : 532 }, + "p533": { "x" : 533 }, + "p534": { "x" : 534 }, + "p535": { "x" : 535 }, + "p536": { "x" : 536 }, + "p537": { "x" : 537 }, + "p538": { "x" : 538 }, + "p539": { "x" : 539 }, + "p540": { "x" : 540 }, + "p541": { "x" : 541 }, + "p542": { "x" : 542 }, + "p543": { "x" : 543 }, + "p544": { "x" : 544 }, + "p545": { "x" : 545 }, + "p546": { "x" : 546 }, + "p547": { "x" : 547 }, + "p548": { "x" : 548 }, + "p549": { "x" : 549 }, + "p550": { "x" : 550 }, + "p551": { "x" : 551 }, + "p552": { "x" : 552 }, + "p553": { "x" : 553 }, + "p554": { "x" : 554 }, + "p555": { "x" : 555 }, + "p556": { "x" : 556 }, + "p557": { "x" : 557 }, + "p558": { "x" : 558 }, + "p559": { "x" : 559 }, + "p560": { "x" : 560 }, + "p561": { "x" : 561 }, + "p562": { "x" : 562 }, + "p563": { "x" : 563 }, + "p564": { "x" : 564 }, + "p565": { "x" : 565 }, + "p566": { "x" : 566 }, + "p567": { "x" : 567 }, + "p568": { "x" : 568 }, + "p569": { "x" : 569 }, + "p570": { "x" : 570 }, + "p571": { "x" : 571 }, + "p572": { "x" : 572 }, + "p573": { "x" : 573 }, + "p574": { "x" : 574 }, + "p575": { "x" : 575 }, + "p576": { "x" : 576 }, + "p577": { "x" : 577 }, + "p578": { "x" : 578 }, + "p579": { "x" : 579 }, + "p580": { "x" : 580 }, + "p581": { "x" : 581 }, + "p582": { "x" : 582 }, + "p583": { "x" : 583 }, + "p584": { "x" : 584 }, + "p585": { "x" : 585 }, + "p586": { "x" : 586 }, + "p587": { "x" : 587 }, + "p588": { "x" : 588 }, + "p589": { "x" : 589 }, + "p590": { "x" : 590 }, + "p591": { "x" : 591 }, + "p592": { "x" : 592 }, + "p593": { "x" : 593 }, + "p594": { "x" : 594 }, + "p595": { "x" : 595 }, + "p596": { "x" : 596 }, + "p597": { "x" : 597 }, + "p598": { "x" : 598 }, + "p599": { "x" : 599 }, + "p600": { "x" : 600 }, + "p601": { "x" : 601 }, + "p602": { "x" : 602 }, + "p603": { "x" : 603 }, + "p604": { "x" : 604 }, + "p605": { "x" : 605 }, + "p606": { "x" : 606 }, + "p607": { "x" : 607 }, + "p608": { "x" : 608 }, + "p609": { "x" : 609 }, + "p610": { "x" : 610 }, + "p611": { "x" : 611 }, + "p612": { "x" : 612 }, + "p613": { "x" : 613 }, + "p614": { "x" : 614 }, + "p615": { "x" : 615 }, + "p616": { "x" : 616 }, + "p617": { "x" : 617 }, + "p618": { "x" : 618 }, + "p619": { "x" : 619 }, + "p620": { "x" : 620 }, + "p621": { "x" : 621 }, + "p622": { "x" : 622 }, + "p623": { "x" : 623 }, + "p624": { "x" : 624 }, + "p625": { "x" : 625 }, + "p626": { "x" : 626 }, + "p627": { "x" : 627 }, + "p628": { "x" : 628 }, + "p629": { "x" : 629 }, + "p630": { "x" : 630 }, + "p631": { "x" : 631 }, + "p632": { "x" : 632 }, + "p633": { "x" : 633 }, + "p634": { "x" : 634 }, + "p635": { "x" : 635 }, + "p636": { "x" : 636 }, + "p637": { "x" : 637 }, + "p638": { "x" : 638 }, + "p639": { "x" : 639 }, + "p640": { "x" : 640 }, + "p641": { "x" : 641 }, + "p642": { "x" : 642 }, + "p643": { "x" : 643 }, + "p644": { "x" : 644 }, + "p645": { "x" : 645 }, + "p646": { "x" : 646 }, + "p647": { "x" : 647 }, + "p648": { "x" : 648 }, + "p649": { "x" : 649 }, + "p650": { "x" : 650 }, + "p651": { "x" : 651 }, + "p652": { "x" : 652 }, + "p653": { "x" : 653 }, + "p654": { "x" : 654 }, + "p655": { "x" : 655 }, + "p656": { "x" : 656 }, + "p657": { "x" : 657 }, + "p658": { "x" : 658 }, + "p659": { "x" : 659 }, + "p660": { "x" : 660 }, + "p661": { "x" : 661 }, + "p662": { "x" : 662 }, + "p663": { "x" : 663 }, + "p664": { "x" : 664 }, + "p665": { "x" : 665 }, + "p666": { "x" : 666 }, + "p667": { "x" : 667 }, + "p668": { "x" : 668 }, + "p669": { "x" : 669 }, + "p670": { "x" : 670 }, + "p671": { "x" : 671 }, + "p672": { "x" : 672 }, + "p673": { "x" : 673 }, + "p674": { "x" : 674 }, + "p675": { "x" : 675 }, + "p676": { "x" : 676 }, + "p677": { "x" : 677 }, + "p678": { "x" : 678 }, + "p679": { "x" : 679 }, + "p680": { "x" : 680 }, + "p681": { "x" : 681 }, + "p682": { "x" : 682 }, + "p683": { "x" : 683 }, + "p684": { "x" : 684 }, + "p685": { "x" : 685 }, + "p686": { "x" : 686 }, + "p687": { "x" : 687 }, + "p688": { "x" : 688 }, + "p689": { "x" : 689 }, + "p690": { "x" : 690 }, + "p691": { "x" : 691 }, + "p692": { "x" : 692 }, + "p693": { "x" : 693 }, + "p694": { "x" : 694 }, + "p695": { "x" : 695 }, + "p696": { "x" : 696 }, + "p697": { "x" : 697 }, + "p698": { "x" : 698 }, + "p699": { "x" : 699 }, + "p700": { "x" : 700 }, + "p701": { "x" : 701 }, + "p702": { "x" : 702 }, + "p703": { "x" : 703 }, + "p704": { "x" : 704 }, + "p705": { "x" : 705 }, + "p706": { "x" : 706 }, + "p707": { "x" : 707 }, + "p708": { "x" : 708 }, + "p709": { "x" : 709 }, + "p710": { "x" : 710 }, + "p711": { "x" : 711 }, + "p712": { "x" : 712 }, + "p713": { "x" : 713 }, + "p714": { "x" : 714 }, + "p715": { "x" : 715 }, + "p716": { "x" : 716 }, + "p717": { "x" : 717 }, + "p718": { "x" : 718 }, + "p719": { "x" : 719 }, + "p720": { "x" : 720 }, + "p721": { "x" : 721 }, + "p722": { "x" : 722 }, + "p723": { "x" : 723 }, + "p724": { "x" : 724 }, + "p725": { "x" : 725 }, + "p726": { "x" : 726 }, + "p727": { "x" : 727 }, + "p728": { "x" : 728 }, + "p729": { "x" : 729 }, + "p730": { "x" : 730 }, + "p731": { "x" : 731 }, + "p732": { "x" : 732 }, + "p733": { "x" : 733 }, + "p734": { "x" : 734 }, + "p735": { "x" : 735 }, + "p736": { "x" : 736 }, + "p737": { "x" : 737 }, + "p738": { "x" : 738 }, + "p739": { "x" : 739 }, + "p740": { "x" : 740 }, + "p741": { "x" : 741 }, + "p742": { "x" : 742 }, + "p743": { "x" : 743 }, + "p744": { "x" : 744 }, + "p745": { "x" : 745 }, + "p746": { "x" : 746 }, + "p747": { "x" : 747 }, + "p748": { "x" : 748 }, + "p749": { "x" : 749 }, + "p750": { "x" : 750 }, + "p751": { "x" : 751 }, + "p752": { "x" : 752 }, + "p753": { "x" : 753 }, + "p754": { "x" : 754 }, + "p755": { "x" : 755 }, + "p756": { "x" : 756 }, + "p757": { "x" : 757 }, + "p758": { "x" : 758 }, + "p759": { "x" : 759 }, + "p760": { "x" : 760 }, + "p761": { "x" : 761 }, + "p762": { "x" : 762 }, + "p763": { "x" : 763 }, + "p764": { "x" : 764 }, + "p765": { "x" : 765 }, + "p766": { "x" : 766 }, + "p767": { "x" : 767 }, + "p768": { "x" : 768 }, + "p769": { "x" : 769 }, + "p770": { "x" : 770 }, + "p771": { "x" : 771 }, + "p772": { "x" : 772 }, + "p773": { "x" : 773 }, + "p774": { "x" : 774 }, + "p775": { "x" : 775 }, + "p776": { "x" : 776 }, + "p777": { "x" : 777 }, + "p778": { "x" : 778 }, + "p779": { "x" : 779 }, + "p780": { "x" : 780 }, + "p781": { "x" : 781 }, + "p782": { "x" : 782 }, + "p783": { "x" : 783 }, + "p784": { "x" : 784 }, + "p785": { "x" : 785 }, + "p786": { "x" : 786 }, + "p787": { "x" : 787 }, + "p788": { "x" : 788 }, + "p789": { "x" : 789 }, + "p790": { "x" : 790 }, + "p791": { "x" : 791 }, + "p792": { "x" : 792 }, + "p793": { "x" : 793 }, + "p794": { "x" : 794 }, + "p795": { "x" : 795 }, + "p796": { "x" : 796 }, + "p797": { "x" : 797 }, + "p798": { "x" : 798 }, + "p799": { "x" : 799 }, + "p800": { "x" : 800 }, + "p801": { "x" : 801 }, + "p802": { "x" : 802 }, + "p803": { "x" : 803 }, + "p804": { "x" : 804 }, + "p805": { "x" : 805 }, + "p806": { "x" : 806 }, + "p807": { "x" : 807 }, + "p808": { "x" : 808 }, + "p809": { "x" : 809 }, + "p810": { "x" : 810 }, + "p811": { "x" : 811 }, + "p812": { "x" : 812 }, + "p813": { "x" : 813 }, + "p814": { "x" : 814 }, + "p815": { "x" : 815 }, + "p816": { "x" : 816 }, + "p817": { "x" : 817 }, + "p818": { "x" : 818 }, + "p819": { "x" : 819 }, + "p820": { "x" : 820 }, + "p821": { "x" : 821 }, + "p822": { "x" : 822 }, + "p823": { "x" : 823 }, + "p824": { "x" : 824 }, + "p825": { "x" : 825 }, + "p826": { "x" : 826 }, + "p827": { "x" : 827 }, + "p828": { "x" : 828 }, + "p829": { "x" : 829 }, + "p830": { "x" : 830 }, + "p831": { "x" : 831 }, + "p832": { "x" : 832 }, + "p833": { "x" : 833 }, + "p834": { "x" : 834 }, + "p835": { "x" : 835 }, + "p836": { "x" : 836 }, + "p837": { "x" : 837 }, + "p838": { "x" : 838 }, + "p839": { "x" : 839 }, + "p840": { "x" : 840 }, + "p841": { "x" : 841 }, + "p842": { "x" : 842 }, + "p843": { "x" : 843 }, + "p844": { "x" : 844 }, + "p845": { "x" : 845 }, + "p846": { "x" : 846 }, + "p847": { "x" : 847 }, + "p848": { "x" : 848 }, + "p849": { "x" : 849 }, + "p850": { "x" : 850 }, + "p851": { "x" : 851 }, + "p852": { "x" : 852 }, + "p853": { "x" : 853 }, + "p854": { "x" : 854 }, + "p855": { "x" : 855 }, + "p856": { "x" : 856 }, + "p857": { "x" : 857 }, + "p858": { "x" : 858 }, + "p859": { "x" : 859 }, + "p860": { "x" : 860 }, + "p861": { "x" : 861 }, + "p862": { "x" : 862 }, + "p863": { "x" : 863 }, + "p864": { "x" : 864 }, + "p865": { "x" : 865 }, + "p866": { "x" : 866 }, + "p867": { "x" : 867 }, + "p868": { "x" : 868 }, + "p869": { "x" : 869 }, + "p870": { "x" : 870 }, + "p871": { "x" : 871 }, + "p872": { "x" : 872 }, + "p873": { "x" : 873 }, + "p874": { "x" : 874 }, + "p875": { "x" : 875 }, + "p876": { "x" : 876 }, + "p877": { "x" : 877 }, + "p878": { "x" : 878 }, + "p879": { "x" : 879 }, + "p880": { "x" : 880 }, + "p881": { "x" : 881 }, + "p882": { "x" : 882 }, + "p883": { "x" : 883 }, + "p884": { "x" : 884 }, + "p885": { "x" : 885 }, + "p886": { "x" : 886 }, + "p887": { "x" : 887 }, + "p888": { "x" : 888 }, + "p889": { "x" : 889 }, + "p890": { "x" : 890 }, + "p891": { "x" : 891 }, + "p892": { "x" : 892 }, + "p893": { "x" : 893 }, + "p894": { "x" : 894 }, + "p895": { "x" : 895 }, + "p896": { "x" : 896 }, + "p897": { "x" : 897 }, + "p898": { "x" : 898 }, + "p899": { "x" : 899 }, + "p900": { "x" : 900 }, + "p901": { "x" : 901 }, + "p902": { "x" : 902 }, + "p903": { "x" : 903 }, + "p904": { "x" : 904 }, + "p905": { "x" : 905 }, + "p906": { "x" : 906 }, + "p907": { "x" : 907 }, + "p908": { "x" : 908 }, + "p909": { "x" : 909 }, + "p910": { "x" : 910 }, + "p911": { "x" : 911 }, + "p912": { "x" : 912 }, + "p913": { "x" : 913 }, + "p914": { "x" : 914 }, + "p915": { "x" : 915 }, + "p916": { "x" : 916 }, + "p917": { "x" : 917 }, + "p918": { "x" : 918 }, + "p919": { "x" : 919 }, + "p920": { "x" : 920 }, + "p921": { "x" : 921 }, + "p922": { "x" : 922 }, + "p923": { "x" : 923 }, + "p924": { "x" : 924 }, + "p925": { "x" : 925 }, + "p926": { "x" : 926 }, + "p927": { "x" : 927 }, + "p928": { "x" : 928 }, + "p929": { "x" : 929 }, + "p930": { "x" : 930 }, + "p931": { "x" : 931 }, + "p932": { "x" : 932 }, + "p933": { "x" : 933 }, + "p934": { "x" : 934 }, + "p935": { "x" : 935 }, + "p936": { "x" : 936 }, + "p937": { "x" : 937 }, + "p938": { "x" : 938 }, + "p939": { "x" : 939 }, + "p940": { "x" : 940 }, + "p941": { "x" : 941 }, + "p942": { "x" : 942 }, + "p943": { "x" : 943 }, + "p944": { "x" : 944 }, + "p945": { "x" : 945 }, + "p946": { "x" : 946 }, + "p947": { "x" : 947 }, + "p948": { "x" : 948 }, + "p949": { "x" : 949 }, + "p950": { "x" : 950 }, + "p951": { "x" : 951 }, + "p952": { "x" : 952 }, + "p953": { "x" : 953 }, + "p954": { "x" : 954 }, + "p955": { "x" : 955 }, + "p956": { "x" : 956 }, + "p957": { "x" : 957 }, + "p958": { "x" : 958 }, + "p959": { "x" : 959 }, + "p960": { "x" : 960 }, + "p961": { "x" : 961 }, + "p962": { "x" : 962 }, + "p963": { "x" : 963 }, + "p964": { "x" : 964 }, + "p965": { "x" : 965 }, + "p966": { "x" : 966 }, + "p967": { "x" : 967 }, + "p968": { "x" : 968 }, + "p969": { "x" : 969 }, + "p970": { "x" : 970 }, + "p971": { "x" : 971 }, + "p972": { "x" : 972 }, + "p973": { "x" : 973 }, + "p974": { "x" : 974 }, + "p975": { "x" : 975 }, + "p976": { "x" : 976 }, + "p977": { "x" : 977 }, + "p978": { "x" : 978 }, + "p979": { "x" : 979 }, + "p980": { "x" : 980 }, + "p981": { "x" : 981 }, + "p982": { "x" : 982 }, + "p983": { "x" : 983 }, + "p984": { "x" : 984 }, + "p985": { "x" : 985 }, + "p986": { "x" : 986 }, + "p987": { "x" : 987 }, + "p988": { "x" : 988 }, + "p989": { "x" : 989 }, + "p990": { "x" : 990 }, + "p991": { "x" : 991 }, + "p992": { "x" : 992 }, + "p993": { "x" : 993 }, + "p994": { "x" : 994 }, + "p995": { "x" : 995 }, + "p996": { "x" : 996 }, + "p997": { "x" : 997 }, + "p998": { "x" : 998 }, + "p999": { "x" : 999 } +}; + +for (var i = 0; i < 1000; i++) { + var value = obj["p" + i]; + Assert.assertTrue(typeof value === "object"); + Assert.assertTrue(value.x === i); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8074556.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,52 @@ +/* + * 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-8074556: Functions should not share allocator maps + * + * @test + * @run + */ + +function A () { + return this; +} + +function B() { + return this; +} + +A.prototype.x = "x"; +A.prototype.y = "y"; +B.prototype.y = "y"; // same properties but different order +B.prototype.x = "x"; + +function test(o) { + Assert.assertEquals(o.x, "x"); + Assert.assertEquals(o.y, "y"); +} + +test(new A()); +test(new B()); +test(new A()); +test(new B());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8074687.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,60 @@ +/* + * 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-8074687: Add tests for JSON parsing of numeric keys + * + * @test + * @run + */ + +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": {} }')), '{"0":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": 1 }')), '{"0":1}'); + +Assert.assertEquals(JSON.stringify(JSON.parse('{ "65503": {} }')), '{"65503":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "65503": 1 }')), '{"65503":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": {}, "65503": {} }')), '{"0":{},"65503":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": 1, "65503": 1 }')), '{"0":1,"65503":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "65503": {}, "0": {} }')), '{"0":{},"65503":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "65503": 1, "0": 1 }')), '{"0":1,"65503":1}'); + +Assert.assertEquals(JSON.stringify(JSON.parse('{ "4294967295": {} }')), '{"4294967295":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "4294967295": 1 }')), '{"4294967295":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": {}, "4294967295": {} }')), '{"0":{},"4294967295":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": 1, "4294967295": 1 }')), '{"0":1,"4294967295":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "4294967295": {}, "0": {} }')), '{"0":{},"4294967295":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "4294967295": 1, "0": 1 }')), '{"0":1,"4294967295":1}'); + +Assert.assertEquals(JSON.stringify(JSON.parse('{ "100": {} }')), '{"100":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "100": 1 }')), '{"100":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": {}, "100": {} }')), '{"0":{},"100":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": 1, "100": 1 }')), '{"0":1,"100":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "100": {}, "0": {} }')), '{"0":{},"100":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "100": 1, "0": 1 }')), '{"0":1,"100":1}'); + +Assert.assertEquals(JSON.stringify(JSON.parse('{ "-100": {} }')), '{"-100":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "-100": 1 }')), '{"-100":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": {}, "-100": {} }')), '{"0":{},"-100":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "0": 1, "-100": 1 }')), '{"0":1,"-100":1}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "-100": {}, "0": {} }')), '{"0":{},"-100":{}}'); +Assert.assertEquals(JSON.stringify(JSON.parse('{ "-100": 1, "0": 1 }')), '{"0":1,"-100":1}');
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8074693.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,74 @@ +/* + * 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-8074693: Different instances of same function use same allocator map + * + * @test + * @run + */ + +var lib = {}; + +lib.mixin = function(target, source) { + for (var p in source) { + if (source.hasOwnProperty(p) && !target.hasOwnProperty(p)) { + target.prototype[p] = source[p]; + } + } +}; + +lib.declare = function(def) { + var className = def.name; + + lib[className] = function() { + this.init.apply(this, arguments); + }; + + lib.mixin(lib[className], def.members); +}; + + +lib.declare({ + name: "ClassA", + members: { + init : function () { + print("init A called"); + } + } +}); + +lib.declare({ + name: "ClassB", + members: { + util : function () { + print("util called") + }, + init : function() { + print("init B called"); + } + } +}); + +var objA = new lib.ClassA(); +var objB = new lib.ClassB();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8074693.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,2 @@ +init A called +init B called
--- a/test/script/basic/parser/tryCatchStat.js.EXPECTED Thu Mar 12 13:35:18 2015 -0700 +++ b/test/script/basic/parser/tryCatchStat.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -1,32 +1,70 @@ +{ + "type": "Program", + "body": [ + { + "type": "TryStatement", + "block": { + "type": "BlockStatement", + "body": [] + }, + "guardedHandlers": [], + "handler": { + "type": "CatchClause", + "param": { + "type": "Identifier", + "name": "e" + }, + "body": { + "type": "BlockStatement", + "body": [] + } + }, + "finalizer": null + } + ] +} { "type": "Program", "body": [ { - "type": "BlockStatement", + "type": "TryStatement", "block": { "type": "BlockStatement", - "body": [ - { - "type": "TryStatement", - "block": { - "type": "BlockStatement", - "body": [] - }, - "guardedHandlers": [], - "handler": { - "type": "CatchClause", - "param": { - "type": "Identifier", - "name": "e" - }, - "body": { - "type": "BlockStatement", - "body": [] - } - }, - "finalizer": null - } - ] + "body": [] + }, + "guardedHandlers": [], + "handler": { + "type": "CatchClause", + "param": { + "type": "Identifier", + "name": "e" + }, + "body": { + "type": "BlockStatement", + "body": [] + } + }, + "finalizer": { + "type": "BlockStatement", + "body": [] + } + } + ] +} +{ + "type": "Program", + "body": [ + { + "type": "TryStatement", + "block": { + "type": "BlockStatement", + "body": [] + }, + "guardedHandlers": [], + "handler": null, + "finalizer": { + "type": "BlockStatement", + "body": [] } } ] @@ -35,35 +73,36 @@ "type": "Program", "body": [ { - "type": "BlockStatement", + "type": "TryStatement", "block": { "type": "BlockStatement", - "body": [ - { - "type": "TryStatement", - "block": { - "type": "BlockStatement", - "body": [] - }, - "guardedHandlers": [], - "handler": { - "type": "CatchClause", - "param": { - "type": "Identifier", - "name": "e" - }, - "body": { - "type": "BlockStatement", - "body": [] + "body": [] + }, + "guardedHandlers": [], + "handler": { + "type": "CatchClause", + "param": { + "type": "Identifier", + "name": "e" + }, + "body": { + "type": "BlockStatement", + "body": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { + "type": "Identifier", + "name": "handle" + }, + "arguments": [] } - }, - "finalizer": { - "type": "BlockStatement", - "body": [] } - } - ] - } + ] + } + }, + "finalizer": null } ] } @@ -71,21 +110,59 @@ "type": "Program", "body": [ { - "type": "BlockStatement", + "type": "TryStatement", "block": { "type": "BlockStatement", "body": [ { - "type": "TryStatement", - "block": { - "type": "BlockStatement", - "body": [] - }, - "guardedHandlers": [], - "handler": null, - "finalizer": { - "type": "BlockStatement", - "body": [] + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { + "type": "Identifier", + "name": "that" + }, + "arguments": [] + } + } + ] + }, + "guardedHandlers": [], + "handler": { + "type": "CatchClause", + "param": { + "type": "Identifier", + "name": "e" + }, + "body": { + "type": "BlockStatement", + "body": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { + "type": "Identifier", + "name": "handle" + }, + "arguments": [] + } + } + ] + } + }, + "finalizer": { + "type": "BlockStatement", + "body": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { + "type": "Identifier", + "name": "clean" + }, + "arguments": [] } } ] @@ -97,209 +174,84 @@ "type": "Program", "body": [ { - "type": "BlockStatement", - "block": { - "type": "BlockStatement", - "body": [ - { - "type": "TryStatement", - "block": { - "type": "BlockStatement", - "body": [] - }, - "guardedHandlers": [], - "handler": { - "type": "CatchClause", - "param": { - "type": "Identifier", - "name": "e" - }, - "body": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "handle" - }, - "arguments": [] - } - } - ] - } - }, - "finalizer": null - } - ] - } - } - ] -} -{ - "type": "Program", - "body": [ - { - "type": "BlockStatement", + "type": "TryStatement", "block": { "type": "BlockStatement", "body": [ { - "type": "TryStatement", - "block": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "that" - }, - "arguments": [] - } - } - ] - }, - "guardedHandlers": [], - "handler": { - "type": "CatchClause", - "param": { + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { "type": "Identifier", - "name": "e" + "name": "that" }, - "body": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "handle" - }, - "arguments": [] - } - } - ] - } - }, - "finalizer": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "clean" - }, - "arguments": [] - } - } - ] + "arguments": [] } } ] - } + }, + "guardedHandlers": [ + { + "type": "CatchClause", + "param": { + "type": "Identifier", + "name": "e" + }, + "guard": { + "type": "BinaryExpression", + "operator": "instanceof", + "left": { + "type": "Identifier", + "name": "e" + }, + "right": { + "type": "Identifier", + "name": "TypeError" + } + }, + "body": { + "type": "BlockStatement", + "body": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { + "type": "Identifier", + "name": "handle" + }, + "arguments": [] + } + } + ] + } + } + ], + "handler": { + "type": "CatchClause", + "param": { + "type": "Identifier", + "name": "e" + }, + "body": { + "type": "BlockStatement", + "body": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "CallExpression", + "callee": { + "type": "Identifier", + "name": "rest" + }, + "arguments": [] + } + } + ] + } + }, + "finalizer": null } ] } -{ - "type": "Program", - "body": [ - { - "type": "BlockStatement", - "block": { - "type": "BlockStatement", - "body": [ - { - "type": "TryStatement", - "block": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "that" - }, - "arguments": [] - } - } - ] - }, - "guardedHandlers": [ - { - "type": "CatchClause", - "param": { - "type": "Identifier", - "name": "e" - }, - "guard": { - "type": "BinaryExpression", - "operator": "instanceof", - "left": { - "type": "Identifier", - "name": "e" - }, - "right": { - "type": "Identifier", - "name": "TypeError" - } - }, - "body": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "handle" - }, - "arguments": [] - } - } - ] - } - } - ], - "handler": { - "type": "CatchClause", - "param": { - "type": "Identifier", - "name": "e" - }, - "body": { - "type": "BlockStatement", - "body": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "rest" - }, - "arguments": [] - } - } - ] - } - }, - "finalizer": null - } - ] - } - } - ] -}
--- a/test/script/basic/parser/util.js Thu Mar 12 13:35:18 2015 -0700 +++ b/test/script/basic/parser/util.js Thu Mar 12 21:14:04 2015 -0700 @@ -25,7 +25,7 @@ * @subtest */ -// utilitity for parser tests +// utility for parser tests load("nashorn:parser.js"); function printParse(code) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,126 @@ +/* + * 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. + */ + +/** + * Nashorn parser API usage. + * + * @test + * @option -scripting + * @run + */ + +function Parser() { + // create nashorn parser + this._parser = Parser.create(); +} + +// Java types used +Parser.Diagnostic = Java.type("jdk.nashorn.api.tree.Diagnostic"); +Parser.SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); +Parser.Tree = Java.type("jdk.nashorn.api.tree.Tree"); +Parser.List = Java.type("java.util.List"); +Parser.Enum = Java.type("java.lang.Enum"); + +// function to parse the script and return script friendly object +Parser.prototype.parse = function(name, script, listener) { + var tree = this._parser.parse(name, script, listener); + tree.accept(new Parser.SimpleTreeVisitor(), null); + return this.convert(tree); +} + +Parser.create = function() { + return Java.type("jdk.nashorn.api.tree.Parser").create(); +} + +// convert Nashorn parser Tree, Diagnostic as a script friendly object +Parser.prototype.convert = function(tree) { + if (!tree || typeof tree != 'object') { + return tree; + } + + var obj = Object.bindProperties({}, tree); + var result = {}; + for (var i in obj) { + var val = obj[i]; + if (val instanceof Parser.Tree) { + result[i] = this.convert(val); + } else if (val instanceof Parser.List) { + var arr = new Array(val.size()); + for (var j in val) { + arr[j] = this.convert(val[j]); + } + + result[i] = arr; + } else { + switch (typeof val) { + case 'number': + case 'string': + case 'boolean': + result[i] = String(val); + default: + if (val instanceof Parser.Enum) { + result[i] = String(val); + } + } + } + } + return result; +} + +function processFiles(subdir) { + var File = Java.type("java.io.File"); + var files = new File(__DIR__ + subdir).listFiles(); + java.util.Arrays.sort(files); + for each (var file in files) { + if (file.name.endsWith(".js")) { + var script = readFully(file); + var parser = new Parser(); + var tree = parser.parse(subdir + "/" + file.name, script, + function(diagnostic) { + print(JSON.stringify(parser.convert(diagnostic), null, 2)); + print(","); + }); + + if (tree != null) { + print(JSON.stringify(tree, null, 2)); + print(","); + } + } + } +} + +// parse files in parsertests directory +function main() { + print("["); + + processFiles("parsertests"); + processFiles("parsernegativetests"); + + // parse this file first! + var script = readFully(__FILE__); + var tree = new Parser().parse("parserapi.js", script, null); + print(JSON.stringify(tree, null, 2)); + print("]"); +} + +main();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,7015 @@ +[ +{ + "endPosition": "1113", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1123", + "kind": "VARIABLE", + "name": "x", + "startPosition": "1117", + "initializer": { + "endPosition": "1123", + "kind": "ARRAY_LITERAL", + "elements": [], + "startPosition": "1121" + } + }, + { + "endPosition": "1147", + "kind": "VARIABLE", + "name": "y", + "startPosition": "1129", + "initializer": { + "endPosition": "1147", + "kind": "ARRAY_LITERAL", + "elements": [ + { + "endPosition": "1135", + "kind": "NUMBER_LITERAL", + "value": "1", + "startPosition": "1134" + }, + { + "endPosition": "1139", + "kind": "NUMBER_LITERAL", + "value": "43", + "startPosition": "1137" + }, + { + "endPosition": "1142", + "kind": "NUMBER_LITERAL", + "value": "5", + "startPosition": "1141" + }, + { + "endPosition": "1146", + "kind": "NUMBER_LITERAL", + "value": "45", + "startPosition": "1144" + } + ], + "startPosition": "1133" + } + }, + { + "endPosition": "1165", + "kind": "VARIABLE", + "name": "z", + "startPosition": "1153", + "initializer": { + "endPosition": "1165", + "kind": "ARRAY_LITERAL", + "elements": [ + { + "endPosition": "1160", + "kind": "NUMBER_LITERAL", + "value": "34", + "startPosition": "1158" + }, + null, + null, + { + "endPosition": "1164", + "kind": "NUMBER_LITERAL", + "value": "4", + "startPosition": "1163" + } + ], + "startPosition": "1157" + } + }, + { + "endPosition": "1200", + "kind": "VARIABLE", + "name": "k", + "startPosition": "1171", + "initializer": { + "endPosition": "1200", + "kind": "ARRAY_LITERAL", + "elements": [ + { + "endPosition": "1179", + "kind": "OBJECT_LITERAL", + "startPosition": "1177", + "properties": [] + }, + { + "endPosition": "1189", + "kind": "OBJECT_LITERAL", + "startPosition": "1181", + "properties": [ + { + "endPosition": "1185", + "kind": "PROPERTY", + "value": { + "endPosition": "1187", + "kind": "NUMBER_LITERAL", + "value": "3", + "startPosition": "1186" + }, + "startPosition": "1183", + "key": { + "endPosition": "1184", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1183" + } + } + ] + }, + { + "endPosition": "1197", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1192" + } + ], + "startPosition": "1175" + } + } + ], + "sourceName": "parsertests/array_literal.js", + "strict": "false", + "startPosition": "1113" +} +, +{ + "endPosition": "1126", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "expression": { + "endPosition": "1135", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1132" + }, + "endPosition": "1135", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1129", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1126" + }, + "startPosition": "1126" + }, + "endPosition": "1135", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1126" + }, + { + "expression": { + "expression": { + "endPosition": "1147", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1144" + }, + "endPosition": "1147", + "kind": "PLUS_ASSIGNMENT", + "variable": { + "endPosition": "1140", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1137" + }, + "startPosition": "1137" + }, + "endPosition": "1147", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1137" + }, + { + "expression": { + "expression": { + "endPosition": "1159", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1156" + }, + "endPosition": "1159", + "kind": "MINUS_ASSIGNMENT", + "variable": { + "endPosition": "1152", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1149" + }, + "startPosition": "1149" + }, + "endPosition": "1159", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1149" + }, + { + "expression": { + "expression": { + "endPosition": "1171", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1168" + }, + "endPosition": "1171", + "kind": "MULTIPLY_ASSIGNMENT", + "variable": { + "endPosition": "1164", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1161" + }, + "startPosition": "1161" + }, + "endPosition": "1171", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1161" + }, + { + "expression": { + "expression": { + "endPosition": "1183", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1180" + }, + "endPosition": "1183", + "kind": "DIVIDE_ASSIGNMENT", + "variable": { + "endPosition": "1176", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1173" + }, + "startPosition": "1173" + }, + "endPosition": "1183", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1173" + }, + { + "expression": { + "expression": { + "endPosition": "1195", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1192" + }, + "endPosition": "1195", + "kind": "REMAINDER_ASSIGNMENT", + "variable": { + "endPosition": "1188", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1185" + }, + "startPosition": "1185" + }, + "endPosition": "1195", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1185" + }, + { + "expression": { + "expression": { + "endPosition": "1208", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1205" + }, + "endPosition": "1208", + "kind": "LEFT_SHIFT_ASSIGNMENT", + "variable": { + "endPosition": "1200", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1197" + }, + "startPosition": "1197" + }, + "endPosition": "1208", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1197" + }, + { + "expression": { + "expression": { + "endPosition": "1221", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1218" + }, + "endPosition": "1221", + "kind": "RIGHT_SHIFT_ASSIGNMENT", + "variable": { + "endPosition": "1213", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1210" + }, + "startPosition": "1210" + }, + "endPosition": "1221", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1210" + }, + { + "expression": { + "expression": { + "endPosition": "1235", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1232" + }, + "endPosition": "1235", + "kind": "UNSIGNED_RIGHT_SHIFT_ASSIGNMENT", + "variable": { + "endPosition": "1226", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1223" + }, + "startPosition": "1223" + }, + "endPosition": "1235", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1223" + }, + { + "expression": { + "expression": { + "endPosition": "1247", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1244" + }, + "endPosition": "1247", + "kind": "AND_ASSIGNMENT", + "variable": { + "endPosition": "1240", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1237" + }, + "startPosition": "1237" + }, + "endPosition": "1247", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1237" + }, + { + "expression": { + "expression": { + "endPosition": "1259", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1256" + }, + "endPosition": "1259", + "kind": "XOR_ASSIGNMENT", + "variable": { + "endPosition": "1252", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1249" + }, + "startPosition": "1249" + }, + "endPosition": "1259", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1249" + }, + { + "expression": { + "expression": { + "endPosition": "1271", + "kind": "NUMBER_LITERAL", + "value": "314", + "startPosition": "1268" + }, + "endPosition": "1271", + "kind": "OR_ASSIGNMENT", + "variable": { + "endPosition": "1264", + "kind": "IDENTIFIER", + "name": "xyz", + "startPosition": "1261" + }, + "startPosition": "1261" + }, + "endPosition": "1271", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1261" + } + ], + "sourceName": "parsertests/assignmentExpr.js", + "strict": "false", + "startPosition": "1126" +} +, +{ + "endPosition": "1116", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "leftOperand": { + "endPosition": "1117", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1116" + }, + "endPosition": "1121", + "kind": "MULTIPLY", + "rightOperand": { + "endPosition": "1121", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1120" + }, + "startPosition": "1116" + }, + "endPosition": "1121", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1116" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1123", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1122" + }, + "endPosition": "1127", + "kind": "DIVIDE", + "rightOperand": { + "endPosition": "1127", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1126" + }, + "startPosition": "1122" + }, + "endPosition": "1127", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1122" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1130", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1129" + }, + "endPosition": "1134", + "kind": "REMAINDER", + "rightOperand": { + "endPosition": "1134", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1133" + }, + "startPosition": "1129" + }, + "endPosition": "1134", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1129" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1137", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1136" + }, + "endPosition": "1141", + "kind": "PLUS", + "rightOperand": { + "endPosition": "1141", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1140" + }, + "startPosition": "1136" + }, + "endPosition": "1141", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1136" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1144", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1143" + }, + "endPosition": "1148", + "kind": "MINUS", + "rightOperand": { + "endPosition": "1148", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1147" + }, + "startPosition": "1143" + }, + "endPosition": "1148", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1143" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1151", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1150" + }, + "endPosition": "1156", + "kind": "LEFT_SHIFT", + "rightOperand": { + "endPosition": "1156", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1155" + }, + "startPosition": "1150" + }, + "endPosition": "1156", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1150" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1159", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1158" + }, + "endPosition": "1164", + "kind": "RIGHT_SHIFT", + "rightOperand": { + "endPosition": "1164", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1163" + }, + "startPosition": "1158" + }, + "endPosition": "1164", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1158" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1167", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1166" + }, + "endPosition": "1173", + "kind": "UNSIGNED_RIGHT_SHIFT", + "rightOperand": { + "endPosition": "1173", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1172" + }, + "startPosition": "1166" + }, + "endPosition": "1173", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1166" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1176", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1175" + }, + "endPosition": "1180", + "kind": "LESS_THAN", + "rightOperand": { + "endPosition": "1180", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1179" + }, + "startPosition": "1175" + }, + "endPosition": "1180", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1175" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1183", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1182" + }, + "endPosition": "1187", + "kind": "GREATER_THAN", + "rightOperand": { + "endPosition": "1187", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1186" + }, + "startPosition": "1182" + }, + "endPosition": "1187", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1182" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1190", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1189" + }, + "endPosition": "1195", + "kind": "LESS_THAN_EQUAL", + "rightOperand": { + "endPosition": "1195", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1194" + }, + "startPosition": "1189" + }, + "endPosition": "1195", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1189" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1198", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1197" + }, + "endPosition": "1203", + "kind": "GREATER_THAN_EQUAL", + "rightOperand": { + "endPosition": "1203", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1202" + }, + "startPosition": "1197" + }, + "endPosition": "1203", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1197" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1206", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1205" + }, + "expression": { + "endPosition": "1206", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1205" + }, + "endPosition": "1219", + "kind": "INSTANCE_OF", + "rightOperand": { + "endPosition": "1219", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1218" + }, + "type": { + "endPosition": "1219", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1218" + }, + "startPosition": "1205" + }, + "endPosition": "1219", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1205" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1222", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1221" + }, + "endPosition": "1227", + "kind": "EQUAL_TO", + "rightOperand": { + "endPosition": "1227", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1226" + }, + "startPosition": "1221" + }, + "endPosition": "1227", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1221" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1230", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1229" + }, + "endPosition": "1235", + "kind": "NOT_EQUAL_TO", + "rightOperand": { + "endPosition": "1235", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1234" + }, + "startPosition": "1229" + }, + "endPosition": "1235", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1229" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1238", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1237" + }, + "endPosition": "1244", + "kind": "STRICT_EQUAL_TO", + "rightOperand": { + "endPosition": "1244", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1243" + }, + "startPosition": "1237" + }, + "endPosition": "1244", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1237" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1247", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1246" + }, + "endPosition": "1253", + "kind": "STRICT_NOT_EQUAL_TO", + "rightOperand": { + "endPosition": "1253", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1252" + }, + "startPosition": "1246" + }, + "endPosition": "1253", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1246" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1256", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1255" + }, + "endPosition": "1260", + "kind": "AND", + "rightOperand": { + "endPosition": "1260", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1259" + }, + "startPosition": "1255" + }, + "endPosition": "1260", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1255" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1263", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1262" + }, + "endPosition": "1267", + "kind": "XOR", + "rightOperand": { + "endPosition": "1267", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1266" + }, + "startPosition": "1262" + }, + "endPosition": "1267", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1262" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1270", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1269" + }, + "endPosition": "1274", + "kind": "OR", + "rightOperand": { + "endPosition": "1274", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1273" + }, + "startPosition": "1269" + }, + "endPosition": "1274", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1269" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1277", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1276" + }, + "endPosition": "1282", + "kind": "CONDITIONAL_AND", + "rightOperand": { + "endPosition": "1282", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1281" + }, + "startPosition": "1276" + }, + "endPosition": "1282", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1276" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1285", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1284" + }, + "endPosition": "1290", + "kind": "CONDITIONAL_OR", + "rightOperand": { + "endPosition": "1290", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1289" + }, + "startPosition": "1284" + }, + "endPosition": "1290", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1284" + } + ], + "sourceName": "parsertests/binaryExpr.js", + "strict": "false", + "startPosition": "1116" +} +, +{ + "endPosition": "1117", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1119", + "kind": "BLOCK", + "statements": [], + "startPosition": "1117" + }, + { + "endPosition": "1139", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1136", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1127", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1122" + }, + "arguments": [ + { + "endPosition": "1134", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1129" + } + ], + "startPosition": "1122" + }, + "endPosition": "1136", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1122" + } + ], + "startPosition": "1120" + } + ], + "sourceName": "parsertests/block.js", + "strict": "false", + "startPosition": "1117" +} +, +{ + "endPosition": "1117", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "condition": { + "endPosition": "1128", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1124" + }, + "endPosition": "1140", + "kind": "WHILE_LOOP", + "statement": { + "endPosition": "1140", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1138", + "kind": "BREAK", + "startPosition": "1132" + } + ], + "startPosition": "1130" + }, + "startPosition": "1117" + }, + { + "endPosition": "1179", + "kind": "LABELED_STATEMENT", + "statement": { + "endPosition": "1179", + "kind": "BLOCK", + "statements": [ + { + "condition": { + "endPosition": "1161", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1157" + }, + "endPosition": "1177", + "kind": "WHILE_LOOP", + "statement": { + "endPosition": "1177", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1175", + "kind": "BREAK", + "label": "loop", + "startPosition": "1165" + } + ], + "startPosition": "1163" + }, + "startPosition": "1150" + } + ], + "startPosition": "1148" + }, + "label": "loop", + "startPosition": "1142" + }, + { + "endPosition": "1214", + "kind": "LABELED_STATEMENT", + "statement": { + "endPosition": "1214", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1212", + "kind": "FOR_LOOP", + "statement": { + "endPosition": "1212", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1210", + "kind": "BREAK", + "label": "loop", + "startPosition": "1200" + } + ], + "startPosition": "1198" + }, + "startPosition": "1189" + } + ], + "startPosition": "1187" + }, + "label": "loop", + "startPosition": "1181" + } + ], + "sourceName": "parsertests/breakStat.js", + "strict": "false", + "startPosition": "1117" +} +, +{ + "endPosition": "1117", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "condition": { + "endPosition": "1118", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1117" + }, + "endPosition": "1125", + "kind": "CONDITIONAL_EXPRESSION", + "trueExpression": { + "endPosition": "1121", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1120" + }, + "falseExpression": { + "endPosition": "1125", + "kind": "IDENTIFIER", + "name": "c", + "startPosition": "1124" + }, + "startPosition": "1118" + }, + "endPosition": "1125", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1117" + } + ], + "sourceName": "parsertests/condExpr.js", + "strict": "false", + "startPosition": "1117" +} +, +{ + "endPosition": "1120", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "condition": { + "endPosition": "1131", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1127" + }, + "endPosition": "1146", + "kind": "WHILE_LOOP", + "statement": { + "endPosition": "1146", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1144", + "kind": "CONTINUE", + "startPosition": "1135" + } + ], + "startPosition": "1133" + }, + "startPosition": "1120" + }, + { + "endPosition": "1191", + "kind": "LABELED_STATEMENT", + "statement": { + "endPosition": "1191", + "kind": "BLOCK", + "statements": [ + { + "condition": { + "endPosition": "1168", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1164" + }, + "endPosition": "1189", + "kind": "WHILE_LOOP", + "statement": { + "endPosition": "1189", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1187", + "kind": "CONTINUE", + "label": "begin", + "startPosition": "1172" + } + ], + "startPosition": "1170" + }, + "startPosition": "1157" + } + ], + "startPosition": "1155" + }, + "label": "begin", + "startPosition": "1148" + }, + { + "endPosition": "1231", + "kind": "LABELED_STATEMENT", + "statement": { + "endPosition": "1231", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1229", + "kind": "FOR_LOOP", + "statement": { + "endPosition": "1229", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1227", + "kind": "CONTINUE", + "label": "start", + "startPosition": "1212" + } + ], + "startPosition": "1210" + }, + "startPosition": "1202" + } + ], + "startPosition": "1200" + }, + "label": "start", + "startPosition": "1193" + } + ], + "sourceName": "parsertests/continueStat.js", + "strict": "false", + "startPosition": "1120" +} +, +{ + "endPosition": "1118", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1127", + "kind": "DEBUGGER", + "startPosition": "1118" + } + ], + "sourceName": "parsertests/debuggerStat.js", + "strict": "false", + "startPosition": "1118" +} +, +{ + "endPosition": "1137", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1172", + "kind": "FUNCTION", + "name": "hello", + "body": { + "endPosition": "1170", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1170", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1161", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1156" + }, + "arguments": [ + { + "endPosition": "1168", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1163" + } + ], + "startPosition": "1156" + }, + "endPosition": "1170", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1156" + } + ], + "startPosition": "1154" + }, + "strict": "false", + "startPosition": "1137", + "parameters": [] + }, + { + "endPosition": "1203", + "kind": "FUNCTION", + "name": "hello", + "body": { + "endPosition": "1201", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1201", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1198", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1193" + }, + "arguments": [ + { + "endPosition": "1200", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1199" + } + ], + "startPosition": "1193" + }, + "endPosition": "1201", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1193" + } + ], + "startPosition": "1191" + }, + "strict": "false", + "startPosition": "1173", + "parameters": [ + { + "endPosition": "1189", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1188" + } + ] + }, + { + "endPosition": "1240", + "kind": "FUNCTION", + "name": "hello", + "body": { + "endPosition": "1238", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1238", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1232", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1227" + }, + "arguments": [ + { + "endPosition": "1234", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1233" + }, + { + "endPosition": "1237", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1236" + } + ], + "startPosition": "1227" + }, + "endPosition": "1238", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1227" + } + ], + "startPosition": "1225" + }, + "strict": "false", + "startPosition": "1204", + "parameters": [ + { + "endPosition": "1220", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1219" + }, + { + "endPosition": "1223", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1222" + } + ] + }, + { + "endPosition": "1380", + "kind": "FUNCTION", + "name": "test", + "body": { + "endPosition": "1377", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1377", + "kind": "STRING_LITERAL", + "value": "use strict", + "startPosition": "1367" + }, + "endPosition": "1377", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1367" + } + ], + "startPosition": "1364" + }, + "strict": "true", + "startPosition": "1348", + "parameters": [] + }, + { + "endPosition": "1282", + "kind": "VARIABLE", + "name": "hello", + "startPosition": "1245", + "initializer": { + "endPosition": "1264", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1280", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1280", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1271", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1266" + }, + "arguments": [ + { + "endPosition": "1278", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1273" + } + ], + "startPosition": "1266" + }, + "endPosition": "1280", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1266" + } + ], + "startPosition": "1264" + }, + "strict": "false", + "startPosition": "1264", + "parameters": [] + } + }, + { + "endPosition": "1331", + "kind": "VARIABLE", + "name": "hello", + "startPosition": "1288", + "initializer": { + "endPosition": "1313", + "kind": "FUNCTION_EXPRESSION", + "name": "hello", + "body": { + "endPosition": "1329", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1329", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1320", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1315" + }, + "arguments": [ + { + "endPosition": "1327", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1322" + } + ], + "startPosition": "1315" + }, + "endPosition": "1329", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1315" + } + ], + "startPosition": "1313" + }, + "strict": "false", + "startPosition": "1313", + "parameters": [] + } + }, + { + "expression": { + "endPosition": "1344", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1345", + "kind": "BLOCK", + "statements": [], + "startPosition": "1344" + }, + "strict": "false", + "startPosition": "1344", + "parameters": [] + }, + "endPosition": "1347", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1333" + } + ], + "sourceName": "parsertests/functions.js", + "strict": "false", + "startPosition": "1137" +} +, +{ + "endPosition": "1114", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "condition": { + "endPosition": "1120", + "kind": "IDENTIFIER", + "name": "js", + "startPosition": "1118" + }, + "endPosition": "1135", + "kind": "IF", + "startPosition": "1114", + "thenStatement": { + "endPosition": "1135", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1133", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1131", + "kind": "IDENTIFIER", + "name": "nashorn", + "startPosition": "1124" + }, + "arguments": [], + "startPosition": "1124" + }, + "endPosition": "1133", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1124" + } + ], + "startPosition": "1122" + } + }, + { + "condition": { + "endPosition": "1143", + "kind": "IDENTIFIER", + "name": "js", + "startPosition": "1141" + }, + "elseStatement": { + "endPosition": "1174", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1172", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1170", + "kind": "IDENTIFIER", + "name": "java", + "startPosition": "1166" + }, + "arguments": [], + "startPosition": "1166" + }, + "endPosition": "1172", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1166" + } + ], + "startPosition": "1164" + }, + "endPosition": "1174", + "kind": "IF", + "startPosition": "1137", + "thenStatement": { + "endPosition": "1158", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1156", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1154", + "kind": "IDENTIFIER", + "name": "nashorn", + "startPosition": "1147" + }, + "arguments": [], + "startPosition": "1147" + }, + "endPosition": "1156", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1147" + } + ], + "startPosition": "1145" + } + } + ], + "sourceName": "parsertests/ifStat.js", + "strict": "false", + "startPosition": "1114" +} +, +{ + "endPosition": "1113", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1144", + "kind": "LABELED_STATEMENT", + "statement": { + "endPosition": "1144", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1142", + "kind": "FOR_LOOP", + "statement": { + "endPosition": "1142", + "kind": "BREAK", + "label": "begin", + "startPosition": "1131" + }, + "startPosition": "1122" + } + ], + "startPosition": "1120" + }, + "label": "begin", + "startPosition": "1113" + }, + { + "endPosition": "1181", + "kind": "LABELED_STATEMENT", + "statement": { + "endPosition": "1181", + "kind": "BLOCK", + "statements": [ + { + "condition": { + "endPosition": "1166", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1162" + }, + "endPosition": "1179", + "kind": "WHILE_LOOP", + "statement": { + "endPosition": "1179", + "kind": "BREAK", + "label": "begin", + "startPosition": "1168" + }, + "startPosition": "1155" + } + ], + "startPosition": "1153" + }, + "label": "begin", + "startPosition": "1146" + } + ], + "sourceName": "parsertests/labelledStat.js", + "strict": "false", + "startPosition": "1113" +} +, +{ + "endPosition": "1125", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "expression": { + "endPosition": "1126", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1125" + }, + "endPosition": "1129", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "1128", + "kind": "NUMBER_LITERAL", + "value": "3", + "startPosition": "1127" + }, + "startPosition": "1125" + }, + "endPosition": "1129", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1125" + }, + { + "expression": { + "expression": { + "endPosition": "1132", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1131" + }, + "endPosition": "1135", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "1134", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1133" + }, + "startPosition": "1131" + }, + "endPosition": "1135", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1131" + }, + { + "expression": { + "expression": { + "endPosition": "1138", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1137" + }, + "endPosition": "1145", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "1143", + "kind": "STRING_LITERAL", + "value": "foo", + "startPosition": "1140" + }, + "startPosition": "1137" + }, + "endPosition": "1145", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1137" + }, + { + "expression": { + "identifier": "foo", + "expression": { + "endPosition": "1150", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1147" + }, + "endPosition": "1154", + "kind": "MEMBER_SELECT", + "startPosition": "1147" + }, + "endPosition": "1154", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1147" + }, + { + "expression": { + "identifier": "bar", + "expression": { + "identifier": "foo", + "expression": { + "endPosition": "1159", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1156" + }, + "endPosition": "1163", + "kind": "MEMBER_SELECT", + "startPosition": "1156" + }, + "endPosition": "1167", + "kind": "MEMBER_SELECT", + "startPosition": "1156" + }, + "endPosition": "1167", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1156" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1177", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1177", + "kind": "IDENTIFIER", + "name": "Type", + "startPosition": "1173" + }, + "arguments": [], + "startPosition": "1173" + }, + "endPosition": "1177", + "kind": "NEW", + "startPosition": "1169" + }, + "endPosition": "1177", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1169" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1189", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1187", + "kind": "IDENTIFIER", + "name": "Type", + "startPosition": "1183" + }, + "arguments": [], + "startPosition": "1183" + }, + "endPosition": "1189", + "kind": "NEW", + "startPosition": "1179" + }, + "endPosition": "1189", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1179" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1211", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1199", + "kind": "IDENTIFIER", + "name": "Type", + "startPosition": "1195" + }, + "arguments": [ + { + "endPosition": "1201", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1200" + }, + { + "endPosition": "1209", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1204" + } + ], + "startPosition": "1195" + }, + "endPosition": "1211", + "kind": "NEW", + "startPosition": "1191" + }, + "endPosition": "1211", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1191" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1225", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "Type", + "expression": { + "endPosition": "1220", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1217" + }, + "endPosition": "1225", + "kind": "MEMBER_SELECT", + "startPosition": "1217" + }, + "arguments": [], + "startPosition": "1220" + }, + "endPosition": "1225", + "kind": "NEW", + "startPosition": "1213" + }, + "endPosition": "1225", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1213" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1241", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "Type", + "expression": { + "endPosition": "1234", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1231" + }, + "endPosition": "1239", + "kind": "MEMBER_SELECT", + "startPosition": "1231" + }, + "arguments": [], + "startPosition": "1234" + }, + "endPosition": "1241", + "kind": "NEW", + "startPosition": "1227" + }, + "endPosition": "1241", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1227" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1267", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "Type", + "expression": { + "endPosition": "1250", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1247" + }, + "endPosition": "1255", + "kind": "MEMBER_SELECT", + "startPosition": "1247" + }, + "arguments": [ + { + "endPosition": "1257", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1256" + }, + { + "endPosition": "1265", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1260" + } + ], + "startPosition": "1250" + }, + "endPosition": "1267", + "kind": "NEW", + "startPosition": "1243" + }, + "endPosition": "1267", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1243" + }, + { + "expression": { + "endPosition": "1274", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1272", + "kind": "IDENTIFIER", + "name": "foo", + "startPosition": "1269" + }, + "arguments": [], + "startPosition": "1269" + }, + "endPosition": "1274", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1269" + }, + { + "expression": { + "endPosition": "1284", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "foo", + "expression": { + "endPosition": "1278", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1275" + }, + "endPosition": "1282", + "kind": "MEMBER_SELECT", + "startPosition": "1275" + }, + "arguments": [], + "startPosition": "1275" + }, + "endPosition": "1284", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1275" + }, + { + "expression": { + "endPosition": "1294", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1289", + "kind": "IDENTIFIER", + "name": "foo", + "startPosition": "1286" + }, + "arguments": [ + { + "endPosition": "1291", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1290" + }, + { + "endPosition": "1293", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1292" + } + ], + "startPosition": "1286" + }, + "endPosition": "1294", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1286" + }, + { + "expression": { + "endPosition": "1309", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "foo", + "expression": { + "endPosition": "1299", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1296" + }, + "endPosition": "1303", + "kind": "MEMBER_SELECT", + "startPosition": "1296" + }, + "arguments": [ + { + "endPosition": "1305", + "kind": "IDENTIFIER", + "name": "a", + "startPosition": "1304" + }, + { + "endPosition": "1308", + "kind": "IDENTIFIER", + "name": "b", + "startPosition": "1307" + } + ], + "startPosition": "1296" + }, + "endPosition": "1309", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1296" + } + ], + "sourceName": "parsertests/lhsExpr.js", + "strict": "false", + "startPosition": "1125" +} +, +{ + "endPosition": "1110", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "condition": { + "endPosition": "1120", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1116" + }, + "endPosition": "1140", + "kind": "WHILE_LOOP", + "statement": { + "endPosition": "1140", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1138", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1129", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1124" + }, + "arguments": [ + { + "endPosition": "1136", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1131" + } + ], + "startPosition": "1124" + }, + "endPosition": "1138", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1124" + } + ], + "startPosition": "1122" + }, + "startPosition": "1110" + }, + { + "condition": { + "endPosition": "1173", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1169" + }, + "endPosition": "1174", + "kind": "DO_WHILE_LOOP", + "statement": { + "endPosition": "1162", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1160", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1151", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1146" + }, + "arguments": [ + { + "endPosition": "1158", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1153" + } + ], + "startPosition": "1146" + }, + "endPosition": "1160", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1146" + } + ], + "startPosition": "1144" + }, + "startPosition": "1141" + }, + { + "expression": { + "endPosition": "1188", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1185" + }, + "endPosition": "1207", + "kind": "FOR_IN_LOOP", + "forEach": "false", + "variable": { + "endPosition": "1181", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1180" + }, + "statement": { + "endPosition": "1207", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1205", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1197", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1192" + }, + "arguments": [ + { + "expression": { + "endPosition": "1201", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1198" + }, + "endPosition": "1204", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "1203", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1202" + }, + "startPosition": "1198" + } + ], + "startPosition": "1192" + }, + "endPosition": "1205", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1192" + } + ], + "startPosition": "1190" + }, + "startPosition": "1175" + }, + { + "expression": { + "endPosition": "1226", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1223" + }, + "endPosition": "1240", + "kind": "FOR_IN_LOOP", + "forEach": "true", + "variable": { + "endPosition": "1219", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1218" + }, + "statement": { + "endPosition": "1240", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1238", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1235", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1230" + }, + "arguments": [ + { + "endPosition": "1237", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1236" + } + ], + "startPosition": "1230" + }, + "endPosition": "1238", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1230" + } + ], + "startPosition": "1228" + }, + "startPosition": "1208" + }, + { + "condition": { + "leftOperand": { + "endPosition": "1254", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1253" + }, + "endPosition": "1259", + "kind": "LESS_THAN", + "rightOperand": { + "endPosition": "1259", + "kind": "NUMBER_LITERAL", + "value": "10", + "startPosition": "1257" + }, + "startPosition": "1253" + }, + "endPosition": "1278", + "kind": "FOR_LOOP", + "statement": { + "endPosition": "1278", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1276", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1273", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1268" + }, + "arguments": [ + { + "endPosition": "1275", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1274" + } + ], + "startPosition": "1268" + }, + "endPosition": "1276", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1268" + } + ], + "startPosition": "1266" + }, + "update": { + "expression": { + "endPosition": "1262", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1261" + }, + "endPosition": "1264", + "kind": "POSTFIX_INCREMENT", + "startPosition": "1261" + }, + "startPosition": "1241", + "initializer": { + "expression": { + "endPosition": "1251", + "kind": "NUMBER_LITERAL", + "value": "0", + "startPosition": "1250" + }, + "endPosition": "1251", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1247", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "1246" + }, + "startPosition": "1246" + } + } + ], + "sourceName": "parsertests/loopStat.js", + "strict": "false", + "startPosition": "1110" +} +, +{ + "endPosition": "1125", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "expression": { + "endPosition": "1133", + "kind": "OBJECT_LITERAL", + "startPosition": "1131", + "properties": [] + }, + "endPosition": "1133", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1128", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "1125" + }, + "startPosition": "1125" + }, + "endPosition": "1133", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1125" + }, + { + "expression": { + "expression": { + "endPosition": "1154", + "kind": "OBJECT_LITERAL", + "startPosition": "1139", + "properties": [ + { + "endPosition": "1143", + "kind": "PROPERTY", + "value": { + "endPosition": "1146", + "kind": "NUMBER_LITERAL", + "value": "10", + "startPosition": "1144" + }, + "startPosition": "1141", + "key": { + "endPosition": "1142", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1141" + } + }, + { + "endPosition": "1150", + "kind": "PROPERTY", + "value": { + "endPosition": "1152", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1151" + }, + "startPosition": "1148", + "key": { + "endPosition": "1149", + "kind": "IDENTIFIER", + "name": "y", + "startPosition": "1148" + } + } + ] + }, + "endPosition": "1154", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1136", + "kind": "IDENTIFIER", + "name": "p", + "startPosition": "1135" + }, + "startPosition": "1135" + }, + "endPosition": "1154", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1135" + }, + { + "expression": { + "expression": { + "endPosition": "1179", + "kind": "OBJECT_LITERAL", + "startPosition": "1160", + "properties": [ + { + "endPosition": "1166", + "kind": "PROPERTY", + "value": { + "endPosition": "1169", + "kind": "NUMBER_LITERAL", + "value": "10", + "startPosition": "1167" + }, + "startPosition": "1163", + "key": { + "endPosition": "1164", + "kind": "STRING_LITERAL", + "value": "x", + "startPosition": "1163" + } + }, + { + "endPosition": "1175", + "kind": "PROPERTY", + "value": { + "endPosition": "1177", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1176" + }, + "startPosition": "1172", + "key": { + "endPosition": "1173", + "kind": "STRING_LITERAL", + "value": "y", + "startPosition": "1172" + } + } + ] + }, + "endPosition": "1179", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1157", + "kind": "IDENTIFIER", + "name": "p", + "startPosition": "1156" + }, + "startPosition": "1156" + }, + "endPosition": "1179", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1156" + }, + { + "expression": { + "expression": { + "endPosition": "1241", + "kind": "OBJECT_LITERAL", + "startPosition": "1185", + "properties": [ + { + "getter": { + "endPosition": "1195", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1210", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1210", + "kind": "IDENTIFIER", + "name": "xValue", + "startPosition": "1204" + }, + "endPosition": "1210", + "kind": "RETURN", + "startPosition": "1197" + } + ], + "startPosition": "1195" + }, + "strict": "false", + "startPosition": "1195", + "parameters": [] + }, + "endPosition": "1212", + "kind": "PROPERTY", + "startPosition": "1187", + "key": { + "endPosition": "1192", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1191" + } + }, + { + "getter": { + "endPosition": "1222", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1237", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1237", + "kind": "IDENTIFIER", + "name": "yValue", + "startPosition": "1231" + }, + "endPosition": "1237", + "kind": "RETURN", + "startPosition": "1224" + } + ], + "startPosition": "1222" + }, + "strict": "false", + "startPosition": "1222", + "parameters": [] + }, + "endPosition": "1239", + "kind": "PROPERTY", + "startPosition": "1214", + "key": { + "endPosition": "1219", + "kind": "IDENTIFIER", + "name": "y", + "startPosition": "1218" + } + } + ] + }, + "endPosition": "1241", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1182", + "kind": "IDENTIFIER", + "name": "p", + "startPosition": "1181" + }, + "startPosition": "1181" + }, + "endPosition": "1241", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1181" + }, + { + "expression": { + "expression": { + "endPosition": "1315", + "kind": "OBJECT_LITERAL", + "startPosition": "1247", + "properties": [ + { + "getter": { + "endPosition": "1259", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1277", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "identifier": "_foo", + "expression": { + "endPosition": "1272", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "1268" + }, + "endPosition": "1277", + "kind": "MEMBER_SELECT", + "startPosition": "1268" + }, + "endPosition": "1277", + "kind": "RETURN", + "startPosition": "1261" + } + ], + "startPosition": "1259" + }, + "strict": "false", + "startPosition": "1259", + "parameters": [] + }, + "endPosition": "1279", + "kind": "PROPERTY", + "setter": { + "endPosition": "1294", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1311", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "1311", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "1308" + }, + "endPosition": "1311", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "_foo", + "expression": { + "endPosition": "1300", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "1296" + }, + "endPosition": "1305", + "kind": "MEMBER_SELECT", + "startPosition": "1296" + }, + "startPosition": "1296" + }, + "endPosition": "1311", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1296" + } + ], + "startPosition": "1294" + }, + "strict": "false", + "startPosition": "1294", + "parameters": [ + { + "endPosition": "1292", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "1289" + } + ] + }, + "startPosition": "1249", + "key": { + "endPosition": "1256", + "kind": "IDENTIFIER", + "name": "foo", + "startPosition": "1253" + } + } + ] + }, + "endPosition": "1315", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1244", + "kind": "IDENTIFIER", + "name": "p", + "startPosition": "1243" + }, + "startPosition": "1243" + }, + "endPosition": "1315", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1243" + } + ], + "sourceName": "parsertests/objectLitExpr.js", + "strict": "false", + "startPosition": "1125" +} +, +{ + "endPosition": "1118", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "leftOperand": { + "leftOperand": { + "endPosition": "1120", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1119" + }, + "endPosition": "1126", + "kind": "PLUS", + "rightOperand": { + "endPosition": "1126", + "kind": "NUMBER_LITERAL", + "value": "1", + "startPosition": "1125" + }, + "startPosition": "1119" + }, + "endPosition": "1131", + "kind": "PLUS", + "rightOperand": { + "endPosition": "1131", + "kind": "NUMBER_LITERAL", + "value": "4", + "startPosition": "1130" + }, + "startPosition": "1119" + }, + "endPosition": "1131", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1118" + }, + { + "expression": { + "leftOperand": { + "leftOperand": { + "endPosition": "1134", + "kind": "NUMBER_LITERAL", + "value": "3", + "startPosition": "1133" + }, + "endPosition": "1139", + "kind": "PLUS", + "rightOperand": { + "endPosition": "1139", + "kind": "NUMBER_LITERAL", + "value": "7", + "startPosition": "1138" + }, + "startPosition": "1133" + }, + "endPosition": "1146", + "kind": "LEFT_SHIFT", + "rightOperand": { + "endPosition": "1146", + "kind": "NUMBER_LITERAL", + "value": "5", + "startPosition": "1145" + }, + "startPosition": "1133" + }, + "endPosition": "1147", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1133" + } + ], + "sourceName": "parsertests/parenExpr.js", + "strict": "false", + "startPosition": "1118" +} +, +{ + "endPosition": "1119", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1123", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "1119" + }, + "endPosition": "1123", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1119" + }, + { + "expression": { + "endPosition": "1128", + "kind": "IDENTIFIER", + "name": "foo", + "startPosition": "1125" + }, + "endPosition": "1128", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1125" + }, + { + "expression": { + "endPosition": "1134", + "kind": "NULL_LITERAL", + "startPosition": "1130" + }, + "endPosition": "1134", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1130" + }, + { + "expression": { + "endPosition": "1140", + "kind": "BOOLEAN_LITERAL", + "value": "true", + "startPosition": "1136" + }, + "endPosition": "1140", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1136" + }, + { + "expression": { + "endPosition": "1147", + "kind": "BOOLEAN_LITERAL", + "value": "false", + "startPosition": "1142" + }, + "endPosition": "1147", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1142" + }, + { + "expression": { + "endPosition": "1151", + "kind": "NUMBER_LITERAL", + "value": "33", + "startPosition": "1149" + }, + "endPosition": "1151", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1149" + }, + { + "expression": { + "endPosition": "1157", + "kind": "NUMBER_LITERAL", + "value": "3.14", + "startPosition": "1153" + }, + "endPosition": "1157", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1153" + }, + { + "expression": { + "leftOperand": { + "leftOperand": { + "endPosition": "1162", + "kind": "NUMBER_LITERAL", + "value": "10", + "startPosition": "1160" + }, + "endPosition": "1166", + "kind": "PLUS", + "rightOperand": { + "endPosition": "1166", + "kind": "NUMBER_LITERAL", + "value": "3", + "startPosition": "1165" + }, + "startPosition": "1160" + }, + "endPosition": "1169", + "kind": "MULTIPLY", + "rightOperand": { + "endPosition": "1169", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1168" + }, + "startPosition": "1160" + }, + "endPosition": "1169", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1159" + }, + { + "expression": { + "endPosition": "1174", + "kind": "OBJECT_LITERAL", + "startPosition": "1172", + "properties": [] + }, + "endPosition": "1175", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1171" + }, + { + "expression": { + "endPosition": "1186", + "kind": "OBJECT_LITERAL", + "startPosition": "1178", + "properties": [ + { + "endPosition": "1182", + "kind": "PROPERTY", + "value": { + "endPosition": "1184", + "kind": "NUMBER_LITERAL", + "value": "3", + "startPosition": "1183" + }, + "startPosition": "1180", + "key": { + "endPosition": "1181", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1180" + } + } + ] + }, + "endPosition": "1187", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1177" + }, + { + "expression": { + "endPosition": "1191", + "kind": "ARRAY_LITERAL", + "elements": [], + "startPosition": "1189" + }, + "endPosition": "1191", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1189" + }, + { + "expression": { + "endPosition": "1197", + "kind": "ARRAY_LITERAL", + "elements": [ + null, + null + ], + "startPosition": "1193" + }, + "endPosition": "1197", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1193" + }, + { + "expression": { + "endPosition": "1208", + "kind": "ARRAY_LITERAL", + "elements": [ + { + "endPosition": "1201", + "kind": "NUMBER_LITERAL", + "value": "4", + "startPosition": "1200" + }, + { + "endPosition": "1204", + "kind": "NUMBER_LITERAL", + "value": "5", + "startPosition": "1203" + }, + { + "endPosition": "1207", + "kind": "NUMBER_LITERAL", + "value": "5", + "startPosition": "1206" + } + ], + "startPosition": "1199" + }, + "endPosition": "1208", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1199" + } + ], + "sourceName": "parsertests/primaryExpr.js", + "strict": "false", + "startPosition": "1119" +} +, +{ + "endPosition": "1114", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1127", + "kind": "VARIABLE", + "name": "x", + "startPosition": "1118", + "initializer": { + "endPosition": "1127", + "kind": "REGEXP_LITERAL", + "options": "", + "pattern": "foo", + "startPosition": "1122" + } + }, + { + "endPosition": "1143", + "kind": "VARIABLE", + "name": "y", + "startPosition": "1133", + "initializer": { + "endPosition": "1143", + "kind": "REGEXP_LITERAL", + "options": "g", + "pattern": "foo", + "startPosition": "1137" + } + }, + { + "endPosition": "1168", + "kind": "VARIABLE", + "name": "z", + "startPosition": "1149", + "initializer": { + "endPosition": "1168", + "kind": "REGEXP_LITERAL", + "options": "", + "pattern": "[a-z]*[1-10]?", + "startPosition": "1153" + } + } + ], + "sourceName": "parsertests/regexp_literal.js", + "strict": "false", + "startPosition": "1114" +} +, +{ + "endPosition": "1118", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1130", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1138", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1138", + "kind": "RETURN", + "startPosition": "1132" + } + ], + "startPosition": "1130" + }, + "strict": "false", + "startPosition": "1130", + "parameters": [] + }, + "endPosition": "1141", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1118" + }, + { + "expression": { + "endPosition": "1155", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1167", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1167", + "kind": "IDENTIFIER", + "name": "res", + "startPosition": "1164" + }, + "endPosition": "1167", + "kind": "RETURN", + "startPosition": "1157" + } + ], + "startPosition": "1155" + }, + "strict": "false", + "startPosition": "1155", + "parameters": [] + }, + "endPosition": "1170", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1143" + }, + { + "expression": { + "endPosition": "1184", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1198", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1198", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1196", + "kind": "IDENTIFIER", + "name": "foo", + "startPosition": "1193" + }, + "arguments": [], + "startPosition": "1193" + }, + "endPosition": "1198", + "kind": "RETURN", + "startPosition": "1186" + } + ], + "startPosition": "1184" + }, + "strict": "false", + "startPosition": "1184", + "parameters": [] + }, + "endPosition": "1201", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1172" + } + ], + "sourceName": "parsertests/returnStat.js", + "strict": "false", + "startPosition": "1118" +} +, +{ + "endPosition": "1111", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "cases": [], + "expression": { + "endPosition": "1122", + "kind": "IDENTIFIER", + "name": "key", + "startPosition": "1119" + }, + "endPosition": "1126", + "kind": "SWITCH", + "startPosition": "1111" + }, + { + "cases": [ + { + "expression": { + "endPosition": "1149", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1148" + }, + "endPosition": "1166", + "kind": "CASE", + "statements": [ + { + "expression": { + "endPosition": "1158", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1156", + "kind": "IDENTIFIER", + "name": "hello", + "startPosition": "1151" + }, + "arguments": [], + "startPosition": "1151" + }, + "endPosition": "1158", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1151" + }, + { + "endPosition": "1166", + "kind": "BREAK", + "startPosition": "1160" + } + ], + "startPosition": "1143" + } + ], + "expression": { + "endPosition": "1139", + "kind": "IDENTIFIER", + "name": "key", + "startPosition": "1136" + }, + "endPosition": "1168", + "kind": "SWITCH", + "startPosition": "1128" + }, + { + "cases": [ + { + "expression": { + "endPosition": "1191", + "kind": "NUMBER_LITERAL", + "value": "4", + "startPosition": "1190" + }, + "endPosition": "1208", + "kind": "CASE", + "statements": [ + { + "expression": { + "endPosition": "1200", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1198", + "kind": "IDENTIFIER", + "name": "hello", + "startPosition": "1193" + }, + "arguments": [], + "startPosition": "1193" + }, + "endPosition": "1200", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1193" + }, + { + "endPosition": "1208", + "kind": "BREAK", + "startPosition": "1202" + } + ], + "startPosition": "1185" + }, + { + "expression": { + "endPosition": "1215", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1214" + }, + "endPosition": "1232", + "kind": "CASE", + "statements": [ + { + "expression": { + "endPosition": "1224", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1222", + "kind": "IDENTIFIER", + "name": "world", + "startPosition": "1217" + }, + "arguments": [], + "startPosition": "1217" + }, + "endPosition": "1224", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1217" + }, + { + "endPosition": "1232", + "kind": "BREAK", + "startPosition": "1226" + } + ], + "startPosition": "1209" + }, + { + "endPosition": "1247", + "kind": "CASE", + "statements": [ + { + "endPosition": "1247", + "kind": "BREAK", + "startPosition": "1242" + } + ], + "startPosition": "1233" + } + ], + "expression": { + "endPosition": "1181", + "kind": "IDENTIFIER", + "name": "key", + "startPosition": "1178" + }, + "endPosition": "1249", + "kind": "SWITCH", + "startPosition": "1170" + } + ], + "sourceName": "parsertests/switchStat.js", + "strict": "false", + "startPosition": "1111" +} +, +{ + "endPosition": "1110", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1119", + "kind": "IDENTIFIER", + "name": "err", + "startPosition": "1116" + }, + "endPosition": "1120", + "kind": "THROW", + "startPosition": "1110" + }, + { + "expression": { + "endPosition": "1133", + "kind": "STRING_LITERAL", + "value": "wrong", + "startPosition": "1128" + }, + "endPosition": "1135", + "kind": "THROW", + "startPosition": "1121" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1155", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1155", + "kind": "IDENTIFIER", + "name": "TypeError", + "startPosition": "1146" + }, + "arguments": [], + "startPosition": "1146" + }, + "endPosition": "1155", + "kind": "NEW", + "startPosition": "1142" + }, + "endPosition": "1156", + "kind": "THROW", + "startPosition": "1136" + }, + { + "expression": { + "constructorExpression": { + "endPosition": "1192", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1176", + "kind": "IDENTIFIER", + "name": "TypeError", + "startPosition": "1167" + }, + "arguments": [ + { + "endPosition": "1190", + "kind": "STRING_LITERAL", + "value": "not an array", + "startPosition": "1178" + } + ], + "startPosition": "1167" + }, + "endPosition": "1192", + "kind": "NEW", + "startPosition": "1163" + }, + "endPosition": "1193", + "kind": "THROW", + "startPosition": "1157" + }, + { + "expression": { + "endPosition": "1217", + "kind": "OBJECT_LITERAL", + "startPosition": "1200", + "properties": [ + { + "endPosition": "1206", + "kind": "PROPERTY", + "value": { + "endPosition": "1214", + "kind": "STRING_LITERAL", + "value": "wrong!", + "startPosition": "1208" + }, + "startPosition": "1202", + "key": { + "endPosition": "1205", + "kind": "IDENTIFIER", + "name": "msg", + "startPosition": "1202" + } + } + ] + }, + "endPosition": "1218", + "kind": "THROW", + "startPosition": "1194" + } + ], + "sourceName": "parsertests/throwStat.js", + "strict": "false", + "startPosition": "1110" +} +, +{ + "endPosition": "1121", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1142", + "kind": "TRY", + "catches": [ + { + "endPosition": "1142", + "kind": "CATCH", + "parameter": { + "endPosition": "1137", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1136" + }, + "block": { + "endPosition": "1142", + "kind": "BLOCK", + "statements": [], + "startPosition": "1139" + }, + "startPosition": "1129" + } + ], + "block": { + "endPosition": "1128", + "kind": "BLOCK", + "statements": [], + "startPosition": "1125" + }, + "startPosition": "1121" + }, + { + "endPosition": "1175", + "kind": "TRY", + "catches": [ + { + "endPosition": "1164", + "kind": "CATCH", + "parameter": { + "endPosition": "1159", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1158" + }, + "block": { + "endPosition": "1164", + "kind": "BLOCK", + "statements": [], + "startPosition": "1161" + }, + "startPosition": "1151" + } + ], + "block": { + "endPosition": "1150", + "kind": "BLOCK", + "statements": [], + "startPosition": "1147" + }, + "finallyBlock": { + "endPosition": "1175", + "kind": "BLOCK", + "statements": [], + "startPosition": "1173" + }, + "startPosition": "1143" + }, + { + "endPosition": "1194", + "kind": "TRY", + "catches": [], + "block": { + "endPosition": "1183", + "kind": "BLOCK", + "statements": [], + "startPosition": "1180" + }, + "finallyBlock": { + "endPosition": "1194", + "kind": "BLOCK", + "statements": [], + "startPosition": "1192" + }, + "startPosition": "1176" + }, + { + "endPosition": "1225", + "kind": "TRY", + "catches": [ + { + "endPosition": "1225", + "kind": "CATCH", + "parameter": { + "endPosition": "1211", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1210" + }, + "block": { + "endPosition": "1225", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1223", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1221", + "kind": "IDENTIFIER", + "name": "handle", + "startPosition": "1215" + }, + "arguments": [], + "startPosition": "1215" + }, + "endPosition": "1223", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1215" + } + ], + "startPosition": "1213" + }, + "startPosition": "1203" + } + ], + "block": { + "endPosition": "1202", + "kind": "BLOCK", + "statements": [], + "startPosition": "1199" + }, + "startPosition": "1195" + }, + { + "endPosition": "1283", + "kind": "TRY", + "catches": [ + { + "endPosition": "1263", + "kind": "CATCH", + "parameter": { + "endPosition": "1249", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1248" + }, + "block": { + "endPosition": "1263", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1261", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1259", + "kind": "IDENTIFIER", + "name": "handle", + "startPosition": "1253" + }, + "arguments": [], + "startPosition": "1253" + }, + "endPosition": "1261", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1253" + } + ], + "startPosition": "1251" + }, + "startPosition": "1241" + } + ], + "block": { + "endPosition": "1240", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1238", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1236", + "kind": "IDENTIFIER", + "name": "that", + "startPosition": "1232" + }, + "arguments": [], + "startPosition": "1232" + }, + "endPosition": "1238", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1232" + } + ], + "startPosition": "1230" + }, + "finallyBlock": { + "endPosition": "1283", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1281", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1279", + "kind": "IDENTIFIER", + "name": "clean", + "startPosition": "1274" + }, + "arguments": [], + "startPosition": "1274" + }, + "endPosition": "1281", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1274" + } + ], + "startPosition": "1272" + }, + "startPosition": "1226" + }, + { + "endPosition": "1368", + "kind": "TRY", + "catches": [ + { + "condition": { + "leftOperand": { + "endPosition": "1312", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1311" + }, + "expression": { + "endPosition": "1312", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1311" + }, + "endPosition": "1333", + "kind": "INSTANCE_OF", + "rightOperand": { + "endPosition": "1333", + "kind": "IDENTIFIER", + "name": "TypeError", + "startPosition": "1324" + }, + "type": { + "endPosition": "1333", + "kind": "IDENTIFIER", + "name": "TypeError", + "startPosition": "1324" + }, + "startPosition": "1311" + }, + "endPosition": "1347", + "kind": "CATCH", + "parameter": { + "endPosition": "1307", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1306" + }, + "block": { + "endPosition": "1347", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1345", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1343", + "kind": "IDENTIFIER", + "name": "handle", + "startPosition": "1337" + }, + "arguments": [], + "startPosition": "1337" + }, + "endPosition": "1345", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1337" + } + ], + "startPosition": "1335" + }, + "startPosition": "1299" + }, + { + "endPosition": "1368", + "kind": "CATCH", + "parameter": { + "endPosition": "1356", + "kind": "IDENTIFIER", + "name": "e", + "startPosition": "1355" + }, + "block": { + "endPosition": "1368", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1366", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1364", + "kind": "IDENTIFIER", + "name": "rest", + "startPosition": "1360" + }, + "arguments": [], + "startPosition": "1360" + }, + "endPosition": "1366", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1360" + } + ], + "startPosition": "1358" + }, + "startPosition": "1348" + } + ], + "block": { + "endPosition": "1298", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1296", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1294", + "kind": "IDENTIFIER", + "name": "that", + "startPosition": "1290" + }, + "arguments": [], + "startPosition": "1290" + }, + "endPosition": "1296", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1290" + } + ], + "startPosition": "1288" + }, + "startPosition": "1284" + } + ], + "sourceName": "parsertests/tryCatchStat.js", + "strict": "false", + "startPosition": "1121" +} +, +{ + "endPosition": "1115", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "expression": { + "endPosition": "1116", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1115" + }, + "endPosition": "1118", + "kind": "POSTFIX_INCREMENT", + "startPosition": "1115" + }, + "endPosition": "1118", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1115" + }, + { + "expression": { + "expression": { + "endPosition": "1121", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1120" + }, + "endPosition": "1123", + "kind": "POSTFIX_DECREMENT", + "startPosition": "1120" + }, + "endPosition": "1123", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1120" + }, + { + "expression": { + "expression": { + "endPosition": "1133", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1132" + }, + "endPosition": "1133", + "kind": "DELETE", + "startPosition": "1125" + }, + "endPosition": "1133", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1125" + }, + { + "expression": { + "expression": { + "endPosition": "1141", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1140" + }, + "endPosition": "1141", + "kind": "VOID", + "startPosition": "1135" + }, + "endPosition": "1141", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1135" + }, + { + "expression": { + "expression": { + "endPosition": "1151", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1150" + }, + "endPosition": "1151", + "kind": "TYPEOF", + "startPosition": "1143" + }, + "endPosition": "1151", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1143" + }, + { + "expression": { + "expression": { + "endPosition": "1156", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1155" + }, + "endPosition": "1156", + "kind": "PREFIX_INCREMENT", + "startPosition": "1153" + }, + "endPosition": "1156", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1153" + }, + { + "expression": { + "expression": { + "endPosition": "1161", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1160" + }, + "endPosition": "1161", + "kind": "PREFIX_DECREMENT", + "startPosition": "1158" + }, + "endPosition": "1161", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1158" + }, + { + "expression": { + "expression": { + "endPosition": "1165", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1164" + }, + "endPosition": "1165", + "kind": "PLUS", + "startPosition": "1163" + }, + "endPosition": "1165", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1163" + }, + { + "expression": { + "expression": { + "endPosition": "1169", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1168" + }, + "endPosition": "1169", + "kind": "MINUS", + "startPosition": "1167" + }, + "endPosition": "1169", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1167" + }, + { + "expression": { + "expression": { + "endPosition": "1173", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1172" + }, + "endPosition": "1173", + "kind": "BITWISE_COMPLEMENT", + "startPosition": "1171" + }, + "endPosition": "1173", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1171" + }, + { + "expression": { + "expression": { + "endPosition": "1177", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1176" + }, + "endPosition": "1177", + "kind": "LOGICAL_COMPLEMENT", + "startPosition": "1175" + }, + "endPosition": "1177", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1175" + } + ], + "sourceName": "parsertests/unaryExpr.js", + "strict": "false", + "startPosition": "1115" +} +, +{ + "endPosition": "1122", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1165", + "kind": "FUNCTION", + "name": "f", + "body": { + "endPosition": "1162", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1162", + "kind": "STRING_LITERAL", + "value": "use strict", + "startPosition": "1152" + }, + "endPosition": "1162", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1152" + } + ], + "startPosition": "1149" + }, + "strict": "true", + "startPosition": "1136", + "parameters": [] + }, + { + "expression": { + "endPosition": "1133", + "kind": "STRING_LITERAL", + "value": "use strict", + "startPosition": "1123" + }, + "endPosition": "1133", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1123" + } + ], + "sourceName": "parsertests/useStrict.js", + "strict": "true", + "startPosition": "1122" +} +, +{ + "endPosition": "1143", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1148", + "kind": "VARIABLE", + "name": "a", + "startPosition": "1147" + }, + { + "endPosition": "1155", + "kind": "VARIABLE", + "name": "a", + "startPosition": "1154" + }, + { + "endPosition": "1158", + "kind": "VARIABLE", + "name": "b", + "startPosition": "1157" + }, + { + "endPosition": "1200", + "kind": "VARIABLE", + "name": "a", + "startPosition": "1190", + "initializer": { + "endPosition": "1200", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1195" + } + }, + { + "endPosition": "1212", + "kind": "VARIABLE", + "name": "a", + "startPosition": "1207", + "initializer": { + "endPosition": "1212", + "kind": "NUMBER_LITERAL", + "value": "1", + "startPosition": "1211" + } + }, + { + "endPosition": "1219", + "kind": "VARIABLE", + "name": "b", + "startPosition": "1214", + "initializer": { + "endPosition": "1219", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "1218" + } + }, + { + "endPosition": "1226", + "kind": "VARIABLE", + "name": "c", + "startPosition": "1221", + "initializer": { + "endPosition": "1226", + "kind": "NUMBER_LITERAL", + "value": "3", + "startPosition": "1225" + } + } + ], + "sourceName": "parsertests/varDecl.js", + "strict": "false", + "startPosition": "1143" +} +, +{ + "endPosition": "1111", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1133", + "kind": "WITH", + "scope": { + "endPosition": "1122", + "kind": "IDENTIFIER", + "name": "scope", + "startPosition": "1117" + }, + "statement": { + "endPosition": "1133", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "1131", + "kind": "IDENTIFIER", + "name": "y", + "startPosition": "1130" + }, + "endPosition": "1131", + "kind": "ASSIGNMENT", + "variable": { + "endPosition": "1127", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1126" + }, + "startPosition": "1126" + }, + "endPosition": "1131", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1126" + } + ], + "startPosition": "1124" + }, + "startPosition": "1111" + } + ], + "sourceName": "parsertests/withStat.js", + "strict": "false", + "startPosition": "1111" +} +, +{ + "fileName": "parsernegativetests/caseoutofswitch.js", + "code": "case (1090, 4)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1090", + "message": "parsernegativetests/caseoutofswitch.js:29:0 Expected an operand but found case\ncase 23:\n^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/caseoutofswitch.js", + "code": "default (1112, 7)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1112", + "message": "parsernegativetests/caseoutofswitch.js:31:0 Expected an operand but found default\ndefault:\n^", + "lineNumber": "31" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1098", + "kind": "ERROR", + "startPosition": "1090" + }, + "endPosition": "1098", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1090" + }, + { + "expression": { + "endPosition": "1110", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1104", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1099" + }, + "arguments": [ + { + "endPosition": "1108", + "kind": "STRING_LITERAL", + "value": "23", + "startPosition": "1106" + } + ], + "startPosition": "1099" + }, + "endPosition": "1110", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1099" + }, + { + "expression": { + "endPosition": "1120", + "kind": "ERROR", + "startPosition": "1112" + }, + "endPosition": "1120", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1112" + }, + { + "expression": { + "endPosition": "1135", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "1126", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "1121" + }, + "arguments": [ + { + "endPosition": "1133", + "kind": "STRING_LITERAL", + "value": "hello", + "startPosition": "1128" + } + ], + "startPosition": "1121" + }, + "endPosition": "1135", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1121" + } + ], + "sourceName": "parsernegativetests/caseoutofswitch.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/illegalbreak.js", + "code": "break (1090, 5)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1090", + "message": "parsernegativetests/illegalbreak.js:29:0 Illegal break statement\nbreak;\n^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/illegalbreak.js", + "code": "ident (1103, 3)", + "columnNumber": "6", + "kind": "ERROR", + "position": "1103", + "message": "parsernegativetests/illegalbreak.js:30:6 Undefined Label \"foo\"\nbreak foo;\n ^", + "lineNumber": "30" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1096", + "kind": "ERROR", + "startPosition": "1095" + }, + "endPosition": "1096", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1095" + }, + { + "expression": { + "endPosition": "1107", + "kind": "ERROR", + "startPosition": "1106" + }, + "endPosition": "1107", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1106" + } + ], + "sourceName": "parsernegativetests/illegalbreak.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/illegalcontinue.js", + "code": "continue (1090, 8)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1090", + "message": "parsernegativetests/illegalcontinue.js:29:0 Illegal continue statement\ncontinue;\n^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/illegalcontinue.js", + "code": "ident (1109, 3)", + "columnNumber": "9", + "kind": "ERROR", + "position": "1109", + "message": "parsernegativetests/illegalcontinue.js:30:9 Undefined Label \"foo\"\ncontinue foo;\n ^", + "lineNumber": "30" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1099", + "kind": "ERROR", + "startPosition": "1098" + }, + "endPosition": "1099", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1098" + }, + { + "expression": { + "endPosition": "1113", + "kind": "ERROR", + "startPosition": "1112" + }, + "endPosition": "1113", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1112" + } + ], + "sourceName": "parsernegativetests/illegalcontinue.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/illegallvalue.js", + "code": "decimal (1090, 2)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1090", + "message": "parsernegativetests/illegallvalue.js:29:0 Invalid left hand side for assignment\n44 = 54;\n^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/illegallvalue.js", + "code": "decimal (1099, 3)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1099", + "message": "parsernegativetests/illegallvalue.js:30:0 Invalid left hand side for assignment\n233 += 33;\n^", + "lineNumber": "30" +} +, +{ + "fileName": "parsernegativetests/illegallvalue.js", + "code": "decimal (1110, 4)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1110", + "message": "parsernegativetests/illegallvalue.js:31:0 Invalid left hand side for assignment\n3423 -= 234;\n^", + "lineNumber": "31" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1098", + "kind": "ERROR", + "startPosition": "1097" + }, + "endPosition": "1098", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1097" + }, + { + "expression": { + "endPosition": "1109", + "kind": "ERROR", + "startPosition": "1108" + }, + "endPosition": "1109", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1108" + }, + { + "expression": { + "endPosition": "1122", + "kind": "ERROR", + "startPosition": "1121" + }, + "endPosition": "1122", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1121" + } + ], + "sourceName": "parsernegativetests/illegallvalue.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/illegaloperator.js", + "code": "* (1093, 1)", + "columnNumber": "3", + "kind": "ERROR", + "position": "1093", + "message": "parsernegativetests/illegaloperator.js:29:3 Expected an operand but found *\nx ** y\n ^", + "lineNumber": "29" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1096", + "kind": "ERROR", + "startPosition": "1093" + }, + "endPosition": "1096", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1093" + } + ], + "sourceName": "parsernegativetests/illegaloperator.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/keywordident.js", + "code": "var (1094, 3)", + "columnNumber": "4", + "kind": "ERROR", + "position": "1094", + "message": "parsernegativetests/keywordident.js:29:4 Expected ident but found var\nvar var = 23;\n ^", + "lineNumber": "29" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1103", + "kind": "ERROR", + "startPosition": "1094" + }, + "endPosition": "1103", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1094" + }, + { + "endPosition": "1115", + "kind": "VARIABLE", + "name": "x", + "startPosition": "1108", + "initializer": { + "endPosition": "1115", + "kind": "NUMBER_LITERAL", + "value": "223", + "startPosition": "1112" + } + } + ], + "sourceName": "parsernegativetests/keywordident.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/parenmissing.js", + "code": "; (1096, 1)", + "columnNumber": "6", + "kind": "ERROR", + "position": "1096", + "message": "parsernegativetests/parenmissing.js:29:6 Expected ) but found ;\n(1 + 2;\n ^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/parenmissing.js", + "code": ") (1103, 1)", + "columnNumber": "5", + "kind": "ERROR", + "position": "1103", + "message": "parsernegativetests/parenmissing.js:30:5 Expected ; but found )\nx * y);\n ^", + "lineNumber": "30" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1097", + "kind": "ERROR", + "startPosition": "1096" + }, + "endPosition": "1097", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1096" + }, + { + "expression": { + "leftOperand": { + "endPosition": "1099", + "kind": "IDENTIFIER", + "name": "x", + "startPosition": "1098" + }, + "endPosition": "1103", + "kind": "MULTIPLY", + "rightOperand": { + "endPosition": "1103", + "kind": "IDENTIFIER", + "name": "y", + "startPosition": "1102" + }, + "startPosition": "1098" + }, + "endPosition": "1103", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1098" + }, + { + "expression": { + "endPosition": "1105", + "kind": "ERROR", + "startPosition": "1103" + }, + "endPosition": "1105", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1103" + } + ], + "sourceName": "parsernegativetests/parenmissing.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/repeatedproperty.js", + "code": "ident (1111, 3)", + "columnNumber": "21", + "kind": "ERROR", + "position": "1111", + "message": "parsernegativetests/repeatedproperty.js:29:21 Property \"foo\" already defined\nvar obj = { foo: 34, get foo() { return 'hello' } };\n ^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/repeatedproperty.js", + "code": "ident (1165, 3)", + "columnNumber": "22", + "kind": "ERROR", + "position": "1165", + "message": "parsernegativetests/repeatedproperty.js:30:22 Property \"foo\" already defined\nvar obj1 = { foo: 34, set foo(x) { } };\n ^", + "lineNumber": "30" +} +, +{ + "fileName": "parsernegativetests/repeatedproperty.js", + "code": "ident (1205, 3)", + "columnNumber": "22", + "kind": "ERROR", + "position": "1205", + "message": "parsernegativetests/repeatedproperty.js:31:22 Property \"foo\" already defined\nvar obj2 = { foo: 34, set foo(x) { } };\n ^", + "lineNumber": "31" +} +, +{ + "fileName": "parsernegativetests/repeatedproperty.js", + "code": "ident (1251, 3)", + "columnNumber": "28", + "kind": "ERROR", + "position": "1251", + "message": "parsernegativetests/repeatedproperty.js:32:28 Property \"bar\" already defined\nvar obj3 = { get bar() { }, get bar() {} };\n ^", + "lineNumber": "32" +} +, +{ + "fileName": "parsernegativetests/repeatedproperty.js", + "code": "ident (1296, 3)", + "columnNumber": "29", + "kind": "ERROR", + "position": "1296", + "message": "parsernegativetests/repeatedproperty.js:33:29 Property \"bar\" already defined\nvar obj4 = { set bar(x) { }, set bar(x) {} };\n ^", + "lineNumber": "33" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1141", + "kind": "ERROR", + "startPosition": "1140" + }, + "endPosition": "1141", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1140" + }, + { + "expression": { + "endPosition": "1181", + "kind": "ERROR", + "startPosition": "1180" + }, + "endPosition": "1181", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1180" + }, + { + "expression": { + "endPosition": "1221", + "kind": "ERROR", + "startPosition": "1220" + }, + "endPosition": "1221", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1220" + }, + { + "expression": { + "endPosition": "1265", + "kind": "ERROR", + "startPosition": "1264" + }, + "endPosition": "1265", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1264" + }, + { + "expression": { + "endPosition": "1311", + "kind": "ERROR", + "startPosition": "1310" + }, + "endPosition": "1311", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1310" + } + ], + "sourceName": "parsernegativetests/repeatedproperty.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/strict_repeatedproperty.js", + "code": "ident (1126, 3)", + "columnNumber": "21", + "kind": "ERROR", + "position": "1126", + "message": "parsernegativetests/strict_repeatedproperty.js:31:21 Property \"foo\" already defined\nvar obj = { foo: 34, foo: 'hello' };\n ^", + "lineNumber": "31" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1101", + "kind": "STRING_LITERAL", + "value": "use strict", + "startPosition": "1091" + }, + "endPosition": "1101", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1091" + }, + { + "expression": { + "endPosition": "1140", + "kind": "ERROR", + "startPosition": "1139" + }, + "endPosition": "1140", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1139" + } + ], + "sourceName": "parsernegativetests/strict_repeatedproperty.js", + "strict": "true", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/strict_repeatparam.js", + "code": "ident (1119, 1)", + "columnNumber": "14", + "kind": "ERROR", + "position": "1119", + "message": "parsernegativetests/strict_repeatparam.js:31:14 strict mode function cannot have duplicate parameter name \"x\"\nfunction func(x, x) {}\n ^", + "lineNumber": "31" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1101", + "kind": "STRING_LITERAL", + "value": "use strict", + "startPosition": "1091" + }, + "endPosition": "1101", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1091" + }, + { + "expression": { + "endPosition": "1127", + "kind": "ERROR", + "startPosition": "1128" + }, + "endPosition": "1127", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1128" + } + ], + "sourceName": "parsernegativetests/strict_repeatparam.js", + "strict": "true", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/strict_with.js", + "code": "with (1105, 4)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1105", + "message": "parsernegativetests/strict_with.js:31:0 \"with\" statement cannot be used in strict mode\nwith({}) {}\n^", + "lineNumber": "31" +} +, +{ + "fileName": "parsernegativetests/strict_with.js", + "code": ") (1112, 1)", + "columnNumber": "7", + "kind": "ERROR", + "position": "1112", + "message": "parsernegativetests/strict_with.js:31:7 Expected ; but found )\nwith({}) {}\n ^", + "lineNumber": "31" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1101", + "kind": "STRING_LITERAL", + "value": "use strict", + "startPosition": "1091" + }, + "endPosition": "1101", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1091" + }, + { + "expression": { + "endPosition": "1112", + "kind": "ERROR", + "startPosition": "1109" + }, + "endPosition": "1112", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1109" + }, + { + "expression": { + "endPosition": "1116", + "kind": "ERROR", + "startPosition": "1112" + }, + "endPosition": "1116", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1112" + } + ], + "sourceName": "parsernegativetests/strict_with.js", + "strict": "true", + "startPosition": "1090" +} +, +{ + "fileName": "parsernegativetests/toplevelreturn.js", + "code": "return (1090, 6)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1090", + "message": "parsernegativetests/toplevelreturn.js:29:0 Invalid return statement\nreturn;\n^", + "lineNumber": "29" +} +, +{ + "fileName": "parsernegativetests/toplevelreturn.js", + "code": "return (1098, 6)", + "columnNumber": "0", + "kind": "ERROR", + "position": "1098", + "message": "parsernegativetests/toplevelreturn.js:30:0 Invalid return statement\nreturn 23;\n^", + "lineNumber": "30" +} +, +{ + "endPosition": "1090", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "expression": { + "endPosition": "1097", + "kind": "ERROR", + "startPosition": "1090" + }, + "endPosition": "1097", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1090" + }, + { + "expression": { + "endPosition": "1108", + "kind": "ERROR", + "startPosition": "1098" + }, + "endPosition": "1108", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1098" + } + ], + "sourceName": "parsernegativetests/toplevelreturn.js", + "strict": "false", + "startPosition": "1090" +} +, +{ + "endPosition": "1136", + "kind": "COMPILATION_UNIT", + "sourceElements": [ + { + "endPosition": "1240", + "kind": "FUNCTION", + "name": "Parser", + "body": { + "endPosition": "1218", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "1217", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "create", + "expression": { + "endPosition": "1208", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1202" + }, + "endPosition": "1215", + "kind": "MEMBER_SELECT", + "startPosition": "1202" + }, + "arguments": [], + "startPosition": "1202" + }, + "endPosition": "1217", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "_parser", + "expression": { + "endPosition": "1191", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "1187" + }, + "endPosition": "1199", + "kind": "MEMBER_SELECT", + "startPosition": "1187" + }, + "startPosition": "1187" + }, + "endPosition": "1217", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1187" + } + ], + "startPosition": "1154" + }, + "strict": "false", + "startPosition": "1136", + "parameters": [] + }, + { + "endPosition": "3598", + "kind": "FUNCTION", + "name": "processFiles", + "body": { + "endPosition": "3555", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "2938", + "kind": "VARIABLE", + "name": "File", + "startPosition": "2906", + "initializer": { + "endPosition": "2938", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "2917", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "2913" + }, + "endPosition": "2922", + "kind": "MEMBER_SELECT", + "startPosition": "2913" + }, + "arguments": [ + { + "endPosition": "2936", + "kind": "STRING_LITERAL", + "value": "java.io.File", + "startPosition": "2924" + } + ], + "startPosition": "2913" + } + }, + { + "endPosition": "2993", + "kind": "VARIABLE", + "name": "files", + "startPosition": "2947", + "initializer": { + "endPosition": "2993", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "listFiles", + "expression": { + "constructorExpression": { + "endPosition": "2981", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "2963", + "kind": "IDENTIFIER", + "name": "File", + "startPosition": "2959" + }, + "arguments": [ + { + "leftOperand": { + "endPosition": "2971", + "kind": "IDENTIFIER", + "name": "__DIR__", + "startPosition": "2964" + }, + "endPosition": "2980", + "kind": "PLUS", + "rightOperand": { + "endPosition": "2980", + "kind": "IDENTIFIER", + "name": "subdir", + "startPosition": "2974" + }, + "startPosition": "2964" + } + ], + "startPosition": "2959" + }, + "endPosition": "2981", + "kind": "NEW", + "startPosition": "2955" + }, + "endPosition": "2991", + "kind": "MEMBER_SELECT", + "startPosition": "2955" + }, + "arguments": [], + "startPosition": "2955" + } + }, + { + "expression": { + "endPosition": "3026", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "sort", + "expression": { + "identifier": "Arrays", + "expression": { + "identifier": "util", + "expression": { + "endPosition": "3002", + "kind": "IDENTIFIER", + "name": "java", + "startPosition": "2998" + }, + "endPosition": "3007", + "kind": "MEMBER_SELECT", + "startPosition": "2998" + }, + "endPosition": "3014", + "kind": "MEMBER_SELECT", + "startPosition": "2998" + }, + "endPosition": "3019", + "kind": "MEMBER_SELECT", + "startPosition": "2998" + }, + "arguments": [ + { + "endPosition": "3025", + "kind": "IDENTIFIER", + "name": "files", + "startPosition": "3020" + } + ], + "startPosition": "2998" + }, + "endPosition": "3026", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "2998" + }, + { + "endPosition": "3049", + "kind": "VARIABLE", + "name": "file", + "startPosition": "3045" + }, + { + "expression": { + "endPosition": "3058", + "kind": "IDENTIFIER", + "name": "files", + "startPosition": "3053" + }, + "endPosition": "3555", + "kind": "FOR_IN_LOOP", + "forEach": "true", + "variable": { + "endPosition": "3049", + "kind": "IDENTIFIER", + "name": "file", + "startPosition": "3045" + }, + "statement": { + "endPosition": "3555", + "kind": "BLOCK", + "statements": [ + { + "condition": { + "endPosition": "3098", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "endsWith", + "expression": { + "identifier": "name", + "expression": { + "endPosition": "3077", + "kind": "IDENTIFIER", + "name": "file", + "startPosition": "3073" + }, + "endPosition": "3082", + "kind": "MEMBER_SELECT", + "startPosition": "3073" + }, + "endPosition": "3091", + "kind": "MEMBER_SELECT", + "startPosition": "3073" + }, + "arguments": [ + { + "endPosition": "3096", + "kind": "STRING_LITERAL", + "value": ".js", + "startPosition": "3093" + } + ], + "startPosition": "3073" + }, + "endPosition": "3550", + "kind": "IF", + "startPosition": "3069", + "thenStatement": { + "endPosition": "3550", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "3141", + "kind": "VARIABLE", + "name": "script", + "startPosition": "3117", + "initializer": { + "endPosition": "3141", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3135", + "kind": "IDENTIFIER", + "name": "readFully", + "startPosition": "3126" + }, + "arguments": [ + { + "endPosition": "3140", + "kind": "IDENTIFIER", + "name": "file", + "startPosition": "3136" + } + ], + "startPosition": "3126" + } + }, + { + "endPosition": "3179", + "kind": "VARIABLE", + "name": "parser", + "startPosition": "3158", + "initializer": { + "constructorExpression": { + "endPosition": "3179", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3177", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "3171" + }, + "arguments": [], + "startPosition": "3171" + }, + "endPosition": "3179", + "kind": "NEW", + "startPosition": "3167" + } + }, + { + "endPosition": "3415", + "kind": "VARIABLE", + "name": "tree", + "startPosition": "3196", + "initializer": { + "endPosition": "3415", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "parse", + "expression": { + "endPosition": "3209", + "kind": "IDENTIFIER", + "name": "parser", + "startPosition": "3203" + }, + "endPosition": "3215", + "kind": "MEMBER_SELECT", + "startPosition": "3203" + }, + "arguments": [ + { + "leftOperand": { + "leftOperand": { + "endPosition": "3222", + "kind": "IDENTIFIER", + "name": "subdir", + "startPosition": "3216" + }, + "endPosition": "3227", + "kind": "PLUS", + "rightOperand": { + "endPosition": "3227", + "kind": "STRING_LITERAL", + "value": "/", + "startPosition": "3226" + }, + "startPosition": "3216" + }, + "endPosition": "3240", + "kind": "PLUS", + "rightOperand": { + "identifier": "name", + "expression": { + "endPosition": "3235", + "kind": "IDENTIFIER", + "name": "file", + "startPosition": "3231" + }, + "endPosition": "3240", + "kind": "MEMBER_SELECT", + "startPosition": "3231" + }, + "startPosition": "3216" + }, + { + "endPosition": "3248", + "kind": "IDENTIFIER", + "name": "script", + "startPosition": "3242" + }, + { + "endPosition": "3286", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "3397", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "3365", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3312", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3307" + }, + "arguments": [ + { + "endPosition": "3364", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "stringify", + "expression": { + "endPosition": "3317", + "kind": "IDENTIFIER", + "name": "JSON", + "startPosition": "3313" + }, + "endPosition": "3327", + "kind": "MEMBER_SELECT", + "startPosition": "3313" + }, + "arguments": [ + { + "endPosition": "3354", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "convert", + "expression": { + "endPosition": "3334", + "kind": "IDENTIFIER", + "name": "parser", + "startPosition": "3328" + }, + "endPosition": "3342", + "kind": "MEMBER_SELECT", + "startPosition": "3328" + }, + "arguments": [ + { + "endPosition": "3353", + "kind": "IDENTIFIER", + "name": "diagnostic", + "startPosition": "3343" + } + ], + "startPosition": "3328" + }, + { + "endPosition": "3360", + "kind": "NULL_LITERAL", + "startPosition": "3356" + }, + { + "endPosition": "3363", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "3362" + } + ], + "startPosition": "3313" + } + ], + "startPosition": "3307" + }, + "endPosition": "3365", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3307" + }, + { + "expression": { + "endPosition": "3396", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3391", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3386" + }, + "arguments": [ + { + "endPosition": "3394", + "kind": "STRING_LITERAL", + "value": ",", + "startPosition": "3393" + } + ], + "startPosition": "3386" + }, + "endPosition": "3396", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3386" + } + ], + "startPosition": "3286" + }, + "strict": "false", + "startPosition": "3286", + "parameters": [ + { + "endPosition": "3284", + "kind": "IDENTIFIER", + "name": "diagnostic", + "startPosition": "3274" + } + ] + } + ], + "startPosition": "3203" + } + }, + { + "condition": { + "leftOperand": { + "endPosition": "3437", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "3433" + }, + "endPosition": "3445", + "kind": "NOT_EQUAL_TO", + "rightOperand": { + "endPosition": "3445", + "kind": "NULL_LITERAL", + "startPosition": "3441" + }, + "startPosition": "3433" + }, + "endPosition": "3541", + "kind": "IF", + "startPosition": "3429", + "thenStatement": { + "endPosition": "3541", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "3500", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3469", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3464" + }, + "arguments": [ + { + "endPosition": "3499", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "stringify", + "expression": { + "endPosition": "3474", + "kind": "IDENTIFIER", + "name": "JSON", + "startPosition": "3470" + }, + "endPosition": "3484", + "kind": "MEMBER_SELECT", + "startPosition": "3470" + }, + "arguments": [ + { + "endPosition": "3489", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "3485" + }, + { + "endPosition": "3495", + "kind": "NULL_LITERAL", + "startPosition": "3491" + }, + { + "endPosition": "3498", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "3497" + } + ], + "startPosition": "3470" + } + ], + "startPosition": "3464" + }, + "endPosition": "3500", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3464" + }, + { + "expression": { + "endPosition": "3527", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3522", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3517" + }, + "arguments": [ + { + "endPosition": "3525", + "kind": "STRING_LITERAL", + "value": ",", + "startPosition": "3524" + } + ], + "startPosition": "3517" + }, + "endPosition": "3527", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3517" + } + ], + "startPosition": "3447" + } + } + ], + "startPosition": "3100" + } + } + ], + "startPosition": "3060" + }, + "startPosition": "3031" + } + ], + "startPosition": "2897" + }, + "strict": "false", + "startPosition": "2867", + "parameters": [ + { + "endPosition": "2895", + "kind": "IDENTIFIER", + "name": "subdir", + "startPosition": "2889" + } + ] + }, + { + "endPosition": "3901", + "kind": "FUNCTION", + "name": "main", + "body": { + "endPosition": "3899", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "3631", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3626", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3621" + }, + "arguments": [ + { + "endPosition": "3629", + "kind": "STRING_LITERAL", + "value": "[", + "startPosition": "3628" + } + ], + "startPosition": "3621" + }, + "endPosition": "3631", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3621" + }, + { + "expression": { + "endPosition": "3665", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3650", + "kind": "IDENTIFIER", + "name": "processFiles", + "startPosition": "3638" + }, + "arguments": [ + { + "endPosition": "3663", + "kind": "STRING_LITERAL", + "value": "parsertests", + "startPosition": "3652" + } + ], + "startPosition": "3638" + }, + "endPosition": "3665", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3638" + }, + { + "expression": { + "endPosition": "3706", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3683", + "kind": "IDENTIFIER", + "name": "processFiles", + "startPosition": "3671" + }, + "arguments": [ + { + "endPosition": "3704", + "kind": "STRING_LITERAL", + "value": "parsernegativetests", + "startPosition": "3685" + } + ], + "startPosition": "3671" + }, + "endPosition": "3706", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3671" + }, + { + "endPosition": "3775", + "kind": "VARIABLE", + "name": "script", + "startPosition": "3747", + "initializer": { + "endPosition": "3775", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3765", + "kind": "IDENTIFIER", + "name": "readFully", + "startPosition": "3756" + }, + "arguments": [ + { + "endPosition": "3774", + "kind": "IDENTIFIER", + "name": "__FILE__", + "startPosition": "3766" + } + ], + "startPosition": "3756" + } + }, + { + "endPosition": "3840", + "kind": "VARIABLE", + "name": "tree", + "startPosition": "3785", + "initializer": { + "endPosition": "3840", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "parse", + "expression": { + "constructorExpression": { + "endPosition": "3804", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3802", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "3796" + }, + "arguments": [], + "startPosition": "3796" + }, + "endPosition": "3804", + "kind": "NEW", + "startPosition": "3792" + }, + "endPosition": "3810", + "kind": "MEMBER_SELECT", + "startPosition": "3792" + }, + "arguments": [ + { + "endPosition": "3824", + "kind": "STRING_LITERAL", + "value": "parserapi.js", + "startPosition": "3812" + }, + { + "endPosition": "3833", + "kind": "IDENTIFIER", + "name": "script", + "startPosition": "3827" + }, + { + "endPosition": "3839", + "kind": "NULL_LITERAL", + "startPosition": "3835" + } + ], + "startPosition": "3792" + } + }, + { + "expression": { + "endPosition": "3882", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3851", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3846" + }, + "arguments": [ + { + "endPosition": "3881", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "stringify", + "expression": { + "endPosition": "3856", + "kind": "IDENTIFIER", + "name": "JSON", + "startPosition": "3852" + }, + "endPosition": "3866", + "kind": "MEMBER_SELECT", + "startPosition": "3852" + }, + "arguments": [ + { + "endPosition": "3871", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "3867" + }, + { + "endPosition": "3877", + "kind": "NULL_LITERAL", + "startPosition": "3873" + }, + { + "endPosition": "3880", + "kind": "NUMBER_LITERAL", + "value": "2", + "startPosition": "3879" + } + ], + "startPosition": "3852" + } + ], + "startPosition": "3846" + }, + "endPosition": "3882", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3846" + }, + { + "expression": { + "endPosition": "3898", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3893", + "kind": "IDENTIFIER", + "name": "print", + "startPosition": "3888" + }, + "arguments": [ + { + "endPosition": "3896", + "kind": "STRING_LITERAL", + "value": "]", + "startPosition": "3895" + } + ], + "startPosition": "3888" + }, + "endPosition": "3898", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3888" + } + ], + "startPosition": "3615" + }, + "strict": "false", + "startPosition": "3599", + "parameters": [] + }, + { + "expression": { + "expression": { + "endPosition": "1305", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "1265", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "1261" + }, + "endPosition": "1270", + "kind": "MEMBER_SELECT", + "startPosition": "1261" + }, + "arguments": [ + { + "endPosition": "1303", + "kind": "STRING_LITERAL", + "value": "jdk.nashorn.api.tree.Diagnostic", + "startPosition": "1272" + } + ], + "startPosition": "1261" + }, + "endPosition": "1305", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "Diagnostic", + "expression": { + "endPosition": "1247", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1241" + }, + "endPosition": "1258", + "kind": "MEMBER_SELECT", + "startPosition": "1241" + }, + "startPosition": "1241" + }, + "endPosition": "1305", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1241" + }, + { + "expression": { + "expression": { + "endPosition": "1390", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "1338", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "1334" + }, + "endPosition": "1343", + "kind": "MEMBER_SELECT", + "startPosition": "1334" + }, + "arguments": [ + { + "endPosition": "1388", + "kind": "STRING_LITERAL", + "value": "jdk.nashorn.api.tree.SimpleTreeVisitorES5_1", + "startPosition": "1345" + } + ], + "startPosition": "1334" + }, + "endPosition": "1390", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "SimpleTreeVisitor", + "expression": { + "endPosition": "1313", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1307" + }, + "endPosition": "1331", + "kind": "MEMBER_SELECT", + "startPosition": "1307" + }, + "startPosition": "1307" + }, + "endPosition": "1390", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1307" + }, + { + "expression": { + "expression": { + "endPosition": "1444", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "1410", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "1406" + }, + "endPosition": "1415", + "kind": "MEMBER_SELECT", + "startPosition": "1406" + }, + "arguments": [ + { + "endPosition": "1442", + "kind": "STRING_LITERAL", + "value": "jdk.nashorn.api.tree.Tree", + "startPosition": "1417" + } + ], + "startPosition": "1406" + }, + "endPosition": "1444", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "Tree", + "expression": { + "endPosition": "1398", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1392" + }, + "endPosition": "1403", + "kind": "MEMBER_SELECT", + "startPosition": "1392" + }, + "startPosition": "1392" + }, + "endPosition": "1444", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1392" + }, + { + "expression": { + "expression": { + "endPosition": "1487", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "1464", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "1460" + }, + "endPosition": "1469", + "kind": "MEMBER_SELECT", + "startPosition": "1460" + }, + "arguments": [ + { + "endPosition": "1485", + "kind": "STRING_LITERAL", + "value": "java.util.List", + "startPosition": "1471" + } + ], + "startPosition": "1460" + }, + "endPosition": "1487", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "List", + "expression": { + "endPosition": "1452", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1446" + }, + "endPosition": "1457", + "kind": "MEMBER_SELECT", + "startPosition": "1446" + }, + "startPosition": "1446" + }, + "endPosition": "1487", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1446" + }, + { + "expression": { + "expression": { + "endPosition": "1530", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "1507", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "1503" + }, + "endPosition": "1512", + "kind": "MEMBER_SELECT", + "startPosition": "1503" + }, + "arguments": [ + { + "endPosition": "1528", + "kind": "STRING_LITERAL", + "value": "java.lang.Enum", + "startPosition": "1514" + } + ], + "startPosition": "1503" + }, + "endPosition": "1530", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "Enum", + "expression": { + "endPosition": "1495", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1489" + }, + "endPosition": "1500", + "kind": "MEMBER_SELECT", + "startPosition": "1489" + }, + "startPosition": "1489" + }, + "endPosition": "1530", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1489" + }, + { + "expression": { + "expression": { + "endPosition": "1657", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1803", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "1716", + "kind": "VARIABLE", + "name": "tree", + "startPosition": "1667", + "initializer": { + "endPosition": "1716", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "parse", + "expression": { + "identifier": "_parser", + "expression": { + "endPosition": "1678", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "1674" + }, + "endPosition": "1686", + "kind": "MEMBER_SELECT", + "startPosition": "1674" + }, + "endPosition": "1692", + "kind": "MEMBER_SELECT", + "startPosition": "1674" + }, + "arguments": [ + { + "endPosition": "1697", + "kind": "IDENTIFIER", + "name": "name", + "startPosition": "1693" + }, + { + "endPosition": "1705", + "kind": "IDENTIFIER", + "name": "script", + "startPosition": "1699" + }, + { + "endPosition": "1715", + "kind": "IDENTIFIER", + "name": "listener", + "startPosition": "1707" + } + ], + "startPosition": "1674" + } + }, + { + "expression": { + "endPosition": "1771", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "accept", + "expression": { + "endPosition": "1726", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "1722" + }, + "endPosition": "1733", + "kind": "MEMBER_SELECT", + "startPosition": "1722" + }, + "arguments": [ + { + "constructorExpression": { + "endPosition": "1764", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "SimpleTreeVisitor", + "expression": { + "endPosition": "1744", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1738" + }, + "endPosition": "1762", + "kind": "MEMBER_SELECT", + "startPosition": "1738" + }, + "arguments": [], + "startPosition": "1744" + }, + "endPosition": "1764", + "kind": "NEW", + "startPosition": "1734" + }, + { + "endPosition": "1770", + "kind": "NULL_LITERAL", + "startPosition": "1766" + } + ], + "startPosition": "1722" + }, + "endPosition": "1771", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1722" + }, + { + "expression": { + "endPosition": "1802", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "convert", + "expression": { + "endPosition": "1788", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "1784" + }, + "endPosition": "1796", + "kind": "MEMBER_SELECT", + "startPosition": "1784" + }, + "arguments": [ + { + "endPosition": "1801", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "1797" + } + ], + "startPosition": "1784" + }, + "endPosition": "1803", + "kind": "RETURN", + "startPosition": "1777" + } + ], + "startPosition": "1657" + }, + "strict": "false", + "startPosition": "1657", + "parameters": [ + { + "endPosition": "1637", + "kind": "IDENTIFIER", + "name": "name", + "startPosition": "1633" + }, + { + "endPosition": "1645", + "kind": "IDENTIFIER", + "name": "script", + "startPosition": "1639" + }, + { + "endPosition": "1655", + "kind": "IDENTIFIER", + "name": "listener", + "startPosition": "1647" + } + ] + }, + "endPosition": "1657", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "parse", + "expression": { + "identifier": "prototype", + "expression": { + "endPosition": "1605", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1599" + }, + "endPosition": "1615", + "kind": "MEMBER_SELECT", + "startPosition": "1599" + }, + "endPosition": "1621", + "kind": "MEMBER_SELECT", + "startPosition": "1599" + }, + "startPosition": "1599" + }, + "endPosition": "1805", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1599" + }, + { + "expression": { + "expression": { + "endPosition": "1834", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "1897", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "1896", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "create", + "expression": { + "endPosition": "1887", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "type", + "expression": { + "endPosition": "1851", + "kind": "IDENTIFIER", + "name": "Java", + "startPosition": "1847" + }, + "endPosition": "1856", + "kind": "MEMBER_SELECT", + "startPosition": "1847" + }, + "arguments": [ + { + "endPosition": "1885", + "kind": "STRING_LITERAL", + "value": "jdk.nashorn.api.tree.Parser", + "startPosition": "1858" + } + ], + "startPosition": "1847" + }, + "endPosition": "1894", + "kind": "MEMBER_SELECT", + "startPosition": "1847" + }, + "arguments": [], + "startPosition": "1894" + }, + "endPosition": "1897", + "kind": "RETURN", + "startPosition": "1840" + } + ], + "startPosition": "1834" + }, + "strict": "false", + "startPosition": "1834", + "parameters": [] + }, + "endPosition": "1834", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "create", + "expression": { + "endPosition": "1813", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1807" + }, + "endPosition": "1820", + "kind": "MEMBER_SELECT", + "startPosition": "1807" + }, + "startPosition": "1807" + }, + "endPosition": "1971", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1807" + }, + { + "expression": { + "expression": { + "endPosition": "2014", + "kind": "FUNCTION_EXPRESSION", + "body": { + "endPosition": "2863", + "kind": "BLOCK", + "statements": [ + { + "condition": { + "leftOperand": { + "expression": { + "endPosition": "2029", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "2025" + }, + "endPosition": "2029", + "kind": "LOGICAL_COMPLEMENT", + "startPosition": "2024" + }, + "endPosition": "2055", + "kind": "CONDITIONAL_OR", + "rightOperand": { + "leftOperand": { + "expression": { + "endPosition": "2044", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "2040" + }, + "endPosition": "2044", + "kind": "TYPEOF", + "startPosition": "2033" + }, + "endPosition": "2055", + "kind": "NOT_EQUAL_TO", + "rightOperand": { + "endPosition": "2055", + "kind": "STRING_LITERAL", + "value": "object", + "startPosition": "2049" + }, + "startPosition": "2033" + }, + "startPosition": "2024" + }, + "endPosition": "2086", + "kind": "IF", + "startPosition": "2020", + "thenStatement": { + "endPosition": "2086", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "endPosition": "2079", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "2075" + }, + "endPosition": "2080", + "kind": "RETURN", + "startPosition": "2068" + } + ], + "startPosition": "2058" + } + }, + { + "endPosition": "2133", + "kind": "VARIABLE", + "name": "obj", + "startPosition": "2096", + "initializer": { + "endPosition": "2133", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "bindProperties", + "expression": { + "endPosition": "2108", + "kind": "IDENTIFIER", + "name": "Object", + "startPosition": "2102" + }, + "endPosition": "2123", + "kind": "MEMBER_SELECT", + "startPosition": "2102" + }, + "arguments": [ + { + "endPosition": "2126", + "kind": "OBJECT_LITERAL", + "startPosition": "2124", + "properties": [] + }, + { + "endPosition": "2132", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "2128" + } + ], + "startPosition": "2102" + } + }, + { + "endPosition": "2154", + "kind": "VARIABLE", + "name": "result", + "startPosition": "2143", + "initializer": { + "endPosition": "2154", + "kind": "OBJECT_LITERAL", + "startPosition": "2152", + "properties": [] + } + }, + { + "endPosition": "2170", + "kind": "VARIABLE", + "name": "i", + "startPosition": "2169" + }, + { + "expression": { + "endPosition": "2177", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "2174" + }, + "endPosition": "2845", + "kind": "FOR_IN_LOOP", + "forEach": "false", + "variable": { + "endPosition": "2170", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "2169" + }, + "statement": { + "endPosition": "2845", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "2204", + "kind": "VARIABLE", + "name": "val", + "startPosition": "2192", + "initializer": { + "expression": { + "endPosition": "2201", + "kind": "IDENTIFIER", + "name": "obj", + "startPosition": "2198" + }, + "endPosition": "2204", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2203", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "2202" + }, + "startPosition": "2198" + } + }, + { + "condition": { + "leftOperand": { + "endPosition": "2220", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2217" + }, + "expression": { + "endPosition": "2220", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2217" + }, + "endPosition": "2243", + "kind": "INSTANCE_OF", + "rightOperand": { + "identifier": "Tree", + "expression": { + "endPosition": "2238", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "2232" + }, + "endPosition": "2243", + "kind": "MEMBER_SELECT", + "startPosition": "2232" + }, + "type": { + "identifier": "Tree", + "expression": { + "endPosition": "2238", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "2232" + }, + "endPosition": "2243", + "kind": "MEMBER_SELECT", + "startPosition": "2232" + }, + "startPosition": "2217" + }, + "elseStatement": { + "condition": { + "leftOperand": { + "endPosition": "2309", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2306" + }, + "expression": { + "endPosition": "2309", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2306" + }, + "endPosition": "2332", + "kind": "INSTANCE_OF", + "rightOperand": { + "identifier": "List", + "expression": { + "endPosition": "2327", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "2321" + }, + "endPosition": "2332", + "kind": "MEMBER_SELECT", + "startPosition": "2321" + }, + "type": { + "identifier": "List", + "expression": { + "endPosition": "2327", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "2321" + }, + "endPosition": "2332", + "kind": "MEMBER_SELECT", + "startPosition": "2321" + }, + "startPosition": "2306" + }, + "elseStatement": { + "endPosition": "2840", + "kind": "BLOCK", + "statements": [ + { + "cases": [ + { + "expression": { + "endPosition": "2574", + "kind": "STRING_LITERAL", + "value": "number", + "startPosition": "2568" + }, + "endPosition": "2576", + "kind": "CASE", + "statements": [], + "startPosition": "2562" + }, + { + "expression": { + "endPosition": "2603", + "kind": "STRING_LITERAL", + "value": "string", + "startPosition": "2597" + }, + "endPosition": "2605", + "kind": "CASE", + "statements": [], + "startPosition": "2591" + }, + { + "expression": { + "endPosition": "2633", + "kind": "STRING_LITERAL", + "value": "boolean", + "startPosition": "2626" + }, + "endPosition": "2678", + "kind": "CASE", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "2677", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "2672", + "kind": "IDENTIFIER", + "name": "String", + "startPosition": "2666" + }, + "arguments": [ + { + "endPosition": "2676", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2673" + } + ], + "startPosition": "2666" + }, + "endPosition": "2677", + "kind": "ASSIGNMENT", + "variable": { + "expression": { + "endPosition": "2660", + "kind": "IDENTIFIER", + "name": "result", + "startPosition": "2654" + }, + "endPosition": "2663", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2662", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "2661" + }, + "startPosition": "2654" + }, + "startPosition": "2654" + }, + "endPosition": "2677", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "2654" + } + ], + "startPosition": "2620" + }, + { + "endPosition": "2820", + "kind": "CASE", + "statements": [ + { + "condition": { + "leftOperand": { + "endPosition": "2727", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2724" + }, + "expression": { + "endPosition": "2727", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2724" + }, + "endPosition": "2750", + "kind": "INSTANCE_OF", + "rightOperand": { + "identifier": "Enum", + "expression": { + "endPosition": "2745", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "2739" + }, + "endPosition": "2750", + "kind": "MEMBER_SELECT", + "startPosition": "2739" + }, + "type": { + "identifier": "Enum", + "expression": { + "endPosition": "2745", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "2739" + }, + "endPosition": "2750", + "kind": "MEMBER_SELECT", + "startPosition": "2739" + }, + "startPosition": "2724" + }, + "endPosition": "2820", + "kind": "IF", + "startPosition": "2720", + "thenStatement": { + "endPosition": "2820", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "2799", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "2794", + "kind": "IDENTIFIER", + "name": "String", + "startPosition": "2788" + }, + "arguments": [ + { + "endPosition": "2798", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2795" + } + ], + "startPosition": "2788" + }, + "endPosition": "2799", + "kind": "ASSIGNMENT", + "variable": { + "expression": { + "endPosition": "2782", + "kind": "IDENTIFIER", + "name": "result", + "startPosition": "2776" + }, + "endPosition": "2785", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2784", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "2783" + }, + "startPosition": "2776" + }, + "startPosition": "2776" + }, + "endPosition": "2799", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "2776" + } + ], + "startPosition": "2752" + } + } + ], + "startPosition": "2693" + } + ], + "expression": { + "expression": { + "endPosition": "2544", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2541" + }, + "endPosition": "2544", + "kind": "TYPEOF", + "startPosition": "2534" + }, + "endPosition": "2832", + "kind": "SWITCH", + "startPosition": "2526" + } + ], + "startPosition": "2514" + }, + "endPosition": "2840", + "kind": "IF", + "startPosition": "2302", + "thenStatement": { + "endPosition": "2508", + "kind": "BLOCK", + "statements": [ + { + "endPosition": "2377", + "kind": "VARIABLE", + "name": "arr", + "startPosition": "2350", + "initializer": { + "constructorExpression": { + "endPosition": "2377", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "2365", + "kind": "IDENTIFIER", + "name": "Array", + "startPosition": "2360" + }, + "arguments": [ + { + "endPosition": "2376", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "size", + "expression": { + "endPosition": "2369", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2366" + }, + "endPosition": "2374", + "kind": "MEMBER_SELECT", + "startPosition": "2366" + }, + "arguments": [], + "startPosition": "2366" + } + ], + "startPosition": "2360" + }, + "endPosition": "2377", + "kind": "NEW", + "startPosition": "2356" + } + }, + { + "endPosition": "2399", + "kind": "VARIABLE", + "name": "j", + "startPosition": "2398" + }, + { + "expression": { + "endPosition": "2406", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2403" + }, + "endPosition": "2466", + "kind": "FOR_IN_LOOP", + "forEach": "false", + "variable": { + "endPosition": "2399", + "kind": "IDENTIFIER", + "name": "j", + "startPosition": "2398" + }, + "statement": { + "endPosition": "2466", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "2453", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "convert", + "expression": { + "endPosition": "2437", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "2433" + }, + "endPosition": "2445", + "kind": "MEMBER_SELECT", + "startPosition": "2433" + }, + "arguments": [ + { + "expression": { + "endPosition": "2449", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2446" + }, + "endPosition": "2452", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2451", + "kind": "IDENTIFIER", + "name": "j", + "startPosition": "2450" + }, + "startPosition": "2446" + } + ], + "startPosition": "2433" + }, + "endPosition": "2453", + "kind": "ASSIGNMENT", + "variable": { + "expression": { + "endPosition": "2427", + "kind": "IDENTIFIER", + "name": "arr", + "startPosition": "2424" + }, + "endPosition": "2430", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2429", + "kind": "IDENTIFIER", + "name": "j", + "startPosition": "2428" + }, + "startPosition": "2424" + }, + "startPosition": "2424" + }, + "endPosition": "2453", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "2424" + } + ], + "startPosition": "2408" + }, + "startPosition": "2389" + }, + { + "expression": { + "expression": { + "endPosition": "2499", + "kind": "IDENTIFIER", + "name": "arr", + "startPosition": "2496" + }, + "endPosition": "2499", + "kind": "ASSIGNMENT", + "variable": { + "expression": { + "endPosition": "2490", + "kind": "IDENTIFIER", + "name": "result", + "startPosition": "2484" + }, + "endPosition": "2493", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2492", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "2491" + }, + "startPosition": "2484" + }, + "startPosition": "2484" + }, + "endPosition": "2499", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "2484" + } + ], + "startPosition": "2334" + } + }, + "endPosition": "2840", + "kind": "IF", + "startPosition": "2213", + "thenStatement": { + "endPosition": "2296", + "kind": "BLOCK", + "statements": [ + { + "expression": { + "expression": { + "endPosition": "2286", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "identifier": "convert", + "expression": { + "endPosition": "2273", + "kind": "IDENTIFIER", + "name": "this", + "startPosition": "2269" + }, + "endPosition": "2281", + "kind": "MEMBER_SELECT", + "startPosition": "2269" + }, + "arguments": [ + { + "endPosition": "2285", + "kind": "IDENTIFIER", + "name": "val", + "startPosition": "2282" + } + ], + "startPosition": "2269" + }, + "endPosition": "2286", + "kind": "ASSIGNMENT", + "variable": { + "expression": { + "endPosition": "2263", + "kind": "IDENTIFIER", + "name": "result", + "startPosition": "2257" + }, + "endPosition": "2266", + "kind": "ARRAY_ACCESS", + "index": { + "endPosition": "2265", + "kind": "IDENTIFIER", + "name": "i", + "startPosition": "2264" + }, + "startPosition": "2257" + }, + "startPosition": "2257" + }, + "endPosition": "2286", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "2257" + } + ], + "startPosition": "2245" + } + } + ], + "startPosition": "2179" + }, + "startPosition": "2160" + }, + { + "expression": { + "endPosition": "2862", + "kind": "IDENTIFIER", + "name": "result", + "startPosition": "2856" + }, + "endPosition": "2863", + "kind": "RETURN", + "startPosition": "2849" + } + ], + "startPosition": "2014" + }, + "strict": "false", + "startPosition": "2014", + "parameters": [ + { + "endPosition": "2012", + "kind": "IDENTIFIER", + "name": "tree", + "startPosition": "2008" + } + ] + }, + "endPosition": "2014", + "kind": "ASSIGNMENT", + "variable": { + "identifier": "convert", + "expression": { + "identifier": "prototype", + "expression": { + "endPosition": "1978", + "kind": "IDENTIFIER", + "name": "Parser", + "startPosition": "1972" + }, + "endPosition": "1988", + "kind": "MEMBER_SELECT", + "startPosition": "1972" + }, + "endPosition": "1996", + "kind": "MEMBER_SELECT", + "startPosition": "1972" + }, + "startPosition": "1972" + }, + "endPosition": "2865", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "1972" + }, + { + "expression": { + "endPosition": "3909", + "kind": "FUNCTION_INVOCATION", + "functionSelect": { + "endPosition": "3907", + "kind": "IDENTIFIER", + "name": "main", + "startPosition": "3903" + }, + "arguments": [], + "startPosition": "3903" + }, + "endPosition": "3909", + "kind": "EXPRESSION_STATEMENT", + "startPosition": "3903" + } + ], + "sourceName": "parserapi.js", + "strict": "false", + "startPosition": "1136" +} +]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_const_as_var.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,39 @@ +/* + * 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. + */ + +/** + * Nashorn parser API --const-as-var option test. + * + * @test + * @run + */ + +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var constAsVarParser = Parser.create("--const-as-var"); +var parser = Parser.create(); + +var constStr = "const PI = 3.14;"; +// this one should not report error +constAsVarParser.parse("const_as_var.js", constStr, print); +// default parser should report error +parser.parse("const_as_var1.js", constStr, print);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_const_as_var.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,3 @@ +const_as_var1.js:1:0 Expected an operand but found const +const PI = 3.14; +^
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_empty_stat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,45 @@ +/* + * 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. + */ + +/** + * Nashorn parser API --empty-statements option test. + * + * @test + * @run + */ + +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); + +// with --empty-statements parse tree should contain +// EmptyStatement tree nodes. Without this option, empty +// statement Tree nodes may be optimized away by Parser. +var emptyStatParser = Parser.create("--empty-statements"); + +var emptyStat = ";"; +emptyStatParser.parse("empty.js", emptyStat, print). + accept(new (Java.extend(SimpleTreeVisitor)) { + visitEmptyStatement: function(node, p) { + print("inside EmptyStatement visit"); + } + }, null);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_empty_stat.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,1 @@ +inside EmptyStatement visit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_nse.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,102 @@ +/* + * 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. + */ + +/** + * Nashorn parser API -nse option test. + * + * @test + * @option -scripting + * @run + */ + +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var noExtParser = Parser.create("-nse"); +var parser = Parser.create(); +var scriptingParser = Parser.create("-scripting"); + +var condCatch = <<EOF + +try { + that(); +} catch (e if e instanceof ReferenceError) {} + +EOF; + +noExtParser.parse("cond_catch.js", condCatch, print); +parser.parse("cond_catch1.js", condCatch, print); + +var funcClosure = <<EOF + +function square(x) x*x; + +EOF; + +noExtParser.parse("func_closure.js", funcClosure, print); +parser.parse("func_closure1.js", funcClosure, print); + +var forEach = <<EOF + +for each (arg in arguments) print(arg); + +EOF; + +noExtParser.parse("for_each.js", forEach, print); +parser.parse("for_each1.js", forEach, print); + +var anonNew = <<EOF + +var r = new java.lang.Runnable() { + run: function() { print("hello") } +}; + +EOF; + +noExtParser.parse("anon_new.js", anonNew, print); +parser.parse("anon_new1.js", anonNew, print); + +var anonFuncStat = <<EOF + +function () { print("hello") } + +EOF; + +noExtParser.parse("anon_func_stat.js", anonFuncStat, print); +parser.parse("anon_func_stat1.js", anonFuncStat, print); + +// These lexer (scripting) extensions should also be not parsed +// by "no extensions parser" ( as well as "default" parser ) + +var backquote = "`ls`"; +noExtParser.parse("backquote.js", backquote, print); +parser.parse("backquote1.js", backquote, print); +scriptingParser.parse("backquote2.js", backquote, print); + +var heredoc = "var str = <<EOF\nprint('hello')\nEOF\n"; +noExtParser.parse("heredoc.js", heredoc, print); +parser.parse("heredoc1.js", heredoc, print); +scriptingParser.parse("heredoc2.js", heredoc, print); + +var hashComment = "#comment\nprint('hello')"; +noExtParser.parse("hashcomment.js", hashComment, print); +parser.parse("hashcomment1.js", hashComment, print); +scriptingParser.parse("hashcomment2.js", hashComment, print);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_nse.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,43 @@ +cond_catch.js:4:11 Expected ) but found if +} catch (e if e instanceof ReferenceError) {} + ^ +func_closure.js:2:19 Expected { but found x + +function square(x) x*x; + ^ +for_each.js:2:4 Expected ( but found each + +for each (arg in arguments) print(arg); + ^ +anon_new.js:2:33 Expected ; but found { + +var r = new java.lang.Runnable() { + ^ +anon_new.js:3:18 Expected ident but found ( + run: function() { print("hello") } + ^ +anon_new.js:4:0 Expected eof but found } +}; +^ +anon_func_stat.js:2:9 Expected ident but found ( + +function () { print("hello") } + ^ +backquote.js:1:0 Expected an operand but found error +`ls` +^ +backquote1.js:1:0 Expected an operand but found error +`ls` +^ +heredoc.js:1:10 Expected an operand but found << +var str = <<EOF + ^ +heredoc1.js:1:10 Expected an operand but found << +var str = <<EOF + ^ +hashcomment.js:1:0 Expected an operand but found error +#comment +^ +hashcomment1.js:1:0 Expected an operand but found error +#comment +^
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_scripting.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,47 @@ +/* + * 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. + */ + +/** + * Nashorn parser API -scripting option test. + * + * @test + * @option -scripting + * @run + */ + +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var scriptingParser = Parser.create("-scripting"); +var parser = Parser.create(); + +var backquote = "`ls`"; +scriptingParser.parse("backquote.js", backquote, print); +parser.parse("backquote1.js", backquote, print); + +var heredoc = "var str = <<EOF\nprint('hello')\nEOF\n"; +scriptingParser.parse("heredoc.js", heredoc, print); +parser.parse("heredoc1.js", heredoc, print); + +var hashComment = "#comment\nprint('hello')"; +scriptingParser.parse("hashcomment.js", hashComment, print); +parser.parse("hashcomment1.js", hashComment, print); +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_scripting.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,9 @@ +backquote1.js:1:0 Expected an operand but found error +`ls` +^ +heredoc1.js:1:10 Expected an operand but found << +var str = <<EOF + ^ +hashcomment1.js:1:0 Expected an operand but found error +#comment +^
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_strict.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,59 @@ +/* + * 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. + */ + +/** + * Nashorn parser API -strict option test. + * + * @test + * @option -scripting + * @run + */ + +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); +var strictParser = Parser.create("-strict"); +var parser = Parser.create(); + +var withStat = <<EOF + +with({}) {} +EOF; + +strictParser.parse("with_stat.js", withStat, print); +parser.parse("with_stat1.js", withStat, print); + +var repeatParam = <<EOF + +function func(x, x) {} +EOF; + +strictParser.parse("repeat_param.js", repeatParam, print); +parser.parse("repeat_param1.js", repeatParam, print); + +var repeatProp = <<EOF + +var obj = { foo: 34, foo: 'hello' }; + +EOF + +strictParser.parse("repeat_prop.js", repeatProp, print); +parser.parse("repeat_prop1.js", repeatProp, print);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parserapi_strict.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,16 @@ +with_stat.js:2:1 "with" statement cannot be used in strict mode + +with({}) {} + ^ +with_stat.js:2:7 Expected ; but found ) + +with({}) {} + ^ +repeat_param.js:2:15 strict mode function cannot have duplicate parameter name "x" + +function func(x, x) {} + ^ +repeat_prop.js:2:22 Property "foo" already defined + +var obj = { foo: 34, foo: 'hello' }; + ^
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/caseoutofswitch.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +case 23: +print("23"); +default: +print("hello");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/illegalbreak.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +break; +break foo;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/illegalcontinue.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +continue; +continue foo;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/illegallvalue.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +44 = 54; +233 += 33; +3423 -= 234;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/illegaloperator.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,29 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +x ** y
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/keywordident.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +var var = 23; +var x = 223;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/parenmissing.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +(1 + 2; +x * y);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/repeatedproperty.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,33 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +var obj = { foo: 34, get foo() { return 'hello' } }; +var obj1 = { foo: 34, set foo(x) { } }; +var obj2 = { foo: 34, set foo(x) { } }; +var obj3 = { get bar() { }, get bar() {} }; +var obj4 = { set bar(x) { }, set bar(x) {} };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/strict_repeatedproperty.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +'use strict'; + +var obj = { foo: 34, foo: 'hello' }; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/strict_repeatparam.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +'use strict'; + +function func(x, x) {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/strict_with.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +'use strict'; + +with({}) {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsernegativetests/toplevelreturn.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * @subtest + * @negative + */ + +return; +return 23;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/array_literal.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,33 @@ +/* + * 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. + */ + +/** + * Tests to check array literal. + * + * @subtest + */ + +var x = []; +var y = [1, 43, 5, 45]; +var z = [34,,,4]; +var k = [ {}, { x: 3 }, "hello" ];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/assignmentExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,42 @@ +/* + * 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. + */ + +/** + * Tests to check assignment e xyzpressions. + * + * @subtest + */ + + +xyz = 314; +xyz += 314; +xyz -= 314; +xyz *= 314; +xyz /= 314; +xyz %= 314; +xyz <<= 314; +xyz >>= 314; +xyz >>>= 314; +xyz &= 314; +xyz ^= 314; +xyz |= 314;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/binaryExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,51 @@ +/* + * 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. + */ + +/** + * Tests to check binary operators. + * + * @subtest + */ + +a * b +a / b; +a % b; +a + b; +a - b; +a << b; +a >> b; +a >>> b; +a < b; +a > b; +a <= b; +a >= b; +a instanceof b; +a == b; +a != b; +a === b; +a !== b; +a & b; +a ^ b; +a | b; +a && b; +a || b;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/block.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * Tests to check 'block' statement. + * + * @subtest + */ + +{} +{ print("hello"); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/breakStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * Tests to check 'break' statement. + * + * @subtest + */ + +while (true) { break; }; +loop: { while (true) { break loop } }; +loop: { for (;;) { break loop } };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/condExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * Tests to check ternary operator. + * + * @subtest + */ + + +a? b : c;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/continueStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * Tests to check 'continue' statement. + * + * @subtest + */ + +while (true) { continue; }; +begin: { while (true) { continue begin; } }; +start: { for(;;) { continue start; } };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/debuggerStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * Tests to check debugger statement. + * + * @subtest + */ + +debugger;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/functions.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,36 @@ +/* + * 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. + */ + +/** + * Tests to check 'function' statements and expressions. + * + * @subtest + */ + +function hello() { print('hello') } +function hello(a) { print(a) } +function hello(a, b) { print(a, b) } +var hello = function() { print('hello') }; +var hello = function hello() { print('hello') }; +(function(){}) +function test() { 'use strict' };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/ifStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * Tests to check 'if' statement. + * + * @subtest + */ + +if (js) { nashorn() }; +if (js) { nashorn() } else { java() };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/labelledStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * Test for labelled statements. + * + * @subtest + */ + +begin: { for (;;) break begin }; +begin: { while (true) break begin };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/lhsExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,44 @@ +/* + * 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. + */ + +/** + * Tests to check left-hand-side expressions + * + * @subtest + */ + +a[3]; +a[b]; +a['foo']; +obj.foo; +obj.foo.bar; +new Type; +new Type(); +new Type(a, 'hello'); +new obj.Type; +new obj.Type(); +new obj.Type(a, 'hello'); +foo() +obj.foo(); +foo(a,b); +obj.foo(a, b);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/loopStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,34 @@ +/* + * 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. + */ + +/** + * Tests for loop statements. + * + * @subtest + */ + +while(true) { print('hello') } +do { print('hello') } while(true) +for (i in obj) { print(obj[i]) } +for each (i in obj) { print(i) } +for (i = 0; i < 10; i++) { print(i) }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/objectLitExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,34 @@ +/* + * 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. + */ + +/** + * Tests to check assignment e xyzpressions. + * + * @subtest + */ + +obj = {}; +p = { x: 10, y: 2 }; +p = { 'x': 10, 'y': 2 }; +p = { get x() { return xValue }, get y() { return yValue } }; +p = { get foo() { return this._foo }, set foo(val) { this._foo = val } };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/parenExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * Tests for parenthesis expressions. + * + * @subtest + */ + +(2) + (1) + 4; +3 + (7) << (5);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/primaryExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,42 @@ +/* + * 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. + */ + +/** + * Tests to check primary expressions. + * + * @subtest + */ + +this; +foo; +null; +true; +false; +33; +3.14; +(10 + 3)*2; +({}); +({ x: 3 }); +[]; +[,,]; +[4, 5, 5];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/regexp_literal.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * Tests to check regexp literal. + * + * @subtest + */ + +var x = /foo/; +var y = /foo/g; +var z = /[a-z]*[1-10]?/;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/returnStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * Tests to check 'return' statement. + * + * @subtest + */ + +(function() { return }); +(function() { return res }); +(function() { return foo() });
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/switchStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,32 @@ +/* + * 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. + */ + +/** + * Tests for switch statement. + * + * @subtest + */ + +switch (key) {}; +switch (key) { case 2: hello(); break; }; +switch (key) { case 4: hello(); break; case 2: world(); break; default: break };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/throwStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,34 @@ +/* + * 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. + */ + +/** + * Tests for throw statement. + * + * @subtest + */ + +throw err; +throw 'wrong'; +throw new TypeError; +throw new TypeError('not an array'); +throw { msg: 'wrong!' };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/tryCatchStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,35 @@ +/* + * 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. + */ + +/** + * Tests to check try..catch statements. + * + * @subtest + */ + +try { } catch (e) { } +try { } catch (e) { } finally {} +try { } finally {} +try { } catch (e) { handle() } +try { that() } catch (e) { handle() } finally { clean() } +try { that() } catch (e if e instanceof TypeError) { handle() } catch (e) { rest() }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/unaryExpr.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,40 @@ +/* + * 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. + */ + +/** + * Tests to check unary operators. + * + * @subtest + */ + +x++; +x--; +delete x; +void x; +typeof x; +++x; +--x; ++x; +-x; +~x; +!x;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/useStrict.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ + +/** + * Tests to check 'use strict' directive. + * + * @subtest + */ + +'use strict'; +function f() { 'use strict' }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/varDecl.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,37 @@ +/* + * 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. + */ + +/** + * Tests to check variable declarations. + * + * @subtest + */ + + +// no initialization +var a; +var a, b; + +// init single, multiple +var a = 'hello'; +var a = 1, b = 2, c = 3;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parsertests/withStat.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * Tests for 'with' statement. + * + * @subtest + */ + +with (scope) { x = y };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parservisitor.js Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,380 @@ +/* + * 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. + */ + +/** + * Nashorn parser API - Basic TreeVisitor tests. + * + * @test + * @option -scripting + * @run + */ + +// Java types used +var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1"); +var Parser = Java.type("jdk.nashorn.api.tree.Parser"); + +function parse(name, script, visitor) { + var parser = Parser.create("--empty-statements"); + var tree = parser.parse(name, script, null); + return tree.accept(visitor, print); +} + +parse("arrayaccess.js", "this['eval']", + new (Java.extend(SimpleTreeVisitor))() { + visitArrayAccess: function(aa) { + print("in visitArrayAccess " + + aa.expression.name + " " + aa.index.value); + } + }); + +parse("arrayliteral.js", "[2, 3, 22]", + new (Java.extend(SimpleTreeVisitor))() { + visitArrayLiteral: function(al) { + print("in visitArrayLiteral"); + for each (var e in al.elements) { + print(e.value); + } + } + }); + +parse("assign.js", "x = 33", + new (Java.extend(SimpleTreeVisitor))() { + visitAssignment: function(an) { + print("in visitAssignment " + + an.variable.name + " " + an.expression.value); + } + }); + +function binaryExpr(name, code) { + parse(name, code, + new (Java.extend(SimpleTreeVisitor))() { + visitBinary: function(bn) { + print("in visitBinary " + bn.kind + " " + + bn.leftOperand.value + ", " + bn.rightOperand.value); + } + }); +} + +binaryExpr("add.js", "3 + 4"); +binaryExpr("sub.js", "3 - 4"); +binaryExpr("mul.js", "3 * 4"); +binaryExpr("div.js", "3 / 4"); +binaryExpr("rem.js", "3 % 4"); +binaryExpr("rshift.js", "3 >> 4"); +binaryExpr("rshift.js", "3 >>> 4"); +binaryExpr("lshift.js", "3 << 4"); +binaryExpr("less.js", "3 < 4"); +binaryExpr("lessOrEq.js", "3 <= 4"); +binaryExpr("greater.js", "3 > 4"); +binaryExpr("greaterOrEq.js", "3 >= 4"); +binaryExpr("in.js", "3 in this"); +binaryExpr("eq.js", "3 == 3"); +binaryExpr("ne.js", "3 != 2"); +binaryExpr("seq.js", "3 === 2"); +binaryExpr("sne.js", "3 !== 2"); +binaryExpr("and.js", "3 & 2"); +binaryExpr("or.js", "3 | 2"); +binaryExpr("xor.js", "3 ^ 2"); +binaryExpr("cond_and.js", "3 && 2"); +binaryExpr("cond_or.js", "3 || 2"); +binaryExpr("comma", "3, 2"); + +parse("block.js", "{ print('hello'); }", + new (Java.extend(SimpleTreeVisitor))() { + visitBlock: function() { + print("in visitBlock"); + } + }); + + +parse("break.js", "while(true) { break; }", + new (Java.extend(SimpleTreeVisitor))() { + visitBreak: function() { + print("in visitBreak"); + } + }); + +function compAssignExpr(name, code) { + parse(name, code, + new (Java.extend(SimpleTreeVisitor))() { + visitCompoundAssignment: function(bn) { + print("in visitCompoundAssignment " + bn.kind + " " + + bn.variable.name + " " + bn.expression.value); + } + }); +} + +compAssignExpr("mult_assign.js", "x *= 3"); +compAssignExpr("div_assign.js", "x /= 3"); +compAssignExpr("rem_assign.js", "x %= 3"); +compAssignExpr("add_assign.js", "x += 3"); +compAssignExpr("sub_assign.js", "x -= 3"); +compAssignExpr("lshift_assign.js", "x <<= 3"); +compAssignExpr("rshift_assign.js", "x >>= 3"); +compAssignExpr("urshift_assign.js", "x >>>= 3"); +compAssignExpr("and_assign.js", "x &= 3"); +compAssignExpr("xor_assign.js", "x ^= 3"); +compAssignExpr("or_assign.js", "x |= 3"); + +parse("condexpr.js", "foo? x : y", + new (Java.extend(SimpleTreeVisitor))() { + visitConditionalExpression: function() { + print("in visitConditionalExpression"); + } + }); + +parse("continue.js", "while(true) { continue; }", + new (Java.extend(SimpleTreeVisitor))() { + visitContinue: function() { + print("in visitContinue"); + } + }); + +parse("debugger.js", "debugger;", + new (Java.extend(SimpleTreeVisitor))() { + visitDebugger: function() { + print("in visitDebugger"); + } + }); + +parse("dowhile.js", "do {} while(true)", + new (Java.extend(SimpleTreeVisitor))() { + visitDoWhileLoop: function() { + print("in visitDoWhileLoop"); + } + }); + +parse("empty.js", ";", + new (Java.extend(SimpleTreeVisitor))() { + visitEmptyStatement: function() { + print("in visitEmptyStatement"); + } + }); + +parse("exprstat.js", "2+3;", + new (Java.extend(SimpleTreeVisitor))() { + visitExpressionStatement: function() { + print("in visitExpressionStatement"); + } + }); + +parse("forin.js", "for(i in this) {}", + new (Java.extend(SimpleTreeVisitor))() { + visitForInLoop: function() { + print("in visitForInLoop"); + } + }); + +parse("for.js", "for(;;) {}", + new (Java.extend(SimpleTreeVisitor))() { + visitForLoop: function() { + print("in visitForLoop"); + } + }); + +parse("funccall.js", "func()", + new (Java.extend(SimpleTreeVisitor))() { + visitFunctionCall: function(fc) { + print("in visitFunctionCall " + fc.functionSelect.name); + } + }); + +parse("funcdecl.js", "function func() {}", + new (Java.extend(SimpleTreeVisitor))() { + visitFunctionDeclaration: function(fd) { + print("in visitFunctionDeclaration " + fd.name); + } + }); + +parse("funcexpr.js", "x = function() {}", + new (Java.extend(SimpleTreeVisitor))() { + visitFunctionExpression: function() { + print("in visitFunctionExpression"); + } + }); + +parse("ident.js", "this", + new (Java.extend(SimpleTreeVisitor))() { + visitIdentifier: function(ident) { + print("in visitIdentifier " + ident.name); + } + }); + +parse("if.js", "if (true) {}", + new (Java.extend(SimpleTreeVisitor))() { + visitIf: function() { + print("in visitIf"); + } + }); + +parse("if2.js", "if (true) print('yes')", + new (visitor = Java.extend(SimpleTreeVisitor))() { + visitBlock: function(node, extra) { + print("ERROR: No block expected here!"); + Error.dumpStack(); + } + }); + +parse("instanceof.js", "this instanceof Object", + new (Java.extend(SimpleTreeVisitor))() { + visitInstanceOf: function() { + print("in visitInstanceOf"); + } + }); + +parse("labeled.js", "foo: print('hello');", + new (Java.extend(SimpleTreeVisitor))() { + visitLabeledStatement: function() { + print("in visitLabeledStatement"); + } + }); + +function literalExpr(name, code) { + parse(name, code, + new (Java.extend(SimpleTreeVisitor))() { + visitLiteral: function(ln) { + print("in visitLiteral " + ln.kind + " " + ln.value); + } + }); +} + +literalExpr("bool.js", "true"); +literalExpr("num.js", "3.14"); +literalExpr("str.js", "'hello'"); +literalExpr("null.js", "null"); + +parse("memselect.js", "this.foo", + new (Java.extend(SimpleTreeVisitor))() { + visitMemberSelect: function(ms) { + print("in visitMemberSelect " + ms.identifier); + } + }); + +parse("new.js", "new Object()", + new (Java.extend(SimpleTreeVisitor))() { + visitNew: function() { + print("in visitNew"); + } + }); + +parse("obj_literal.js", "({ foo: 343 })", + visitor = new (Java.extend(SimpleTreeVisitor))() { + visitObjectLiteral: function(ol) { + print("in visitObjectLiteral"); + Java.super(visitor).visitObjectLiteral(ol, null); + }, + + visitProperty: function(pn) { + print("in visitProperty " + pn.key.name); + } + }); + +parse("regexp.js", "/[a-b]/i", + new (Java.extend(SimpleTreeVisitor))() { + visitRegExpLiteral: function(re) { + print("in visitRegExpLiteral " + re.pattern + " " + re.options); + } + }); + +parse("ret.js", "function func() { return 33 }", + new (Java.extend(SimpleTreeVisitor))() { + visitReturn: function(ret) { + print("in visitReturn " + ret.expression.value); + } + }); + +parse("switch.js", "switch(c) { case '1': break; default: }", + visitor = new (Java.extend(SimpleTreeVisitor))() { + visitSwitch: function(sn) { + print("in visitSwitch"); + Java.super(visitor).visitSwitch(sn, null); + }, + + visitCase: function(cn) { + if (cn.expression) { + print("in visitCase"); + } else { + print("in visitCase (default)"); + } + } + }); + +parse("throw.js", "throw 2", + new (Java.extend(SimpleTreeVisitor))() { + visitThrow: function(tn) { + print("in visitThrow " + tn.expression.value); + } + }); + +parse("try.js", "try { func() } catch(e) {}", + visitor = new (Java.extend(SimpleTreeVisitor))() { + visitTry: function(tn) { + print("in visitTry"); + Java.super(visitor).visitTry(tn, null); + }, + visitCatch: function(cn) { + print("in visitCatch " + cn.parameter.name); + } + }); + +function unaryExpr(name, code) { + parse(name, code, + new (Java.extend(SimpleTreeVisitor))() { + visitUnary: function(un) { + print("in visitUnary " + un.kind + " " + un.expression.name); + } + }); +} + +unaryExpr("postincr.js", "x++"); +unaryExpr("postdecr.js", "x--"); +unaryExpr("preincr.js", "++x"); +unaryExpr("predecr.js", "--x"); +unaryExpr("plus.js", "+x"); +unaryExpr("minus.js", "-x"); +unaryExpr("complement.js", "~x"); +unaryExpr("logical_compl.js", "!x"); +unaryExpr("delete.js", "delete x"); +unaryExpr("typeof.js", "typeof x"); +unaryExpr("void.js", "void x"); + +parse("var.js", "var x = 34;", + new (Java.extend(SimpleTreeVisitor))() { + visitVariable: function(vn) { + print("in visitVariable " + vn.name + " = " + vn.initializer.value); + } + }); + +parse("while.js", "while(true) {}", + new (Java.extend(SimpleTreeVisitor))() { + visitWhileLoop: function() { + print("in visitWhileLoop"); + } + }); + +parse("with.js", "with({}) {}", + new (Java.extend(SimpleTreeVisitor))() { + visitWith: function() { + print("in visitWith"); + } + });
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/parservisitor.js.EXPECTED Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,87 @@ +in visitArrayAccess this eval +in visitArrayLiteral +2 +3 +22 +in visitAssignment x 33 +in visitBinary PLUS 3, 4 +in visitBinary MINUS 3, 4 +in visitBinary MULTIPLY 3, 4 +in visitBinary DIVIDE 3, 4 +in visitBinary REMAINDER 3, 4 +in visitBinary RIGHT_SHIFT 3, 4 +in visitBinary UNSIGNED_RIGHT_SHIFT 3, 4 +in visitBinary LEFT_SHIFT 3, 4 +in visitBinary LESS_THAN 3, 4 +in visitBinary LESS_THAN_EQUAL 3, 4 +in visitBinary GREATER_THAN 3, 4 +in visitBinary GREATER_THAN_EQUAL 3, 4 +in visitBinary IN 3, undefined +in visitBinary EQUAL_TO 3, 3 +in visitBinary NOT_EQUAL_TO 3, 2 +in visitBinary STRICT_EQUAL_TO 3, 2 +in visitBinary STRICT_NOT_EQUAL_TO 3, 2 +in visitBinary AND 3, 2 +in visitBinary OR 3, 2 +in visitBinary XOR 3, 2 +in visitBinary CONDITIONAL_AND 3, 2 +in visitBinary CONDITIONAL_OR 3, 2 +in visitBinary COMMA 3, 2 +in visitBlock +in visitBreak +in visitCompoundAssignment MULTIPLY_ASSIGNMENT x 3 +in visitCompoundAssignment DIVIDE_ASSIGNMENT x 3 +in visitCompoundAssignment REMAINDER_ASSIGNMENT x 3 +in visitCompoundAssignment PLUS_ASSIGNMENT x 3 +in visitCompoundAssignment MINUS_ASSIGNMENT x 3 +in visitCompoundAssignment LEFT_SHIFT_ASSIGNMENT x 3 +in visitCompoundAssignment RIGHT_SHIFT_ASSIGNMENT x 3 +in visitCompoundAssignment UNSIGNED_RIGHT_SHIFT_ASSIGNMENT x 3 +in visitCompoundAssignment AND_ASSIGNMENT x 3 +in visitCompoundAssignment XOR_ASSIGNMENT x 3 +in visitCompoundAssignment OR_ASSIGNMENT x 3 +in visitConditionalExpression +in visitContinue +in visitDebugger +in visitDoWhileLoop +in visitEmptyStatement +in visitExpressionStatement +in visitForInLoop +in visitForLoop +in visitFunctionCall func +in visitFunctionDeclaration func +in visitFunctionExpression +in visitIdentifier this +in visitIf +in visitInstanceOf +in visitLabeledStatement +in visitLiteral BOOLEAN_LITERAL true +in visitLiteral NUMBER_LITERAL 3.14 +in visitLiteral STRING_LITERAL hello +in visitLiteral NULL_LITERAL null +in visitMemberSelect foo +in visitNew +in visitObjectLiteral +in visitProperty foo +in visitRegExpLiteral [a-b] i +in visitReturn 33 +in visitSwitch +in visitCase +in visitCase (default) +in visitThrow 2 +in visitTry +in visitCatch e +in visitUnary POSTFIX_INCREMENT x +in visitUnary POSTFIX_DECREMENT x +in visitUnary PREFIX_INCREMENT x +in visitUnary PREFIX_DECREMENT x +in visitUnary PLUS x +in visitUnary MINUS x +in visitUnary BITWISE_COMPLEMENT x +in visitUnary LOGICAL_COMPLEMENT x +in visitUnary DELETE x +in visitUnary TYPEOF x +in visitUnary VOID x +in visitVariable x = 34 +in visitWhileLoop +in visitWith
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/src/jdk/nashorn/api/tree/ParseAPITest.java Thu Mar 12 21:14:04 2015 -0700 @@ -0,0 +1,188 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ +package jdk.nashorn.api.tree; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * Test for nashorn Parser API (jdk.nashorn.api.tree.*) + */ +public class ParseAPITest { + + private static final boolean VERBOSE = Boolean.valueOf(System.getProperty("parserapitest.verbose")); + private static final boolean TEST262 = Boolean.valueOf(System.getProperty("parserapitest.test262")); + + private static final String TEST_BASIC_DIR = System.getProperty("test.basic.dir"); + private static final String TEST_MAPTESTS_DIR = System.getProperty("test.maptests.dir"); + private static final String TEST_SANDBOX_DIR = System.getProperty("test.sandbox.dir"); + private static final String TEST_TRUSTED_DIR = System.getProperty("test.trusted.dir"); + private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir"); + + interface TestFilter { + public boolean exclude(File file, String content); + } + + private void log(String msg) { + org.testng.Reporter.log(msg, true); + } + + private static final String[] options = new String[] { + "-scripting", "--const-as-var" + }; + + @Test + public void parseAllTests() { + if (TEST262) { + parseTestSet(TEST262_SUITE_DIR, new TestFilter() { + @Override + public boolean exclude(final File file, final String content) { + return content.indexOf("@negative") != -1; + } + }); + } + parseTestSet(TEST_BASIC_DIR, new TestFilter() { + @Override + public boolean exclude(final File file, final String content) { + return file.getParentFile().getName().equals("es6"); + } + }); + parseTestSet(TEST_MAPTESTS_DIR, null); + parseTestSet(TEST_SANDBOX_DIR, null); + parseTestSet(TEST_TRUSTED_DIR, null); + } + + private void parseTestSet(final String testSet, final TestFilter filter) { + passed = 0; + failed = 0; + skipped = 0; + + final File testSetDir = new File(testSet); + if (! testSetDir.isDirectory()) { + log("WARNING: " + testSetDir + " not found or not a directory"); + return; + } + log(testSetDir.getAbsolutePath()); + parseJSDirectory(testSetDir, filter); + + log(testSet + " parse API done!"); + log("parse API ok: " + passed); + log("parse API failed: " + failed); + log("parse API skipped: " + skipped); + if (failed != 0) { + Assert.fail(failed + " tests failed to parse in " + testSetDir.getAbsolutePath()); + } + } + + // number of scripts that parsed fine + private int passed; + // number of scripts resulting in parse failure + private int failed; + // scripts that were skipped - all tests with @negative are + // skipped for now. + private int skipped; + + private void parseJSDirectory(final File dir, final TestFilter filter) { + for (final File f : dir.listFiles()) { + if (f.isDirectory()) { + parseJSDirectory(f, filter); + } else if (f.getName().endsWith(".js")) { + parseJSFile(f, filter); + } + } + } + + private void parseJSFile(final File file, final TestFilter filter) { + if (VERBOSE) { + log("Begin parsing " + file.getAbsolutePath()); + } + + try { + final char[] buffer = readFully(file); + final String content = new String(buffer); + boolean excluded = false; + if (filter != null) { + excluded = filter.exclude(file, content); + } + + if (excluded) { + if (VERBOSE) { + log("Skipping " + file.getAbsolutePath()); + } + skipped++; + return; + } + + final Parser parser = Parser.create(options); + final Tree tree = parser.parse(file.getAbsolutePath(), content, null); + tree.accept(new SimpleTreeVisitorES5_1<Void, Void>(), null); + passed++; + } catch (final Throwable exp) { + log("Parse API failed: " + file.getAbsolutePath() + " : " + exp); + //if (VERBOSE) { + exp.printStackTrace(System.out); + //} + failed++; + } + + if (VERBOSE) { + log("Done parsing via parser API " + file.getAbsolutePath()); + } + } + + private static char[] byteToCharArray(final byte[] bytes) { + Charset cs = StandardCharsets.UTF_8; + int start = 0; + // BOM detection. + if (bytes.length > 1 && bytes[0] == (byte) 0xFE && bytes[1] == (byte) 0xFF) { + start = 2; + cs = StandardCharsets.UTF_16BE; + } else if (bytes.length > 1 && bytes[0] == (byte) 0xFF && bytes[1] == (byte) 0xFE) { + start = 2; + cs = StandardCharsets.UTF_16LE; + } else if (bytes.length > 2 && bytes[0] == (byte) 0xEF && bytes[1] == (byte) 0xBB && bytes[2] == (byte) 0xBF) { + start = 3; + cs = StandardCharsets.UTF_8; + } else if (bytes.length > 3 && bytes[0] == (byte) 0xFF && bytes[1] == (byte) 0xFE && bytes[2] == 0 && bytes[3] == 0) { + start = 4; + cs = Charset.forName("UTF-32LE"); + } else if (bytes.length > 3 && bytes[0] == 0 && bytes[1] == 0 && bytes[2] == (byte) 0xFE && bytes[3] == (byte) 0xFF) { + start = 4; + cs = Charset.forName("UTF-32BE"); + } + + return new String(bytes, start, bytes.length - start, cs).toCharArray(); + } + + private static char[] readFully(final File file) throws IOException { + final byte[] buf = Files.readAllBytes(file.toPath()); + return byteToCharArray(buf); + } +}
--- a/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Thu Mar 12 13:35:18 2015 -0700 +++ b/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Thu Mar 12 21:14:04 2015 -0700 @@ -66,7 +66,6 @@ @BeforeClass public void setupTest() { final Options options = new Options("nashorn"); - options.set("anon.functions", true); options.set("compile.only", true); options.set("print.ast", true); options.set("print.parse", true);
--- a/test/src/jdk/nashorn/internal/parser/ParserTest.java Thu Mar 12 13:35:18 2015 -0700 +++ b/test/src/jdk/nashorn/internal/parser/ParserTest.java Thu Mar 12 21:14:04 2015 -0700 @@ -62,7 +62,6 @@ @BeforeClass public void setupTest() { final Options options = new Options("nashorn"); - options.set("anon.functions", true); options.set("parse.only", true); options.set("scripting", true); options.set("const.as.var", true);