Skip to content

Commit cfae0cf

Browse files
latkinlatkin
committed
Minor cleanup and alignment with internal build projects
1 parent d99ceb1 commit cfae0cf

File tree

6 files changed

+51
-45
lines changed

6 files changed

+51
-45
lines changed

‎src/fsharp/FSComp.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -928,9 +928,9 @@ optsEmitDebugInfoInQuotations,"Emit debug information in quotations"
928928
# service.fs strings
929929
# -----------------------------------------------------------------------------
930930
typeInfoFullName,"Full name"
931-
typeInfoType,"type"
932-
typeInfoInherits,"inherits"
933-
typeInfoImplements,"implements"
931+
# typeInfoType,"type"
932+
# typeInfoInherits,"inherits"
933+
# typeInfoImplements,"implements"
934934
typeInfoOtherOverloads,"and %d other overloads"
935935
typeInfoUnionCase,"union case"
936936
typeInfoActivePatternResult,"active pattern result"
@@ -1089,8 +1089,8 @@ lexHashBangMustBeFirstInFile,"#! may only appear as the first line at the start
10891089
1189,parsNonAdjacentTypars,"Type parameters must be placed directly adjacent to the type name, e.g. \"type C<'T>\", not type \"C <'T>\""
10901090
1190,parsNonAdjacentTyargs,"Type arguments must be placed directly adjacent to the type name, e.g. \"C<'T>\", not \"C <'T>\""
10911091
parsNonAtomicType,"The use of the type syntax 'int C' and 'C <int>' is not permitted here. Consider adjusting this type to be written in the form 'C<int>'"
1092-
1191,tastUndefinedTyconItemField,"The type %s did not contain the field '%s'"
1093-
1192,tastUndefinedTyconItemUnionCase,"The type %s did not contain the union case '%s'"
1092+
# 1191,tastUndefinedTyconItemField,"The type %s did not contain the field '%s'"
1093+
# 1192,tastUndefinedTyconItemUnionCase,"The type %s did not contain the union case '%s'"
10941094
1193,tastUndefinedItemRefModuleNamespace,"The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s'"
10951095
1194,tastUndefinedItemRefVal,"The module/namespace '%s' from compilation unit '%s' did not contain the val '%s'"
10961096
1195,tastUndefinedItemRefModuleNamespaceType,"The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s'"

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

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@
133133
<Compile Include="..\..\absil\ildiag.fs">
134134
<Link>ildiag.fs</Link>
135135
</Compile>
136+
<Compile Include="..\ReferenceResolution.fsi">
137+
<Link>ReferenceResolution.fsi</Link>
138+
</Compile>
136139
<Compile Include="..\ReferenceResolution.fs">
137140
<Link>ReferenceResolution.fs</Link>
138141
</Compile>
@@ -228,12 +231,15 @@
228231
<Compile Include="..\..\ilx\ilxsettings.fs">
229232
<Link>ilxsettings.fs</Link>
230233
</Compile>
231-
<Compile Include="..\..\ilx\EraseClosures.fsi">
232-
<Link>EraseClosures.fsi</Link>
233-
</Compile>
234-
<Compile Include="..\..\ilx\EraseClosures.fs">
234+
<Compile Include="..\..\ilx\EraseClosures.fsi">
235+
<Link>EraseClosures.fsi</Link>
236+
</Compile>
237+
<Compile Include="..\..\ilx\EraseClosures.fs">
235238
<Link>EraseClosures.fs</Link>
236239
</Compile>
240+
<Compile Include="..\..\ilx\EraseUnions.fsi">
241+
<Link>EraseUnions.fsi</Link>
242+
</Compile>
237243
<Compile Include="..\..\ilx\EraseUnions.fs">
238244
<Link>EraseUnions.fs</Link>
239245
</Compile>
@@ -268,14 +274,11 @@
268274
</Compile>
269275
<Compile Include="pplex.fs" />
270276
<Compile Include="lex.fs" />
271-
<Compile Include="..\ast.fs">
272-
<Link>ast.fs</Link>
273-
</Compile>
274277
<Compile Include="..\QuotationPickler.fsi">
275278
<Link>QuotationPickler.fsi</Link>
276279
</Compile>
277280
<Compile Include="..\QuotationPickler.fs">
278-
<Link>QuotationPickler.fs</Link>
281+
<Link>QuotationPickler.fs</Link>
279282
</Compile>
280283
<Compile Include="..\QueueList.fs">
281284
<Link>QueueList.fs</Link>
@@ -284,14 +287,14 @@
284287
<Link>tast.fs</Link>
285288
</Compile>
286289
<Compile Include="..\TcGlobals.fs">
287-
<Link>TcGlobals.fs</Link>
288-
</Compile>
289-
<Compile Include="..\TastOps.fsi">
290-
<Link>TastOps.fsi</Link>
291-
</Compile>
292-
<Compile Include="..\TastOps.fs">
293-
<Link>TastOps.fs</Link>
294-
</Compile>
290+
<Link>TcGlobals.fs</Link>
291+
</Compile>
292+
<Compile Include="..\TastOps.fsi">
293+
<Link>TastOps.fsi</Link>
294+
</Compile>
295+
<Compile Include="..\TastOps.fs">
296+
<Link>TastOps.fs</Link>
297+
</Compile>
295298
<Compile Include="..\TastPickle.fsi">
296299
<Link>TastPickle.fsi</Link>
297300
</Compile>
@@ -334,10 +337,10 @@
334337
<Compile Include="..\PatternMatchCompilation.fs">
335338
<Link>PatternMatchCompilation.fs</Link>
336339
</Compile>
337-
<Compile Include="..\ConstraintSolver.fsi">
338-
<Link>ConstraintSolver.fsi</Link>
339-
</Compile>
340-
<Compile Include="..\ConstraintSolver.fs">
340+
<Compile Include="..\ConstraintSolver.fsi">
341+
<Link>ConstraintSolver.fsi</Link>
342+
</Compile>
343+
<Compile Include="..\ConstraintSolver.fs">
341344
<Link>ConstraintSolver.fs</Link>
342345
</Compile>
343346
<Compile Include="..\CheckFormatStrings.fsi">
@@ -370,16 +373,16 @@
370373
<Compile Include="..\Optimizer.fsi">
371374
<Link>Optimizer.fsi</Link>
372375
</Compile>
376+
<Compile Include="..\Optimizer.fs">
377+
<Link>Optimizer.fs</Link>
378+
</Compile>
373379
<Compile Include="..\autobox.fs">
374380
<Link>autobox.fs</Link>
375381
</Compile>
376-
<Compile Include="..\Optimizer.fs">
377-
<Link>Optimizer.fs</Link>
382+
<Compile Include="..\DetupleArgs.fsi">
383+
<Link>DetupleArgs.fsi</Link>
378384
</Compile>
379-
<Compile Include="..\DetupleArgs.fsi">
380-
<Link>DetupleArgs.fsi</Link>
381-
</Compile>
382-
<Compile Include="..\DetupleArgs.fs">
385+
<Compile Include="..\DetupleArgs.fs">
383386
<Link>DetupleArgs.fs</Link>
384387
</Compile>
385388
<Compile Include="..\InnerLambdasToTopLevelFuncs.fsi">
@@ -421,6 +424,9 @@
421424
<Compile Include="..\vs\IncrementalBuild.fs">
422425
<Link>IncrementalBuild.fs</Link>
423426
</Compile>
427+
<Compile Include="..\fsc.fsi">
428+
<Link>fsc.fsi</Link>
429+
</Compile>
424430
<Compile Include="..\fsc.fs">
425431
<Link>fsc.fs</Link>
426432
</Compile>

