Merge pull request #228 from teo-tsirpanis/fix-no-header

Fix compile errors in fsyacc's output if there is no header in the input file.
fsprojects · Dec 23, 2024 · 4500cbe · 4500cbe
2 parents e8a4481 + 84fba2c
commit 4500cbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/FsYacc.Core/fsyaccdriver.fs b/src/FsYacc.Core/fsyaccdriver.fs
@@ -120,11 +120,12 @@ type Writer(outputFileName, outputFileInterface) =
     member x.WriteUInt16(i: int) = fprintf os "%dus;" i
 
     member x.WriteCode(code, pos) =
-        x.WriteLine "# %d \"%s\"" pos.pos_lnum pos.pos_fname
-        x.WriteLine "%s" code
-        let codeLines = code.Replace("\r", "").Split([| '\n' |]).Length
-        outputLineCount <- outputLineCount + codeLines
-        x.WriteLine "# %d \"%s\"" outputLineCount outputFileName
+        if code <> "" then
+            x.WriteLine "# %d \"%s\"" pos.pos_lnum pos.pos_fname
+            x.WriteLine "%s" code
+            let codeLines = code.Replace("\r", "").Split([| '\n' |]).Length
+            outputLineCount <- outputLineCount + codeLines
+            x.WriteLine "# %d \"%s\"" outputLineCount outputFileName
 
     member x.OutputLineCount = outputLineCount
 

diff --git a/tests/LexAndYaccMiniProject/Parser.fsy b/tests/LexAndYaccMiniProject/Parser.fsy
@@ -1,9 +1,4 @@
-%{
-
-
-%}
-
-// The start token becomes a parser function in the compiled code:
+// The start token becomes a parser function in the compiled code:
 %start start
 
 // Regular tokens