Skip to content

Revert "Make switch statement report correct error position when it fails to evaluate the condition" #7182

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
daxian-dbw merged 5 commits into from
Jun 26, 2018
Merged

Revert "Make switch statement report correct error position when it fails to evaluate the condition" #7182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d772ca6
Revert "Fix adding padding when right justified (#7136)"
daxian-dbw Jun 26, 2018
f7d3ba7
Revert "Add location history for Set-Location to enable 'cd -' scenar…
daxian-dbw Jun 26, 2018
1a55c33
Revert "Updates to build for Alpine (#7139)"
daxian-dbw Jun 26, 2018
f892b7c
Revert "Bulk update code base to put 'null' on the right-hand-side of…
daxian-dbw Jun 26, 2018
384030b
Revert "Make switch statement report correct error position when it f…
daxian-dbw Jun 26, 2018
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
5 changes: 4 additions & 1 deletion src/System.Management.Automation/engine/parser/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4189,7 +4189,10 @@ private Expression GenerateIteratorStatement(VariablePath iteratorVariablePath,
// $foreach/$switch = GetEnumerator $enumerable
var enumerable = NewTemp(typeof(object), "enumerable");
temps.Add(enumerable);
exprs.Add(UpdatePosition(stmt.Condition));
if (generatingForeach)
{
exprs.Add(UpdatePosition(stmt.Condition));
}
exprs.Add(
Expression.Assign(enumerable,
GetRangeEnumerator(stmt.Condition.GetPureExpression())
Expand Down
51 changes: 0 additions & 51 deletions test/powershell/Language/Scripting/ErrorPosition.Tests.ps1
View file
Open in desktop

This file was deleted.