Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET
Roslyn
提交
da74d1b9
R
Roslyn
项目概览
dotNET
/
Roslyn
通知
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,发现更多精彩内容 >>
提交
da74d1b9
编写于
9月 20, 2016
作者:
J
Jared Parsons
提交者:
GitHub
9月 20, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13924 from jaredpar/watson
Harden ParseEmbeddedStatement
上级
d710efa2
d689f37b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
1 deletion
+44
-1
src/Compilers/CSharp/Portable/Parser/LanguageParser.cs
src/Compilers/CSharp/Portable/Parser/LanguageParser.cs
+10
-1
src/Compilers/CSharp/Test/Syntax/Parsing/StatementParsingTests.cs
...ilers/CSharp/Test/Syntax/Parsing/StatementParsingTests.cs
+34
-0
未找到文件。
src/Compilers/CSharp/Portable/Parser/LanguageParser.cs
浏览文件 @
da74d1b9
...
...
@@ -7457,10 +7457,19 @@ private StatementSyntax ParseEmbeddedStatement(bool complexCheck)
statement
=
this
.
ParseStatementCore
();
}
// The consumers of embedded statements are expecting to receive a non-null statement yet there are
// several error conditions that can lead ParseStatementCore to return null. When that occurs
// create an empty error Statement and return it to the caller.
if
(
statement
==
null
)
{
Debug
.
Assert
(
CurrentToken
.
Kind
!=
SyntaxKind
.
SemicolonToken
);
statement
=
SyntaxFactory
.
EmptyStatement
(
EatToken
(
SyntaxKind
.
SemicolonToken
));
}
// An "embedded" statement is simply a statement that is not a labelled
// statement or a declaration statement. Parse a normal statement and post-
// check for the error case.
switch
(
statement
?
.
Kind
)
switch
(
statement
.
Kind
)
{
case
SyntaxKind
.
LabeledStatement
:
case
SyntaxKind
.
LocalDeclarationStatement
:
...
...
src/Compilers/CSharp/Test/Syntax/Parsing/StatementParsingTests.cs
浏览文件 @
da74d1b9
...
...
@@ -2623,6 +2623,40 @@ static void Test(int arg1, (byte, byte) arg2)
Assert
.
Equal
(
false
,
tree
.
GetRoot
().
ContainsDiagnostics
);
}
[
Fact
]
[
WorkItem
(
684860
,
"https://devdiv.visualstudio.com/DevDiv/_workitems/edit/266237"
)]
public
void
DevDiv266237
()
{
var
source
=
@"
class Program
{
static void Go()
{
using (var p = new P
{
}
protected override void M()
{
}
}
"
;
var
tree
=
SyntaxFactory
.
ParseSyntaxTree
(
source
,
options
:
TestOptions
.
Regular
);
tree
.
GetDiagnostics
(
tree
.
GetRoot
()).
Verify
(
// (9,10): error CS1026: ) expected
// }
CSharpTestBase
.
Diagnostic
(
ErrorCode
.
ERR_CloseParenExpected
,
""
).
WithLocation
(
9
,
10
),
// (9,10): error CS1002: ; expected
// }
CSharpTestBase
.
Diagnostic
(
ErrorCode
.
ERR_SemicolonExpected
,
""
).
WithLocation
(
9
,
10
),
// (9,10): error CS1513: } expected
// }
CSharpTestBase
.
Diagnostic
(
ErrorCode
.
ERR_RbraceExpected
,
""
).
WithLocation
(
9
,
10
));
}
private
sealed
class
TokenAndTriviaWalker
:
CSharpSyntaxWalker
{
public
int
Tokens
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录