Skip to content

Commit 55dbded

Browse files
ncavencave
committed
Fix merge issues
1 parent 96712d0 commit 55dbded

28 files changed

+145
-41
lines changed

‎buildtools/buildtools.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
BeforeTargets="CoreCompile">
2121

2222
<PropertyGroup>
23-
<FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net9.0\linux-x64\fslex.dll</FsLexPath>
23+
<FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net10.0\linux-x64\fslex.dll</FsLexPath>
2424
</PropertyGroup>
2525

2626
<!-- Create the output directory -->
@@ -44,7 +44,7 @@
4444
BeforeTargets="CoreCompile">
4545

4646
<PropertyGroup>
47-
<FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net9.0\linux-x64\fsyacc.dll</FsYaccPath>
47+
<FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net10.0\linux-x64\fsyacc.dll</FsYaccPath>
4848
</PropertyGroup>
4949

5050
<!-- Create the output directory -->

‎fcs/fcs-fable/FSStrings.fs‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,12 @@ let resources =
242242
( "Parser.TOKEN.EQUALS",
243243
"symbol '='"
244244
);
245+
( "Parser.TOKEN.GREATER.BAR.RBRACE",
246+
"symbol '>|}'"
247+
);
248+
( "Parser.TOKEN.RQUOTE.BAR.RBRACE",
249+
"symbol '@>|}' or '@@>|}'"
250+
);
245251
( "Parser.TOKEN.GREATER.BAR.RBRACK",
246252
"symbol '>|]'"
247253
);
@@ -914,8 +920,14 @@ let resources =
914920
( "Obsolete2",
915921
". {0}"
916922
);
917-
( "Experimental",
918-
"{0}. This warning can be disabled using '--nowarn:57' or '#nowarn \"57\"'."
923+
( "Experimental1",
924+
"This construct is experimental"
925+
);
926+
( "Experimental2",
927+
". {0}"
928+
);
929+
( "Experimental3",
930+
". This warning can be disabled using '--nowarn:57' or '#nowarn \"57\"'."
919931
);
920932
( "PossibleUnverifiableCode",
921933
"Uses of this construct may result in the generation of unverifiable .NET IL code. This warning can be disabled using '--nowarn:9' or '#nowarn \"9\"'."
@@ -1019,4 +1031,13 @@ let resources =
10191031
( "Parser.TOKEN.WHILE.BANG",
10201032
"keyword 'while!'"
10211033
);
1034+
( "InvalidAttributeTargetForLanguageElement1",
1035+
"This attribute cannot be applied to {0}. Valid targets are: {1}"
1036+
);
1037+
( "InvalidAttributeTargetForLanguageElement2",
1038+
"This attribute is not valid for use on this language element"
1039+
);
1040+
( "NoConstructorsAvailableForType",
1041+
"No constructors are available for the type '{0}'"
1042+
);
10221043
]

‎fcs/fcs-fable/System.Collections.Immutable.fs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ type ImmutableArray<'T> = 'T array
1111

1212
module ImmutableArray =
1313
let CreateBuilder<'T>() = ResizeArray<'T>()
14+
1415
let Create<'T>(items: 'T[], start: int, length: int) =
1516
items[start..(start + length - 1)]
1617

