Merge branch 'es6'

ivy.xml

@@ -11,12 +11,12 @@
         <dependency org="org.mozilla" name="rhino" rev="1.7.10" />
 
         <!-- standard jetty libs -->
-        <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.11.v20180605"/>
-        <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.11.v20180605"/>
-        <dependency org="org.eclipse.jetty.websocket" name="websocket-server" rev="9.4.11.v20180605"/>
-        <dependency org="org.eclipse.jetty.websocket" name="websocket-client" rev="9.4.11.v20180605"/>
-        <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.11.v20180605"/>
-        <dependency org="org.eclipse.jetty" name="jetty-xml" rev="9.4.11.v20180605"/>
+        <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.12.v20180830"/>
+        <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.12.v20180830"/>
+        <dependency org="org.eclipse.jetty.websocket" name="websocket-server" rev="9.4.12.v20180830"/>
+        <dependency org="org.eclipse.jetty.websocket" name="websocket-client" rev="9.4.12.v20180830"/>
+        <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.12.v20180830"/>
+        <dependency org="org.eclipse.jetty" name="jetty-xml" rev="9.4.12.v20180830"/>
 
         <!-- logging -->
         <dependency org="org.slf4j" name="slf4j-api" rev="1.7.+"/>

src/org/ringojs/engine/RingoContextFactory.java

@@ -20,7 +20,7 @@ public class RingoContextFactory extends ContextFactory {
 
     RhinoEngine engine;
 
-    int languageVersion = Context.VERSION_1_8;
+    int languageVersion = Context.VERSION_ES6;
     boolean strictMode = false;
     boolean strictVars = true;
     boolean warningAsError = false;

test/rhino/arrow_functions.js

@@ -0,0 +1,9 @@
+const assert = require("assert");
+
+exports.testArrowFunction = function() {
+    assert.equal([1,2,3,4].map(el => el * 2).join("-"), "2-4-6-8");
+};
+
+if (require.main === module) {
+    require("system").exit(require("test").run(module.id));
+}

test/rhino/const_statement.js

@@ -0,0 +1,9 @@
+const assert = require("assert");
+
+exports.testConstNonStandardBehavior = function() {
+    assert.equal(eval('(function() {const x = "y"; x = "z"; return x;})()'), "y");
+};
+
+if (require.main === module) {
+    require("system").exit(require("test").run(module.id));
+}

test/rhino/let_statement.js

@@ -0,0 +1,16 @@
+const assert = require("assert");
+
+exports.testLetScope = function() {
+    let x = 1;
+
+    if (x === 1) {
+        let x = 2;
+        assert.equal(x, 2);
+    }
+
+    assert.equal(x, 1);
+};
+
+if (require.main === module) {
+    require("system").exit(require("test").run(module.id));
+}