Merge https://github.com/RReverser/acorn-jsx

Conflicts: package.json test/tests-jsx.js
2015-01-12 09:59:21 +11:00 · 2015-01-12 09:59:21 +11:00 · bde6ef2e0c
commit bde6ef2e0c
parent 8ca1be061e eb37a57fb0
2 changed files with 2371 additions and 11161 deletions
--- a/acorn.js
+++ b/acorn.js
@ -851,7 +851,7 @@
      size = input.charCodeAt(tokPos + 2) === 61 ? 3 : 2;
      return finishOp(_relational, size);
    }
-    if (next === 47) {
+    if (code === 60 && next === 47) {
      // '</', beginning of JSX closing element
      size = 2;
      return finishOp(_ltSlash, size);
--- a/test/tests-jsx.js
+++ b/test/tests-jsx.js