Make lack of start symbols fatal to parser generation

jasone · Sep 24, 2024 · 84e1578 · 84e1578
1 parent 696b594
commit 84e1578
Show file tree

Hide file tree

Showing 39 changed files with 62 additions and 40 deletions.
diff --git a/bootstrap/bin/hocc/spec.ml b/bootstrap/bin/hocc/spec.ml
@@ -751,6 +751,11 @@ let symbols_init io precs symbols hmh =
   let nprecs = Precs.length precs in
   let ntokens = Symbols.tokens_length symbols in
   let nnonterms = Symbols.nonterms_length symbols in
+  let nstarts = Symbols.nonterms_fold ~init:0L ~f:(fun nstarts (Symbol.{start; _} as symbol) ->
+      match start && (not (Symbol.is_synthetic symbol)) with
+      | false -> nstarts
+      | true -> succ nstarts
+    ) symbols in
   let nprods = Prods.length prods in
   let io =
     io.log
@@ -765,13 +770,28 @@ let symbols_init io precs symbols hmh =
     |> Fmt.fmt ", "
     |> Uns.pp nnonterms |> Fmt.fmt " non-terminal"
     |> (fun formatter -> match nnonterms with 1L -> formatter | _ -> formatter |> Fmt.fmt "s")
+    |> Fmt.fmt " (" |> Uns.pp nstarts
+    |> Fmt.fmt " start"
+    |> (fun formatter -> match nstarts with 1L -> formatter | _ -> formatter |> Fmt.fmt "s")
+    |> Fmt.fmt ")"
 
     |> Fmt.fmt ", "
     |> Uns.pp nprods |> Fmt.fmt " production"
     |> (fun formatter -> match nprods with 1L -> formatter | _ -> formatter |> Fmt.fmt "s")
     |> Fmt.fmt "\n"
     |> Io.with_log io
   in
+  let io = match nstarts with
+    | 0L -> begin
+        let io =
+          io.err
+          |> Fmt.fmt "hocc: Must specify at least one start symbol\n"
+          |> Io.with_err io
+        in
+        Io.fatal io
+      end
+    | _ -> io
+  in
   io, symbols, prods, callbacks
 
 let compat_init algorithm ~resolve io symbols prods =

diff --git a/bootstrap/test/hocc/A.expected b/bootstrap/test/hocc/A.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./A.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 8 tokens, 5 non-terminals, 8 productions
+hocc: 2 precedences, 8 tokens, 5 non-terminals (1 start), 8 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++^^+^^++++^^+^++^^^
 hocc: Generating 25 LR(1) states

diff --git a/bootstrap/test/hocc/B.expected b/bootstrap/test/hocc/B.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./B.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 8 tokens, 5 non-terminals, 8 productions
+hocc: 0 precedences, 8 tokens, 5 non-terminals (1 start), 8 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++..+...++++.+++
 hocc: Generating 15 LR(1) states

diff --git a/bootstrap/test/hocc/C.expected b/bootstrap/test/hocc/C.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./C.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 6 tokens, 4 non-terminals, 6 productions
+hocc: 0 precedences, 6 tokens, 4 non-terminals (1 start), 6 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++++++++
 hocc: Generating 13 LR(1) states

diff --git a/bootstrap/test/hocc/D.expected b/bootstrap/test/hocc/D.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./D.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 6 tokens, 3 non-terminals, 5 productions
+hocc: 2 precedences, 6 tokens, 3 non-terminals (1 start), 5 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++
 hocc: Generating 10 LR(1) states

diff --git a/bootstrap/test/hocc/E.expected b/bootstrap/test/hocc/E.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./E.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 5 tokens, 3 non-terminals, 4 productions
+hocc: 0 precedences, 5 tokens, 3 non-terminals (1 start), 4 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++..+.+
 hocc: Generating 9 LR(1) states

