X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Focaml%2Fcic_notation%2FgrafiteAst.ml;h=c2e44a5df1649aa3461c252eb7844b0b12c273af;hb=3eff4cc36820df9faddb3cb16390717851db499c;hp=7d09e2d6a5933c53c59035d6be3764a219205987;hpb=cd602bc57c4ceba6188b4cac0dbf5dad8f5df7b6;p=helm.git diff --git a/helm/ocaml/cic_notation/grafiteAst.ml b/helm/ocaml/cic_notation/grafiteAst.ml index 7d09e2d6a..c2e44a5df 100644 --- a/helm/ocaml/cic_notation/grafiteAst.ml +++ b/helm/ocaml/cic_notation/grafiteAst.ml @@ -30,11 +30,15 @@ type loc = CicNotationPt.location type ('term, 'ident) pattern = 'term option * ('ident * 'term) list * 'term +type ('term, 'ident) type_spec = + | Ident of 'ident + | Type of UriManager.uri * int + type ('term, 'ident) tactic = | Absurd of loc * 'term | Apply of loc * 'term | Assumption of loc - | Auto of loc * int option * int option (* depth, width *) + | Auto of loc * int option * int option * string option (* depth, width, paramodulation ALB *) | Change of loc * ('term,'ident) pattern * 'term | Clear of loc * 'ident | ClearBody of loc * 'ident @@ -43,7 +47,7 @@ type ('term, 'ident) tactic = | Contradiction of loc | Cut of loc * 'ident option * 'term | DecideEquality of loc - | Decompose of loc * 'term + | Decompose of loc * ('term, 'ident) type_spec list * 'ident * 'ident list | Discriminate of loc * 'term | Elim of loc * 'term * 'term option * int option * 'ident list | ElimType of loc * 'term * 'term option * int option * 'ident list @@ -133,9 +137,9 @@ type ('term,'obj) command = | Alias of loc * alias_spec (** parameters, name, type, fields *) | Obj of loc * 'obj - | Notation of loc * CicNotationPt.term * Gramext.g_assoc option * int option * - CicNotationPt.term - (* level 1 pattern, associativity, precedence, level 2 pattern *) + | Notation of loc * direction option * CicNotationPt.term * Gramext.g_assoc * + int * CicNotationPt.term + (* direction, l1 pattern, associativity, precedence, l2 pattern *) | Interpretation of loc * string * (string * CicNotationPt.argument_pattern list) * CicNotationPt.cic_appl_pattern