Skip to content

Feature/nullness - parsing of constraints #15753

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

Merged
merged 39 commits into from
Sep 8, 2023
Merged

Feature/nullness - parsing of constraints #15753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
884caac
basic tests created for syntaxtree
T-Gro Aug 4, 2023
9912ae7
appType BAR NULL -> rule added
T-Gro Aug 4, 2023
6ab42e0
IIII am still failing...
T-Gro Aug 4, 2023
2aea264
more failing cases added
T-Gro Aug 4, 2023
173d4f6
typar not supports null -> new rule
T-Gro Aug 4, 2023
6d1c8ad
put syntaxtree tests back to doing all of them
T-Gro Aug 4, 2023
de03a17
now it works
T-Gro Aug 4, 2023
a377b20
remove unnecessary leftovers
T-Gro Aug 4, 2023
7099498
regression for Choice type (not yet fixed) caused by precedence rules
T-Gro Aug 22, 2023
b6e4d2c
in unions, "appType | null" has to be put in ()
T-Gro Aug 23, 2023
247b8a9
Fix regression for DU declarations with named fields
T-Gro Aug 23, 2023
5fcc891
heavily annotated expression - test case
T-Gro Aug 23, 2023
2b68ea1
precedence for fsharp.core style of SynUnionCaseKind.FullType
T-Gro Aug 23, 2023
29f5e2f
one more time...
T-Gro Aug 23, 2023
9d06c72
Few more precedence rules, FSharp.Core only feature still failing
T-Gro Aug 25, 2023
1dece40
xx
T-Gro Aug 28, 2023
2c7c76a
regressions
T-Gro Aug 28, 2023
df356d7
better error recovery merged in from a fresher base
T-Gro Aug 28, 2023
14f835a
separated definition
T-Gro Aug 28, 2023
dbf1332
still not there
T-Gro Aug 29, 2023
80e69d3
BAR_NULL created in LexFilter
T-Gro Aug 31, 2023
f6620b7
Renaming to BAR_RIGHT_BEFORE_NULL, because that is what it is (NULL c…
T-Gro Aug 31, 2023
f9c9052
removing spaces
T-Gro Aug 31, 2023
9b66213
baseline adjustments for recovery - it still recovers
T-Gro Sep 1, 2023
beb8fbc
Cases for using type annotation for an expression after a match clause
T-Gro Sep 1, 2023
f639590
BAR precedence
T-Gro Sep 1, 2023
55174f7
try fix "as vs. or" regression in pattern matching
T-Gro Sep 4, 2023
f65d0b6
AS vs BAR precedence for pattern matching
T-Gro Sep 4, 2023
f495c01
Merge branch 'feature/nullness' into feature/nullness_parsing_constra…
T-Gro Sep 4, 2023
a38ead9
merge resolution
T-Gro Sep 4, 2023
79346a7
fix inline flags
T-Gro Sep 4, 2023
b0fa981
Fix IntegerOverflow
T-Gro Sep 7, 2023
c0830da
renamed to BAR_JUST_BEFORE_NULL
T-Gro Sep 7, 2023
f1aa4aa
missing rename
T-Gro Sep 7, 2023
af24968
Merge branch 'main' into feature/nullness_parsing_constraints
T-Gro Sep 7, 2023
dfe4cc3
Few more conflict resolutions
T-Gro Sep 7, 2023
d24043f
Syntaxtree tests updated
T-Gro Sep 8, 2023
267e7a2
Fixing tests
T-Gro Sep 8, 2023
788be51
Merge branch 'feature/nullness' into feature/nullness_parsing_constra…
T-Gro Sep 8, 2023
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
1 change: 0 additions & 1 deletion src/Compiler/Checking/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4658,7 +4658,6 @@ and TcIntersectionConstraint (cenv: cenv) env newOk checkConstraints occ tpenv s
) tpenv

let tpTy = tp.AsType KnownAmbivalentToNull // TODO: NULLNESS

tpTy, tpenv

and TcTypeStaticConstant kindOpt tpenv c m =
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Checking/ConstraintSolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4091,4 +4091,4 @@ let IsApplicableMethApprox g amap m (minfo: MethInfo) availObjTy =
|> CommitOperationResult
| _ -> true
else
true
true
1 change: 1 addition & 0 deletions src/Compiler/Driver/CompilerDiagnostics.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,7 @@ type Exception with
| Parser.TOKEN_INTERP_STRING_END -> SR.GetString("Parser.TOKEN.INTERP.STRING.END")
| Parser.TOKEN_WITHNULL__ -> SR.GetString("Parser.TOKEN.WITHNULL__")
| Parser.TOKEN_NOTNULL__ -> SR.GetString("Parser.TOKEN.NOTNULL__")
| Parser.TOKEN_BAR_JUST_BEFORE_NULL -> SR.GetString("Parser.TOKEN.BAR_JUST_BEFORE_NULL")
| unknown ->
let result = sprintf "unknown token tag %+A" unknown
Debug.Assert(false, result)
Expand Down
3 changes: 3 additions & 0 deletions src/Compiler/FSStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,9 @@
<data name="Parser.TOKEN.BAR.RBRACE" xml:space="preserve">
<value>symbol '|}'</value>
</data>
<data name="Parser.TOKEN.BAR_JUST_BEFORE_NULL" xml:space="preserve">
<value>symbol '|' (directly before 'null')</value>
</data>
<data name="Parser.TOKEN.GREATER.RBRACE" xml:space="preserve">
<value>symbol '&gt;}'</value>
</data>
Expand Down
1 change: 1 addition & 0 deletions src/Compiler/Service/ServiceLexing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ module internal TokenClassifications =
| MAYBENULL__
| NOTNULL__
| WITHNULL__
| BAR_JUST_BEFORE_NULL
| TYPE_COMING_SOON
| TYPE_IS_HERE
| MODULE_COMING_SOON
Expand Down
10 changes: 7 additions & 3 deletions src/Compiler/SyntaxTree/LexFilter.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,10 +1123,11 @@ type LexFilterImpl (
// f<x # x>x
// f<x ' x>x
// f<x __maybenull>x
// f<x __notnull>x
// f<x __withnull>x
// f<x __notnull>x
// f<x __withnull>x
// f<x | string>x
| DEFAULT | COLON | COLON_GREATER | STRUCT | NULL | DELEGATE | AND | WHEN | AMP
| NOTNULL__ | MAYBENULL__ | WITHNULL__
| NOTNULL__ | MAYBENULL__ | WITHNULL__ | BAR_JUST_BEFORE_NULL
| DOT_DOT
| NEW
| LBRACE_BAR
Expand Down Expand Up @@ -2438,6 +2439,9 @@ type LexFilterImpl (
pool.Return tokenTup
hwTokenFetch useBlockRule

| BAR, _ when (lexbuf.SupportsFeature(LanguageFeature.NullnessChecking) && match peekNextToken() with NULL -> true | _ -> false) ->
returnToken tokenLexbufState BAR_JUST_BEFORE_NULL

// Ordinary tokens start a vanilla block
| _, CtxtSeqBlock _ :: _ ->
pushCtxt tokenTup (CtxtVanilla(tokenStartPos, isLongIdentEquals token))
Expand Down
Loading