diff options
Diffstat (limited to 'intf')
| -rw-r--r-- | intf/constrexpr.ml (renamed from intf/constrexpr.mli) | 10 | ||||
| -rw-r--r-- | intf/decl_kinds.ml (renamed from intf/decl_kinds.mli) | 0 | ||||
| -rw-r--r-- | intf/evar_kinds.ml (renamed from intf/evar_kinds.mli) | 0 | ||||
| -rw-r--r-- | intf/extend.ml (renamed from intf/extend.mli) | 0 | ||||
| -rw-r--r-- | intf/genredexpr.ml (renamed from intf/genredexpr.mli) | 0 | ||||
| -rw-r--r-- | intf/glob_term.ml (renamed from intf/glob_term.mli) | 16 | ||||
| -rw-r--r-- | intf/intf.mllib | 12 | ||||
| -rw-r--r-- | intf/locus.ml (renamed from intf/locus.mli) | 0 | ||||
| -rw-r--r-- | intf/misctypes.ml (renamed from intf/misctypes.mli) | 0 | ||||
| -rw-r--r-- | intf/notation_term.ml (renamed from intf/notation_term.mli) | 0 | ||||
| -rw-r--r-- | intf/pattern.ml (renamed from intf/pattern.mli) | 0 | ||||
| -rw-r--r-- | intf/tactypes.ml (renamed from intf/tactypes.mli) | 0 | ||||
| -rw-r--r-- | intf/vernacexpr.ml (renamed from intf/vernacexpr.mli) | 4 |
13 files changed, 37 insertions, 5 deletions
diff --git a/intf/constrexpr.mli b/intf/constrexpr.ml index 614c097b5..593b190a6 100644 --- a/intf/constrexpr.mli +++ b/intf/constrexpr.ml @@ -31,8 +31,16 @@ type abstraction_kind = AbsLambda | AbsPi type proj_flag = int option (** [Some n] = proj of the n-th visible argument *) +(** Representation of integer literals that appear in Coq scripts. + We now use raw strings of digits in base 10 (big-endian), and a separate + sign flag. Note that this representation is not unique, due to possible + multiple leading zeros, and -0 = +0 *) + +type sign = bool +type raw_natural_number = string + type prim_token = - | Numeral of Bigint.bigint (** representation of integer literals that appear in Coq scripts. *) + | Numeral of raw_natural_number * sign | String of string type instance_expr = Misctypes.glob_level list diff --git a/intf/decl_kinds.mli b/intf/decl_kinds.ml index 8254b1b80..8254b1b80 100644 --- a/intf/decl_kinds.mli +++ b/intf/decl_kinds.ml diff --git a/intf/evar_kinds.mli b/intf/evar_kinds.ml index ac0d96e96..ac0d96e96 100644 --- a/intf/evar_kinds.mli +++ b/intf/evar_kinds.ml diff --git a/intf/extend.mli b/intf/extend.ml index 99401d06f..99401d06f 100644 --- a/intf/extend.mli +++ b/intf/extend.ml diff --git a/intf/genredexpr.mli b/intf/genredexpr.ml index 2a542e0ff..2a542e0ff 100644 --- a/intf/genredexpr.mli +++ b/intf/genredexpr.ml diff --git a/intf/glob_term.mli b/intf/glob_term.ml index 5da20c9d1..a35dae4aa 100644 --- a/intf/glob_term.mli +++ b/intf/glob_term.ml @@ -95,3 +95,19 @@ type closure = { and closed_glob_constr = { closure: closure; term: glob_constr } + +(** Ltac variable maps *) +type var_map = Pattern.constr_under_binders Id.Map.t +type uconstr_var_map = closed_glob_constr Id.Map.t +type unbound_ltac_var_map = Geninterp.Val.t Id.Map.t + +type ltac_var_map = { + ltac_constrs : var_map; + (** Ltac variables bound to constrs *) + ltac_uconstrs : uconstr_var_map; + (** Ltac variables bound to untyped constrs *) + ltac_idents: Id.t Id.Map.t; + (** Ltac variables bound to identifiers *) + ltac_genargs : unbound_ltac_var_map; + (** Ltac variables bound to other kinds of arguments *) +} diff --git a/intf/intf.mllib b/intf/intf.mllib new file mode 100644 index 000000000..523e4b265 --- /dev/null +++ b/intf/intf.mllib @@ -0,0 +1,12 @@ +Constrexpr +Evar_kinds +Genredexpr +Locus +Notation_term +Tactypes +Decl_kinds +Extend +Glob_term +Misctypes +Pattern +Vernacexpr diff --git a/intf/locus.mli b/intf/locus.ml index 57b398ab4..57b398ab4 100644 --- a/intf/locus.mli +++ b/intf/locus.ml diff --git a/intf/misctypes.mli b/intf/misctypes.ml index 2ab70a78e..2ab70a78e 100644 --- a/intf/misctypes.mli +++ b/intf/misctypes.ml diff --git a/intf/notation_term.mli b/intf/notation_term.ml index 753fa657a..753fa657a 100644 --- a/intf/notation_term.mli +++ b/intf/notation_term.ml diff --git a/intf/pattern.mli b/intf/pattern.ml index 48381cacd..48381cacd 100644 --- a/intf/pattern.mli +++ b/intf/pattern.ml diff --git a/intf/tactypes.mli b/intf/tactypes.ml index 5c1d31946..5c1d31946 100644 --- a/intf/tactypes.mli +++ b/intf/tactypes.ml diff --git a/intf/vernacexpr.mli b/intf/vernacexpr.ml index ab440c6b7..cabd06735 100644 --- a/intf/vernacexpr.mli +++ b/intf/vernacexpr.ml @@ -96,17 +96,13 @@ type locatable = type showable = | ShowGoal of goal_reference - | ShowGoalImplicitly of int option | ShowProof - | ShowNode | ShowScript | ShowExistentials | ShowUniverses - | ShowTree | ShowProofNames | ShowIntros of bool | ShowMatch of reference - | ShowThesis type comment = | CommentConstr of constr_expr |