From 292942c1d8152f8f04a8b7ebb103f681d6c09a54 Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <me@rreverser.com>
Date: Thu, 10 Jul 2014 19:05:07 +0300
Subject: [PATCH] Small refactoring related to handling XJSText.

Conflicts:
	acorn.js
---
 acorn.js | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/acorn.js b/acorn.js
index c8c6cc95ba..8d3f86f05d 100644
--- a/acorn.js
+++ b/acorn.js
@@ -2281,7 +2281,7 @@
       }
       return id;
 
-    case _num: case _string: case _regexp:
+    case _num: case _string: case _regexp: case _xjsText:
       var node = startNode();
       node.value = tokVal;
       node.raw = input.slice(tokStart, tokEnd);
@@ -2968,11 +2968,7 @@
     } else if (tokVal === '<') {
       node = parseXJSElement();
     } else if (tokType === _xjsText) {
-      node = startNode();
-      node.value = tokVal;
-      node.raw = input.slice(tokStart, tokEnd);
-      next();
-      finishNode(node, "Literal");
+      node = parseExprAtom();
     } else {
       raise(tokStart, "XJS value should be either an expression or a quoted XJS text");
     }
@@ -3038,16 +3034,15 @@
   }
 
   function parseXJSChild() {
-    if (tokType === _braceL) {
-      return parseXJSExpressionContainer();
-    } else if (tokType === _xjsText) {
-      var node = startNode();
-      node.value = tokVal;
-      node.raw = input.slice(tokStart, tokEnd);
-      next();
-      return finishNode(node, "Literal");
-    } else {
-      return parseXJSElement();
+    switch (tokType) {
+      case _braceL:
+        return parseXJSExpressionContainer();
+
+      case _xjsText:
+        return parseExprAtom();
+
+      default:
+        return parseXJSElement();
     }
   }
 
@@ -3089,8 +3084,7 @@
 
     inXJSTag = origInXJSTag;
 
-    if (tokType === _slash) {
-      next();
+    if (eat(_slash)) {
       inXJSChild = origInXJSChild;
       node.selfClosing = true;
     } else {