diff --git a/bootstrap/test/hocc/Example.expected b/bootstrap/test/hocc/Example.expected
@@ -1,7 +1,7 @@
 hocc: Parsing "./Example.hmhi"
 hocc: Parsing "./Example.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 8 tokens, 5 non-terminals, 9 productions
+hocc: 2 precedences, 8 tokens, 5 non-terminals (1 start), 9 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++
 hocc: Generating 14 LR(1) states

diff --git a/bootstrap/test/hocc/Example_b.expected b/bootstrap/test/hocc/Example_b.expected
@@ -1,7 +1,7 @@
 hocc: Parsing "./Example_b.hmhi"
 hocc: Parsing "./Example_b.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 8 tokens, 5 non-terminals, 9 productions
+hocc: 2 precedences, 8 tokens, 5 non-terminals (1 start), 9 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++
 hocc: Generating 14 LR(1) states

diff --git a/bootstrap/test/hocc/Example_c.expected b/bootstrap/test/hocc/Example_c.expected
@@ -1,7 +1,7 @@
 hocc: Parsing "./Example_c.hmhi"
 hocc: Parsing "./Example_c.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 8 tokens, 5 non-terminals, 9 productions
+hocc: 2 precedences, 8 tokens, 5 non-terminals (1 start), 9 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++
 hocc: Generating 14 LR(1) states

diff --git a/bootstrap/test/hocc/Example_rno.expected b/bootstrap/test/hocc/Example_rno.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Example_rno.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 8 tokens, 5 non-terminals, 9 productions
+hocc: 2 precedences, 8 tokens, 5 non-terminals (1 start), 9 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++
 hocc: Generating 14 LR(1) states

diff --git a/bootstrap/test/hocc/F.expected b/bootstrap/test/hocc/F.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./F.hmh"
 hocc: Generating LR(1) specification
-hocc: 0 precedences, 7 tokens, 4 non-terminals, 7 productions
+hocc: 0 precedences, 7 tokens, 4 non-terminals (1 start), 7 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++^+++++++
 hocc: Generating 15 LR(1) states

diff --git a/bootstrap/test/hocc/G.expected b/bootstrap/test/hocc/G.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./G.hmh"
 hocc: Generating IELR(1) specification
-hocc: 2 precedences, 7 tokens, 8 non-terminals, 12 productions
+hocc: 2 precedences, 7 tokens, 8 non-terminals (1 start), 12 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++..+++++++++++++.+++

diff --git a/bootstrap/test/hocc/G2.expected b/bootstrap/test/hocc/G2.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./G2.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 10 tokens, 8 non-terminals, 14 productions
+hocc: 0 precedences, 10 tokens, 8 non-terminals (1 start), 14 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++^.+++++++..+^.......++^.++++...
 hocc: Generating 27 LR(1) states

diff --git a/bootstrap/test/hocc/G2_aielr1.expected b/bootstrap/test/hocc/G2_aielr1.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./G2_aielr1.hmh"
 hocc: Generating IELR(1) specification
-hocc: 0 precedences, 10 tokens, 8 non-terminals, 14 productions
+hocc: 0 precedences, 10 tokens, 8 non-terminals (1 start), 14 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++..+++++++..+........++++++

diff --git a/bootstrap/test/hocc/Gawk.expected b/bootstrap/test/hocc/Gawk.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Gawk.hmh"
 hocc: Generating IELR(1) specification
-hocc: 19 precedences, 60 tokens, 46 non-terminals, 164 productions
+hocc: 19 precedences, 60 tokens, 46 non-terminals (1 start), 164 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++++++++++++++++++++++++++++++++++++++++++..+..+...............++......+..+.......+++++++++..++++++++++++++++++++++++++++++++++++++[62/100]+++++++++++.++++++++.................++.................................++++++++++++++............++.........+++.++++++++++++++++................+...........................................++++++++++++++...+++++++++.++...+........++++++.+...................................+.++.+++.+......................+++[67/200]+++..+++++++++..........+..............++++++++++++.++.+++++++++++++++++++++++++.+++++++++.+.+++++++++++++...+......++++++++++++......+........++++............+...........................................................++++.++[14/300]+++.+++..+.+++++.++++++++

