Skip to content

Commit 09c6d28

Browse files
Martin521Martin521
committed
simplify global trivia types
1 parent 42eccb7 commit 09c6d28

9 files changed

+52
-99
lines changed

‎src/Compiler/Driver/ParseAndCheckInputs.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ let PostParseModuleImpls
271271
lexbuf
272272
|> WarnScopes.MergeInto diagnosticOptions isScript (getImplSubmoduleRanges impls)
273273

274-
let trivia: ParsedImplFileInputTrivia =
274+
let trivia: ParsedInputTrivia =
275275
{
276276
ConditionalDirectives = IfdefStore.GetTrivia(lexbuf)
277277
WarnDirectives = WarnScopes.getDirectiveTrivia (lexbuf)
@@ -311,7 +311,7 @@ let PostParseModuleSpecs
311311
lexbuf
312312
|> WarnScopes.MergeInto diagnosticOptions false (getSpecSubmoduleRanges specs)
313313

314-
let trivia: ParsedSigFileInputTrivia =
314+
let trivia: ParsedInputTrivia =
315315
{
316316
ConditionalDirectives = IfdefStore.GetTrivia(lexbuf)
317317
WarnDirectives = WarnScopes.getDirectiveTrivia (lexbuf)
@@ -550,7 +550,7 @@ let ReportParsingStatistics res =
550550
let EmptyParsedInput (fileName, isLastCompiland) =
551551
if FSharpSigFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName) then
552552
ParsedInput.SigFile(
553-
ParsedSigFileInput(fileName, QualFileNameOfImpls fileName [], [], [], ParsedSigFileInputTrivia.Empty, Set.empty)
553+
ParsedSigFileInput(fileName, QualFileNameOfImpls fileName [], [], [], ParsedInputTrivia.Empty, Set.empty)
554554
)
555555
else
556556
ParsedInput.ImplFile(
@@ -561,7 +561,7 @@ let EmptyParsedInput (fileName, isLastCompiland) =
561561
[],
562562
[],
563563
isLastCompiland,
564-
ParsedImplFileInputTrivia.Empty,
564+
ParsedInputTrivia.Empty,
565565
Set.empty
566566
)
567567
)

‎src/Compiler/Interactive/fsi.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2473,7 +2473,7 @@ type internal FsiDynamicCompiler
24732473
[],
24742474
[ impl ],
24752475
(isLastCompiland, isExe),
2476-
ParsedImplFileInputTrivia.Empty,
2476+
ParsedInputTrivia.Empty,
24772477
Set.empty
24782478
)
24792479
)

‎src/Compiler/Service/IncrementalBuild.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ module IncrementalBuildSyntaxTree =
130130
[],
131131
[],
132132
isLastCompiland,
133-
ParsedImplFileInputTrivia.Empty,
133+
ParsedInputTrivia.Empty,
134134
Set.empty
135135
)
136136
), sourceRange, fileName, [||]

‎src/Compiler/SyntaxTree/SyntaxTree.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ type ParsedImplFileInput =
17781778
hashDirectives: ParsedHashDirective list *
17791779
contents: SynModuleOrNamespace list *
17801780
flags: (bool * bool) *
1781-
trivia: ParsedImplFileInputTrivia *
1781+
trivia: ParsedInputTrivia *
17821782
identifiers: Set<string>
17831783

17841784
member x.QualifiedName =
@@ -1807,7 +1807,7 @@ type ParsedSigFileInput =
18071807
qualifiedNameOfFile: QualifiedNameOfFile *
18081808
hashDirectives: ParsedHashDirective list *
18091809
contents: SynModuleOrNamespaceSig list *
1810-
trivia: ParsedSigFileInputTrivia *
1810+
trivia: ParsedInputTrivia *
18111811
identifiers: Set<string>
18121812

18131813
member x.QualifiedName =

‎src/Compiler/SyntaxTree/SyntaxTree.fsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,7 @@ type ParsedImplFileInput =
19571957
hashDirectives: ParsedHashDirective list *
19581958
contents: SynModuleOrNamespace list *
19591959
flags: (bool * bool) *
1960-
trivia: ParsedImplFileInputTrivia *
1960+
trivia: ParsedInputTrivia *
19611961
identifiers: Set<string>
19621962

