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

Commit094f373

Browse files
authored
Merge branch 'master' into proj1
2 parentsabbe394 +602daf8 commit094f373

File tree

523 files changed

+30921
-41720
lines changed

Some content is hidden

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

523 files changed

+30921
-41720
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ obj
102102
extras
103103
ossreadme*.txt
104104
*.csproj.user
105+
*.fsproj.user
105106
*.sln.DotSettings.user
106107
*.ide
107108
*.log

‎src/FSharpSource.BuildFromSource.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
<TargetName="CopyAndSubstituteTextFiles"
3939
BeforeTargets="Compile"
4040
Inputs="@(CopyAndSubstituteText)"
41-
Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')" >
41+
Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')"
42+
Condition="'$(DesignTimeBuild)' != 'true'">
4243

4344
<ItemGroup>
4445
<ResultsInclude="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')">

‎src/FSharpSource.targets‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<OutputTaskParameter="Include"ItemName="FileWrites"/>
263263
</CreateItem>
264264
</Target>
265-
<ImportProject="scripts\fssrgen.targets" />
265+
<ImportProject="$(FSharpSourcesRoot)\scripts\fssrgen.targets"Condition="'$(Configuration)' == 'Proto'" />
266266
<ImportProject="Microbuild.Settings.targets"Condition="'$(UseMicroBuild)' == 'true'"/>
267267

268268
<TargetName="dotnetrestore"BeforeTargets="Build"Condition=" '$(TargetDotnetProfile)' == 'coreclr'">
@@ -357,6 +357,30 @@
357357
<DeleteFiles="@(OldBuildVersionFiles)"TreatErrorsAsWarnings="true"/>
358358
</Target>
359359

360+
<UsingTaskTaskName="FSharpEmbedResourceText"
361+
AssemblyFile="$(FSharpSourcesRoot)\..\Proto\net40\bin\FSharp.Build-proto.dll"
362+
Condition="'$(Configuration)' != 'Proto'" />
363+
364+
<TargetName="GenerateFSharpTextResources"
365+
BeforeTargets="CoreResGen;PrepareForBuild"
366+
Condition="'$(Configuration)' != 'Proto'">
367+
368+
<MakeDirDirectories="$(IntermediateOutputPath)" />
369+
370+
<FSharpEmbedResourceTextEmbeddedText="@(EmbeddedText)"IntermediateOutputPath="$(IntermediateOutputPath)">
371+
<OutputTaskParameter="GeneratedSource"ItemName="_FsGeneratedSource" />
372+
<OutputTaskParameter="GeneratedResx"ItemName="_FsGeneratedResx" />
373+
</FSharpEmbedResourceText>
374+
375+
<ItemGroup>
376+
<CompileBeforeInclude="@(_FsGeneratedSource)" />
377+
<EmbeddedResourceInclude="@(_FsGeneratedResx)" />
378+
<FileWritesInclude="@(_FsGeneratedSource)" />
379+
<FileWritesInclude="@(_FsGeneratedResx)" />
380+
</ItemGroup>
381+
382+
</Target>
383+
360384
<UsingTaskTaskName="ReplaceFileText"TaskFactory="CodeTaskFactory"AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
361385
<ParameterGroup>
362386
<InputFilenameParameterType="System.String"Required="true" />

‎src/absil/il.fs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,27 +675,33 @@ and [<RequireQualifiedAccess; StructuralEquality; StructuralComparison>]
675675

676676
memberx.QualifiedNameWithNoShortPrimaryAssembly=
677677
x.AddQualifiedNameExtensionWithNoShortPrimaryAssembly(x.BasicQualifiedName)
678+
678679
memberx.TypeSpec=
679680
match xwith
680681
| ILType.Boxed tr| ILType.Value tr-> tr
681682
|_-> invalidOp"not a nominal type"
683+
682684
memberx.Boxity=
683685
match xwith
684686
| ILType.Boxed_-> AsObject
685687
| ILType.Value_-> AsValue
686688
|_-> invalidOp"not a nominal type"
689+
687690
memberx.TypeRef=
688691
match xwith
689692
| ILType.Boxed tspec| ILType.Value tspec-> tspec.TypeRef
690693
|_-> invalidOp"not a nominal type"
694+
691695
memberx.IsNominal=
692696
match xwith
693697
| ILType.Boxed_| ILType.Value_->true
694698
|_->false
699+
695700
memberx.GenericArgs=
696701
match xwith
697702
| ILType.Boxed tspec| ILType.Value tspec-> tspec.GenericArgs
698703
|_->[]
704+
699705
memberx.IsTyvar=
700706
match xwith
701707
| ILType.TypeVar_->true|_->false
@@ -843,9 +849,9 @@ type ILAttribute =
843849

844850
[<NoEquality; NoComparison; Sealed>]
845851
typeILAttributes(f: unit->ILAttribute[])=
846-
let mutablearray= InlineDelayInit<_>(f)
847-
memberx.AsArray= array.Value
848-
memberx.AsList= x.AsArray|> Array.toList
852+
let mutablearray= InlineDelayInit<_>(f)
853+
memberx.AsArray= array.Value
854+
memberx.AsList= x.AsArray|> Array.toList
849855

850856
typeILCodeLabel= int
851857

‎src/absil/ilwrite.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,7 +2112,7 @@ module Codebuf =
21122112

21132113
letlabelsToRange(lab2pc:Dictionary<ILCodeLabel,int>)p=let(l1,l2)= pin lab2pc.[l1], lab2pc.[l2]
21142114