diff --git a/bootstrap/test/hocc/Gpic.expected b/bootstrap/test/hocc/Gpic.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Gpic.hmh"
 hocc: Generating IELR(1) specification
-hocc: 25 precedences, 140 tokens, 46 non-terminals, 248 productions
+hocc: 25 precedences, 140 tokens, 46 non-terminals (1 start), 248 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[88/100]+++++++...+.............+++++++++++++.................++++++++++++++++++++++++++++++++++++++++++++++..++++++++++................+.........................+..+.+......+........++++++++++++++++++[101/200]+..........................++........+++++++++++++++++++++++++++++++++++..+++++...........+.....+++++..+............+.+..+..............++++........................+.+++..++.......+++++.....................++++++++..+.....+++++++++++++++...++..++.....++.+...........+[114/300]++++++++.+.++++++++++++.+++++++++...+.................................................................++++++..+..+++++++..........................................................................................................................................................................................................................................................................................................................................++++++++++++++..+.++++....++....................................................................................++.++...+....................................................................+++++++++++++..+.....++++++++++++++.....+[26/400]+++...+............................................................................+..................+..........................................................................++++..+.....+++++..+.....+++++++++

diff --git a/bootstrap/test/hocc/H.expected b/bootstrap/test/hocc/H.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./H.hmh"
 hocc: Generating IELR(1) specification
-hocc: 2 precedences, 9 tokens, 9 non-terminals, 14 productions
+hocc: 2 precedences, 9 tokens, 9 non-terminals (1 start), 14 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++..+++++++++++++++++.+++

diff --git a/bootstrap/test/hocc/Hocc.expected b/bootstrap/test/hocc/Hocc.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Hocc.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 39 tokens, 40 non-terminals, 75 productions
+hocc: 0 precedences, 39 tokens, 40 non-terminals (2 starts), 75 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++++++++.+.++++++++++++++++++++++++++.......+.+........++............+.............+..............+...............+........+++++++++++++++++++++++++++++++.++++++++++.+.+++++++++[11/100]+++++++++++..........+++++++.+.+++++++++++++++
 hocc: Generating 134 LR(1) states

diff --git a/bootstrap/test/hocc/IelrFig1.expected b/bootstrap/test/hocc/IelrFig1.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig1.hmh"
 hocc: Generating IELR(1) specification
-hocc: 1 precedence, 4 tokens, 3 non-terminals, 5 productions
+hocc: 1 precedence, 4 tokens, 3 non-terminals (1 start), 5 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++.+++++

diff --git a/bootstrap/test/hocc/IelrFig1_rno.expected b/bootstrap/test/hocc/IelrFig1_rno.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig1_rno.hmh"
 hocc: Generating IELR(1) specification
-hocc: 1 precedence, 4 tokens, 3 non-terminals, 5 productions
+hocc: 1 precedence, 4 tokens, 3 non-terminals (1 start), 5 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++.+++++

diff --git a/bootstrap/test/hocc/IelrFig2.expected b/bootstrap/test/hocc/IelrFig2.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig2.hmh"
 hocc: Generating IELR(1) specification
-hocc: 2 precedences, 5 tokens, 5 non-terminals, 10 productions
+hocc: 2 precedences, 5 tokens, 5 non-terminals (1 start), 10 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++.+++++++++++

diff --git a/bootstrap/test/hocc/IelrFig2_rno.expected b/bootstrap/test/hocc/IelrFig2_rno.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig2_rno.hmh"
 hocc: Generating IELR(1) specification
-hocc: 2 precedences, 5 tokens, 5 non-terminals, 10 productions
+hocc: 2 precedences, 5 tokens, 5 non-terminals (1 start), 10 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++.+++++++++++

