introduce ParserHelper.evaluateToBoolean

timse · timse · commit afac22f05870 · 2017-01-21T13:41:19.000+11:00
convert all usages of new BasicEvaluatedExpression().setBoolean to ParserHelper.evaluateToBoolean
diff --git a/lib/NodeStuffPlugin.js b/lib/NodeStuffPlugin.js
@@ -100,9 +100,7 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
 				if(!isHarmony)
 					return true;
 			});
-			parser.plugin("evaluate Identifier module.hot", function(expr) {
-				return new BasicEvaluatedExpression().setBoolean(false).setRange(expr.range);
-			});
+			parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
 			parser.plugin("expression module", function() {
 				var module = this.state.module;
 				var isHarmony = module.meta && module.meta.harmonyModule;
diff --git a/lib/ParserHelpers.js b/lib/ParserHelpers.js
@@ -40,6 +40,12 @@ ParserHelpers.evaluateToString = function setTypeof(value) {
 	};
 };
 
+ParserHelpers.evaluateToBoolean = function setTypeof(value) {
+	return function(expr) {
+		return new BasicEvaluatedExpression().setBoolean(value).setRange(expr.range);
+	};
+};
+
 ParserHelpers.expressionIsUnsupported = function expressionIsUnsupported(message) {
 	return function unsupportedExpression(expr) {
 		var dep = new ConstDependency("(void 0)", expr.range);
diff --git a/lib/dependencies/AMDPlugin.js b/lib/dependencies/AMDPlugin.js
@@ -18,7 +18,6 @@ var AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin
 
 var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
 
-var BasicEvaluatedExpression = require("../BasicEvaluatedExpression");
 var ParserHelpers = require("../ParserHelpers");
 
 function AMDPlugin(options, amdOptions) {
@@ -82,12 +81,8 @@ AMDPlugin.prototype.apply = function(compiler) {
 			});
 			parser.plugin("evaluate typeof define.amd", ParserHelpers.evaluateToString(typeof amdOptions));
 			parser.plugin("evaluate typeof require.amd", ParserHelpers.evaluateToString(typeof amdOptions));
-			parser.plugin("evaluate Identifier define.amd", function(expr) {
-				return new BasicEvaluatedExpression().setBoolean(true).setRange(expr.range);
-			});
-			parser.plugin("evaluate Identifier require.amd", function(expr) {
-				return new BasicEvaluatedExpression().setBoolean(true).setRange(expr.range);
-			});
+			parser.plugin("evaluate Identifier define.amd", ParserHelpers.evaluateToBoolean(true));
+			parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToBoolean(true));
 			parser.plugin("typeof define", ParserHelpers.toConstantDependency("function"));
 			parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
 			parser.plugin("can-rename define", function() {
