Skip to content

fix: compileSwitchStatement will hide inner conditional flags #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcodeIO merged 3 commits into from
Nov 11, 2021
Merged

fix: compileSwitchStatement will hide inner conditional flags #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad1d19f
fix: compileSwitchStatement will hide inner conditional flags
Oct 22, 2021
689fa74
Update src/flow.ts
dcodeIO Nov 10, 2021
60a51c7
Update src/compiler.ts
dcodeIO Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2969,7 +2969,8 @@ export class Compiler extends DiagnosticEmitter {
if (terminates || isLast || innerFlow.isAny(FlowFlags.BREAKS | FlowFlags.CONDITIONALLY_BREAKS)) {
commonCategorical &= innerFlow.flags;
}
commonConditional |= innerFlow.flags & FlowFlags.ANY_CONDITIONAL;

commonConditional |= innerFlow.deriveConditionalFlags();

// Switch back to the parent flow
innerFlow.unset(
Expand Down
20 changes: 20 additions & 0 deletions src/flow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,26 @@ export class Flow {
/** Unsets the specified flag or flags. */
unset(flag: FlowFlags): void { this.flags &= ~flag; }

deriveConditionalFlags(): FlowFlags {
let condiFlags = this.flags & FlowFlags.ANY_CONDITIONAL;
if (this.is(FlowFlags.RETURNS)) {
condiFlags |= FlowFlags.CONDITIONALLY_RETURNS;
}
if (this.is(FlowFlags.THROWS)) {
condiFlags |= FlowFlags.CONDITIONALLY_THROWS;
}
if (this.is(FlowFlags.BREAKS)) {
condiFlags |= FlowFlags.CONDITIONALLY_BREAKS;
}
if (this.is(FlowFlags.CONTINUES)) {
condiFlags |= FlowFlags.CONDITIONALLY_CONTINUES;
}
if (this.is(FlowFlags.ACCESSES_THIS)) {
condiFlags |= FlowFlags.CONDITIONALLY_ACCESSES_THIS;
}
return condiFlags;
}

/** Forks this flow to a child flow. */
fork(resetBreakContext: bool = false): Flow {
var branch = new Flow(this.parentFunction);
Expand Down