19631963
member FileName: string
@@ -1970,7 +1970,7 @@ type ParsedImplFileInput =
19701970

19711971
member Contents: SynModuleOrNamespace list
19721972

1973-
member Trivia: ParsedImplFileInputTrivia
1973+
member Trivia: ParsedInputTrivia
19741974

19751975
member IsLastCompiland: bool
19761976

@@ -1984,7 +1984,7 @@ type ParsedSigFileInput =
19841984
qualifiedNameOfFile: QualifiedNameOfFile *
19851985
hashDirectives: ParsedHashDirective list *
19861986
contents: SynModuleOrNamespaceSig list *
1987-
trivia: ParsedSigFileInputTrivia *
1987+
trivia: ParsedInputTrivia *
19881988
identifiers: Set<string>
19891989

19901990
member FileName: string
@@ -1995,7 +1995,7 @@ type ParsedSigFileInput =
19951995

19961996
member Contents: SynModuleOrNamespaceSig list
19971997

1998-
member Trivia: ParsedSigFileInputTrivia
1998+
member Trivia: ParsedInputTrivia
19991999

20002000
/// Represents the syntax tree for a parsed implementation or signature file
20012001
[<NoEquality; NoComparison; RequireQualifiedAccess>]

‎src/Compiler/SyntaxTree/SyntaxTrivia.fs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,7 @@ type CommentTrivia =
3333
| BlockComment of range: range
3434

