Skip to content
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.

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

Adapt to Coq PR #19301: unify the syntax of definition and theorem #869

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions serlib/ser_constrexpr.mli
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ type entry_relative_level = Constrexpr.entry_relative_level [@@deriving sexp, yo
type notation_entry_relative_level = Constrexpr.notation_entry_relative_level [@@deriving sexp, yojson, hash,compare]

type universe_decl_expr = Constrexpr.universe_decl_expr [@@deriving sexp, yojson, hash,compare]
type ident_decl = Constrexpr.ident_decl [@@deriving sexp, yojson, hash,compare]
type cumul_ident_decl = Constrexpr.cumul_ident_decl [@@deriving sexp, yojson, hash,compare]
type decl_ident = Constrexpr.decl_ident [@@deriving sexp, yojson, hash,compare]
type decl_ident_cumul = Constrexpr.decl_ident_cumul [@@deriving sexp, yojson, hash,compare]
type univ_constraint_expr = Constrexpr.univ_constraint_expr [@@deriving sexp, yojson, hash,compare]
type name_decl = Constrexpr.name_decl [@@deriving sexp, yojson, hash,compare]

Expand Down
12 changes: 4 additions & 8 deletions serlib/ser_vernacexpr.ml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ type option_setting =
* [%import: Vernacexpr.sort_expr]
* [@@deriving sexp,yojson,hash,compare] *)

type body_expr =
[%import: Vernacexpr.body_expr]
[@@deriving sexp,yojson,hash,compare]

type definition_expr =
[%import: Vernacexpr.definition_expr]
[@@deriving sexp,yojson,hash,compare]
Expand Down Expand Up @@ -160,10 +164,6 @@ type recursion_order_expr =
[%import: Vernacexpr.recursion_order_expr]
[@@deriving sexp,yojson,hash,compare]

type recursive_expr_gen =
[%import: Vernacexpr.recursive_expr_gen]
[@@deriving sexp,yojson,hash,compare]

type fixpoint_expr =
[%import: Vernacexpr.fixpoint_expr]
[@@deriving sexp,yojson,hash,compare]
Expand Down Expand Up @@ -245,10 +245,6 @@ type one_inductive_expr =
[%import: Vernacexpr.one_inductive_expr]
[@@deriving sexp,yojson,hash,compare]

type proof_expr =
[%import: Vernacexpr.proof_expr]
[@@deriving sexp,yojson,hash,compare]

type opacity_flag =
[%import: Vernacexpr.opacity_flag]
[@@deriving sexp,yojson,hash,compare]
Expand Down
16 changes: 6 additions & 10 deletions serlib/ser_vernacexpr.mli
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,22 @@ type locality_flag =
[%import: Vernacexpr.locality_flag]
[@@deriving sexp,yojson,hash,compare]

type body_expr =
[%import: Vernacexpr.body_expr]
[@@deriving sexp,yojson,hash,compare]

type definition_expr =
[%import: Vernacexpr.definition_expr]
[@@deriving sexp,yojson,hash,compare]

type notation_declaration =
[%import: Vernacexpr.notation_declaration]
type decl_notation =
[%import: Vernacexpr.decl_notation]
[@@deriving sexp,yojson,hash,compare]

type recursion_order_expr =
[%import: Vernacexpr.recursion_order_expr]
[@@deriving sexp,yojson,hash,compare]

type recursive_expr_gen =
[%import: Vernacexpr.recursive_expr_gen]
[@@deriving sexp,yojson,hash,compare]

type fixpoint_expr =
[%import: Vernacexpr.fixpoint_expr]
[@@deriving sexp,yojson,hash,compare]
Expand Down Expand Up @@ -184,10 +184,6 @@ type one_inductive_expr =
[%import: Vernacexpr.one_inductive_expr]
[@@deriving sexp,yojson,hash,compare]

type proof_expr =
[%import: Vernacexpr.proof_expr]
[@@deriving sexp,yojson,hash,compare]

type proof_end =
[%import: Vernacexpr.proof_end]
[@@deriving sexp,yojson,hash,compare]
Expand Down
Loading