[Pkg-javascript-commits] [node-acorn-jsx] 323/484: Loose: Added support for rest parameters.

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-acorn-jsx.

commit a14a5c81926a2e0fd7ed8c1a754157bda1679a7a
Author: Ingvar Stepanyan <me at rreverser.com>
Date:   Sun Oct 26 21:29:30 2014 +0200

    Loose: Added support for rest parameters.
    
    Includes correction of mistype ".." vs "...".
---
 acorn_loose.js | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/acorn_loose.js b/acorn_loose.js
index 39615aa..b0b73b0 100644
--- a/acorn_loose.js
+++ b/acorn_loose.js
@@ -81,7 +81,13 @@
   function readToken() {
     for (;;) {
       try {
-        return fetchToken();
+        var tok = fetchToken();
+        if (tok.type === tt.dot && input.substr(tok.end, 1) === '.') {
+          tok = fetchToken();
+          tok.start--;
+          tok.type = tt.ellipsis;
+        }
+        return tok;
       } catch(e) {
         if (!(e instanceof SyntaxError)) throw e;
 
@@ -281,8 +287,17 @@
   }
 
   function checkLVal(expr) {
-    if (expr.type === "Identifier" || expr.type === "MemberExpression") return expr;
-    return dummyIdent();
+    switch (expr.type) {
+      case "Identifier":
+      case "MemberExpression":
+      case "ObjectPattern":
+      case "ArrayPattern":
+      case "SpreadElement":
+        return expr;
+
+      default:
+        return dummyIdent();
+    }
   }
 
   function parseTopLevel() {
@@ -577,13 +592,20 @@
 
   function parseMaybeUnary(noIn) {
     if (token.type.prefix) {
-      var node = startNode(), update = token.type.isUpdate;
+      var node = startNode(), update = token.type.isUpdate, nodeType;
+      if (token.type === tt.ellipsis) {
+        nodeType = "SpreadElement";
+      } else {
+        nodeType = update ? "UpdateExpression" : "UnaryExpression";
+        node.operator = token.value;
+        node.prefix = true;
+      }
       node.operator = token.value;
       node.prefix = true;
       next();
       node.argument = parseMaybeUnary(noIn);
       if (update) node.argument = checkLVal(node.argument);
-      return finishNode(node, update ? "UpdateExpression" : "UnaryExpression");
+      return finishNode(node, nodeType);
     }
     var start = storeCurrentPos();
     var expr = parseExprSubscripts();
@@ -810,15 +832,16 @@
     for (var i = 0; i < params.length; i++) {
       var param = toAssignable(params[i]), defValue = null;
       if (param.type === "SpreadElement") {
+        param = param.argument;
         if (i === params.length - 1) {
-          params.length--;
-          node.rest = param.argument;
+          node.rest = param;
+          continue;
         }
       } else if (param.type === "AssignmentExpression") {
         defValue = param.right;
         param = param.left;
       }
-      node.params.push(param);
+      node.params.push(checkLVal(param));
       defaults.push(defValue);
       if (defValue) hasDefaults = true;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-acorn-jsx.git