Separate break and continue statements in execution context

rollup · Oct 17, 2019 · e8e7fa1 · e8e7fa1
1 parent 88d871f
commit e8e7fa1
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/src/ast/ExecutionContext.ts b/src/ast/ExecutionContext.ts
@@ -3,8 +3,8 @@ import { PathTracker } from './utils/PathTracker';
 import ThisVariable from './variables/ThisVariable';
 
 interface ExecutionContextIgnore {
-	breakAndContinue: boolean;
 	breakStatements: boolean;
+	continueStatements: boolean;
 	labels: Set<string>;
 	returnAwaitYield: boolean;
 }
@@ -40,8 +40,8 @@ export function createHasEffectsContext(): HasEffectsContext {
 		breakFlow: BREAKFLOW_NONE,
 		called: new PathTracker(),
 		ignore: {
-			breakAndContinue: false,
 			breakStatements: false,
+			continueStatements: false,
 			labels: new Set(),
 			returnAwaitYield: false
 		},

diff --git a/src/ast/nodes/ArrowFunctionExpression.ts b/src/ast/nodes/ArrowFunctionExpression.ts
@@ -58,8 +58,8 @@ export default class ArrowFunctionExpression extends NodeBase {
 		}
 		const { ignore, breakFlow } = context;
 		context.ignore = {
-			breakAndContinue: false,
 			breakStatements: false,
+			continueStatements: false,
 			labels: new Set(),
 			returnAwaitYield: true
 		};

diff --git a/src/ast/nodes/BreakStatement.ts b/src/ast/nodes/BreakStatement.ts
@@ -8,11 +8,7 @@ export default class BreakStatement extends StatementBase {
 	type!: NodeType.tBreakStatement;
 
 	hasEffects(context: HasEffectsContext) {
-		if (
-			!(this.label
-				? context.ignore.labels.has(this.label.name)
-				: context.ignore.breakStatements || context.ignore.breakAndContinue)
-		)
+		if (!(this.label ? context.ignore.labels.has(this.label.name) : context.ignore.breakStatements))
 			return true;
 		context.breakFlow = new Set([this.label && this.label.name]);
 		return false;

diff --git a/src/ast/nodes/ContinueStatement.ts b/src/ast/nodes/ContinueStatement.ts
@@ -9,7 +9,7 @@ export default class ContinueStatement extends StatementBase {
 
 	hasEffects(context: HasEffectsContext) {
 		if (
-			!(this.label ? context.ignore.labels.has(this.label.name) : context.ignore.breakAndContinue)
+			!(this.label ? context.ignore.labels.has(this.label.name) : context.ignore.continueStatements)
 		)
 			return true;
 		context.breakFlow = new Set([this.label && this.label.name]);

diff --git a/src/ast/nodes/DoWhileStatement.ts b/src/ast/nodes/DoWhileStatement.ts
@@ -11,11 +11,13 @@ export default class DoWhileStatement extends StatementBase {
 		if (this.test.hasEffects(context)) return true;
 		const {
 			breakFlow,
-			ignore: { breakAndContinue }
+			ignore: { breakStatements, continueStatements }
 		} = context;
-		context.ignore.breakAndContinue = true;
+		context.ignore.breakStatements = true;
+		context.ignore.continueStatements = true;
 		if (this.body.hasEffects(context)) return true;
-		context.ignore.breakAndContinue = breakAndContinue;
+		context.ignore.breakStatements = breakStatements;
+		context.ignore.continueStatements = continueStatements;
 		if (context.breakFlow instanceof Set && context.breakFlow.has(null)) {
 			context.breakFlow = breakFlow;
 		}

diff --git a/src/ast/nodes/ForInStatement.ts b/src/ast/nodes/ForInStatement.ts
@@ -36,11 +36,13 @@ export default class ForInStatement extends StatementBase {
 			return true;
 		const {
 			breakFlow,
-			ignore: { breakAndContinue }
+			ignore: { breakStatements, continueStatements }
 		} = context;
-		context.ignore.breakAndContinue = true;
+		context.ignore.breakStatements = true;
+		context.ignore.continueStatements = true;
 		if (this.body.hasEffects(context)) return true;
-		context.ignore.breakAndContinue = breakAndContinue;
+		context.ignore.breakStatements = breakStatements;
+		context.ignore.continueStatements = continueStatements;
 		context.breakFlow = breakFlow;
 		return false;
 	}

diff --git a/src/ast/nodes/ForStatement.ts b/src/ast/nodes/ForStatement.ts
@@ -27,11 +27,13 @@ export default class ForStatement extends StatementBase {
 			return true;
 		const {
 			breakFlow,
-			ignore: { breakAndContinue }
+			ignore: { breakStatements, continueStatements }
 		} = context;
-		context.ignore.breakAndContinue = true;
+		context.ignore.breakStatements = true;
+		context.ignore.continueStatements = true;
 		if (this.body.hasEffects(context)) return true;
-		context.ignore.breakAndContinue = breakAndContinue;
+		context.ignore.breakStatements = breakStatements;
+		context.ignore.continueStatements = continueStatements;
 		context.breakFlow = breakFlow;
 		return false;
 	}

diff --git a/src/ast/nodes/WhileStatement.ts b/src/ast/nodes/WhileStatement.ts
@@ -11,11 +11,13 @@ export default class WhileStatement extends StatementBase {
 		if (this.test.hasEffects(context)) return true;
 		const {
 			breakFlow,
-			ignore: { breakAndContinue }
+			ignore: { breakStatements, continueStatements }
 		} = context;
-		context.ignore.breakAndContinue = true;
+		context.ignore.breakStatements = true;
+		context.ignore.continueStatements = true;
 		if (this.body.hasEffects(context)) return true;
-		context.ignore.breakAndContinue = breakAndContinue;
+		context.ignore.breakStatements = breakStatements;
+		context.ignore.continueStatements = continueStatements;
 		context.breakFlow = breakFlow;
 		return false;
 	}

diff --git a/src/ast/nodes/shared/FunctionNode.ts b/src/ast/nodes/shared/FunctionNode.ts
@@ -74,8 +74,8 @@ export default class FunctionNode extends NodeBase {
 		);
 		const { breakFlow, ignore } = context;
 		context.ignore = {
-			breakAndContinue: false,
 			breakStatements: false,
+			continueStatements: false,
 			labels: new Set(),
 			returnAwaitYield: true
 		};