Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
79da721e
F
fsharp
项目概览
dotNET Platform
/
fsharp
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
79da721e
编写于
10月 10, 2022
作者:
T
Tomas Grosup
提交者:
GitHub
10月 10, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adding parser support for N-d arrays up to rank 32 (#13991)
* Adding parser support for N-d arrays up to rank 32
上级
fcd06c7d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
152 addition
and
3 deletion
+152
-3
src/Compiler/pars.fsy
src/Compiler/pars.fsy
+87
-3
tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
...iler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+1
-0
tests/FSharp.Compiler.ComponentTests/Language/MultiDimensionalArrayTests.fs
...ler.ComponentTests/Language/MultiDimensionalArrayTests.fs
+52
-0
tests/service/Symbols.fs
tests/service/Symbols.fs
+12
-0
未找到文件。
src/Compiler/pars.fsy
浏览文件 @
79da721e
...
@@ -5272,15 +5272,99 @@ arrayTypeSuffix:
...
@@ -5272,15 +5272,99 @@ arrayTypeSuffix:
| LBRACK RBRACK
| LBRACK RBRACK
{ 1 }
{ 1 }
| LBRACK COMMA RBRACK
| LBRACK COMMA RBRACK
{ 2 }
{ 2 }
| LBRACK COMMA COMMA RBRACK
| LBRACK COMMA COMMA RBRACK
{ 3 }
{ 3 }
| LBRACK COMMA COMMA COMMA RBRACK
| LBRACK COMMA COMMA COMMA RBRACK
{ 4 }
{ 4 }
| LBRACK COMMA COMMA COMMA COMMA RBRACK
{ 5 }
| LBRACK COMMA COMMA COMMA COMMA COMMA RBRACK
{ 6 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 7 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 8 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 9 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 10 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 11 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 12 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 13 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 14 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 15 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 16 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 17 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 18 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 19 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 20 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 21 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 22 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 23 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 24 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 25 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 26 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 27 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 28 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 29 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 30 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 31 }
| LBRACK COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA COMMA RBRACK
{ 32 }
appTypePrefixArguments:
appTypePrefixArguments:
| typeArgActual COMMA typeArgActual typeArgListElements
| typeArgActual COMMA typeArgActual typeArgListElements
{ let typeArgs, commas = $4 in $1 :: $3 :: List.rev typeArgs, (rhs parseState 2) :: (List.rev commas) }
{ let typeArgs, commas = $4 in $1 :: $3 :: List.rev typeArgs, (rhs parseState 2) :: (List.rev commas) }
...
...
tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
浏览文件 @
79da721e
...
@@ -161,6 +161,7 @@
...
@@ -161,6 +161,7 @@
<Compile
Include=
"ErrorMessages\WarnIfDiscardedInList.fs"
/>
<Compile
Include=
"ErrorMessages\WarnIfDiscardedInList.fs"
/>
<Compile
Include=
"ErrorMessages\UnionCasePatternMatchingErrors.fs"
/>
<Compile
Include=
"ErrorMessages\UnionCasePatternMatchingErrors.fs"
/>
<Compile
Include=
"Language\IndexerSetterParamArray.fs"
/>
<Compile
Include=
"Language\IndexerSetterParamArray.fs"
/>
<Compile
Include=
"Language\MultiDimensionalArrayTests.fs"
/>
<Compile
Include=
"Language\RegressionTests.fs"
/>
<Compile
Include=
"Language\RegressionTests.fs"
/>
<Compile
Include=
"Language\AttributeCheckingTests.fs"
/>
<Compile
Include=
"Language\AttributeCheckingTests.fs"
/>
<Compile
Include=
"Language\ObsoleteAttributeCheckingTests.fs"
/>
<Compile
Include=
"Language\ObsoleteAttributeCheckingTests.fs"
/>
...
...
tests/FSharp.Compiler.ComponentTests/Language/MultiDimensionalArrayTests.fs
0 → 100644
浏览文件 @
79da721e
namespace
FSharp
.
Compiler
.
ComponentTests
.
Language
open
Xunit
open
FSharp
.
Test
.
Compiler
module
MultiDimensionalArrayTests
=
[<
Theory
>]
[<
InlineData
(
1
,
"array2d"
)>]
[<
InlineData
(
5
,
"array6d"
)>]
[<
InlineData
(
31
,
"array32d"
)>]
let
``MultiDimensional array type can be written with or without backticks``
(
commas
:
int
,
shortcut
:
string
)
=
let
commaString
=
System
.
String
(
'
,
'
,
commas
)
FSharp
$
"""
module MultiDimArrayTests
let backTickStyle : int ``[{commaString}]`` = Unchecked.defaultof<_>
let cleanStyle : int [{commaString}] = backTickStyle
let shortCutStyle : int {shortcut} = cleanStyle
"""
|>
compile
|>
shouldSucceed
[<
Fact
>]
let
``Multidimensional array - reports an error if types are not matching``
()
=
let
commaString
=
System
.
String
(
'
,
'
,
30
)
FSharp
$
"""
module MultiDimArrayErrorTests
let cleanStyle : int [{commaString}] = Unchecked.defaultof<_>
let shortCutStyle : int array32d = cleanStyle
"""
|>
compile
|>
shouldFail
|>
withSingleDiagnostic
(
Error
1
,
Line
4
,
Col
36
,
Line
4
,
Col
46
,
"This expression was expected to have type
'int array32d'
but here has type
'int array31d' "
)
[<
Fact
>]
let
``Multidimensional with rank over 32 cannot be defined``
()
=
let
commaString
=
System
.
String
(
'
,
'
,
42
)
FSharp
$
"""
module MultiDimArrayErrorTests
let cleanStyle : int [{commaString}] = Unchecked.defaultof<_>
"""
|>
compile
|>
shouldFail
tests/service/Symbols.fs
浏览文件 @
79da721e
...
@@ -361,3 +361,15 @@ let tester2: int Group = []
...
@@ -361,3 +361,15 @@ let tester2: int Group = []
|>
should
equal
expectedTypeFormat
|>
should
equal
expectedTypeFormat
|
_
->
Assert
.
Fail
(
sprintf
"Couldn't get member: %s"
entityName
)
|
_
->
Assert
.
Fail
(
sprintf
"Couldn't get member: %s"
entityName
)
)
)
[<
Test
>]
let
``FsharpType.Format default to arrayNd shorthands for multidimensional arrays``
([<
Values
(
2
,
6
,
32
)>]
rank
)
=
let
commas
=
System
.
String
(
'
,
'
,
rank
-
1
)
let
_,
checkResults
=
getParseAndCheckResults
$
""" let myArr : int[{commas}] = Unchecked.defaultOf<_>"""
let
symbolUse
=
findSymbolUseByName
"myArr"
checkResults
match
symbolUse
.
Symbol
with
|
:?
FSharpMemberOrFunctionOrValue
as
v
->
v
.
FullType
.
Format
symbolUse
.
DisplayContext
|>
shouldEqual
$
"int array{rank}d"
|
other
->
Assert
.
Fail
(
sprintf
"myArr was supposed to be a value, but is %A"
other
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录