Inline the TemplateElement evaluations

Diogo Franco (Kovensky) · Diogo Franco (Kovensky) · commit 5be77b3b333d · 2016-11-21T08:37:22.000+09:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -300,7 +300,7 @@ Parser.prototype.initializeEvaluating = function() {
 		this.plugin("evaluate TemplateLiteral", function(node) {
 			var i, quasis = node.quasis, exprs = [];
 			for (i = 0; i < quasis.length; i++) {
-				exprs.push(this.evaluateExpression(quasis[i]).cooked);
+				exprs.push(new BasicEvaluatedExpression().setString(quasis[i].value.cooked).setRange(quasis[i].range));
 				// possible improvement: evaluate node.expressions[i-1]
 				// and append to previous quasis if has a set value
 			}
@@ -310,16 +310,10 @@ Parser.prototype.initializeEvaluating = function() {
 			if (this.evaluateExpression(node.tag).identifier !== 'String.raw') return;
 			var i, quasis = node.quasi.quasis, exprs = [];
 			for (i = 0; i < quasis.length; i++) {
-				exprs.push(this.evaluateExpression(quasis[i]).raw);
+				exprs.push(new BasicEvaluatedExpression().setString(quasis[i].value.raw).setRange(quasis[i].range));
 			}
 			return new BasicEvaluatedExpression().setTemplateString(exprs).setRange(node.range);
 		});
-		this.plugin("evaluate TemplateElement", function(node) {
-			return {
-				raw: new BasicEvaluatedExpression().setString(node.value.raw).setRange(node.range),
-				cooked: new BasicEvaluatedExpression().setString(node.value.cooked).setRange(node.range)
-			};
-		})
 	}, this);
 	this.plugin("evaluate CallExpression .split", function(expr, param) {
 		if(!param.isString()) return;
