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

Add char range overload to DotDot operator (#5026)

Browse Source
This commit is contained in:
Mathias R. Jessen
2017-10-28 10:47:10 -07:00
committed by Travis Plunk
parent 14af3e1297
commit 9b32c1d039
3 changed files with 128 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/parser/Compiler.cs
+7
View File
@@ -65,6 +65,8 @@ namespace System.Management.Automation.Language
typeof(CharOps).GetMethod(nameof(CharOps.CompareStringIeq), staticFlags);
internal static readonly MethodInfo CharOps_CompareStringIne =
typeof(CharOps).GetMethod(nameof(CharOps.CompareStringIne), staticFlags);
internal static readonly MethodInfo CharOps_Range =
typeof(CharOps).GetMethod(nameof(CharOps.Range), staticFlags);
internal static readonly MethodInfo CommandParameterInternal_CreateArgument =
typeof(CommandParameterInternal).GetMethod(nameof(CommandParameterInternal.CreateArgument), staticFlags);
@@ -4901,6 +4903,11 @@ namespace System.Management.Automation.Language
return Expression.Call(CachedReflectionInfo.TypeOps_AsOperator, lhs.Cast(typeof(object)), rhs.Convert(typeof(Type)));
case TokenKind.DotDot:
if(lhs.Type == typeof(string)){
return Expression.Call(CachedReflectionInfo.CharOps_Range,
lhs.Convert(typeof(char)),
rhs.Convert(typeof(char)));
}
return Expression.Call(CachedReflectionInfo.IntOps_Range,
lhs.Convert(typeof(int)),
rhs.Convert(typeof(int)));
src/System.Management.Automation/engine/runtime/Operations/NumericOps.cs
+24 -5
View File
@@ -101,11 +101,6 @@ namespace System.Management.Automation
internal static object[] Range(int lower, int upper)
{
if (lower == upper)
{
return new object[] { lower };
}
int absRange = Math.Abs(checked(upper - lower));
object[] ra = new object[absRange + 1];
@@ -863,5 +858,29 @@ namespace System.Management.Automation
char secondAsUpper = char.ToUpperInvariant(rhs);
return firstAsUpper != secondAsUpper ? Boxed.True : Boxed.False;
}
internal static object[] Range(char start, char end)
{
int lower = (int)start;
int upper = (int)end;
int absRange = Math.Abs(checked(upper - lower));
object[] ra = new object[absRange + 1];
if (lower > upper)
{
// 3 .. 1 => 3 2 1
for (int offset = 0; offset < ra.Length; offset++)
ra[offset] = (char)lower--;
}
else
{
// 1 .. 3 => 1 2 3
for (int offset = 0; offset < ra.Length; offset++)
ra[offset] = (char)lower++;
}
return ra;
}
}
}
test/powershell/Language/Operators/RangeOperator.Tests.ps1
+97
View File
@@ -0,0 +1,97 @@
Describe "Range Operator" -Tags CI {
Context "Range integer operations" {
It "Range operator generates arrays of integers" {
$Range = 5..8
$Range.count | Should Be 4
$Range[0] | Should BeOfType [int]
$Range[1] | Should BeOfType [int]
$Range[2] | Should BeOfType [int]
$Range[3] | Should BeOfType [int]
$Range[0] | Should Be 5
$Range[1] | Should Be 6
$Range[2] | Should Be 7
$Range[3] | Should Be 8
}
It "Range operator accepts negative integer values" {
$Range = -8..-5
$Range.count | Should Be 4
$Range[0] | Should Be -8
$Range[1] | Should Be -7
$Range[2] | Should Be -6
$Range[3] | Should Be -5
}
It "Range operator support single-item sequences" {
$Range = 0..0
$Range.count | Should Be 1
$Range[0] | Should BeOfType [int]
$Range[0] | Should Be 0
}
It "Range operator works in descending order" {
$Range = 4..3
$Range.count | Should Be 2
$Range[0] | Should Be 4
$Range[1] | Should Be 3
}
It "Range operator works for sequences of both negative and positive numbers" {
$Range = -2..2
$Range.count | Should Be 5
$Range[0] | Should Be -2
$Range[1] | Should Be -1
$Range[2] | Should Be 0
$Range[3] | Should Be 1
$Range[4] | Should Be 2
}
}
Context "Character expansion" {
It "Range operator generates an array of [char] from single-character string operands" {
$CharRange = 'A'..'E'
$CharRange.count | Should Be 5
$CharRange[0] | Should BeOfType [char]
$CharRange[1] | Should BeOfType [char]
$CharRange[2] | Should BeOfType [char]
$CharRange[3] | Should BeOfType [char]
$CharRange[4] | Should BeOfType [char]
}
It "Range operator works in ascending and descending order" {
$CharRange = 'a'..'b'
$CharRange.count | Should Be 2
$CharRange[0] | Should Be ([char]'a')
$CharRange[1] | Should Be ([char]'b')
$CharRange = 'b'..'a'
$CharRange.count | Should Be 2
$CharRange[0] | Should Be ([char]'b')
$CharRange[1] | Should Be ([char]'a')
}
It "Range operator works with 16-bit unicode characters" {
$UnicodeRange = "`u{0110}".."`u{0114}"
$UnicodeRange.count | Should Be 5
$UnicodeRange[0] | Should Be "`u{0110}"[0]
$UnicodeRange[1] | Should Be "`u{0111}"[0]
$UnicodeRange[2] | Should Be "`u{0112}"[0]
$UnicodeRange[3] | Should Be "`u{0113}"[0]
$UnicodeRange[4] | Should Be "`u{0114}"[0]
$UnicodeRange.Where({$_ -is [char]}).count | Should Be 5
}
}
Context "Range operator operand types" {
It "Range operator works on [decimal]" {
$Range = 1.1d..3.9d
$Range.count | Should Be 4
$Range[0] | Should Be 1
$Range[1] | Should Be 2
$Range[2] | Should Be 3
$Range[3] | Should Be 4
$Range.Where({$_ -is [int]}).count | Should Be 4
}
}
}