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

Commit80a4a96

Browse files
authored
Merge pull requestdotnet#4414 from Microsoft/merges/master-to-dev15.7
Merge master to dev15.7
2 parentsedba1b0 +83b9238 commit80a4a96

File tree

63 files changed

+536
-1242
lines changed

Some content is hidden

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

63 files changed

+536
-1242
lines changed

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.6.0-vs-for-mac-62329-05

‎VisualFSharp.sln‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "Project
3030
EndProject
3131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Tests","Tests","{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
3232
EndProject
33-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.Salsa","vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj","{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
33+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.Salsa","vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj","{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
3434
EndProject
35-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.UnitTests","vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
35+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.UnitTests","vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
3636
EndProject
3737
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttribute","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj","{DA39AD38-4A58-47BF-9215-E49768295169}"
3838
EndProject
@@ -248,18 +248,18 @@ Global
248248
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.Build.0=Release|Any CPU
249249
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.ActiveCfg=Release|Any CPU
250250
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.Build.0=Release|Any CPU
251-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
252-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.Build.0=Debug|Any CPU
253-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.ActiveCfg=Debug|Any CPU
254-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.Build.0=Debug|Any CPU
251+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.ActiveCfg=Proto|Any CPU
252+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.Build.0=Proto|Any CPU
253+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.ActiveCfg=Proto|Any CPU
254+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.Build.0=Proto|Any CPU
255255
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
256256
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|Any CPU.Build.0=Proto|Any CPU
257257
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|x86.ActiveCfg=Proto|Any CPU
258258
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|x86.Build.0=Proto|Any CPU
259-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.ActiveCfg=Release|Any CPU
260-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.Build.0=Release|Any CPU
261-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.ActiveCfg=Release|Any CPU
262-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.Build.0=Release|Any CPU
259+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.ActiveCfg=Proto|Any CPU
260+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.Build.0=Proto|Any CPU
261+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.ActiveCfg=Proto|Any CPU
262+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.Build.0=Proto|Any CPU
263263
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
264264
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.Build.0=Debug|Any CPU
265265
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -276,10 +276,10 @@ Global
276276
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|Any CPU.Build.0=Debug|Any CPU
277277
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|x86.ActiveCfg=Debug|Any CPU
278278
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|x86.Build.0=Debug|Any CPU
279-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
280-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.Build.0=Proto|Any CPU
281-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.ActiveCfg=Proto|Any CPU
282-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.Build.0=Proto|Any CPU
279+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.ActiveCfg=Release|Any CPU
280+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.Build.0=Release|Any CPU
281+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.ActiveCfg=Release|Any CPU
282+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.Build.0=Release|Any CPU
283283
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|Any CPU.ActiveCfg=Release|Any CPU
284284
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|Any CPU.Build.0=Release|Any CPU
285285
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|x86.ActiveCfg=Release|Any CPU
@@ -288,10 +288,10 @@ Global
288288
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|Any CPU.Build.0=Debug|Any CPU
289289
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|x86.ActiveCfg=Debug|Any CPU
290290
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|x86.Build.0=Debug|Any CPU
291-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
292-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.Build.0=Proto|Any CPU
293-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.ActiveCfg=Proto|Any CPU
294-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.Build.0=Proto|Any CPU
291+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.ActiveCfg=Release|Any CPU
292+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.Build.0=Release|Any CPU
293+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.ActiveCfg=Release|Any CPU
294+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.Build.0=Release|Any CPU
295295
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.ActiveCfg=Release|Any CPU
296296
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.Build.0=Release|Any CPU
297297
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|x86.ActiveCfg=Release|Any CPU

‎build-everything.proj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
3535
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
3636
</ItemGroup>
37-
<PropertyGroup>
37+
<PropertyGroupCondition="'$(BUILD_VS)'=='1'">
3838
<RestoreVSIntegration>true</RestoreVSIntegration>
39+
<RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
40+
<RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
3941
</PropertyGroup>
4042

4143
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
@@ -100,13 +102,19 @@
100102
<ProjectsToRestoreInclude="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
101103
</ItemGroup>
102104

103-
<ItemGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
104-
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
105+
<ItemGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
106+
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
105107
</ItemGroup>
108+
<PropertyGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
109+
<RestoreVSIntegrationUnitTests>true</RestoreVSIntegrationUnitTests>
110+
</PropertyGroup>
106111

107112
<ItemGroup>
108113
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj"Condition="'$(RestorePEVerify)' == 'true'" />
109114
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
115+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj"Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
116+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-item-templates-build.proj"Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
117+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-project-templates-build.proj"Condition="'$(RestoreVSIntegrationProjectTemplates)' == 'true'" />
110118
</ItemGroup>
111119

112120
<PropertyGroup>

‎build/targets/PackageVersions.props‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33
<PropertyGroup>
44

5+
<!-- version numbers from files-->
6+
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
7+
58
<!-- System.* packages-->
69
<SystemCollectionsImmutablePackageVersion>1.3.1</SystemCollectionsImmutablePackageVersion>
710

811
<!-- Roslyn packages-->
9-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>2.6.0-vs-for-mac-62329-05</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
10-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.6.0-vs-for-mac-62329-05</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
11-
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>2.6.0-vs-for-mac-62329-05</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
12-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.6.0-vs-for-mac-62329-05</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
13-
<MicrosoftVisualStudioLanguageServicesPackageVersion>2.6.0-vs-for-mac-62329-05</MicrosoftVisualStudioLanguageServicesPackageVersion>
12+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
13+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
14+
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
15+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
16+
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
1417

1518
<!-- Visual Studio packages-->
1619
<EnvDTE80PackageVersion>8.0.1</EnvDTE80PackageVersion>
@@ -20,6 +23,7 @@
2023
<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>
2124
<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.0.26201</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>
2225
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.0.26201</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
26+
<MicrosoftVisualStudioManagedInterfacesPackageVersion>8.0.50727</MicrosoftVisualStudioManagedInterfacesPackageVersion>
2327
<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
2428
<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>
2529
<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>
@@ -34,17 +38,20 @@
3438
<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>
3539
<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>
3640
<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>
41+
<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>
3742
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
3843
<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>
3944
<VSSDKVSLangProjPackageVersion>7.0.4</VSSDKVSLangProjPackageVersion>
4045
<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>
46+
<VSSDKVSLangProj11PackageVersion>11.0.4</VSSDKVSLangProj11PackageVersion>
4147
<VSSDKVSHelpPackageVersion>7.0.4</VSSDKVSHelpPackageVersion>
4248

4349
<!-- other packages-->
4450
<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>
4551
<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>
4652
<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>
4753
<NewtonsoftJsonPackageVersion>10.0.2</NewtonsoftJsonPackageVersion>
54+
<NUnitPackageVersion>3.5.0</NUnitPackageVersion>
4855
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>
4956

5057
</PropertyGroup>

‎src/FSharpSource.Settings.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
<BuildToolsTargets45>true</BuildToolsTargets45>
8888
<WarningsAsErrors />
8989

90-
<RoslynVersion>2.6.0-vs-for-mac-62329-05</RoslynVersion>
91-
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
9290
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
9391
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
9492
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.1.192</VSSDK_BUILDTOOLS_VERSION>

‎src/fsharp/FSharp.Core/prim-types.fs‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3043,30 +3043,35 @@ namespace Microsoft.FSharp.Collections
30433043
// List (debug view)
30443044
//-------------------------------------------------------------------------
30453045

3046-
and
3046+
and
30473047
ListDebugView<'T>(l:list<'T>)=
30483048

3049-
letListDebugViewMaxLength=50
3050-
let reccount l n=
3051-
match lwith
3052-
|[]-> n
3053-
|_::t->if n> ListDebugViewMaxLengththen nelse count t(n+1)
3049+
letListDebugViewMaxLength=50// default displayed Max Length
3050+
letListDebugViewMaxFullLength=5000// display only when FullList opened (5000 is a super big display used to cut-off an infinite list or undebuggably huge one)
3051+
let reccount l n max=
3052+
match lwith
3053+
|[]-> n
3054+
|_::t->if n> maxthen nelse count t(n+1) max
30543055

3055-
[<DebuggerBrowsable(DebuggerBrowsableState.RootHidden)>]
3056-
memberx.Items=
3057-
letn= count l0
3058-
letitems= zeroCreate n
3056+
letitems length=
3057+
letitems= zeroCreate length
30593058
let reccopy(items:'T[])l i=
30603059
match lwith
30613060
|[]->()
30623061
| h::t->
3063-
if i<nthen
3062+
if i<lengththen
30643063
SetArray items i h
30653064
copy items t(i+1)
30663065

30673066
copy items l0
30683067
items
30693068

3069+
[<DebuggerBrowsable(DebuggerBrowsableState.RootHidden)>]
3070+
memberx.Items= items(count l0 ListDebugViewMaxLength)
3071+
3072+
[<DebuggerBrowsable(DebuggerBrowsableState.Collapsed)>]
3073+
memberx._FullList= items(count l0 ListDebugViewMaxFullLength)
3074+
30703075
typeResizeArray<'T>= System.Collections.Generic.List<'T>
30713076

30723077
//-------------------------------------------------------------------------

‎src/fsharp/PostInferenceChecks.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ and CheckBinding cenv env alwaysCheckNoReraise (TBind(v,bindRhs,_) as bind) =
11911191

11921192
// If we've already recorded a definition then skip this
11931193
match v.ReflectedDefinitionwith
1194-
| None-> v.val_defn<- Some bindRhs
1194+
| None-> v.SetValDefn bindRhs
11951195
| Some_->()
11961196
// Run the conversion process over the reflected definition to report any errors in the
11971197
// front end rather than the back end. We currently re-run this during ilxgen.fs but there's

‎src/fsharp/SignatureConformance.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ type Checker(g, amap, denv, remapInfo: SignatureRepackageInfo, checkingSig) =
291291
elifnot(checkValInfo aenv(err denv) implVal sigVal)thenfalse
292292
elifnot(implVal.IsExtensionMember= sigVal.IsExtensionMember)then err denv(FSComp.SR.ValueNotContainedMutabilityExtensionsDiffer)
293293
elifnot(checkMemberDatasConform(err denv)(implVal.Attribs, implVal,implVal.MemberInfo)(sigVal.Attribs,sigVal,sigVal.MemberInfo))thenfalse
294-
else checkAttribs aenv implVal.Attribs sigVal.Attribs(fun attribs-> implVal.val_attribs<- attribs)
294+
else checkAttribs aenv implVal.Attribs sigVal.Attribs(fun attribs-> implVal.SetAttribs attribs)
295295

296296

297297
andcheckExnInfo err aenv implTypeRepr sigTypeRepr=

‎src/fsharp/TastOps.fs‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4632,14 +4632,23 @@ and remapValReprInfo g tmenv (ValReprInfo(tpNames, arginfosl, retInfo)) =
46324632

46334633
andremapValData g tmenv(d:ValData)=
46344634
letty= d.val_type
4635-
lettopValInfo= d.val_repr_info
4636-
letty'= ty|> remapPossibleForallTy g tmenv
4635+
lettopValInfo= d.ValReprInfo
4636+
lettyR= ty|> remapPossibleForallTy g tmenv
4637+
letdeclaringEntityR= d.DeclaringEntity|> remapParentRef tmenv
4638+
letreprInfoR= d.ValReprInfo|> Option.map(remapValReprInfo g tmenv)
4639+
letmemberInfoR= d.MemberInfo|> Option.map(remapMemberInfo g d.val_range topValInfo ty tyR tmenv)
4640+
letattribsR= d.Attribs|> remapAttribs g tmenv
46374641
{ dwith
4638-
val_type= ty';
4639-
val_declaring_entity= d.val_declaring_entity|> remapParentRef tmenv;
4640-
val_repr_info= d.val_repr_info|> Option.map(remapValReprInfo g tmenv);
4641-
val_member_info= d.val_member_info|> Option.map(remapMemberInfo g d.val_range topValInfo ty ty' tmenv);
4642-
val_attribs= d.val_attribs|> remapAttribs g tmenv}
4642+
val_type= tyR
4643+
val_opt_data=
4644+
match d.val_opt_datawith
4645+
| Some dd->
4646+
Some{ ddwith
4647+
val_declaring_entity= declaringEntityR
4648+
val_repr_info= reprInfoR
4649+
val_member_info= memberInfoR
4650+
val_attribs= attribsR}
4651+
| None-> None}
46434652

46444653
andremapParentRef tyenv p=
46454654
match pwith
@@ -6997,8 +7006,8 @@ let etaExpandTypeLambda g m tps (tm, ty) =
69977006
if isNil tpsthen tmelse mkTypeLambda m tps(mkApps g((tm, ty),[(List.map mkTyparTy tps)],[], m), ty)
69987007

69997008
letAdjustValToTopVal(tmp:Val)parent valData=
7000-
tmp.SetValReprInfo(Some valData);
7001-
tmp.val_declaring_entity<-parent;
7009+
tmp.SetValReprInfo(Some valData)
7010+
tmp.SetDeclaringEntityparent
70027011
tmp.SetIsMemberOrModuleBinding()
70037012

70047013
/// For match with only one non-failing target T0, the other targets, T1... failing (say, raise exception).

0 commit comments

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