diff --git a/bootstrap/test/hocc/IelrFig3.expected b/bootstrap/test/hocc/IelrFig3.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig3.hmh"
 hocc: Generating IELR(1) specification
-hocc: 3 precedences, 4 tokens, 5 non-terminals, 10 productions
+hocc: 3 precedences, 4 tokens, 5 non-terminals (1 start), 10 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++.+++++++++++

diff --git a/bootstrap/test/hocc/IelrFig3_apgm1.expected b/bootstrap/test/hocc/IelrFig3_apgm1.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig3_apgm1.hmh"
 hocc: Generating PGM(1) specification
-hocc: 3 precedences, 4 tokens, 5 non-terminals, 10 productions
+hocc: 3 precedences, 4 tokens, 5 non-terminals (1 start), 10 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++.+++++++++++
 hocc: Generating 19 LR(1) states

diff --git a/bootstrap/test/hocc/IelrFig3_rno.expected b/bootstrap/test/hocc/IelrFig3_rno.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig3_rno.hmh"
 hocc: Generating IELR(1) specification
-hocc: 3 precedences, 4 tokens, 5 non-terminals, 10 productions
+hocc: 3 precedences, 4 tokens, 5 non-terminals (1 start), 10 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++.+++++++++++

diff --git a/bootstrap/test/hocc/IelrFig4_rno.expected b/bootstrap/test/hocc/IelrFig4_rno.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig4_rno.hmh"
 hocc: Generating IELR(1) specification
-hocc: 0 precedences, 4 tokens, 4 non-terminals, 8 productions
+hocc: 0 precedences, 4 tokens, 4 non-terminals (1 start), 8 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++.++++++++

diff --git a/bootstrap/test/hocc/IelrFig5.expected b/bootstrap/test/hocc/IelrFig5.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig5.hmh"
 hocc: Generating IELR(1) specification
-hocc: 2 precedences, 5 tokens, 7 non-terminals, 10 productions
+hocc: 2 precedences, 5 tokens, 7 non-terminals (1 start), 10 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++.+++++++.+.+++++

diff --git a/bootstrap/test/hocc/IelrFig5_rno.expected b/bootstrap/test/hocc/IelrFig5_rno.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig5_rno.hmh"
 hocc: Generating IELR(1) specification
-hocc: 2 precedences, 5 tokens, 7 non-terminals, 10 productions
+hocc: 2 precedences, 5 tokens, 7 non-terminals (1 start), 10 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++.+++++++.+.+++++

diff --git a/bootstrap/test/hocc/IelrFig6.expected b/bootstrap/test/hocc/IelrFig6.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./IelrFig6.hmh"
 hocc: Generating IELR(1) specification
-hocc: 0 precedences, 4 tokens, 6 non-terminals, 8 productions
+hocc: 0 precedences, 4 tokens, 6 non-terminals (1 start), 8 productions
 hocc: Generating LALR(1) specification as IELR(1) prerequisite
 hocc: LR(1) item set compatibility: lalr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++++.++++++

diff --git a/bootstrap/test/hocc/Lyken.expected b/bootstrap/test/hocc/Lyken.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Lyken.hmh"
 hocc: Generating PGM(1) specification