18+
let ofSeq<'T>(items: seq<'T>) = Array.ofSeq items
19+
1720
[<Sealed>]
1821
type ImmutableHashSet<'T when 'T: equality>(values: 'T seq) =
1922
let xs = HashSet<'T>(values)

‎fcs/fcs-fable/TcImports_shim.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ module TcImports =
8989

9090
unpickleObjWithDanglingCcus file ilScopeRef ilModule Optimizer.u_CcuOptimizationInfo memA memB
9191

92-
let memoize_mod = new MemoizationTable<_,_> (LoadMod, keyComparer=HashIdentity.Structural)
92+
let memoize_mod = MemoizationTable<_,_> ("mod", LoadMod, keyComparer=HashIdentity.Structural)
9393

9494
let LoadSigData ccuName =
9595
let ilModule = memoize_mod.Apply ccuName
@@ -109,8 +109,8 @@ module TcImports =
109109
| [] -> None
110110
| (readerA, readerB)::_ -> Some (GetOptimizationData (fileName, ilScopeRef, Some ilModule, readerA, readerB))
111111

112-
let memoize_sig = new MemoizationTable<_,_> (LoadSigData, keyComparer=HashIdentity.Structural)
113-
let memoize_opt = new MemoizationTable<_,_> (LoadOptData, keyComparer=HashIdentity.Structural)
112+
let memoize_sig = MemoizationTable<_,_> ("sig", LoadSigData, keyComparer=HashIdentity.Structural)
113+
let memoize_opt = MemoizationTable<_,_> ("opt", LoadOptData, keyComparer=HashIdentity.Structural)
114114

115115
let GetCustomAttributesOfILModule (ilModule: ILModuleDef) =
116116
(match ilModule.Manifest with Some m -> m.CustomAttrs | None -> ilModule.CustomAttrs).AsList()
@@ -218,7 +218,7 @@ module TcImports =
218218
refCcusUnfixed |> List.choose snd |> List.iter fixup
219219
refCcus
220220

221-
let m = range.Zero
221+
let m = Range.range0
222222
let fsharpCoreAssemblyName = "FSharp.Core"
223223
let primaryAssemblyName = PrimaryAssembly.Mscorlib.Name
224224
let refCcusUnfixed = List.ofArray references |> List.map (GetCcu m)

‎fcs/fcs-fable/codegen/codegen.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
<PropertyGroup>
33
<ArtifactsDir Condition="'$(ArtifactsDir)' == ''">artifacts</ArtifactsDir>
44
<FSharpSourcesRoot>$(MSBuildProjectDirectory)/../../../src/Compiler</FSharpSourcesRoot>
5+
<TolerateUnusedBindings>true</TolerateUnusedBindings>
56
</PropertyGroup>
67
<Import Project="../../../buildtools/buildtools.targets" />
78
<!-- <Import Project="fssrgen.targets" /> -->
89
<PropertyGroup>
910
<OutputType>Exe</OutputType>
10-
<TargetFramework>net9.0</TargetFramework>
11+
<TargetFramework>net10.0</TargetFramework>
1112
<!-- <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> -->
1213
</PropertyGroup>
1314
<ItemGroup>

‎fcs/fcs-fable/fcs-fable.fsproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<!-- <WarningsAsErrors>FS3261</WarningsAsErrors> -->
1919
<!-- <WarningsAsErrors>FS3559</WarningsAsErrors> -->
2020
<!-- <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> -->
21+
<TolerateUnusedBindings>true</TolerateUnusedBindings>
2122
</PropertyGroup>
2223

2324
<ItemGroup>
@@ -37,6 +38,8 @@
3738
<Compile Include="$(FSharpSourcesRoot)/Utilities/NullnessShims.fs" />
3839
<Compile Include="$(FSharpSourcesRoot)/Utilities/Activity.fsi" />
3940
<Compile Include="$(FSharpSourcesRoot)/Utilities/Activity.fs" />
41+
<!-- <Compile Include="$(FSharpSourcesRoot)/Utilities/Caches.fsi" /> -->
42+
<!-- <Compile Include="$(FSharpSourcesRoot)/Utilities/Caches.fs" /> -->
4043
<Compile Include="$(FSharpSourcesRoot)/Utilities/illib.fsi" />
4144
<Compile Include="$(FSharpSourcesRoot)/Utilities/illib.fs" />
4245
<Compile Include="$(FSharpSourcesRoot)/Utilities/sformat.fsi" />
@@ -164,6 +167,8 @@
164167
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/SyntaxTree.fs" />
165168
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/SyntaxTreeOps.fsi" />
166169
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/SyntaxTreeOps.fs" />
170+
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/WarnScopes.fsi" />
171+
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/WarnScopes.fs" />
167172
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/LexerStore.fsi" />
168173
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/LexerStore.fs" />
169174
<Compile Include="$(FSharpSourcesRoot)/SyntaxTree/ParseHelpers.fsi" />

‎fcs/fcs-fable/service_slim.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ module internal ParseAndCheck =
158158
let dependencyFiles = parseResults |> Seq.map (fun x -> x.DependencyFiles) |> Array.concat
159159
let getAssemblyData () = None
160160
let details = (compilerState.tcGlobals, compilerState.tcImports, tcState.Ccu, tcState.CcuSig, symbolUses, topAttrsOpt,
161-
getAssemblyData, assemblyRef, access, tcImplFilesOpt, dependencyFiles, compilerState.projectOptions)
161+
getAssemblyData, assemblyRef, access, tcImplFilesOpt, dependencyFiles, Some compilerState.projectOptions)
162162
let keepAssemblyContents = true
163163
FSharpCheckProjectResults (projectFileName, Some compilerState.tcConfig, keepAssemblyContents, errors, Some details)
164164

