Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
432d19fd
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,发现更多精彩内容 >>
未验证
提交
432d19fd
编写于
5月 26, 2020
作者:
S
Steffen Forkmann
提交者:
GitHub
5月 26, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove isAppTy (#9246)
上级
ac9485f4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
12 deletion
+17
-12
src/fsharp/AccessibilityLogic.fs
src/fsharp/AccessibilityLogic.fs
+6
-5
src/fsharp/LowerCallsAndSeqs.fs
src/fsharp/LowerCallsAndSeqs.fs
+5
-1
src/fsharp/MethodCalls.fs
src/fsharp/MethodCalls.fs
+3
-3
src/fsharp/NameResolution.fs
src/fsharp/NameResolution.fs
+3
-3
未找到文件。
src/fsharp/AccessibilityLogic.fs
浏览文件 @
432d19fd
...
...
@@ -208,12 +208,13 @@ and IsTypeInstAccessible g amap m ad tinst =
/// Indicate if a provided member is accessible
let
IsProvidedMemberAccessible
(
amap
:
Import
.
ImportMap
)
m
ad
ty
access
=
let
g
=
amap
.
g
let
isTyAccessible
=
IsTypeAccessible
g
amap
m
ad
ty
if
not
isTyAccessible
then
false
if
IsTypeAccessible
g
amap
m
ad
ty
then
match
tryTcrefOfAppTy
g
ty
with
|
ValueNone
->
true
|
ValueSome
tcrefOfViewedItem
->
IsILMemberAccessible
g
amap
m
tcrefOfViewedItem
ad
access
else
not
(
isAppTy
g
ty
)
||
let
tcrefOfViewedItem
=
tcrefOfAppTy
g
ty
IsILMemberAccessible
g
amap
m
tcrefOfViewedItem
ad
access
false
/// Compute the accessibility of a provided member
let
ComputeILAccess
isPublic
isFamily
isFamilyOrAssembly
isFamilyAndAssembly
=
...
...
src/fsharp/LowerCallsAndSeqs.fs
浏览文件 @
432d19fd
...
...
@@ -542,7 +542,11 @@ let ConvertSequenceExprToObject g amap overallExpr =
// printfn "FAILED - not worth compiling an unrecognized immediate yield! %s " (stringOfRange m)
None
else
let
tyConfirmsToSeq
g
ty
=
isAppTy
g
ty
&&
tyconRefEq
g
(
tcrefOfAppTy
g
ty
)
g
.
tcref_System_Collections_Generic_IEnumerable
let
tyConfirmsToSeq
g
ty
=
match
tryTcrefOfAppTy
g
ty
with
|
ValueSome
tcref
->
tyconRefEq
g
tcref
g
.
tcref_System_Collections_Generic_IEnumerable
|
_
->
false
match
SearchEntireHierarchyOfType
(
tyConfirmsToSeq
g
)
g
amap
m
(
tyOfExpr
g
arbitrarySeqExpr
)
with
|
None
->
// printfn "FAILED - yield! did not yield a sequence! %s" (stringOfRange m)
...
...
src/fsharp/MethodCalls.fs
浏览文件 @
432d19fd
...
...
@@ -848,8 +848,8 @@ let MakeMethInfoCall amap m minfo minst args =
let
TryImportProvidedMethodBaseAsLibraryIntrinsic
(
amap
:
Import
.
ImportMap
,
m
:
range
,
mbase
:
Tainted
<
ProvidedMethodBase
>)
=
let
methodName
=
mbase
.
PUntaint
((
fun
x
->
x
.
Name
),
m
)
let
declaringType
=
Import
.
ImportProvidedType
amap
m
(
mbase
.
PApply
((
fun
x
->
x
.
DeclaringType
),
m
))
if
isAppTy
amap
.
g
declaringType
then
let
declaringEntity
=
tcrefOfAppTy
amap
.
g
declaringType
match
tryTcrefOfAppTy
amap
.
g
declaringType
with
|
ValueSome
declaringEntity
->
if
not
declaringEntity
.
IsLocalRef
&&
ccuEq
declaringEntity
.
nlr
.
Ccu
amap
.
g
.
fslibCcu
then
match
amap
.
g
.
knownIntrinsics
.
TryGetValue
((
declaringEntity
.
LogicalName
,
methodName
))
with
|
true
,
vref
->
Some
vref
...
...
@@ -861,7 +861,7 @@ let TryImportProvidedMethodBaseAsLibraryIntrinsic (amap: Import.ImportMap, m: ra
|
_
->
None
else
None
else
|
_
->
None
#
endif
...
...
src/fsharp/NameResolution.fs
浏览文件 @
432d19fd
...
...
@@ -2398,10 +2398,10 @@ let rec ResolveLongIdentInTypePrim (ncenv: NameResolver) nenv lookupKind (resInf
|
_
->
()
let
errorTextF
s
=
if
isAppTy
g
ty
then
let
tcref
=
tcrefOfAppTy
g
ty
match
tryTcrefOfAppTy
g
ty
with
|
ValueSome
tcref
->
FSComp
.
SR
.
undefinedNameFieldConstructorOrMemberWhenTypeIsKnown
(
tcref
.
DisplayNameWithStaticParametersAndTypars
,
s
)
else
|
_
->
FSComp
.
SR
.
undefinedNameFieldConstructorOrMember
(
s
)
raze
(
UndefinedName
(
depth
,
errorTextF
,
id
,
suggestMembers
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录