[Pkg-javascript-commits] [node-esprima] 02/03: Merge tag 'upstream/3.1.2+ds'

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository node-esprima.

commit bc31d5dc04c444c9cb9808bde161d9d206790a99
Merge: 35c189a 80448d4
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Dec 7 17:07:14 2016 +0100

    Merge tag 'upstream/3.1.2+ds'
    
    Upstream version 3.1.2+ds
    
    # gpg: Signature faite le mer. 07 déc. 2016 17:07:14 CET
    # gpg:                avec la clef RSA 812EEFD8A3FBA4ACE4DF114B04C53BD7FE030551
    # gpg:                issuer "julien.puydt at laposte.net"
    # gpg: Bonne signature de « Julien Puydt (Debian) <julien.puydt at laposte.net> » [inconnu]
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : 812E EFD8 A3FB A4AC E4DF  114B 04C5 3BD7 FE03 0551

 ChangeLog                                          |   7 +
 LICENSE.BSD                                        |   2 +-
 bin/esparse.js                                     |   2 +-
 bin/esvalidate.js                                  |   2 +-
 package.json                                       |   2 +-
 src/esprima.ts                                     |   4 +-
 src/jsx-parser.ts                                  | 111 +++++---
 src/parser.ts                                      |  21 +-
 test/api-tests.js                                  |   2 +-
 test/benchmark-parser.js                           |   2 +-
 test/benchmark-tokenizer.js                        |   2 +-
 test/browser-tests.js                              |   2 +-
 test/check-complexity.js                           |   2 +-
 test/check-version.js                              |   2 +-
 test/downstream.js                                 |   2 +-
 .../import-declaration/invalid-import-boolean.js   |   1 +
 .../invalid-import-boolean.module.json             |   1 +
 .../import-declaration/invalid-import-keyword.js   |   1 +
 .../invalid-import-keyword.module.json             |   1 +
 .../ES6/import-declaration/invalid-import-null.js  |   1 +
 .../invalid-import-null.module.json                |   1 +
 test/fixtures/JSX/attribute-empty-entity1.js       |   1 +
 ...tree.json => attribute-empty-entity1.tree.json} | 177 ++++---------
 test/fixtures/JSX/attribute-empty-entity2.js       |   1 +
 ...tree.json => attribute-empty-entity2.tree.json} | 177 ++++---------
 test/fixtures/JSX/attribute-expression.tree.json   |  20 +-
 .../fixtures/JSX/attribute-illegal-short-entity.js |   1 +
 ...on => attribute-illegal-short-entity.tree.json} | 173 ++++--------
 test/fixtures/JSX/attribute-invalid-entity.js      |   1 +
 ...ree.json => attribute-invalid-entity.tree.json} | 177 ++++---------
 test/fixtures/JSX/attribute-non-hex-entity.js      |   1 +
 ...ree.json => attribute-non-hex-entity.tree.json} | 177 ++++---------
 test/fixtures/JSX/attribute-non-numeric-entity.js  |   1 +
 ...json => attribute-non-numeric-entity.tree.json} | 177 ++++---------
 test/fixtures/JSX/attribute-primary.tree.json      |  20 +-
 test/fixtures/JSX/attribute-spread.tree.json       |  20 +-
 test/fixtures/JSX/attribute-unterminated-entity.js |   1 +
 ...son => attribute-unterminated-entity.tree.json} | 173 ++++--------
 test/fixtures/JSX/attribute-x-entity.js            |   1 +
 ...mary.tree.json => attribute-x-entity.tree.json} | 177 ++++---------
 .../JSX/container-object-expression.tree.json      |  18 --
 test/fixtures/JSX/container-series.tree.json       |  56 +---
 .../JSX/simple-expression-container.tree.json      |  20 +-
 test/fixtures/JSX/template-literal.js              |   1 +
 ...ession.tree.json => template-literal.tree.json} | 293 +++++++++++----------
 test/grammar-tests.js                              |   2 +-
 test/hostile-environment-tests.js                  |   2 +-
 test/profile.js                                    |   2 +-
 test/regression-tests.js                           |   2 +-
 test/unit-tests.js                                 |   2 +-
 test/utils/create-testcases.js                     |   2 +-
 test/utils/error-to-object.js                      |   2 +-
 test/utils/evaluate-testcase.js                    |   2 +-
 tools/fixupbundle.js                               |   2 +-
 tools/generate-fixtures.js                         |   2 +-
 55 files changed, 716 insertions(+), 1339 deletions(-)

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