Skip to content

Make the output of fsyacc compatible with nullable reference types. #227

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
nojaf merged 1 commit into from
Dec 23, 2024
Merged

Make the output of fsyacc compatible with nullable reference types. #227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/FsYacc.Core/fsyaccdriver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,6 @@ let writeSpecToFile (generatorState: GeneratorState) (spec: ParserSpec) (compile

writer.WriteLine "#nowarn \"1182\" // the generated code often has unused variable 'parseState'"

writer.WriteLine
"#nowarn \"3261\" // the generated code would need to properly annotate nulls, e.g. changing System.Object to `obj|null`"

for s in generatorState.opens do
writer.WriteLine "open %s" s
writer.WriteLineInterface "open %s" s
Expand Down Expand Up @@ -371,7 +368,10 @@ let writeSpecToFile (generatorState: GeneratorState) (spec: ParserSpec) (compile
| None -> "")
(match typ with
| Some _ -> "Microsoft.FSharp.Core.Operators.box _fsyacc_x"
| None -> "(null : System.Object)")
// We can't use null here because if all tokens are untyped, the function will be generic.
// We used to use (null : obj) but that leads to warnings when nullable reference types are enabled.
// box null does the right thing regardless of NRT and gets optimized to a single ldnull.
| None -> "Microsoft.FSharp.Core.Operators.box null")

for key, _ in spec.Types |> Seq.countBy fst |> Seq.filter (fun (_, n) -> n > 1) do
failwithf "%s is given multiple %%type declarations" key
Expand Down
Loading