JavaScriptExample
diff --git a/‎lib/ConstPlugin.js‎
Lines changed: 2 additions & 6 deletions b/‎lib/ConstPlugin.js‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎lib/HotModuleReplacementPlugin.js‎
Lines changed: 1 addition & 4 deletions b/‎lib/HotModuleReplacementPlugin.js‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎lib/NodeStuffPlugin.js‎
Lines changed: 2 additions & 9 deletions b/‎lib/NodeStuffPlugin.js‎
Lines changed: 2 additions & 9 deletions
@@ -3,10 +3,9 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
-
 const ConstDependency = require("./dependencies/ConstDependency");
-const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 const NullFactory = require("./NullFactory");
+const ParserHelpers = require("./ParserHelpers");
 
 const getQuery = (request) => {
 	const i = request.indexOf("?");
@@ -46,10 +45,7 @@ class ConstPlugin {
 				});
 				parser.plugin("evaluate Identifier __resourceQuery", function(expr) {
 					if(!this.state.module) return;
-					const res = new BasicEvaluatedExpression();
-					res.setString(getQuery(this.state.module.resource));
-					res.setRange(expr.range);
-					return res;
+					return ParserHelpers.evaluateToString(getQuery(this.state.module.resource))(expr);
 				});
 				parser.plugin("expression __resourceQuery", function() {
 					if(!this.state.module) return;
 
@@ -4,7 +4,6 @@
 */
 "use strict";
 var Template = require("./Template");
-var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 var ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
 var ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
 var RawSource = require("webpack-sources").RawSource;
@@ -200,9 +199,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 			parser.plugin("expression __webpack_hash__", ParserHelpers.toConstantDependency("__webpack_require__.h()"));
 			parser.plugin("evaluate typeof __webpack_hash__", ParserHelpers.evaluateToString("string"));
 			parser.plugin("evaluate Identifier module.hot", function(expr) {
-				return new BasicEvaluatedExpression()
-					.setBoolean(!!this.state.compilation.hotUpdateChunkTemplate)
-					.setRange(expr.range);
+				return ParserHelpers.evaluateToBoolean(!!this.state.compilation.hotUpdateChunkTemplate)(expr);
 			});
 			parser.plugin("call module.hot.accept", function(expr) {
 				if(!this.state.compilation.hotUpdateChunkTemplate) return false;
 
@@ -5,7 +5,6 @@
 var path = require("path");
 var ParserHelpers = require("./ParserHelpers");
 var ConstDependency = require("./dependencies/ConstDependency");
-var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 
 var NullFactory = require("./NullFactory");
 
@@ -51,12 +50,9 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
 			}
 			parser.plugin("evaluate Identifier __filename", function(expr) {
 				if(!this.state.module) return;
-				var res = new BasicEvaluatedExpression();
 				var resource = this.state.module.resource;
 				var i = resource.indexOf("?");
-				res.setString(i < 0 ? resource : resource.substr(0, i));
-				res.setRange(expr.range);
-				return res;
+				return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);
 			});
 			if(localOptions.__dirname === "mock") {
 				setConstant("__dirname", "/");
@@ -67,10 +63,7 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
 			}
 			parser.plugin("evaluate Identifier __dirname", function(expr) {
 				if(!this.state.module) return;
-				var res = new BasicEvaluatedExpression();
-				res.setString(this.state.module.context);
-				res.setRange(expr.range);
-				return res;
+				return ParserHelpers.evaluateToString(this.state.module.context)(expr);
 			});
 			parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));
 			parser.plugin(