Skip to content

Split TypedTreeOps.fs (12,569 lines) into 7 focused files #19521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
T-Gro wants to merge 34 commits into
base: main
Choose a base branch
from
Open

Split TypedTreeOps.fs (12,569 lines) into 7 focused files #19521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8f79f3a
Create TypedTreeOps.Remap.fs and .fsi (Sprint 1 of 7)
T-Gro Mar 26, 2026
5afd3c7
Extract TypedTreeOps.ExprConstruction.fs/.fsi (File 2 of 7)
T-Gro Mar 26, 2026
a21a7b9
Extract TypedTreeOps.FreeVars.fs/.fsi (File 3 of 7)
T-Gro Mar 26, 2026
8658b63
Extract TypedTreeOps.Attributes.fs/.fsi (File 4 of 7)
T-Gro Mar 26, 2026
dcb0053
Fix TypedTreeOps.Attributes.fsi: remove misplaced declarations
T-Gro Mar 27, 2026
852b79d
Extract TypedTreeOps.Remapping.fs/.fsi (File 5 of 7)
T-Gro Mar 27, 2026
b452e5f
Extract TypedTreeOps.ExprOps.fs/.fsi (File 6 of 7)
T-Gro Mar 27, 2026
4f1af05
Extract TypedTreeOps.Transforms.fs/.fsi (File 7 of 7)
T-Gro Mar 27, 2026
80b4029
Fix TypedTreeOps.Transforms.fsi: remove duplicates, misplaced declara…
T-Gro Mar 27, 2026
9f20ec6
Split TypedTreeOps into 7 files: wire up project, delete originals, f…
T-Gro Mar 27, 2026
1855643
Create CommonContainers module in file 2, move container type helpers…
T-Gro Mar 27, 2026
807f642
Rename modules for coherence, move type constructors and encoding hel…
T-Gro Mar 27, 2026
88efabc
Round 2: Move misplaced functions to correct modules
T-Gro Mar 27, 2026
cd50af0
Round 3: Move quotation type helpers to TypeConstruction
T-Gro Mar 27, 2026
dc36a32
Round 4: Move type queries to TypeTesters, member helpers to Display
T-Gro Mar 27, 2026
4e4b43e
Round 5: Move CombineCcuContentFragments to SignatureOps
T-Gro Mar 27, 2026
d004926
Rename TupleCompilation → LoopAndConstantOptimization
T-Gro Mar 27, 2026
a670561
Move unblocked functions to correct modules
T-Gro Mar 27, 2026
2390789
Move mkLabelled from AttribChecking to Makers
T-Gro Mar 27, 2026
781a7f1
Break rec chain assumptions: move standalone functions to correct mod…
T-Gro Mar 27, 2026
67fdc23
Final placement fixes: isResumableCodeTy, mkArray, isSealedTy, export…
T-Gro Mar 27, 2026
e419972
Move updateSeqTypeIsPrefix→SignatureOps, isTyparOrderMismatch→Display
T-Gro Mar 27, 2026
1a75b23
Incorporate reviewer findings: move attribute/expr helpers to correct…
T-Gro Mar 27, 2026
1ac6b3f
Split TypeEncoding into XmlDocSignatures, NullnessAnalysis, TypeTests…
T-Gro Mar 30, 2026
ae377f3
Split AttribChecking into ResumableCodePatterns, SeqExprPatterns, Ext…
T-Gro Mar 30, 2026
5e5b0e6
Split TypeConstruction into MeasureOps, TypeBuilders, TypeAbbreviatio…
T-Gro Mar 30, 2026
8ca762f
Rename Display→MemberRepresentation, dissolve ExtensionAndMiscHelpers…
T-Gro Mar 30, 2026
a779e56
Rename TypeTesters→TypeQueries, ExprHelpers→ExprTransforms, tighten E…
T-Gro Mar 30, 2026
37fd00f
Fix B-grade outliers: rename CollectionTypes, move dest/is from Maker…
T-Gro Mar 30, 2026
7fdde75
Rename TypeQueries back to TypeTesters
T-Gro Mar 30, 2026
bdefb0b
Remove accidentally committed scratch files
T-Gro Mar 30, 2026
bc3ac40
Fix FS0667: disambiguate cenv record update in IlxGen.fs
T-Gro Mar 31, 2026
7f317fe
Apply fantomas formatting to all TypedTreeOps files
T-Gro Mar 31, 2026
69f7772
Merge branch 'main' into refactoring/typedtreeops
T-Gro Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Compiler/CodeGen/IlxGen.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3208,7 +3208,7 @@ and DelayCodeGenMethodForExpr cenv mgbuf (_, _, eenv, _, _, _, _ as args) =
let change3rdOutOf7 (a1, a2, _, a4, a5, a6, a7) newA3 = (a1, a2, newA3, a4, a5, a6, a7)

if eenv.delayCodeGen then
let cenv =
let cenv: cenv =
{ cenv with
stackGuard = getEmptyStackGuard ()
}
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Driver/CompilerImports.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ let WriteSignatureData (tcConfig: TcConfig, tcGlobals, exportRemapping, ccu: Ccu
let signatureDataFile =
FileSystem.ChangeExtensionShim(outputFile, ".signature-data.json")

serializeEntity signatureDataFile mspec)
DebugPrint.serializeEntity signatureDataFile mspec)

// For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers
// don't complain when they see the resource.
Expand Down
16 changes: 14 additions & 2 deletions src/Compiler/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,20 @@
<Compile Include="TypedTree\TypedTreeBasics.fs" />
<Compile Include="TypedTree\TcGlobals.fsi" />
<Compile Include="TypedTree\TcGlobals.fs" />
<Compile Include="TypedTree\TypedTreeOps.fsi" />
<Compile Include="TypedTree\TypedTreeOps.fs" />
<Compile Include="TypedTree\TypedTreeOps.Remap.fsi" />
<Compile Include="TypedTree\TypedTreeOps.Remap.fs" />
<Compile Include="TypedTree\TypedTreeOps.ExprConstruction.fsi" />
<Compile Include="TypedTree\TypedTreeOps.ExprConstruction.fs" />
<Compile Include="TypedTree\TypedTreeOps.FreeVars.fsi" />
<Compile Include="TypedTree\TypedTreeOps.FreeVars.fs" />
<Compile Include="TypedTree\TypedTreeOps.Attributes.fsi" />
<Compile Include="TypedTree\TypedTreeOps.Attributes.fs" />
<Compile Include="TypedTree\TypedTreeOps.Remapping.fsi" />
<Compile Include="TypedTree\TypedTreeOps.Remapping.fs" />
<Compile Include="TypedTree\TypedTreeOps.ExprOps.fsi" />
<Compile Include="TypedTree\TypedTreeOps.ExprOps.fs" />
<Compile Include="TypedTree\TypedTreeOps.Transforms.fsi" />
<Compile Include="TypedTree\TypedTreeOps.Transforms.fs" />
<Compile Include="TypedTree\TypedTreePickle.fsi" />
<Compile Include="TypedTree\TypedTreePickle.fs" />
<Compile Include="TypedTree\UpdatePrettyTyparNames.fsi" />
Expand Down
2,545 changes: 2,545 additions & 0 deletions src/Compiler/TypedTree/TypedTreeOps.Attributes.fs
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading