Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d27e87e2
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d27e87e2
编写于
4月 16, 2016
作者:
N
Neal Gafter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changes per code review on previous PR in pattern-matching branch.
上级
c7673f60
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
11 deletion
+13
-11
src/Compilers/CSharp/Portable/Binder/Binder_Operators.cs
src/Compilers/CSharp/Portable/Binder/Binder_Operators.cs
+1
-1
src/Compilers/CSharp/Portable/Binder/Binder_Patterns.cs
src/Compilers/CSharp/Portable/Binder/Binder_Patterns.cs
+5
-5
src/Compilers/CSharp/Portable/Binder/SwitchBinder_BindPatternSwitch.cs
.../CSharp/Portable/Binder/SwitchBinder_BindPatternSwitch.cs
+5
-3
src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests.cs
...rs/CSharp/Test/Semantic/Semantics/PatternMatchingTests.cs
+2
-2
未找到文件。
src/Compilers/CSharp/Portable/Binder/Binder_Operators.cs
浏览文件 @
d27e87e2
...
...
@@ -2603,7 +2603,7 @@ private BoundExpression BindIsOperator(BinaryExpressionSyntax node, DiagnosticBa
bool
wasExpression
;
var
tempBag2
=
DiagnosticBag
.
GetInstance
();
var
boundConstantPattern
=
BindConstantPattern
(
node
,
operand
,
operand
.
Type
,
node
.
Right
,
node
.
Right
.
HasErrors
,
tempBag2
,
out
wasExpression
,
wasSwitch
:
false
);
node
,
operand
,
operand
.
Type
,
node
.
Right
,
node
.
Right
.
HasErrors
,
tempBag2
,
out
wasExpression
,
wasSwitch
Case
:
false
);
if
(
wasExpression
)
{
tempBag
.
Free
();
...
...
src/Compilers/CSharp/Portable/Binder/Binder_Patterns.cs
浏览文件 @
d27e87e2
...
...
@@ -26,7 +26,7 @@ private BoundExpression BindIsPatternExpression(IsPatternExpressionSyntax node,
TypeSymbol
operandType
,
bool
hasErrors
,
DiagnosticBag
diagnostics
,
bool
wasSwitch
=
false
)
bool
wasSwitch
Case
=
false
)
{
switch
(
node
.
Kind
())
{
...
...
@@ -36,7 +36,7 @@ private BoundExpression BindIsPatternExpression(IsPatternExpressionSyntax node,
case
SyntaxKind
.
ConstantPattern
:
return
BindConstantPattern
(
(
ConstantPatternSyntax
)
node
,
operand
,
operandType
,
hasErrors
,
diagnostics
,
wasSwitch
);
(
ConstantPatternSyntax
)
node
,
operand
,
operandType
,
hasErrors
,
diagnostics
,
wasSwitch
Case
);
case
SyntaxKind
.
PropertyPattern
:
return
BindPropertyPattern
(
...
...
@@ -524,10 +524,10 @@ private bool ApplicableOperatorIs(MethodSymbol candidate, CSharpSyntaxNode node,
TypeSymbol
operandType
,
bool
hasErrors
,
DiagnosticBag
diagnostics
,
bool
wasSwitch
=
fal
se
)
bool
wasSwitch
Ca
se
)
{
bool
wasExpression
;
return
BindConstantPattern
(
node
,
operand
,
operandType
,
node
.
Expression
,
hasErrors
,
diagnostics
,
out
wasExpression
,
wasSwitch
);
return
BindConstantPattern
(
node
,
operand
,
operandType
,
node
.
Expression
,
hasErrors
,
diagnostics
,
out
wasExpression
,
wasSwitch
Case
);
}
internal
BoundPattern
BindConstantPattern
(
...
...
@@ -538,7 +538,7 @@ private bool ApplicableOperatorIs(MethodSymbol candidate, CSharpSyntaxNode node,
bool
hasErrors
,
DiagnosticBag
diagnostics
,
out
bool
wasExpression
,
bool
wasSwitch
)
bool
wasSwitch
Case
)
{
var
expression
=
BindValue
(
right
,
diagnostics
,
BindValueKind
.
RValue
);
wasExpression
=
expression
.
Type
?.
IsErrorType
()
!=
true
;
...
...
src/Compilers/CSharp/Portable/Binder/SwitchBinder_BindPatternSwitch.cs
浏览文件 @
d27e87e2
...
...
@@ -70,8 +70,9 @@ private static BoundPatternSwitchLabel BindPatternSwitchSectionLabel(Binder sect
case
SyntaxKind
.
CasePatternSwitchLabel
:
{
var
matchLabelSyntax
=
(
CasePatternSwitchLabelSyntax
)
node
;
return
new
BoundPatternSwitchLabel
(
node
,
sectionBinder
.
BindPattern
(
matchLabelSyntax
.
Pattern
,
boundSwitchExpression
,
boundSwitchExpression
.
Type
,
node
.
HasErrors
,
diagnostics
,
wasSwitch
:
true
),
var
pattern
=
sectionBinder
.
BindPattern
(
matchLabelSyntax
.
Pattern
,
boundSwitchExpression
,
boundSwitchExpression
.
Type
,
node
.
HasErrors
,
diagnostics
,
wasSwitchCase
:
true
);
return
new
BoundPatternSwitchLabel
(
node
,
pattern
,
matchLabelSyntax
.
WhenClause
!=
null
?
sectionBinder
.
BindBooleanExpression
(
matchLabelSyntax
.
WhenClause
.
Condition
,
diagnostics
)
:
null
,
node
.
HasErrors
);
}
...
...
@@ -79,7 +80,8 @@ private static BoundPatternSwitchLabel BindPatternSwitchSectionLabel(Binder sect
{
var
caseLabelSyntax
=
(
CaseSwitchLabelSyntax
)
node
;
bool
wasExpression
;
var
pattern
=
sectionBinder
.
BindConstantPattern
(
node
,
boundSwitchExpression
,
boundSwitchExpression
.
Type
,
caseLabelSyntax
.
Value
,
node
.
HasErrors
,
diagnostics
,
out
wasExpression
,
wasSwitch
:
true
);
var
pattern
=
sectionBinder
.
BindConstantPattern
(
node
,
boundSwitchExpression
,
boundSwitchExpression
.
Type
,
caseLabelSyntax
.
Value
,
node
.
HasErrors
,
diagnostics
,
out
wasExpression
,
wasSwitchCase
:
true
);
return
new
BoundPatternSwitchLabel
(
node
,
pattern
,
null
,
node
.
HasErrors
);
}
...
...
src/Compilers/CSharp/Test/Semantic/Semantics/PatternMatchingTests.cs
浏览文件 @
d27e87e2
...
...
@@ -15299,8 +15299,8 @@ public static void Main(string[] args)
// case typeof(string[]):
Diagnostic(ErrorCode.ERR_ConstantExpected, "typeof(string[])").WithLocation(12, 18)
);
// If we
decide to support switching on System.Type, the following line would be appropriate.
// CompileAndVerify(compilation, expectedOutput: @"string[]");
// If we
support switching on System.Type as proposed, the expectation would be
//
something like
CompileAndVerify(compilation, expectedOutput: @"string[]");
}
[Fact, WorkItem(10364, "https://github.com/dotnet/roslyn/issues/10364")]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录