2115-
letlrange_inside_lrange lab2pc ls1 ls2=
2115+
letlabelRangeInsideLabelRange lab2pc ls1 ls2=
21162116
rangeInsideRange(labelsToRange lab2pc ls1)(labelsToRange lab2pc ls2)
21172117

21182118
letfindRoots contains vs=
@@ -2136,10 +2136,10 @@ module Codebuf =
21362136
let recmakeSEHTree cenv env(pc2pos:int[])(lab2pc:Dictionary<ILCodeLabel,int>)(exs:ILExceptionSpec list)=
21372137

21382138
letclause_inside_lrange cl lr=
2139-
List.forall(fun lr1->lrange_inside_lrange lab2pc lr1 lr)(lranges_of_clause cl)
2139+
List.forall(fun lr1->labelRangeInsideLabelRange lab2pc lr1 lr)(lranges_of_clause cl)
21402140

21412141
lettryspec_inside_lrange(tryspec1:ILExceptionSpec)lr=
2142-
(lrange_inside_lrange lab2pc tryspec1.Range lr&& clause_inside_lrange tryspec1.Clause lr)
2142+
(labelRangeInsideLabelRange lab2pc tryspec1.Range lr&& clause_inside_lrange tryspec1.Clause lr)
21432143

21442144
lettryspec_inside_clause tryspec1 cl=
21452145
List.exists(fun lr-> tryspec_inside_lrange tryspec1 lr)(lranges_of_clause cl)
@@ -2169,10 +2169,10 @@ module Codebuf =
21692169
trees
21702170

21712171
let recmakeLocalsTree cenv localSigs(pc2pos:int[])(lab2pc:Dictionary<ILCodeLabel,int>)(exs:ILLocalDebugInfo list)=
2172-
letlocspec_inside_locspec(locspec1:ILLocalDebugInfo)(locspec2:ILLocalDebugInfo)=
2173-
lrange_inside_lrange lab2pc locspec1.Range locspec2.Range
2172+
letlocalInsideLocal(locspec1:ILLocalDebugInfo)(locspec2:ILLocalDebugInfo)=
2173+
labelRangeInsideLabelRange lab2pc locspec1.Range locspec2.Range
21742174

2175-
letroots= findRootslocspec_inside_locspec exs
2175+
letroots= findRootslocalInsideLocal exs
21762176

21772177
lettrees=
21782178
roots|> List.collect(fun(cl,ch)->

‎src/buildfromsource.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if ERRORLEVEL 1 echo Error: failed && goto :failure
2020
rem build and pack tools
2121
dotnet restore%__scriptpath%fsharp\FSharp.Compiler.nuget\FSharp.Compiler.nuget.BuildFromSource.fsproj
2222
ifERRORLEVEL1echo Error: failed&&goto :failure
23-
dotnet pack%__scriptpath%fsharp\FSharp.Compiler.nuget\FSharp.Compiler.nuget.BuildFromSource.fsproj -crelease
23+
dotnet pack%__scriptpath%fsharp\FSharp.Compiler.nuget\FSharp.Compiler.nuget.BuildFromSource.fsproj -cdebug
2424
ifERRORLEVEL1echo Error: failed&&goto :failure
2525

2626
goto :success

‎src/fsharp/CompileOps.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ let warningOn err level specificWarnOn =
399399
// Some specific warnings are never on by default, i.e. unused variable warnings
400400
match nwith
401401
|1182->false// chkUnusedValue - off by default
402+
|3218->false// ArgumentsInSigAndImplMismatch - off by default
402403
|3180->false// abImplicitHeapAllocation - off by default
403404
|_-> level>= GetWarningLevel err
404405

‎src/fsharp/FSComp.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,3 +1420,4 @@ notAFunctionButMaybeIndexerWithName,"This value is not a function and cannot be
14201420
notAFunctionButMaybeIndexer,"This expression is not a function and cannot be applied. Did you intend to access the indexer via expr.[index] instead?"
14211421
3217,notAFunctionButMaybeIndexerErrorCode,""
14221422
notAFunctionButMaybeDeclaration,"This value is not a function and cannot be applied. Did you forget to terminate a declaration?"
1423+
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."

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<CompileInclude="..\FSharp.Build\Fsc.fs">
3535
<Link>Fsc.fs</Link>
3636
</Compile>
37+
<CompileInclude="..\FSharp.Build\FSharpEmbedResourceText.fs">
38+
<Link>FSharpEmbedResourceText.fs</Link>
39+
</Compile>
3740
<CopyAndSubstituteTextInclude="..\FSharp.Build\Microsoft.FSharp.Targets">
3841
<Link>Microsoft.FSharp-proto.targets</Link>
3942
<TargetFilename>Microsoft.FSharp-proto.targets</TargetFilename>
@@ -63,6 +66,7 @@
6366
<ReferenceInclude="mscorlib" />
6467
<ReferenceInclude="System" />
6568
<ReferenceInclude="System.Numerics" />
69+
<ReferenceInclude="System.Xml" />
6670
</ItemGroup>
6771
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' != 'true'">
6872
<ReferenceInclude="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

‎src/fsharp/FSharp.Build/FSharp.Build.BuildFromSource.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<CompileInclude="..\..\utils\reshapedreflection.fs" />
2222
<CompileInclude="Fsc.fsi" />
2323
<CompileInclude="Fsc.fs" />
24+
<CompileInclude="FSharpEmbedResourceText.fs" />
2425
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
2526
<CompileInclude="CreateFSharpManifestResourceName.fs" />
2627
<CopyAndSubstituteTextInclude="Microsoft.FSharp.Targets">

0 commit comments

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