Merge branch 'refactor-parser' into refactor-parser-2

sokra · sokra · commit 51369d4e24d4 · 2017-04-10T12:24:00.000+02:00
# Conflicts:
#	lib/Parser.js
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -494,14 +494,17 @@ class Parser extends Tapable {
 		this.walkSwitchCases(statement.cases);
 	}
 
-	walkReturnStatement(statement) {
+	walkTerminatingStatement(statement) {
 		if(statement.argument)
 			this.walkExpression(statement.argument);
 	}
 
+	walkReturnStatement(statement) {
+		this.walkTerminatingStatement(statement);
+	}
+
 	walkThrowStatement(statement) {
-		if(statement.argument)
-			this.walkExpression(statement.argument);
+		this.walkTerminatingStatement(statement);
 	}
 
 	walkTryStatement(statement) {
@@ -524,8 +527,8 @@ class Parser extends Tapable {
 	}
 
 	walkDoWhileStatement(statement) {
-		this.walkExpression(statement.test);
 		this.walkStatement(statement.body);
+		this.walkExpression(statement.test);
 	}
 
 	walkForStatement(statement) {
@@ -1158,29 +1161,33 @@ class Parser extends Tapable {
 		};
 	}
 
-	parseXXXArray(fn, expression) {
-		switch(expression.type) {
-			case "ArrayExpression":
-				{
-					const arr = [];
-					if(expression.elements)
-						expression.elements.forEach(function(expr) {
-							arr.push(this[fn](expr));
-						}, this);
-					return arr;
-				}
+	parseStringArray(expression) {
+		if(expression.type !== "ArrayExpression") {
+			return [this.parseString(expression)];
 		}
-		return [this[fn](expression)];
-	}
 
-	parseStringArray(expression) {
-		return this.parseXXXArray("parseString", expression);
+		const arr = [];
+		if(expression.elements)
+			expression.elements.forEach(function(expr) {
+				arr.push(this.parseString(expr));
+			}, this);
+		return arr;
 	}
 
 	parseCalculatedStringArray(expression) {
-		return this.parseXXXArray("parseCalculatedString", expression);
+		if(expression.type !== "ArrayExpression") {
+			return [this.parseCalculatedString(expression)];
+		}
+
+		const arr = [];
+		if(expression.elements)
+			expression.elements.forEach(function(expr) {
+				arr.push(this.parseCalculatedString(expr));
+			}, this);
+		return arr;
 	}
 
+
 	parse(source, initialState) {
 		let ast;
 		const comments = [];
