Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9994a23

Browse files
authored
Merge pull requestfsharp#816 from dsyme/i44
integrate visualfsharp master
2 parents85569fa +593f6de commit9994a23

File tree

124 files changed

+2093
-1331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+2093
-1331
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
/packages
44
/Tools
55

6+
/tests/scripts/current
7+
/release
8+
/debug
9+
/Proto
10+
611
# Patches that may have been generated by scripts.
712
# (These aren't generally useful to commit directly; if anything, they should be applied.)
813
scripts/*.patch

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,9 @@ The `master` branch is for F# 4.x. To bootstrap the compiler, binaries built fr
5454
###The``FSharp.Core`` NuGet package
5555

5656
[The FSharp.Core NuGet package](https://www.nuget.org/packages/FSharp.Core) was previously published from this repo.
57-
With theinformalconsent of the F# Software Foundation this package is now published by Microsoft.
57+
With the consent of the F# Software Foundation this package is now published by Microsoft.
5858
* FSharp.Core.dll for .NET Framework/Mono
59-
* FSharp.Core.dll for .NET Core
60-
* FSharp.Core.dll for portable profiles
61-
62-
The FSharp.Core NuGet package includes all of the FSharp.Core redistributables from Visual F#.
59+
* FSharp.Core.dll for .NET Standard
6360

6461
###The``FSharp.Compiler.Tools`` NuGet package
6562

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<ProjectToolsVersion="14.0"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<DependencyUptakeDirectory>$(MSBuildThisFileDirectory)..\..\Tools\dependencyUptake</DependencyUptakeDirectory>
5+
<PackageVersionsPropsFile>$(DependencyUptakeDirectory)\PackageVersions.props</PackageVersionsPropsFile>
6+
<PackagesConfigFile>$(DependencyUptakeDirectory)\packages.config</PackagesConfigFile>
7+
<NuGetConfigFile>$(DependencyUptakeDirectory)\NuGet.config</NuGetConfigFile>
8+
</PropertyGroup>
9+
10+
<ImportProject="$(PackageVersionsPropsFile)" />
11+
12+
<!-- Prepare a dummy packages.config-->
13+
<ItemGroup>
14+
<PackagesConfigLinesInclude="&lt;packages&gt;" />
15+
<PackagesConfigLinesInclude="&lt;package id=&quot;Microsoft.DiaSymReader&quot; version=&quot;$(MicrosoftDiaSymReaderPackageVersion)&quot; /&gt;" />
16+
<PackagesConfigLinesInclude="&lt;package id=&quot;Microsoft.DiaSymReader.PortablePdb&quot; version=&quot;$(MicrosoftDiaSymReaderPortablePdbPackageVersion)&quot; /&gt;" />
17+
<PackagesConfigLinesInclude="&lt;/packages&gt;" />
18+
</ItemGroup>
19+
20+
<!-- Prepare a dummy NuGet.config-->
21+
<ItemGroup>
22+
<NuGetConfigLinesInclude="&lt;configuration&gt;" />
23+
<NuGetConfigLinesInclude="&lt;packageSources&gt;" />
24+
<NuGetConfigLinesInclude="&lt;clear /&gt;" />
25+
<NuGetConfigLinesInclude="&lt;add key=&quot;dependency-uptake&quot; value=&quot;$(PB_RestoreSource)&quot; /&gt;" />
26+
<NuGetConfigLinesInclude="&lt;/packageSources&gt;" />
27+
<NuGetConfigLinesInclude="&lt;/configuration&gt;" />
28+
</ItemGroup>
29+
30+
<TargetName="Build">
31+
<WriteLinesToFileFile="$(PackagesConfigFile)"Lines="@(PackagesConfigLines)"Overwrite="true" />
32+
<WriteLinesToFileFile="$(NuGetConfigFile)"Lines="@(NuGetConfigLines)"Overwrite="true" />
33+
</Target>
34+
35+
</Project>

‎src/FSharpSource.Profiles.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
<PropertyGroupCondition="'$(TargetDotnetProfile)'=='net40'">
66
<DefineConstantsCondition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
7-
<DefineConstants>$(DefineConstants);PREFERRED_UI_LANG</DefineConstants>
87
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
98
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
109
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
@@ -16,7 +15,6 @@
1615
<PropertyGroupCondition="'$(TargetDotnetProfile)'=='coreclr'">
1716
<DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
1817
<DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
19-
<DefineConstants>$(DefineConstants);PREFERRED_UI_LANG</DefineConstants>
2018
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
2119
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
2220
<DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>

‎src/FSharpSource.Settings.targets‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@
8484
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
8585
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
8686

87+
<MicrosoftDiaSymReaderPackageVersion>1.1.0</MicrosoftDiaSymReaderPackageVersion>
88+
<MicrosoftDiaSymReaderPortablePdbPackageVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbPackageVersion>
89+
8790
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
8891
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
8992
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
@@ -100,11 +103,19 @@
100103
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45</NUnitLibDir>
101104
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\</NUnitToolsLibDir>
102105

106+
<MonoPackagingCondition="'$(TargetDotnetProfile)' != 'coreclr' AND '$(OS)' == 'Unix'">true</MonoPackaging>
107+
108+
<DependencyUptakePackageVersionPropsFile>$(MSBuildThisFileDirectory)..\Tools\dependencyUptake\PackageVersions.props</DependencyUptakePackageVersionPropsFile>
109+
103110
<!-- Localization-->
111+
<DisableLocalizationCondition="'$(MonoPackaging)' == 'true'">true</DisableLocalization>
104112
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
105113
<XliffTasksVersion>0.2.0-beta-000076</XliffTasksVersion>
114+
106115
</PropertyGroup>
107116

117+
<ImportProject="$(DependencyUptakePackageVersionPropsFile)"Condition="Exists('$(DependencyUptakePackageVersionPropsFile)')" />
118+
108119
<!-- Default setting. Some get modified later in FSharpSource.targets-->
109120
<PropertyGroup>
110121
<SkipSigning>false</SkipSigning>
@@ -180,7 +191,6 @@
180191
<DefineConstantsCondition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV15=True</DefineConstants>
181192
<DefineConstantsCondition="'$(VisualStudioVersion)'=='15.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV15</DefineConstants>
182193
<!-- VisualStudioVersion is not defined when using xbuild on Mono. Assume 14.0, the last shipped in-the-box with Mono-->
183-
<!-- Note we probably just need to add imports of Microsoft.Common.props-->
184194
<DefineConstantsCondition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV14=True</DefineConstants>
185195
<DefineConstantsCondition="'$(VisualStudioVersion)'=='' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
186196
</PropertyGroup>

‎src/FSharpSource.targets‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<DefineConstants>STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY;$(DefineConstants)</DefineConstants>
2929
</PropertyGroup>
3030

31-
<!-- On proto, usehe FSharp.Core assembly version for everything (it only matters we get it right for FSharp.Core), and pass the version flag explicitly if not using MicroBuild-->
31+
<!-- On proto, usethe FSharp.Core assembly version for everything (it only matters we get it right for FSharp.Core), and pass the version flag explicitly if not using MicroBuild-->
3232
<PropertyGroupCondition="'$(Configuration)' == 'Proto'">
3333
<MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
3434
<OtherFlags>$(OtherFlags) --version:"$(MicroBuildAssemblyVersion)"</OtherFlags>
@@ -91,6 +91,10 @@
9191

9292
<!-- If building an FSharp.Core for a back version (Mono Debian source builds only), put it in a qualified directory-->
9393
<PropertyGroup>
94+
<TargetFrameworkOutputDirectoryCondition="'$(FSharpCoreBackVersion)' == ''">$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
95+
<TargetFrameworkOutputDirectoryCondition="'$(FSharpCoreBackVersion)' == '3.0'">fsharp30\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
96+
<TargetFrameworkOutputDirectoryCondition="'$(FSharpCoreBackVersion)' == '3.1'">fsharp31\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
97+
<TargetFrameworkOutputDirectoryCondition="'$(FSharpCoreBackVersion)' == '4.0'">fsharp40\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
9498
<TargetFrameworkOutputDirectory>$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
9599
<IntermediateOutputPath>obj\$(Configuration)\$(TargetFrameworkOutputDirectory)\</IntermediateOutputPath>
96100
</PropertyGroup>
@@ -206,8 +210,8 @@
206210
<OutputTaskParameter="Include"ItemName="FileWrites"/>
207211
</CreateItem>
208212
</Target>
209-
<ImportProject="scripts\fssrgen.targets"Condition="'$(Configuration)' == 'Proto'" />
210-
<!-- <Import Project="Microbuild.Settings.targets" Condition="'$(UseMicroBuild)' == 'true'"/>-->
213+
<ImportProject="$(FSharpSourcesRoot)\scripts\fssrgen.targets"Condition="'$(Configuration)' == 'Proto'" />
214+
<ImportProject="Microbuild.Settings.targets"Condition="'$(UseMicroBuild)' == 'true'"/>
211215

212216
<!-- Not included in Linux/Mono build because target 'CopyFilesToOutputDirectory' doesn't exist and this fails the Mono build-->
213217
<!--
@@ -312,6 +316,7 @@
312316

313317
<MakeDirDirectories="$(IntermediateOutputPath)" />
314318

319+
<!-- Generate source for all resx files.-->
315320
<FSharpEmbedResXSourceEmbeddedResource="@(EmbeddedResource)"IntermediateOutputPath="$(IntermediateOutputPath)"TargetFramework="$(TargetFramework)">
316321
<OutputTaskParameter="GeneratedSource"ItemName="_FsGeneratedResXSource" />
317322
</FSharpEmbedResXSource>
@@ -321,6 +326,7 @@
321326
<FileWritesInclude="@(_FsGeneratedResXSource)" />
322327
</ItemGroup>
323328

329+
<!-- Generate resx and source for all txt files.-->
324330
<FSharpEmbedResourceTextEmbeddedText="@(EmbeddedText)"IntermediateOutputPath="$(IntermediateOutputPath)">
325331
<OutputTaskParameter="GeneratedSource"ItemName="_FsGeneratedTxtSource" />
326332
<OutputTaskParameter="GeneratedResx"ItemName="_FsGeneratedResx" />
@@ -347,9 +353,14 @@
347353

348354
<TargetName="PrepareFSharpGenerateInternalsVisibleToFile"
349355
Condition="'$(Configuration)' != 'Proto' and '@(InternalsVisibleTo)' != ''">
350-
<PropertyGroup>
356+
<PropertyGroupCondition="'$(MonoPackaging)' != 'true'">
357+
<!-- msft.pubkey delay signing of compiler binaries-->
351358
<_PublicKey>002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293</_PublicKey>
352359
</PropertyGroup>
360+
<PropertyGroupCondition="'$(MonoPackaging)' == 'true'">
361+
<!-- test.snk delay signing of compiler binaries-->
362+
<_PublicKey>002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee</_PublicKey>
363+
</PropertyGroup>
353364
<ItemGroup>
354365
<_InternalsVisibleToAttributeInclude="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
355366
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key)</_Parameter1>

‎src/absil/il.fs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ type ILMethodRef =
726726
mrefName:string;
727727
mrefArgs:ILTypes;
728728
mrefReturn:ILType}
729-
memberx.EnclosingTypeRef= x.mrefParent
729+
memberx.DeclaringTypeRef= x.mrefParent
730730
memberx.CallingConv= x.mrefCallconv
731731
memberx.Name= x.mrefName
732732
memberx.GenericArity= x.mrefGenericArity
@@ -737,24 +737,24 @@ type ILMethodRef =
737737
memberx.CallingSignature= mkILCallSig(x.CallingConv,x.ArgTypes,x.ReturnType)
738738
static memberCreate(a,b,c,d,e,f)=
739739
{ mrefParent= a;mrefCallconv=b;mrefName=c;mrefGenericArity=d; mrefArgs=e;mrefReturn=f}
740-
overridex.ToString()= x.EnclosingTypeRef.ToString()+"::"+ x.Name+"(...)"
740+
overridex.ToString()= x.DeclaringTypeRef.ToString()+"::"+ x.Name+"(...)"
741741

742742

743743
[<StructuralEquality; StructuralComparison>]
744744
typeILFieldRef=
745-
{EnclosingTypeRef:ILTypeRef;
745+
{DeclaringTypeRef:ILTypeRef;
746746
Name:string;
747747
Type:ILType}
748-
overridex.ToString()= x.EnclosingTypeRef.ToString()+"::"+ x.Name
748+
overridex.ToString()= x.DeclaringTypeRef.ToString()+"::"+ x.Name
749749

750750
[<StructuralEquality; StructuralComparison>]
751751
typeILMethodSpec=
752752
{ mspecMethodRef:ILMethodRef;
753-
mspecEnclosingType:ILType;
753+
mspecDeclaringType:ILType;
754754
mspecMethodInst:ILGenericArgs;}
755-
static memberCreate(a,b,c)={mspecEnclosingType=a; mspecMethodRef=b; mspecMethodInst=c}
755+
static memberCreate(a,b,c)={mspecDeclaringType=a; mspecMethodRef=b; mspecMethodInst=c}
756756
memberx.MethodRef= x.mspecMethodRef
757-
memberx.EnclosingType=x.mspecEnclosingType
757+
memberx.DeclaringType=x.mspecDeclaringType
758758
memberx.GenericArgs=x.mspecMethodInst
759759
memberx.Name=x.MethodRef.Name
760760
memberx.CallingConv=x.MethodRef.CallingConv
@@ -766,10 +766,10 @@ type ILMethodSpec =
766766

767767
typeILFieldSpec=
768768
{ FieldRef:ILFieldRef;
769-
EnclosingType:ILType}
769+
DeclaringType:ILType}
770770
memberx.FormalType= x.FieldRef.Type
771771
memberx.Name= x.FieldRef.Name
772-
memberx.EnclosingTypeRef= x.FieldRef.EnclosingTypeRef
772+
memberx.DeclaringTypeRef= x.FieldRef.DeclaringTypeRef
773773
overridex.ToString()= x.FieldRef.ToString()
774774

775775

@@ -1302,7 +1302,7 @@ type ILReturn =
13021302
typeILOverridesSpec=
13031303
| OverridesSpecofILMethodRef*ILType
13041304
memberx.MethodRef=let(OverridesSpec(mr,_ty))= xin mr
1305-
memberx.EnclosingType=let(OverridesSpec(_mr,ty))= xin ty
1305+
memberx.DeclaringType=let(OverridesSpec(_mr,ty))= xin ty
13061306

13071307
typeILMethodVirtualInfo=
13081308
{ IsFinal:bool
@@ -1817,10 +1817,10 @@ let mkILMethRef (tref,callconv,nm,gparams,args,rty) =
18171817

18181818
letmkILMethSpecForMethRefInTy(mref,typ,minst)=
18191819
{ mspecMethodRef=mref;
1820-
mspecEnclosingType=typ;
1820+
mspecDeclaringType=typ;
18211821
mspecMethodInst=minst}
18221822

1823-
letmkILMethSpec(mref,vc,tinst,minst)= mkILMethSpecForMethRefInTy(mref,mkILNamedTy vc mref.EnclosingTypeRef tinst, minst)
1823+
letmkILMethSpec(mref,vc,tinst,minst)= mkILMethSpecForMethRefInTy(mref,mkILNamedTy vc mref.DeclaringTypeRef tinst, minst)
18241824

18251825
letmk_mspec_in_tref(tref,vc,cc,nm,args,rty,tinst,minst)=
18261826
mkILMethSpec(mkILMethRef( tref,cc,nm,List.length minst,args,rty),vc,tinst,minst)
@@ -1856,9 +1856,9 @@ let mkILNonGenericCtorMethSpec (tref,args) =
18561856
// Make references to fields
18571857
// --------------------------------------------------------------------
18581858

1859-
letmkILFieldRef(tref,nm,ty)={EnclosingTypeRef=tref; Name=nm; Type=ty}
1859+
letmkILFieldRef(tref,nm,ty)={DeclaringTypeRef=tref; Name=nm; Type=ty}
18601860

1861-
letmkILFieldSpec(tref,ty)={ FieldRef= tref;EnclosingType=ty}
1861+
letmkILFieldSpec(tref,ty)={ FieldRef= tref;DeclaringType=ty}
18621862

18631863
letmkILFieldSpecInTy(typ:ILType,nm,fty)=
18641864
mkILFieldSpec(mkILFieldRef(typ.TypeRef,nm,fty), typ)
@@ -2205,15 +2205,15 @@ and rescopeILCallSig scoref csig =
22052205
mkILCallSig(csig.CallingConv,rescopeILTypes scoref csig.ArgTypes,rescopeILType scoref csig.ReturnType)
22062206

22072207
letrescopeILMethodRef scoref(x:ILMethodRef)=
2208-
{ mrefParent= rescopeILTypeRef scoref x.EnclosingTypeRef;
2208+
{ mrefParent= rescopeILTypeRef scoref x.DeclaringTypeRef;
22092209
mrefCallconv= x.mrefCallconv;
22102210
mrefGenericArity=x.mrefGenericArity;
22112211
mrefName=x.mrefName;
22122212
mrefArgs= rescopeILTypes scoref x.mrefArgs;
22132213
mrefReturn= rescopeILType scoref x.mrefReturn}
22142214

22152215
letrescopeILFieldRef scoref x=
2216-
{EnclosingTypeRef= rescopeILTypeRef scoref x.EnclosingTypeRef;
2216+
{DeclaringTypeRef= rescopeILTypeRef scoref x.DeclaringTypeRef;
22172217
Name= x.Name;
22182218
Type= rescopeILType scoref x.Type}
22192219

@@ -2277,7 +2277,7 @@ let mkILLocal ty dbgInfo : ILLocal =
22772277

22782278
typeILFieldSpecwith
22792279
memberfr.ActualType=
2280-
letenv= fr.EnclosingType.GenericArgs
2280+
letenv= fr.DeclaringType.GenericArgs
22812281
instILType env fr.FormalType
22822282

22832283
// --------------------------------------------------------------------
@@ -3482,20 +3482,20 @@ and refs_of_genparams s b = List.iter (refs_of_genparam s) b
34823482
andrefs_of_dloc s ts= refs_of_tref s ts
34833483

34843484
andrefs_of_mref s(x:ILMethodRef)=
3485-
refs_of_dloc s x.EnclosingTypeRef;
3485+
refs_of_dloc s x.DeclaringTypeRef;
34863486
refs_of_typs s x.mrefArgs;
34873487
refs_of_typ s x.mrefReturn
34883488

3489-
andrefs_of_fref s x= refs_of_tref s x.EnclosingTypeRef; refs_of_typ s x.Type
3489+
andrefs_of_fref s x= refs_of_tref s x.DeclaringTypeRef; refs_of_typ s x.Type
34903490
andrefs_of_ospec s(OverridesSpec(mref,ty))= refs_of_mref s mref; refs_of_typ s ty
34913491
andrefs_of_mspec s(x:ILMethodSpec)=
34923492
refs_of_mref s x.MethodRef;
3493-
refs_of_typ s x.EnclosingType;
3493+
refs_of_typ s x.DeclaringType;
34943494
refs_of_inst s x.GenericArgs
34953495

34963496
andrefs_of_fspec s x=
34973497
refs_of_fref s x.FieldRef;
3498-
refs_of_typ s x.EnclosingType
3498+
refs_of_typ s x.DeclaringType
34993499

35003500
andrefs_of_typs s l= List.iter(refs_of_typ s) l
35013501

@@ -3769,11 +3769,11 @@ let ungenericizeTypeName n =
37693769
typeILEventRef=
37703770
{ erA:ILTypeRef; erB:string}
37713771
static memberCreate(a,b)={erA=a;erB=b}
3772-
memberx.EnclosingTypeRef= x.erA
3772+
memberx.DeclaringTypeRef= x.erA
37733773
memberx.Name= x.erB
37743774

37753775
typeILPropertyRef=
37763776
{ prA:ILTypeRef; prB:string}
37773777
static memberCreate(a,b)={prA=a;prB=b}
3778-
memberx.EnclosingTypeRef= x.prA
3778+
memberx.DeclaringTypeRef= x.prA
37793779
memberx.Name= x.prB

‎src/absil/il.fsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ and ILTypes = list<ILType>
372372
[<Sealed>]
373373
typeILMethodRef=
374374
static memberCreate:enclosingTypeRef:ILTypeRef* callingConv: ILCallingConv* name: string* genericArity: int* argTypes: ILTypes* returnType: ILType-> ILMethodRef
375-
memberEnclosingTypeRef: ILTypeRef
375+
memberDeclaringTypeRef: ILTypeRef
376376
member CallingConv: ILCallingConv
377377
member Name: string
378378
member GenericArity: int
@@ -386,7 +386,7 @@ type ILMethodRef =
386386
387387
[<StructuralEquality; StructuralComparison>]
388388
type ILFieldRef=
389-
{EnclosingTypeRef:ILTypeRef;
389+
{DeclaringTypeRef:ILTypeRef;
390390
Name:string;
391391
Type:ILType}
392392

@@ -407,7 +407,7 @@ type ILFieldRef =
407407
typeILMethodSpec=
408408
static memberCreate:ILType* ILMethodRef* ILGenericArgs-> ILMethodSpec
409409
member MethodRef: ILMethodRef
410-
memberEnclosingType: ILType
410+
memberDeclaringType: ILType
411411
member GenericArgs: ILGenericArgs
412412
member CallingConv: ILCallingConv
413413
member GenericArity: int
@@ -421,8 +421,8 @@ type ILMethodSpec =
421421
[<StructuralEquality; StructuralComparison>]
422422
type ILFieldSpec=
423423
{ FieldRef:ILFieldRef;
424-
EnclosingType:ILType}
425-
memberEnclosingTypeRef:ILTypeRef
424+
DeclaringType:ILType}
425+
memberDeclaringTypeRef:ILTypeRef
426426
memberName:string
427427
memberFormalType:ILType
428428
memberActualType:ILType
@@ -963,7 +963,7 @@ type PInvokeMethod =
963963
typeILOverridesSpec=
964964
| OverridesSpecofILMethodRef*ILType
965965
memberMethodRef:ILMethodRef
966-
memberEnclosingType:ILType
966+
memberDeclaringType:ILType
967967

968968
// REVIEW: fold this into ILMethodDef.
969969
type ILMethodVirtualInfo=
@@ -1921,13 +1921,13 @@ val computeILEnumInfo: string * ILFieldDefs -> ILEnumInfo
19211921
[<Sealed>]
19221922
type ILEventRef=
19231923
static memberCreate:ILTypeRef* string-> ILEventRef
1924-
memberEnclosingTypeRef: ILTypeRef
1924+
memberDeclaringTypeRef: ILTypeRef
19251925
member Name: string
19261926

19271927
[<Sealed>]
19281928
type ILPropertyRef=
19291929
static memberCreate:ILTypeRef* string-> ILPropertyRef
1930-
memberEnclosingTypeRef: ILTypeRef
1930+
memberDeclaringTypeRef: ILTypeRef
19311931
member Name: string
19321932
interface System.IComparable
19331933

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp