admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark -parallel and -throttlelimit reserved for foreach and switch statements (#10328)

Browse Source
This commit is contained in:
Kirk Munro
2019-08-15 14:41:41 -07:00
committed by Dongbo Wang
parent b916229d89
commit eb81fb749a
4 changed files with 145 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/parser/SemanticChecks.cs
+24 -15
View File
@@ -458,13 +458,12 @@ namespace System.Management.Automation.Language
// Parallel flag not allowed
if ((switchStatementAst.Flags & SwitchFlags.Parallel) == SwitchFlags.Parallel)
{
bool reportError = !switchStatementAst.IsInWorkflow();
if (reportError)
{
_parser.ReportError(switchStatementAst.Extent,
nameof(ParserStrings.ParallelNotSupported),
ParserStrings.ParallelNotSupported);
}
_parser.ReportError(
switchStatementAst.Extent,
nameof(ParserStrings.KeywordParameterReservedForFutureUse),
ParserStrings.KeywordParameterReservedForFutureUse,
"switch",
"parallel");
}
return AstVisitAction.Continue;
@@ -494,20 +493,30 @@ namespace System.Management.Automation.Language
// Parallel flag not allowed
if ((forEachStatementAst.Flags & ForEachFlags.Parallel) == ForEachFlags.Parallel)
{
bool reportError = !forEachStatementAst.IsInWorkflow();
if (reportError)
{
_parser.ReportError(forEachStatementAst.Extent,
nameof(ParserStrings.ParallelNotSupported),
ParserStrings.ParallelNotSupported);
}
_parser.ReportError(
forEachStatementAst.Extent,
nameof(ParserStrings.KeywordParameterReservedForFutureUse),
ParserStrings.KeywordParameterReservedForFutureUse,
"foreach",
"parallel");
}
if (forEachStatementAst.ThrottleLimit != null)
{
_parser.ReportError(
forEachStatementAst.Extent,
nameof(ParserStrings.KeywordParameterReservedForFutureUse),
ParserStrings.KeywordParameterReservedForFutureUse,
"foreach",
"throttlelimit");
}
// Throttle limit must be combined with Parallel flag
if ((forEachStatementAst.ThrottleLimit != null) &&
((forEachStatementAst.Flags & ForEachFlags.Parallel) != ForEachFlags.Parallel))
{
_parser.ReportError(forEachStatementAst.Extent,
_parser.ReportError(
forEachStatementAst.Extent,
nameof(ParserStrings.ThrottleLimitRequiresParallelFlag),
ParserStrings.ThrottleLimitRequiresParallelFlag);
}
src/System.Management.Automation/resources/ParserStrings.resx
+2 -2
View File
@@ -392,8 +392,8 @@ Possible matches are</value>
<data name="IncompleteSwitchStatement" xml:space="preserve">
<value>The switch statement was incomplete.</value>
</data>
<data name="ParallelNotSupported" xml:space="preserve">
<value>The '-parallel' parameter can be used only within a workflow.</value>
<data name="KeywordParameterReservedForFutureUse" xml:space="preserve">
<value>The {0} '-{1}' parameter is reserved for future use.</value>
</data>
<data name="MissingFilenameOption" xml:space="preserve">
<value>Cannot process the 'switch' statement because of a missing file name argument to the -file option.</value>
test/powershell/Language/Scripting/ForeachParallel.Tests.ps1
+71 -28
View File
@@ -1,41 +1,84 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
Describe "Parallel foreach syntax" -Tags "CI" {
Context 'Should be able to retrieve AST of parallel foreach, error in regular case' {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -parallel ($foo in $bar) {}', [ref] $null, [ref] $errors)
It '$errors.Count' { $errors.Count | Should -Be 1 }
It '$ast.EndBlock.Statements[0].Flags' { $ast.EndBlock.Statements[0].Flags | Should -BeExactly 'Parallel' }
}
Describe 'Parallel foreach syntax' -Tags 'CI' {
It 'Should be able to retrieve AST of parallel foreach, works in JobDefinition case' -Skip:$IsCoreCLR {
. .\TestsOnWinFullOnly.ps1
Run-TestOnWinFull "ForeachParallel:ASTOfParallelForeachOnWorkflow"
Context 'Should be able to retrieve AST of parallel foreach' {
BeforeAll {
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -parallel ($foo in $bar) {}', [ref]$null, [ref]$null)
}
It '$ast.EndBlock.Statements[0].Flags' {
$ast.EndBlock.Statements[0].Flags | Should -BeExactly 'Parallel'
}
}
Context 'Supports newlines before and after' {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
"foreach `n-parallel `n(`$foo in `$bar) {}", [ref] $null, [ref] $null)
It '$errors.Count' { $errors.Count | Should -Be 0 }
It '$ast.EndBlock.Statements[0].Flags' { $ast.EndBlock.Statements[0].Flags | Should -BeExactly 'Parallel' }
BeforeAll {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
"foreach `n-parallel `n(`$foo in `$bar) {}", [ref] $null, [ref] $null)
}
It '$errors.Count' {
$errors.Count | Should -Be 0
}
It '$ast.EndBlock.Statements[0].Flags' {
$ast.EndBlock.Statements[0].Flags | Should -BeExactly 'Parallel'
}
}
Context 'Generates an error on invalid parameter' {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -bogus ($input in $bar) { }', [ref]$null, [ref]$errors)
It '$errors.Count' { $errors.Count | Should -Be 1 }
It '$errors[0].ErrorId' { $errors[0].ErrorId | Should -BeExactly 'InvalidForeachFlag' }
BeforeAll {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -bogus ($input in $bar) { }', [ref]$null, [ref]$errors)
}
It '$errors.Count' {
$errors.Count | Should -Be 1
}
It '$errors[0].ErrorId' {
$errors[0].ErrorId | Should -BeExactly 'InvalidForeachFlag'
}
}
Context 'Generate an error on -parallel that is not a workflow' {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -parallel ($input in $bar) { }', [ref]$null, [ref]$errors)
It '$errors.Count' { $errors.Count | Should -Be 1 }
It '$errors[0].ErrorId' { $errors[0].ErrorId | Should -BeExactly 'ParallelNotSupported' }
Context 'Generate an error on -parallel' {
BeforeAll {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -parallel ($input in $bar) { }', [ref]$null, [ref]$errors)
}
It '$errors.Count' {
$errors.Count | Should -Be 1
}
It '$errors[0].ErrorId' {
$errors[0].ErrorId | Should -Be 'KeywordParameterReservedForFutureUse'
}
}
}
Context 'Generate an error on -throttlelimit' {
BeforeAll {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'foreach -throttlelimit 2 ($input in $bar) { }', [ref]$null, [ref]$errors)
}
It '$errors.Count' {
$errors.Count | Should -Be 2
}
It '$errors[0].ErrorId' {
$errors[0].ErrorId | Should -Be 'KeywordParameterReservedForFutureUse'
}
It '$errors[1].ErrorId' {
$errors[1].ErrorId | Should -Be 'ThrottleLimitRequiresParallelFlag'
}
}
}
test/powershell/Language/Scripting/SwitchParallel.Tests.ps1
+48
View File
@@ -0,0 +1,48 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
Describe 'Parallel switch syntax' -Tags 'CI' {
Context 'Should be able to retrieve AST of parallel switch' {
BeforeAll {
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'switch -parallel ($foo) {1 {break}}', [ref] $null, [ref] $null)
}
It '$ast.EndBlock.Statements[0].Flags' {
$ast.EndBlock.Statements[0].Flags | Should -BeExactly 'Parallel'
}
}
Context 'Generates an error on invalid parameter' {
BeforeAll {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'switch -bogus ($foo) {1 {break}}', [ref]$null, [ref]$errors)
}
It '$errors.Count' {
$errors.Count | Should -Be 1
}
It '$errors[0].ErrorId' {
$errors[0].ErrorId | Should -BeExactly 'InvalidSwitchFlag'
}
}
Context 'Generate an error on -parallel' {
BeforeAll {
$errors = @()
$ast = [System.Management.Automation.Language.Parser]::ParseInput(
'switch -parallel ($foo) {1 {break}}', [ref]$null, [ref]$errors)
}
It '$errors.Count' {
$errors.Count | Should -Be 1
}
It '$errors[0].ErrorId' {
$errors[0].ErrorId | Should -Be 'KeywordParameterReservedForFutureUse'
}
}
}