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

Commit5d177a4

Browse files
authored
Preserve XML docs for in-memory project references (#3683)
* fix xmldocs for in-memory project references* add test* fix tests
1 parentd29d6e2 commit5d177a4

20 files changed

+570
-441
lines changed

‎src/fsharp/CompileOps.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3773,42 +3773,42 @@ type ILResource with
37733773
memberr.GetByteReader(m)=
37743774
match r.Locationwith
37753775
| ILResourceLocation.Local b-> b
3776-
|_-> error(InternalError("UnpickleFromResource", m))
3776+
|_-> error(InternalError("GetByteReader", m))
37773777

37783778
letMakeILResource rname bytes=
37793779
{ Name= rname
37803780
Location= ILResourceLocation.Local(fun()-> bytes)
37813781
Access= ILResourceAccess.Public
37823782
CustomAttrs= emptyILCustomAttrs}
37833783

3784-
letPickleToResource file g scope rname p x=
3784+
letPickleToResourceinMemfile g scope rname p x=
37853785
{ Name= rname
3786-
Location=(letbytes= pickleObjWithDanglingCcus file g scope p xin ILResourceLocation.Local(fun()-> bytes))
3786+
Location=(letbytes= pickleObjWithDanglingCcusinMemfile g scope p xin ILResourceLocation.Local(fun()-> bytes))
37873787
Access= ILResourceAccess.Public
37883788
CustomAttrs= emptyILCustomAttrs}
37893789

37903790
letGetSignatureData(file,ilScopeRef,ilModule,byteReader):PickledDataWithReferences<PickledCcuInfo>=
37913791
unpickleObjWithDanglingCcus file ilScopeRef ilModule unpickleCcuInfo byteReader
37923792

3793-
letWriteSignatureData(tcConfig:TcConfig,tcGlobals,exportRemapping,ccu:CcuThunk,file):ILResource=
3793+
letWriteSignatureData(tcConfig:TcConfig,tcGlobals,exportRemapping,ccu:CcuThunk,file,inMem):ILResource=
37943794
letmspec= ccu.Contents
37953795
letmspec= ApplyExportRemappingToEntity tcGlobals exportRemapping mspec
37963796
// For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers
37973797
// don't complain when they see the resource.
37983798
letrname=if ccu.AssemblyName= GetFSharpCoreLibraryName()then FSharpSignatureDataResourceName2else FSharpSignatureDataResourceName
3799-
PickleToResource file tcGlobals ccu(rname+ccu.AssemblyName) pickleCcuInfo
3799+
PickleToResourceinMemfile tcGlobals ccu(rname+ccu.AssemblyName) pickleCcuInfo
38003800
{ mspec=mspec
38013801
compileTimeWorkingDir=tcConfig.implicitIncludeDir
38023802
usesQuotations= ccu.UsesFSharp20PlusQuotations}
38033803

38043804
letGetOptimizationData(file,ilScopeRef,ilModule,byteReader)=
38053805
unpickleObjWithDanglingCcus file ilScopeRef ilModule Optimizer.u_CcuOptimizationInfo(byteReader())
38063806

3807-
letWriteOptimizationData(tcGlobals,file,ccu:CcuThunk,modulInfo)=
3807+
letWriteOptimizationData(tcGlobals,file,inMem,ccu:CcuThunk,modulInfo)=
38083808
// For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers
38093809
// don't complain when they see the resource.
38103810
letrname=if ccu.AssemblyName= GetFSharpCoreLibraryName()then FSharpOptimizationDataResourceName2else FSharpOptimizationDataResourceName
3811-
PickleToResource file tcGlobals ccu(rname+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo
3811+
PickleToResourceinMemfile tcGlobals ccu(rname+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo
38123812

38133813
//----------------------------------------------------------------------------
38143814
// Abstraction for project reference

‎src/fsharp/CompileOps.fsi‎

Lines changed: 307 additions & 307 deletions
Large diffs are not rendered by default.

‎src/fsharp/FSComp.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,3 +1421,4 @@ notAFunctionButMaybeIndexer,"This expression is not a function and cannot be app
14211421
3217,notAFunctionButMaybeIndexerErrorCode,""
14221422
notAFunctionButMaybeDeclaration,"This value is not a function and cannot be applied. Did you forget to terminate a declaration?"
14231423
3218,ArgumentsInSigAndImplMismatch,"The argument names in the signature '%s' and implementation '%s' do not match. The argument name from the signature file will be used. This may cause problems when debugging or profiling."
1424+
3219,pickleUnexpectedNonZero,"An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct."

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp