Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
cf5afdc9
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
cf5afdc9
编写于
3月 14, 2018
作者:
A
Avi Avni
提交者:
GitHub
3月 14, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #26 from forki/literal-value-bug
Use WithFieldMarshal
上级
ccd130a8
4b131f85
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
src/absil/il.fs
src/absil/il.fs
+1
-1
src/absil/il.fsi
src/absil/il.fsi
+1
-1
src/fsharp/IlxGen.fs
src/fsharp/IlxGen.fs
+2
-2
未找到文件。
src/absil/il.fs
浏览文件 @
cf5afdc9
...
@@ -1559,7 +1559,7 @@ type ILFieldDef =
...
@@ -1559,7 +1559,7 @@ type ILFieldDef =
member
x
.
WithSpecialName
(
condition
)
=
{
x
with
Attributes
=
x
.
Attributes
|>
conditionalAdd
condition
(
FieldAttributes
.
SpecialName
|||
FieldAttributes
.
RTSpecialName
)
}
member
x
.
WithSpecialName
(
condition
)
=
{
x
with
Attributes
=
x
.
Attributes
|>
conditionalAdd
condition
(
FieldAttributes
.
SpecialName
|||
FieldAttributes
.
RTSpecialName
)
}
member
x
.
WithNotSerialized
(
condition
)
=
{
x
with
Attributes
=
x
.
Attributes
|>
conditionalAdd
condition
FieldAttributes
.
NotSerialized
}
member
x
.
WithNotSerialized
(
condition
)
=
{
x
with
Attributes
=
x
.
Attributes
|>
conditionalAdd
condition
FieldAttributes
.
NotSerialized
}
member
x
.
WithLiteralDefaultValue
(
literal
)
=
{
x
with
LiteralValue
=
literal
;
Attributes
=
x
.
Attributes
|>
conditionalAdd
literal
.
IsSome
(
FieldAttributes
.
Literal
|||
FieldAttributes
.
HasDefault
)
}
member
x
.
WithLiteralDefaultValue
(
literal
)
=
{
x
with
LiteralValue
=
literal
;
Attributes
=
x
.
Attributes
|>
conditionalAdd
literal
.
IsSome
(
FieldAttributes
.
Literal
|||
FieldAttributes
.
HasDefault
)
}
member
x
.
With
HasFieldMarshal
(
condition
)
=
{
x
with
Attributes
=
x
.
Attributes
|>
conditionalAdd
condition
FieldAttributes
.
HasFieldMarshal
}
member
x
.
With
FieldMarshal
(
marshal
)
=
{
x
with
Marshal
=
marshal
;
Attributes
=
x
.
Attributes
|>
conditionalAdd
marshal
.
IsSome
FieldAttributes
.
HasFieldMarshal
}
// Index table by name. Keep a canonical list to make sure field order is not disturbed for binary manipulation.
// Index table by name. Keep a canonical list to make sure field order is not disturbed for binary manipulation.
...
...
src/absil/il.fsi
浏览文件 @
cf5afdc9
...
@@ -1139,7 +1139,7 @@ type ILFieldDef =
...
@@ -1139,7 +1139,7 @@ type ILFieldDef =
member
WithSpecialName
:
bool
->
ILFieldDef
member
WithSpecialName
:
bool
->
ILFieldDef
member
WithNotSerialized
:
bool
->
ILFieldDef
member
WithNotSerialized
:
bool
->
ILFieldDef
member
WithLiteralDefaultValue
:
ILFieldInit
option
->
ILFieldDef
member
WithLiteralDefaultValue
:
ILFieldInit
option
->
ILFieldDef
member
With
HasFieldMarshal
:
bool
->
ILFieldDef
member
With
FieldMarshal
:
ILNativeType
option
->
ILFieldDef
/// Tables of fields. Logically equivalent to a list of fields but
/// Tables of fields. Logically equivalent to a list of fields but
/// the table is kept in a form optimized for looking up fields by
/// the table is kept in a form optimized for looking up fields by
...
...
src/fsharp/IlxGen.fs
浏览文件 @
cf5afdc9
...
@@ -6350,7 +6350,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) =
...
@@ -6350,7 +6350,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) =
Data
=
None
Data
=
None
LiteralValue
=
None
LiteralValue
=
None
Offset
=
ilFieldOffset
Offset
=
ilFieldOffset
Marshal
=
ilFieldMarshal
Marshal
=
None
CustomAttrs
=
mkILCustomAttrs
(
GenAttrs
cenv
eenv
fattribs
@
extraAttribs
)
}
CustomAttrs
=
mkILCustomAttrs
(
GenAttrs
cenv
eenv
fattribs
@
extraAttribs
)
}
let
fdef
=
let
fdef
=
fdef
.
WithAccess
(
access
)
fdef
.
WithAccess
(
access
)
...
@@ -6358,7 +6358,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) =
...
@@ -6358,7 +6358,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) =
.
WithSpecialName
(
ilFieldName
=
"value__"
&&
tycon
.
IsEnumTycon
)
.
WithSpecialName
(
ilFieldName
=
"value__"
&&
tycon
.
IsEnumTycon
)
.
WithNotSerialized
(
ilNotSerialized
)
.
WithNotSerialized
(
ilNotSerialized
)
.
WithLiteralDefaultValue
(
literalValue
)
.
WithLiteralDefaultValue
(
literalValue
)
.
With
HasFieldMarshal
(
ilFieldMarshal
.
IsSome
)
.
With
FieldMarshal
(
ilFieldMarshal
)
yield
fdef
yield
fdef
if
requiresExtraField
then
if
requiresExtraField
then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录