1) GrafiteAst.NEval => GrafiteAst.NReduce

[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 039d5bfa4e446cb306baaa82e17ddff71c84ae46..a2d1ef655cc09922eb497490d6b7f4f7639c8fcc 100644 (file)
--- a/helm/software/components/grafite/grafiteAst.ml
+++ b/helm/software/components/grafite/grafiteAst.ml
@@ -56,11 +56,11 @@ type ntactic =
    | NCase1 of loc * string
    | NChange of loc * npattern * CicNotationPt.term
    | NElim of loc * CicNotationPt.term * npattern  
-   | NEval of loc * npattern * [ `Whd of bool ]
    | NGeneralize of loc * npattern
    | NId of loc
    | NIntro of loc * string
    | NLetIn of loc * npattern * CicNotationPt.term * string
+   | NReduce of loc * [ `Normalize of bool | `Whd of bool ] * npattern
    | NRewrite of loc * direction * CicNotationPt.term * npattern
 
 type ('term, 'lazy_term, 'reduction, 'ident) tactic =
@@ -216,6 +216,8 @@ type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
       * punctuation_tactical
   | NonPunctuationTactical of loc * non_punctuation_tactical
       * punctuation_tactical
+  | NNonPunctuationTactical of loc * non_punctuation_tactical
+      * punctuation_tactical
              
 type ('term, 'lazy_term, 'reduction, 'obj, 'ident) comment =
   | Note of loc * string