‎src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@
144144
<Compile Include="..\ErrorLogger.fs">
145145
<Link>ErrorLogging\ErrorLogger.fs</Link>
146146
</Compile>
147+
<Compile Include="..\ReferenceResolution.fsi">
148+
<Link>ReferenceResolution\ReferenceResolution.fsi</Link>
149+
</Compile>
147150
<Compile Include="..\ReferenceResolution.fs">
148151
<Link>ReferenceResolution\ReferenceResolution.fs</Link>
149152
</Compile>
@@ -447,6 +450,9 @@
447450
<Compile Include="..\vs\IncrementalBuild.fs">
448451
<Link>Driver\IncrementalBuild.fs</Link>
449452
</Compile>
453+
<Compile Include="..\fsc.fsi">
454+
<Link>Driver\fsc.fsi</Link>
455+
</Compile>
450456
<Compile Include="..\fsc.fs">
451457
<Link>Driver\fsc.fs</Link>
452458
</Compile>

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@
151151
<Compile Include="..\ErrorLogger.fs">
152152
<Link>ErrorLogging\ErrorLogger.fs</Link>
153153
</Compile>
154+
<Compile Include="..\ReferenceResolution.fsi">
155+
<Link>ReferenceResolution\ReferenceResolution.fsi</Link>
156+
</Compile>
154157
<Compile Include="..\ReferenceResolution.fs">
155158
<Link>ReferenceResolution\ReferenceResolution.fs</Link>
156159
</Compile>
@@ -188,18 +191,6 @@
188191
<Compile Include="..\..\absil\ilprint.fs">
189192
<Link>AbsIL\ilprint.fs</Link>
190193
</Compile>
191-
<Compile Include="..\..\absil\ilmorph.fsi">
192-
<Link>AbsIL\ilmorph.fsi</Link>
193-
</Compile>
194-
<Compile Include="..\..\absil\ilmorph.fs">
195-
<Link>AbsIL\ilmorph.fs</Link>
196-
</Compile>
197-
<Compile Include="..\..\absil\ilsupp.fsi">
198-
<Link>AbsIL\ilsupp.fsi</Link>
199-
</Compile>
200-
<Compile Include="..\..\absil\ilsupp.fs">
201-
<Link>AbsIL\ilsupp.fs</Link>
202-
</Compile>
203194
<Compile Include="ilpars.fs">
204195
<Link>AbsIL\ilpars.fs</Link>
205196
</Compile>
@@ -409,6 +400,9 @@
409400
<Compile Include="..\vs\IncrementalBuild.fs">
410401
<Link>Driver\IncrementalBuild.fs</Link>
411402
</Compile>
403+
<Compile Include="..\fsc.fsi">
404+
<Link>Driver\fsc.fsi</Link>
405+
</Compile>
412406
<Compile Include="..\fsc.fs">
413407
<Link>Driver\fsc.fs</Link>
414408
</Compile>

‎src/fsharp/ReferenceResolution.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ module internal MSBuildResolver =
7070
/// Perform assembly resolution on the given references
7171
val Resolve:
7272
resolutionEnvironment: ResolutionEnvironment *
73-
references:(string*(*baggage*)string)[] *
73+
references:seq<string (* baggage *) * string> *
7474
targetFrameworkVersion:string *
7575
targetFrameworkDirectories:string list *
7676
targetProcessorArchitecture:string *

‎src/fsharp/fsc.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module internal Microsoft.FSharp.Compiler.Driver
44

55
open Microsoft.FSharp.Compiler.ErrorLogger
66
open Microsoft.FSharp.Compiler.CompileOps
7-
open Microsoft.FSharp.Compiler.Env
7+
open Microsoft.FSharp.Compiler.TcGlobals
88
open Microsoft.FSharp.Compiler.Tast
99
open Microsoft.FSharp.Compiler.TypeChecker
1010

0 commit comments

Comments
 (0)