Simplify Hmhi and Hmh

BranchTaken · Aug 21, 2024 · 1313434 · 1313434
1 parent aa76e02
commit 1313434
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 129 deletions.
diff --git a/bootstrap/bin/hocc/Parse.hmh b/bootstrap/bin/hocc/Parse.hmh
@@ -248,11 +248,9 @@ type nonterm_ident =
   | Matter of {token_: Scan.Token.t; matter: nonterm_matter}
   | MatterEpsilon
   and nonterm_hmh =
-  | Hmh of {prelude: nonterm_matter; hocc_: nonterm_hocc; postlude: nonterm_matter;
-  eoi: Scan.Token.t}
+  | Hmh of {prelude: nonterm_matter; hocc_: nonterm_hocc; postlude: nonterm_matter; eoi: token_eoi}
   and nonterm_hmhi =
-  | Hmhi of {prelude: nonterm_matter; hocc_: token_hocc; postlude: nonterm_matter;
-  eoi: Scan.Token.t}
+  | Hmhi of {prelude: nonterm_matter; hocc_: token_hocc; postlude: nonterm_matter; eoi: token_eoi}
 
 include hocc
     (* hocc-specific keywords *)
@@ -552,14 +550,10 @@ include hocc
       | epsilon -> MatterEpsilon
 
     start Hmh of nonterm_hmh ::=
-      | prelude:Matter hocc_:Hocc postlude:Matter eoi:EOI ->
-        let EOI {token_=eoi} = eoi in
-        Hmh {prelude; hocc_; postlude; eoi}
+      | prelude:Matter hocc_:Hocc postlude:Matter eoi:EOI -> Hmh {prelude; hocc_; postlude; eoi}
 
     start Hmhi of nonterm_hmhi ::=
-      | prelude:Matter hocc_:"hocc" postlude:Matter eoi:EOI ->
-        let EOI {token_=eoi} = eoi in
-        Hmhi {prelude; hocc_; postlude; eoi}
+      | prelude:Matter hocc_:"hocc" postlude:Matter eoi:EOI -> Hmhi {prelude; hocc_; postlude; eoi}
 
 let rec scan scanner =
     let scanner, scan_token = Scan.next scanner in
@@ -1663,7 +1657,7 @@ let rec pp_token_hocc (HOCC {token_}) formatter =
           |> fmt_semi ~alt ~width
           |> Fmt.fmt "postlude=" |> pp_matter postlude
           |> fmt_semi ~alt ~width
-          |> Fmt.fmt "eoi=" |> Scan.Token.pp eoi
+          |> Fmt.fmt "eoi=" |> pp_token_eoi eoi
           |> fmt_rcurly ~alt ~width
   and pp_hmh hmh formatter =
     fmt_hmh hmh formatter
@@ -1679,7 +1673,7 @@ let rec pp_token_hocc (HOCC {token_}) formatter =
           |> fmt_semi ~alt ~width
           |> Fmt.fmt "postlude=" |> pp_matter postlude
           |> fmt_semi ~alt ~width
-          |> Fmt.fmt "eoi=" |> Scan.Token.pp eoi
+          |> Fmt.fmt "eoi=" |> pp_token_eoi eoi
           |> fmt_rcurly ~alt ~width
   and pp_hmhi hmhi formatter =
     fmt_hmhi hmhi formatter