[Pkg-javascript-commits] [node-acorn-jsx] 406/484: Merge branch 'upstream' into jsx2

[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 252bb46f7086b2e446d58ddd154a16a8b9cdaf5d
Merge: d1f28b7 caa5da6
Author: Ingvar Stepanyan <me at rreverser.com>
Date:   Thu Jan 22 16:11:28 2015 +0200

    Merge branch 'upstream' into jsx2

 acorn.js              | 158 +++++++++++++++++++++++++++++++-------------------
 acorn_loose.js        |  16 +++--
 test/tests-harmony.js |  10 ++--
 3 files changed, 109 insertions(+), 75 deletions(-)

diff --cc acorn.js
index 00127e4,10cac96..63f9afa
--- a/acorn.js
+++ b/acorn.js
@@@ -423,9 -417,8 +418,9 @@@
    var _comma = {type: ",", beforeExpr: true}, _semi = {type: ";", beforeExpr: true};
    var _colon = {type: ":", beforeExpr: true}, _dot = {type: "."}, _question = {type: "?", beforeExpr: true};
    var _arrow = {type: "=>", beforeExpr: true}, _template = {type: "template"};
-   var _ellipsis = {type: "...", prefix: true, beforeExpr: true};
+   var _ellipsis = {type: "...", beforeExpr: true};
    var _backQuote = {type: "`"}, _dollarBraceL = {type: "${", beforeExpr: true};
 +  var _jsxText = {type: "jsxText"};
  
    // Operators. These carry several kinds of properties to help the
    // parser use them properly (the presence of these properties is

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