@@ -192,7 +192,7 @@ module internal ParseAndCheck =
192192
let input = parseResults.ParseTree
193193
let diagnosticsOptions = compilerState.tcConfig.diagnosticsOptions
194194
let capturingLogger = CompilationDiagnosticLogger("TypeCheckFile", diagnosticsOptions)
195-
let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedPragmas(false, input.ScopedPragmas, diagnosticsOptions, capturingLogger)
195+
let diagnosticsLogger = GetDiagnosticsLoggerFilteringByScopedNowarn(diagnosticsOptions, capturingLogger)
196196
use _scope = new CompilationGlobalsScope (diagnosticsLogger, BuildPhase.TypeCheck)
197197

198198
let checkForErrors () = parseResults.ParseHadErrors || diagnosticsLogger.ErrorCount > 0
@@ -224,7 +224,7 @@ module internal ParseAndCheck =
224224
let errors = Array.append parseResults.Diagnostics tcErrors
225225

226226
let scope = TypeCheckInfo (compilerState.tcConfig, compilerState.tcGlobals, ccuSigForFile, tcState.Ccu, compilerState.tcImports, tcEnvAtEnd.AccessRights,
227-
projectFileName, fileName, compilerState.projectOptions, sink.GetResolutions(), sink.GetSymbolUses(), tcEnvAtEnd.NameEnv,
227+
projectFileName, fileName, Some compilerState.projectOptions, sink.GetResolutions(), sink.GetSymbolUses(), tcEnvAtEnd.NameEnv,
228228
loadClosure, implFile, sink.GetOpenDeclarations())
229229
FSharpCheckFileResults (fileName, errors, Some scope, parseResults.DependencyFiles, None, keepAssemblyContents)
230230

‎fcs/fcs-fable/test/Metadata.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ let references_core = [|
2828
"System.Reflection.TypeExtensions"
2929
"System.Runtime"
3030
"System.Runtime.Extensions"
31+
"System.Runtime.InteropServices"
3132
"System.Runtime.Numerics"
3233
"System.Text.Encoding"
3334
"System.Text.Encoding.Extensions"

‎fcs/fcs-fable/test/bench/fcs-fable-bench.fsproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<DefineConstants>$(DefineConstants);DOTNET_FILE_SYSTEM</DefineConstants>
77
<!-- <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> -->
8+
<TolerateUnusedBindings>true</TolerateUnusedBindings>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎fcs/fcs-fable/test/fcs-fable-test.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<DefineConstants>$(DefineConstants);DOTNET_FILE_SYSTEM</DefineConstants>
77
<!-- <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> -->
88
</PropertyGroup>
@@ -20,7 +20,7 @@
2020
<ItemGroup>
2121
<!-- <PackageReference Include="FSharp.Core" Version="9.0.0" /> -->
2222
<!-- <Reference Include="../../../artifacts/bin/FSharp.Compiler.Service/Release/netstandard2.0/FSharp.Core.dll" /> -->
23-
<PackageReference Include="Fable.Core" Version="*" />
23+
<!-- <PackageReference Include="Fable.Core" Version="*" /> -->
2424
</ItemGroup>
2525

2626
</Project>

0 commit comments

Comments
 (0)