3535
[<NoEquality; NoComparison>]
36-
type ParsedImplFileInputTrivia =
37-
{
38-
ConditionalDirectives: ConditionalDirectiveTrivia list
39-
WarnDirectives: WarnDirectiveTrivia list
40-
CodeComments: CommentTrivia list
41-
}
42-
43-
static member Empty =
44-
{
45-
ConditionalDirectives = []
46-
WarnDirectives = []
47-
CodeComments = []
48-
}
49-
50-
[<NoEquality; NoComparison>]
51-
type ParsedSigFileInputTrivia =
36+
type ParsedInputTrivia =
5237
{
5338
ConditionalDirectives: ConditionalDirectiveTrivia list
5439
WarnDirectives: WarnDirectiveTrivia list

‎src/Compiler/SyntaxTree/SyntaxTrivia.fsi

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ type CommentTrivia =
4444
| LineComment of range: range
4545
| BlockComment of range: range
4646

47-
/// Represents additional information for ParsedImplFileInput
47+
/// Represents additional information for ParsedInput
4848
[<NoEquality; NoComparison>]
49-
type ParsedImplFileInputTrivia =
49+
type ParsedInputTrivia =
5050
{
5151
/// Preprocessor directives of type #if, #else or #endif
5252
ConditionalDirectives: ConditionalDirectiveTrivia list
@@ -58,23 +58,7 @@ type ParsedImplFileInputTrivia =
5858
CodeComments: CommentTrivia list
5959
}
6060

61-
static member internal Empty: ParsedImplFileInputTrivia
62-
63-
/// Represents additional information for ParsedSigFileInputTrivia
64-
[<NoEquality; NoComparison>]
65-
type ParsedSigFileInputTrivia =
66-
{
67-
/// Preprocessor directives of type #if, #else or #endif
68-
ConditionalDirectives: ConditionalDirectiveTrivia list
69-
70-
/// Warn directives (#nowarn / #warnon)
71-
WarnDirectives: WarnDirectiveTrivia list
72-
73-
/// Represent code comments found in the source file
74-
CodeComments: CommentTrivia list
75-
}
76-
77-
static member internal Empty: ParsedSigFileInputTrivia
61+
static member internal Empty: ParsedInputTrivia
7862

7963
/// Represents additional information for SynExpr.TryWith
8064
[<NoEquality; NoComparison>]

‎tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6272,15 +6272,15 @@ FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsLastCompiland()
62726272
FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_IsScript()
62736273
FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean get_isScript()
62746274
FSharp.Compiler.Syntax.ParsedImplFileInput: Boolean isScript
6275-
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String])
6275+
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.ParsedImplFileInput NewParsedImplFileInput(System.String, Boolean, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespace], System.Tuple`2[System.Boolean,System.Boolean], FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String])
62766276
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName
62776277
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName()
62786278
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile()
62796279
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile qualifiedNameOfFile
6280-
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia Trivia
6281-
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia get_Trivia()
6282-
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia get_trivia()
6283-
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia trivia
6280+
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia Trivia
6281+
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia get_Trivia()
6282+
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia get_trivia()
6283+
FSharp.Compiler.Syntax.ParsedImplFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia trivia
62846284
FSharp.Compiler.Syntax.ParsedImplFileInput: Int32 Tag
62856285
FSharp.Compiler.Syntax.ParsedImplFileInput: Int32 get_Tag()
62866286
FSharp.Compiler.Syntax.ParsedImplFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] HashDirectives
@@ -6389,15 +6389,15 @@ FSharp.Compiler.Syntax.ParsedSigFileFragment: FSharp.Compiler.Syntax.ParsedSigFi
63896389
FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 Tag
63906390
FSharp.Compiler.Syntax.ParsedSigFileFragment: Int32 get_Tag()
63916391
FSharp.Compiler.Syntax.ParsedSigFileFragment: System.String ToString()
6392-
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String])
6392+
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.ParsedSigFileInput NewParsedSigFileInput(System.String, FSharp.Compiler.Syntax.QualifiedNameOfFile, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynModuleOrNamespaceSig], FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia, Microsoft.FSharp.Collections.FSharpSet`1[System.String])
63936393
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile QualifiedName
63946394
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_QualifiedName()
63956395
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile get_qualifiedNameOfFile()
63966396
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.Syntax.QualifiedNameOfFile qualifiedNameOfFile
6397-
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia Trivia
6398-
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia get_Trivia()
6399-
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia get_trivia()
6400-
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia trivia
6397+
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia Trivia
6398+
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia get_Trivia()
6399+
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia get_trivia()
6400+
FSharp.Compiler.Syntax.ParsedSigFileInput: FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia trivia
64016401
FSharp.Compiler.Syntax.ParsedSigFileInput: Int32 Tag
64026402
FSharp.Compiler.Syntax.ParsedSigFileInput: Int32 get_Tag()
64036403
FSharp.Compiler.Syntax.ParsedSigFileInput: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.ParsedHashDirective] HashDirectives
@@ -10255,22 +10255,14 @@ FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: FSharp.Compiler.SyntaxTrivia
1025510255
FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: Int32 Tag
1025610256
FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: Int32 get_Tag()
1025710257
FSharp.Compiler.SyntaxTrivia.IfDirectiveExpression: System.String ToString()
10258-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] CodeComments
10259-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] get_CodeComments()
10260-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] ConditionalDirectives
10261-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] get_ConditionalDirectives()
10262-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia] WarnDirectives
10263-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia] get_WarnDirectives()
10264-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: System.String ToString()
10265-
FSharp.Compiler.SyntaxTrivia.ParsedImplFileInputTrivia: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia])
10266-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] CodeComments
10267-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] get_CodeComments()
10268-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] ConditionalDirectives
10269-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] get_ConditionalDirectives()
10270-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia] WarnDirectives
10271-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia] get_WarnDirectives()
10272-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: System.String ToString()
10273-
FSharp.Compiler.SyntaxTrivia.ParsedSigFileInputTrivia: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia])
10258+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] CodeComments
10259+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia] get_CodeComments()
10260+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] ConditionalDirectives
10261+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia] get_ConditionalDirectives()
10262+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia] WarnDirectives
10263+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia] get_WarnDirectives()
10264+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: System.String ToString()
10265+
FSharp.Compiler.SyntaxTrivia.ParsedInputTrivia: Void .ctor(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.ConditionalDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTrivia.CommentTrivia])
1027410266
FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia: FSharp.Compiler.Text.Range ParenRange
1027510267
FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia: FSharp.Compiler.Text.Range get_ParenRange()
1027610268
FSharp.Compiler.SyntaxTrivia.SynArgPatsNamePatPairsTrivia: System.String ToString()

0 commit comments

Comments
 (0)