Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7b359804
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,发现更多精彩内容 >>
未验证
提交
7b359804
编写于
5月 11, 2020
作者:
C
Charles Stoner
提交者:
GitHub
5月 11, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pass basesBeingResolved to BindTupleType (#44098)
上级
9e10e607
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
104 addition
and
3 deletion
+104
-3
src/Compilers/CSharp/Portable/Binder/Binder_Symbols.cs
src/Compilers/CSharp/Portable/Binder/Binder_Symbols.cs
+3
-3
src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs
...ilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs
+53
-0
src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb
...alBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb
+48
-0
未找到文件。
src/Compilers/CSharp/Portable/Binder/Binder_Symbols.cs
浏览文件 @
7b359804
...
...
@@ -441,7 +441,7 @@ internal NamespaceOrTypeOrAliasSymbolWithAnnotations BindNamespaceOrTypeOrAliasS
case
SyntaxKind
.
TupleType
:
{
var
tupleTypeSyntax
=
(
TupleTypeSyntax
)
syntax
;
return
TypeWithAnnotations
.
Create
(
AreNullableAnnotationsEnabled
(
tupleTypeSyntax
.
CloseParenToken
),
BindTupleType
(
tupleTypeSyntax
,
diagnostics
));
return
TypeWithAnnotations
.
Create
(
AreNullableAnnotationsEnabled
(
tupleTypeSyntax
.
CloseParenToken
),
BindTupleType
(
tupleTypeSyntax
,
diagnostics
,
basesBeingResolved
));
}
case
SyntaxKind
.
RefType
:
...
...
@@ -596,7 +596,7 @@ NamespaceOrTypeOrAliasSymbolWithAnnotations bindPointer()
return
type
;
}
private
TypeSymbol
BindTupleType
(
TupleTypeSyntax
syntax
,
DiagnosticBag
diagnostics
)
private
TypeSymbol
BindTupleType
(
TupleTypeSyntax
syntax
,
DiagnosticBag
diagnostics
,
ConsList
<
TypeSymbol
>
basesBeingResolved
)
{
int
numElements
=
syntax
.
Elements
.
Count
;
var
types
=
ArrayBuilder
<
TypeWithAnnotations
>.
GetInstance
(
numElements
);
...
...
@@ -611,7 +611,7 @@ private TypeSymbol BindTupleType(TupleTypeSyntax syntax, DiagnosticBag diagnosti
{
var
argumentSyntax
=
syntax
.
Elements
[
i
];
var
argumentType
=
BindType
(
argumentSyntax
.
Type
,
diagnostics
);
var
argumentType
=
BindType
(
argumentSyntax
.
Type
,
diagnostics
,
basesBeingResolved
);
types
.
Add
(
argumentType
);
string
name
=
null
;
...
...
src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs
浏览文件 @
7b359804
...
...
@@ -2301,5 +2301,58 @@ class F : A<D*>.B { }
// class E : A<C*>.B { }
Diagnostic
(
ErrorCode
.
ERR_ManagedAddr
,
"E"
).
WithArguments
(
"Base.C"
).
WithLocation
(
12
,
11
));
}
[
Fact
]
[
WorkItem
(
1107185
,
"https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1107185"
)]
public
void
Tuple_MissingNestedTypeArgument_01
()
{
var
source
=
@"interface I<T>
{
}
class A : I<(object, A.B)>
{
}"
;
var
comp
=
CreateCompilation
(
source
);
comp
.
VerifyDiagnostics
(
// (4,24): error CS0146: Circular base class dependency involving 'A' and 'A'
// class A : I<(object, A.B)>
Diagnostic
(
ErrorCode
.
ERR_CircularBase
,
"B"
).
WithArguments
(
"A"
,
"A"
).
WithLocation
(
4
,
24
));
}
[
Fact
]
[
WorkItem
(
1107185
,
"https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1107185"
)]
public
void
Tuple_MissingNestedTypeArgument_02
()
{
var
source
=
@"class A<T>
{
}
class B : A<(object, B.C)>
{
}"
;
var
comp
=
CreateCompilation
(
source
);
comp
.
VerifyDiagnostics
(
// (4,24): error CS0146: Circular base class dependency involving 'B' and 'B'
// class B : A<(object, B.C)>
Diagnostic
(
ErrorCode
.
ERR_CircularBase
,
"C"
).
WithArguments
(
"B"
,
"B"
).
WithLocation
(
4
,
24
));
}
[
Fact
]
public
void
Tuple_MissingNestedTypeArgument_03
()
{
var
source
=
@"interface I<T>
{
}
class A : I<System.ValueTuple<object, A.B>>
{
}"
;
var
comp
=
CreateCompilation
(
source
);
comp
.
VerifyDiagnostics
(
// (4,41): error CS0146: Circular base class dependency involving 'A' and 'A'
// class A : I<System.ValueTuple<object, A.B>>
Diagnostic
(
ErrorCode
.
ERR_CircularBase
,
"B"
).
WithArguments
(
"A"
,
"A"
).
WithLocation
(
4
,
41
));
}
}
}
src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/Source/BaseClassTests.vb
浏览文件 @
7b359804
...
...
@@ -2434,6 +2434,54 @@ BC30296: Interface 'A(Of T)' cannot inherit from itself:
]]
></
errors
>
)
End
Sub
<
Fact
>
Public
Sub
Tuple_MissingNestedTypeArgument_01
()
Dim
source
=
"Interface I(Of T)
End Interface
Class A
Implements I(Of (Object, A.B))
End Class"
Dim
comp
=
CreateCompilation
(
source
)
comp
.
AssertTheseDiagnostics
(
<
errors
><
!
[
CDATA
[
BC30002
:
Type
'A.B' is not defined.
Implements
I
(
Of
(
Object
,
A
.
B
))
~~~
]]
></
errors
>
)
End
Sub
<
Fact
>
Public
Sub
Tuple_MissingNestedTypeArgument_02
()
Dim
source
=
"Class A(Of T)
End Class
Class B
Inherits A(Of (Object, B.C))
End Class"
Dim
comp
=
CreateCompilation
(
source
)
comp
.
AssertTheseDiagnostics
(
<
errors
><
!
[
CDATA
[
BC30002
:
Type
'B.C' is not defined.
Inherits
A
(
Of
(
Object
,
B
.
C
))
~~~
]]
></
errors
>
)
End
Sub
<
Fact
>
Public
Sub
Tuple_MissingNestedTypeArgument_03
()
Dim
source
=
"Interface I(Of T)
End Interface
Class A
Implements I(Of System.ValueTuple(Of Object, A.B))
End Class"
Dim
comp
=
CreateCompilation
(
source
)
comp
.
AssertTheseDiagnostics
(
<
errors
><
!
[
CDATA
[
BC30002
:
Type
'A.B' is not defined.
Implements
I
(
Of
System
.
ValueTuple
(
Of
Object
,
A
.
B
))
~~~
]]
></
errors
>
)
End
Sub
End
Class
End
Namespace
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录