-hocc: 88 precedences, 101 tokens, 129 non-terminals, 692 productions
+hocc: 88 precedences, 101 tokens, 129 non-terminals (1 start), 692 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[98/100]++++++++++++++++++++++++++.+.+++++++++.+++++++++.+++++++++++++++++++..............................+..........................+.+.........+++++++.++++.++++++++++++++++++++++[147/200]++++++.....................................+...................+....+................++.................................................................+.......................+.....+.++..........................................+...........+....................................................................................................+................+....+.........................................++...................................................................................+....+....+....................................++...................................................+++.+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[220/300]+++++++++++++++++++++++++++++++...+...+...+...................................................+++++...........+++....+.++++++++.................++..+++++..+..+..+.+.+++++++++++++++++++++++++++++..+++....+++.+++[219/400]+++++++++++++++++++++++.++....+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[227/500]+++++++++++++++++++++++++++++++++.++++++++++++.+++++++++++++++++++++++++++++++++++++++++++++++++++++++[275/600]++++...+.+++.....+++++++....+++++.+++++++.+.....+++.+++.....................................+.........................................+.+..................................................................................................................................................................................................................................................................................................................+++++++++++++++++++++++++++++++.+.+.++++++++..++..++++++++++++++++++++[294/700]+++++++++++++++++++++++++++++++++++++++..+..........+..............++++++++++++++++++++++.++.++++++++++++++++++++++++++++++++..+++[270/800]+++++++++++++++++++++++++++++++++++++++++++++..++++++++++++++++++++++++++++++++++..+++++++++++++++++++++[233/900]+++++++++++++++++++++++++++++++++++++++++++.+.++++++++++++++++++++++++++++++++++++++++++++++++++++++++[201/1_000]+++++++++++++++++++++++++.+.++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[165/1_100]++++++++++++++++++++++++++++++++++++++++++++++++++++.+.+++++++++++++++++++++++++++++++++++++++++++++++[120/1_200]++++++++++++++++++++++++++++++++++++++++++++++.+...+++++++++++++++++++++++++++++++++++++++++++++++++++++[63/1_300]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hocc: Generating 1_375 LR(1) states

diff --git a/bootstrap/test/hocc/Menhir21Longer.expected b/bootstrap/test/hocc/Menhir21Longer.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Menhir21Longer.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 11 tokens, 8 non-terminals, 13 productions
+hocc: 0 precedences, 11 tokens, 8 non-terminals (1 start), 13 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++++++++++.++++++++..+............++++
 hocc: Generating 33 LR(1) states

diff --git a/bootstrap/test/hocc/Menhir21Shorter.expected b/bootstrap/test/hocc/Menhir21Shorter.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./Menhir21Shorter.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 8 tokens, 4 non-terminals, 8 productions
+hocc: 0 precedences, 8 tokens, 4 non-terminals (1 start), 8 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++.+++^..+..++++++++..++
 hocc: Generating 22 LR(1) states

diff --git a/bootstrap/test/hocc/N.expected b/bootstrap/test/hocc/N.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./N.hmh"
 hocc: Generating PGM(1) specification
-hocc: 0 precedences, 11 tokens, 4 non-terminals, 7 productions
+hocc: 0 precedences, 11 tokens, 4 non-terminals (1 start), 7 productions
 hocc: LR(1) item set compatibility: weak
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++^++++++^++++..
 hocc: Generating 19 LR(1) states

diff --git a/bootstrap/test/hocc/NestedEpsilon.expected b/bootstrap/test/hocc/NestedEpsilon.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./NestedEpsilon.hmh"
 hocc: Generating LR(1) specification
-hocc: 0 precedences, 4 tokens, 6 non-terminals, 7 productions
+hocc: 0 precedences, 4 tokens, 6 non-terminals (1 start), 7 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)++++++++
 hocc: Generating 9 LR(1) states

diff --git a/bootstrap/test/hocc/PSEUDO_END_conflict.expected b/bootstrap/test/hocc/PSEUDO_END_conflict.expected
@@ -1,6 +1,6 @@
 hocc: Parsing "./PSEUDO_END_conflict.hmh"
 hocc: Generating LR(1) specification
-hocc: 2 precedences, 7 tokens, 4 non-terminals, 8 productions
+hocc: 2 precedences, 7 tokens, 4 non-terminals (1 start), 8 productions
 hocc: LR(1) item set compatibility: lr1
 hocc: Generating LR(1) item set closures (+^.=add/split/merge)+++++++++++
 hocc: Generating 12 LR(1) states