Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
6cc8247b
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,发现更多精彩内容 >>
提交
6cc8247b
编写于
2月 27, 2018
作者:
N
Neal Gafter
浏览文件
操作
浏览文件
下载
差异文件
Merge from rpatterns4
上级
6aafbf18
fad701c6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
6 addition
and
5 deletion
+6
-5
src/Compilers/CSharp/Portable/Binder/SwitchExpressionArmBinder.cs
...ilers/CSharp/Portable/Binder/SwitchExpressionArmBinder.cs
+3
-3
src/Compilers/CSharp/Portable/Binder/SwitchExpressionBinder.cs
...ompilers/CSharp/Portable/Binder/SwitchExpressionBinder.cs
+2
-1
src/Compilers/CSharp/Portable/Parser/LanguageParser_Patterns.cs
...mpilers/CSharp/Portable/Parser/LanguageParser_Patterns.cs
+1
-1
未找到文件。
src/Compilers/CSharp/Portable/Binder/SwitchExpressionArmBinder.cs
浏览文件 @
6cc8247b
...
...
@@ -34,13 +34,13 @@ internal override BoundSwitchExpressionArm BindSwitchExpressionArm(SwitchExpress
{
Debug
.
Assert
(
node
==
_arm
);
var
caseBinder
=
this
.
GetBinder
(
node
);
var
hasErrors
=
_switchExpressionBinder
.
SwitchGoverning
Expression
.
HasErrors
;
var
hasErrors
=
_switchExpressionBinder
.
SwitchGoverning
Type
.
IsErrorType
()
;
var
locals
=
_armScopeBinder
.
Locals
;
var
pattern
=
caseBinder
.
BindPattern
(
node
.
Pattern
,
_switchExpressionBinder
.
SwitchGoverningType
,
hasErrors
,
diagnostics
);
var
guard
=
node
.
WhenClause
!=
null
?
caseBinder
.
BindBooleanExpression
(
(
ExpressionSyntax
)
node
.
WhenClause
.
Condition
,
diagnostics
)
?
caseBinder
.
BindBooleanExpression
(
node
.
WhenClause
.
Condition
,
diagnostics
)
:
null
;
var
result
=
caseBinder
.
BindValue
(
(
ExpressionSyntax
)
node
.
Expression
,
diagnostics
,
BindValueKind
.
RValue
);
var
result
=
caseBinder
.
BindValue
(
node
.
Expression
,
diagnostics
,
BindValueKind
.
RValue
);
return
new
BoundSwitchExpressionArm
(
node
,
locals
,
pattern
,
guard
,
result
,
hasErrors
);
}
}
...
...
src/Compilers/CSharp/Portable/Binder/SwitchExpressionBinder.cs
浏览文件 @
6cc8247b
...
...
@@ -45,7 +45,7 @@ internal override BoundExpression BindSwitchExpressionCore(SwitchExpressionSynta
/// </summary>
private
TypeSymbol
InferResultType
(
ImmutableArray
<
BoundSwitchExpressionArm
>
switchCases
,
DiagnosticBag
diagnostics
)
{
var
seenTypes
=
new
HashSet
<
TypeSymbol
>
();
var
seenTypes
=
PooledHashSet
<
TypeSymbol
>.
GetInstance
();
var
typesInOrder
=
ArrayBuilder
<
TypeSymbol
>.
GetInstance
();
foreach
(
var
@case
in
switchCases
)
{
...
...
@@ -65,6 +65,7 @@ private TypeSymbol InferResultType(ImmutableArray<BoundSwitchExpressionArm> swit
commonType
=
CreateErrorType
();
}
seenTypes
.
Free
();
return
commonType
;
}
...
...
src/Compilers/CSharp/Portable/Parser/LanguageParser_Patterns.cs
浏览文件 @
6cc8247b
...
...
@@ -454,7 +454,7 @@ bool looksLikeCast()
{
// There is an ambiguity between a deconstruction pattern `(` pattern `)`
// and a constant expression pattern that happens to be parenthesized.
// Per 2017-11-20 LDM we treat such syntax as a parenth
se
ized expression always.
// Per 2017-11-20 LDM we treat such syntax as a parenth
es
ized expression always.
return
_syntaxFactory
.
ConstantPattern
(
_syntaxFactory
.
ParenthesizedExpression
(
openParenToken
,
cp
.
Expression
,
closeParenToken
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录