Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
03a43299
F
fsharp
项目概览
dotNET Platform
/
fsharp
11 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
03a43299
编写于
7月 01, 2022
作者:
E
Eugene Auduchinok
提交者:
GitHub
7月 01, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Parser: fix unfinished tuple range (#13402)
上级
5989aa40
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
17 deletion
+28
-17
src/Compiler/pars.fsy
src/Compiler/pars.fsy
+17
-17
tests/service/ParserTests.fs
tests/service/ParserTests.fs
+11
-0
未找到文件。
src/Compiler/pars.fsy
浏览文件 @
03a43299
...
...
@@ -4176,34 +4176,34 @@ ifExprElifs:
| ELIF declExpr recover
{ None, Some (exprFromParseError $2) }
tupleExpr:
| tupleExpr COMMA declExpr
{ let exprs, commas = $1 in ($3 :: exprs), ((rhs parseState 2) :: commas) }
tupleExpr:
| tupleExpr COMMA declExpr
{ let exprs, commas = $1
$3 :: exprs, (rhs parseState 2 :: commas) }
| tupleExpr COMMA ends_coming_soon_or_recover
{
if not $3 then reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsExpectedExpressionAfterToken())
let exprs, commas = $1
let
zeroWidthAtNextToken = (rhs parseState 3).StartRange
((arbExpr("tupleExpr1", zeroWidthAtNextToken)) :: exprs), (rhs parseState 2)
:: commas }
{
let commaRange = rhs parseState 2
if not $3 then reportParseErrorAt commaRange (FSComp.SR.parsExpectedExpressionAfterToken ())
let
exprs, commas = $1
arbExpr ("tupleExpr1", commaRange.EndRange) :: exprs, commaRange
:: commas }
| declExpr COMMA ends_coming_soon_or_recover
{
if not $3 then reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsExpectedExpressionAfterToken())
let zeroWidthAtNextToken = (rhs parseState 3).StartRange
((arbExpr("tupleExpr2", zeroWidthAtNextToken)) :: [$1]), [rhs parseState 2
] }
{
let commaRange = rhs parseState 2
if not $3 then reportParseErrorAt commaRange (FSComp.SR.parsExpectedExpressionAfterToken ())
[arbExpr ("tupleExpr2", commaRange.EndRange); $1], [commaRange
] }
| declExpr COMMA declExpr
{ [$3
; $1], [rhs parseState 2] }
| declExpr COMMA declExpr
{ [$3; $1], [rhs parseState 2] }
| COMMA declExpr
{ let commaRange = rhs parseState 1
reportParseErrorAt commaRange (FSComp.SR.parsExpectingExpressionInTuple())
reportParseErrorAt commaRange (FSComp.SR.parsExpectingExpressionInTuple
())
[$2; arbExpr ("tupleExpr3", commaRange.StartRange)], [commaRange] }
| COMMA ends_coming_soon_or_recover
{ if not $2 then reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsExpectedExpressionAfterToken())
let commaRange = rhs parseState 1
let zeroWidthAtNextToken = (rhs parseState 2).StartRange
[(arbExpr("tupleExpr4", zeroWidthAtNextToken)); arbExpr ("tupleExpr5", commaRange.StartRange)], [commaRange] }
{ let commaRange = rhs parseState 1
if not $2 then reportParseErrorAt commaRange (FSComp.SR.parsExpectedExpressionAfterToken ())
[arbExpr ("tupleExpr4", commaRange.EndRange); arbExpr ("tupleExpr5", commaRange.StartRange)], [commaRange] }
minusExpr:
| MINUS minusExpr %prec expr_prefix_plus_minus
...
...
tests/service/ParserTests.fs
浏览文件 @
03a43299
...
...
@@ -322,3 +322,14 @@ let ``Expr - Tuple 06`` () =
SynExpr
.
ArbitraryAfterError
_
SynExpr
.
Const
_
],
_,
_)
]
->
()
|
_
->
failwith
"Unexpected tree"
[<
Test
>]
let
``Expr - Tuple 07``
()
=
let
parseResults
=
getParseResults
"""
let x = 1,
"""
match
getSingleModuleMemberDecls
parseResults
with
|
[
SynModuleDecl
.
Let
(_,
[
(
SynBinding
(
expr
=
expr
))
],
range
)
]
->
shouldEqual
expr
.
Range
.
StartLine
expr
.
Range
.
EndLine
shouldEqual
range
.
StartLine
range
.
EndLine
|
_
->
failwith
"Unexpected tree"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录