Reformat + regen

2024-11-08 07:51:43 +03:00 · 2023-06-13 12:24:21 +02:00 · 2023-06-13 12:24:21 +02:00 · ec97c386c3
commit ec97c386c3
parent 26c75af2ae
9 changed files with 76 additions and 79 deletions
--- a/compiler/dcalc/from_scopelang.ml
+++ b/compiler/dcalc/from_scopelang.ml
@ -551,9 +551,9 @@ let rec translate_expr (ctx : 'm ctx) (e : 'm Scopelang.Ast.expr) :
  | EOp { op = Add_dat_dur _; tys } ->
    Expr.eop (Add_dat_dur ctx.date_rounding) tys m
  | EOp { op; tys } -> Expr.eop (Operator.translate op) tys m
-  | (EVar _ | EAbs _ | ELit _ | EExternal _ | EStruct _ | EStructAccess _ | ETuple _
-    | ETupleAccess _ | EInj _ | EEmptyError | EErrorOnEmpty _ | EArray _
-    | EIfThenElse _ ) as e ->
+  | ( EVar _ | EAbs _ | ELit _ | EExternal _ | EStruct _ | EStructAccess _
+    | ETuple _ | ETupleAccess _ | EInj _ | EEmptyError | EErrorOnEmpty _
+    | EArray _ | EIfThenElse _ ) as e ->
    Expr.map ~f:(translate_expr ctx) (e, m)

 (** The result of a rule translation is a list of assignment, with variables and
--- a/compiler/desugared/disambiguate.ml
+++ b/compiler/desugared/disambiguate.ml
@ -71,7 +71,8 @@ let program prg =
  let program_topdefs =
    TopdefName.Map.map
      (function
-        | (Some e, ty) -> Some (Expr.unbox (expr prg.program_ctx env (Expr.box e))), ty
+        | Some e, ty ->
+          Some (Expr.unbox (expr prg.program_ctx env (Expr.box e))), ty
        | None, ty -> None, ty)
      prg.program_topdefs
  in
--- a/compiler/desugared/from_surface.ml
+++ b/compiler/desugared/from_surface.ml
@ -1277,27 +1277,23 @@ let process_topdef
      Some (Expr.unbox e)
  in
  let program_topdefs =
-    TopdefName.Map.update id (fun def0 ->
+    TopdefName.Map.update id
+      (fun def0 ->
        match def0, expr_opt with
        | None, eopt -> Some (eopt, typ)
-        | Some (eopt0, ty0), eopt ->
+        | Some (eopt0, ty0), eopt -> (
          let err msg =
            Messages.raise_multispanned_error
-              [None, Mark.get ty0;
-               None, Mark.get typ]
-              (msg ^^ " for %a")
-              TopdefName.format_t id
+              [None, Mark.get ty0; None, Mark.get typ]
+              (msg ^^ " for %a") TopdefName.format_t id
          in
-          if not (Type.equal ty0 typ) then
-            err "Conflicting type definitions"
+          if not (Type.equal ty0 typ) then err "Conflicting type definitions"
          else
            match eopt0, eopt with
-            | None, None ->
-              err "Multiple declarations"
-            | Some _, Some _ ->
-              err "Multiple definitions"
+            | None, None -> err "Multiple declarations"
+            | Some _, Some _ -> err "Multiple definitions"
            | Some e, None -> Some (Some e, typ)
-            | None, Some e -> Some (Some e, ty0))
+            | None, Some e -> Some (Some e, ty0)))
      prgm.Ast.program_topdefs
  in
  { prgm with Ast.program_topdefs }
@ -1456,13 +1452,13 @@ let translate_program
            List.fold_left
              (fun map (path, def) ->
                match def with
-                | ( Surface.Ast.Topdef
-                    {topdef_name; topdef_type; _},
-                    _pos ) ->
-                  Qident.Map.add (path, Mark.remove topdef_name) (translate_type topdef_type) map
-                | (ScopeDecl _ | StructDecl _ | EnumDecl _), _ (* as e *) ->
+                | Surface.Ast.Topdef { topdef_name; topdef_type; _ }, _pos ->
+                  Qident.Map.add
+                    (path, Mark.remove topdef_name)
+                    (translate_type topdef_type)
                    map
-                  (* assert false (\* TODO *\) *)
+                | (ScopeDecl _ | StructDecl _ | EnumDecl _), _ (* as e *) ->
+                  map (* assert false (\* TODO *\) *)
                | ScopeUse _, _ -> assert false)
              Qident.Map.empty prgm.Surface.Ast.program_interfaces;
        };
