cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small refactoring related to handling XJSText.

Browse Source 
Conflicts:
	acorn.js
This commit is contained in:
Ingvar Stepanyan 2014-07-10 19:05:07 +03:00
parent 4ed5087bea
commit 292942c1d8
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
acorn.js
View File

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