New nohyps option for /demod/

[helm.git] / matita / components / grafite_parser / grafiteParser.ml

diff --git a/matita/components/grafite_parser/grafiteParser.ml b/matita/components/grafite_parser/grafiteParser.ml
index 376c5c9cc5ba985079fe1880386428b4852c959b..024d321b4b359ab54f0859c6e5254f6481960ee0 100644 (file)
--- a/matita/components/grafite_parser/grafiteParser.ml
+++ b/matita/components/grafite_parser/grafiteParser.ml
@@ -32,13 +32,13 @@ let exc_located_wrapper f =
   try
     f ()
   with
-  | Stdpp.Exc_located (_, End_of_file) -> raise End_of_file
-  | Stdpp.Exc_located (floc, Stream.Error msg) ->
+  | Ploc.Exc (_, End_of_file) -> raise End_of_file
+  | Ploc.Exc (floc, Stream.Error msg) ->
       raise (HExtlib.Localized (floc,CicNotationParser.Parse_error msg))
-  | Stdpp.Exc_located (floc, HExtlib.Localized(_,exn)) ->
+  | Ploc.Exc (floc, HExtlib.Localized(_,exn)) ->
       raise (HExtlib.Localized 
         (floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
-  | Stdpp.Exc_located (floc, exn) ->
+  | Ploc.Exc (floc, exn) ->
       raise (HExtlib.Localized 
         (floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
 
@@ -253,6 +253,7 @@ EXTEND
    | IDENT "paramod"
    | IDENT "width"
    | IDENT "size"
+   | IDENT "nohyps"
    ]
 ];
   auto_params: [
@@ -501,7 +502,7 @@ EXTEND
           loc,path,G.WithoutPreferences
      ]];
 
-  index: [[ b = OPT SYMBOL "-" -> match b with None -> false | _ -> true ]];
+  index: [[ b = OPT SYMBOL "-" -> match b with None -> true | _ -> false ]];
 
   grafite_ncommand: [ [
       IDENT "qed" ;  i = index -> G.NQed (loc,i)
@@ -513,7 +514,7 @@ EXTEND
         G.NObj (loc, 
           N.Theorem(nflavour, name, N.Implicit `JustOne, Some body,`Regular),
           true)
-    | i = index; IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
+    | IDENT "axiom"; i = index; name = IDENT; SYMBOL ":"; typ = term ->
         G.NObj (loc, N.Theorem (`Axiom, name, typ, None, `Regular),i)
     | IDENT "discriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty)
     | IDENT "inverter"; name = IDENT; IDENT "for" ; indty = tactic_term ;