--- a/compiler/driver.ml
+++ b/compiler/driver.ml
@ -129,7 +129,8 @@ let get_variable_uid
                     scope_uid)
               second_part )))

-let modname_of_file f = (* Fixme: make this more robust *)
+let modname_of_file f =
+  (* Fixme: make this more robust *)
  String.capitalize_ascii Filename.(basename (remove_extension f))

 (** Entry function for the executable. Returns a negative number in case of
@ -514,8 +515,7 @@ let driver source_file (options : Cli.options) : int =
                let modname =
                  match source_file with
                  (* FIXME: WIP placeholder *)
-                  | FileName n ->
-                    Some (modname_of_file n)
+                  | FileName n -> Some (modname_of_file n)
                  | _ -> None
                in
                Lcalc.To_ocaml.format_program fmt ?modname prgm type_ordering
--- a/compiler/lcalc/to_ocaml.ml
+++ b/compiler/lcalc/to_ocaml.ml
@ -557,7 +557,9 @@ let format_module_registration
  Format.pp_open_vbox fmt 2;
  Format.pp_print_string fmt "[ ";
  Format.pp_print_seq
-    ~pp_sep:(fun fmt () -> Format.pp_print_char fmt ';'; Format.pp_print_cut fmt ())
+    ~pp_sep:(fun fmt () ->
+      Format.pp_print_char fmt ';';
+      Format.pp_print_cut fmt ())
    (fun fmt (id, var) ->
      Format.fprintf fmt "@[<hov 2>%S,@ Obj.repr %a@]" id format_var var)
    fmt (String.Map.to_seq bnd);
--- a/compiler/scopelang/from_desugared.ml
+++ b/compiler/scopelang/from_desugared.ml
@ -812,15 +812,14 @@ let translate_program
  let program_topdefs =
    TopdefName.Map.mapi
      (fun id -> function
-         | (Some e, ty) -> Expr.unbox (translate_expr ctx e), ty
-         | (None, (_, pos)) ->
-           Messages.raise_spanned_error pos
-             "No definition found for %a"
+        | Some e, ty -> Expr.unbox (translate_expr ctx e), ty
+        | None, (_, pos) ->
+          Messages.raise_spanned_error pos "No definition found for %a"
            TopdefName.format_t id)
      pgrm.program_topdefs
  in
-  { Ast.
-    program_topdefs;
+  {
+    Ast.program_topdefs;
    program_scopes;
    program_ctx = { pgrm.program_ctx with ctx_scopes };
  }
--- a/compiler/surface/parser.messages
+++ b/compiler/surface/parser.messages
@ -238,9 +238,9 @@ source_file: BEGIN_CODE DECLARATION YEAR
 ## code_item -> DECLARATION . STRUCT UIDENT COLON list(addpos(struct_scope)) [ SCOPE END_CODE DECLARATION ]
 ## code_item -> DECLARATION . SCOPE UIDENT COLON nonempty_list(addpos(scope_decl_item)) [ SCOPE END_CODE DECLARATION ]
 ## code_item -> DECLARATION . ENUM UIDENT COLON list(addpos(enum_decl_line)) [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION . lident CONTENT typ_data DEPENDS separated_nonempty_list(COMMA,var_content) DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION . lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION . lident CONTENT typ_data DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION . lident CONTENT typ_data DEPENDS separated_nonempty_list(COMMA,var_content) option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION . lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION . lident CONTENT typ_data option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION
@ -944,7 +944,7 @@ expected the name of the scope being used

 source_file: BEGIN_CODE YEAR
 ##
-## Ends in an error in state: 394.
+## Ends in an error in state: 393.
 ##
 ## source_file_item -> BEGIN_CODE . code END_CODE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
 ##
@ -1005,8 +1005,8 @@ source_file: BEGIN_METADATA LAW_TEXT LAW_HEADING
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
 ## In state 1, spurious reduction of production nonempty_list(LAW_TEXT) -> LAW_TEXT
-## In state 383, spurious reduction of production law_text -> nonempty_list(LAW_TEXT)
-## In state 384, spurious reduction of production option(law_text) -> law_text
+## In state 382, spurious reduction of production law_text -> nonempty_list(LAW_TEXT)
+## In state 383, spurious reduction of production option(law_text) -> law_text
 ##

 expected some law text or code block
@ -4019,9 +4019,9 @@ source_file: BEGIN_CODE DECLARATION LIDENT YEAR
 ##
 ## Ends in an error in state: 364.
 ##
-## code_item -> DECLARATION lident . CONTENT typ_data DEPENDS separated_nonempty_list(COMMA,var_content) DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident . CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident . CONTENT typ_data DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident . CONTENT typ_data DEPENDS separated_nonempty_list(COMMA,var_content) option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident . CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident . CONTENT typ_data option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident
@ -4033,9 +4033,9 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT YEAR
 ##
 ## Ends in an error in state: 365.
 ##
-## code_item -> DECLARATION lident CONTENT . typ_data DEPENDS separated_nonempty_list(COMMA,var_content) DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident CONTENT . typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident CONTENT . typ_data DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT . typ_data DEPENDS separated_nonempty_list(COMMA,var_content) option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT . typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT . typ_data option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident CONTENT
@ -4047,9 +4047,9 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT BOOLEAN YEAR
 ##
 ## Ends in an error in state: 366.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data . DEPENDS separated_nonempty_list(COMMA,var_content) DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident CONTENT typ_data . DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident CONTENT typ_data . DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data . DEPENDS separated_nonempty_list(COMMA,var_content) option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data . DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data . option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident CONTENT typ_data
@ -4062,8 +4062,8 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS YEAR
 ##
 ## Ends in an error in state: 367.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS . separated_nonempty_list(COMMA,var_content) DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS . LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data DEPENDS . separated_nonempty_list(COMMA,var_content) option(opt_def) [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data DEPENDS . LPAREN separated_nonempty_list(COMMA,var_content) RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident CONTENT typ_data DEPENDS
@ -4075,7 +4075,7 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS LPAREN YEAR
 ##
 ## Ends in an error in state: 368.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN . separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN . separated_nonempty_list(COMMA,var_content) RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident CONTENT typ_data DEPENDS LPAREN
@ -4087,7 +4087,7 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS LPAREN LIDENT
 ##
 ## Ends in an error in state: 369.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) . RPAREN DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) . RPAREN option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content)
@ -4109,7 +4109,7 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS LPAREN LIDENT
 ##
 ## Ends in an error in state: 370.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN . DEFINED_AS expression [ SCOPE END_CODE DECLARATION ]
+## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN . option(opt_def) [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
 ## DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN
@ -4121,10 +4121,10 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS LPAREN LIDENT
 ##
 ## Ends in an error in state: 371.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS . expression [ SCOPE END_CODE DECLARATION ]
+## option(opt_def) -> DEFINED_AS . expression [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
-## DECLARATION lident CONTENT typ_data DEPENDS LPAREN separated_nonempty_list(COMMA,var_content) RPAREN DEFINED_AS
+## DEFINED_AS
 ##

 expected an expression
@ -4182,9 +4182,8 @@ expected the definition of another argument in the form '<var> content <type>'

 source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS LIDENT CONTENT UIDENT DEFINED_AS FALSE YEAR
 ##
-## Ends in an error in state: 375.
+## Ends in an error in state: 372.
 ##
-## code_item -> DECLARATION lident CONTENT typ_data DEPENDS separated_nonempty_list(COMMA,var_content) DEFINED_AS expression . [ SCOPE END_CODE DECLARATION ]
 ## expression -> expression . DOT qlident [ XOR WITH SCOPE PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER GREATER_EQUAL GREATER FOR EQUAL END_CODE DOT DIV DECLARATION CONTAINS AND ]
 ## expression -> expression . OF funcall_args [ XOR WITH SCOPE PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER GREATER_EQUAL GREATER FOR EQUAL END_CODE DOT DIV DECLARATION CONTAINS AND ]
 ## expression -> expression . WITH constructor_binding [ XOR WITH SCOPE PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER GREATER_EQUAL GREATER FOR EQUAL END_CODE DOT DIV DECLARATION CONTAINS AND ]
@ -4205,16 +4204,17 @@ source_file: BEGIN_CODE DECLARATION LIDENT CONTENT UIDENT DEPENDS LIDENT CONTENT
 ## expression -> expression . OR expression [ XOR WITH SCOPE PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER GREATER_EQUAL GREATER FOR EQUAL END_CODE DOT DIV DECLARATION CONTAINS AND ]
 ## expression -> expression . XOR expression [ XOR WITH SCOPE PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER GREATER_EQUAL GREATER FOR EQUAL END_CODE DOT DIV DECLARATION CONTAINS AND ]
 ## expression -> expression . FOR lident AMONG expression SUCH THAT expression [ XOR WITH SCOPE PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER GREATER_EQUAL GREATER FOR EQUAL END_CODE DOT DIV DECLARATION CONTAINS AND ]
+## option(opt_def) -> DEFINED_AS expression . [ SCOPE END_CODE DECLARATION ]
 ##
 ## The known suffix of the stack is as follows:
-## DECLARATION lident CONTENT typ_data DEPENDS separated_nonempty_list(COMMA,var_content) DEFINED_AS expression
+## DEFINED_AS expression
 ##

 expected a binary operator continuing the expression, or a keyword ending the expression and starting the next item

 source_file: BEGIN_DIRECTIVE YEAR
 ##
-## Ends in an error in state: 385.
+## Ends in an error in state: 384.
 ##
 ## source_file_item -> BEGIN_DIRECTIVE . LAW_INCLUDE COLON nonempty_list(DIRECTIVE_ARG) option(AT_PAGE) END_DIRECTIVE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
 ##
@ -4226,7 +4226,7 @@ expected a directive, e.g. 'Include: <filename>'

 source_file: BEGIN_DIRECTIVE LAW_INCLUDE YEAR
 ##
-## Ends in an error in state: 386.
+## Ends in an error in state: 385.
 ##
 ## source_file_item -> BEGIN_DIRECTIVE LAW_INCLUDE . COLON nonempty_list(DIRECTIVE_ARG) option(AT_PAGE) END_DIRECTIVE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
 ##
@ -4238,7 +4238,7 @@ expected ':', then a file name or 'JORFTEXTNNNNNNNNNNNN'

 source_file: BEGIN_DIRECTIVE LAW_INCLUDE COLON YEAR
 ##
-## Ends in an error in state: 387.
+## Ends in an error in state: 386.
 ##
 ## source_file_item -> BEGIN_DIRECTIVE LAW_INCLUDE COLON . nonempty_list(DIRECTIVE_ARG) option(AT_PAGE) END_DIRECTIVE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
 ##
@ -4250,7 +4250,7 @@ expected a file name or 'JORFTEXTNNNNNNNNNNNN'

 source_file: BEGIN_DIRECTIVE LAW_INCLUDE COLON DIRECTIVE_ARG YEAR
 ##
-## Ends in an error in state: 388.
+## Ends in an error in state: 387.
 ##
 ## nonempty_list(DIRECTIVE_ARG) -> DIRECTIVE_ARG . [ END_DIRECTIVE AT_PAGE ]
 ## nonempty_list(DIRECTIVE_ARG) -> DIRECTIVE_ARG . nonempty_list(DIRECTIVE_ARG) [ END_DIRECTIVE AT_PAGE ]
@ -4263,7 +4263,7 @@ expected a page specification in the form '@p.<number>', or a newline

 source_file: BEGIN_DIRECTIVE LAW_INCLUDE COLON DIRECTIVE_ARG AT_PAGE YEAR
 ##
-## Ends in an error in state: 392.
+## Ends in an error in state: 391.
 ##
 ## source_file_item -> BEGIN_DIRECTIVE LAW_INCLUDE COLON nonempty_list(DIRECTIVE_ARG) option(AT_PAGE) . END_DIRECTIVE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
 ##
@ -4275,7 +4275,7 @@ expected a newline

 source_file: LAW_HEADING YEAR
 ##
-## Ends in an error in state: 397.
+## Ends in an error in state: 396.
 ##
 ## source_file -> source_file_item . source_file [ # ]
 ##
--- a/compiler/surface/parser_driver.ml
+++ b/compiler/surface/parser_driver.ml
@ -349,12 +349,9 @@ let get_interface program =
      List.fold_left
        (fun acc -> function
          | Ast.ScopeUse _, _ -> acc
-          | ((Ast.ScopeDecl _ | StructDecl _ | EnumDecl _), _) as e ->
-            e :: acc
+          | ((Ast.ScopeDecl _ | StructDecl _ | EnumDecl _), _) as e -> e :: acc
          | Ast.Topdef def, m ->
-            ( Ast.Topdef { def with topdef_expr = None },
-              m )
-            :: acc)
+            (Ast.Topdef { def with topdef_expr = None }, m) :: acc)
        acc code
    | Ast.CodeBlock (_, _, false) ->
      (* Non-metadata blocks are ignored *)
@ -373,8 +370,10 @@ let add_interface source_file language path program =
    |> get_interface
    |> qualify_interface path
  in
-  { program with Ast.program_interfaces =
-                   List.append interface program.Ast.program_interfaces
+  {
+    program with
+    Ast.program_interfaces =
+      List.append interface program.Ast.program_interfaces;
  }

 let parse_top_level_file