better simplify

[helm.git] / helm / software / components / grafite / grafiteAst.ml

diff --git a/helm/software/components/grafite/grafiteAst.ml b/helm/software/components/grafite/grafiteAst.ml
index 10d7b6bccad33d454a73385686ea9c085e1944fe..e8811830380cef794daf7f38c68348ae8a959dd8 100644 (file)
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -32,10 +32,6 @@ type loc = Token.flocation
 type ('term, 'lazy_term, 'ident) pattern =
   'lazy_term option * ('ident * 'term) list * 'term option
 
-type ('term, 'ident) type_spec =
-   | Ident of 'ident
-   | Type of UriManager.uri * int 
-
 type 'lazy_term reduction =
   [ `Normalize
   | `Reduce
@@ -56,10 +52,11 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Constructor of loc * int
   | Contradiction of loc
   | Cut of loc * 'ident option * 'term
-  | Decompose of loc * ('term, 'ident) type_spec list * 'ident option * 'ident list
+  | Decompose of loc * 'ident list
   | Demodulate of loc
   | Destruct of loc * 'term
-  | Elim of loc * 'term * 'term option * int option * 'ident list
+  | Elim of loc * 'term * 'term option * ('term, 'lazy_term, 'ident) pattern *
+           int option * 'ident list
   | ElimType of loc * 'term * 'term option * int option * 'ident list
   | Exact of loc * 'term
   | Exists of loc
@@ -97,7 +94,7 @@ type ('term, 'lazy_term, 'reduction, 'ident) tactic =
   | Byinduction of loc * 'term * 'ident
   | Thesisbecomes of loc * 'term
   | Case of loc * string * (string * 'term) list 
-  | ExistsElim of loc * 'term * 'ident * 'term * 'ident * 'term
+  | ExistsElim of loc * 'term option * 'ident * 'term * 'ident * 'lazy_term
   | AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
   | RewritingStep of
      loc * (string option * 'term) option * 'term  *