X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualParser2.ml;h=25c15c575f9c763e33962106b2912456ed3554d1;hb=7793efe5c9ac8ff4c71579e6fc0aa4764dd2bc9e;hp=fc46cc725e8626ee62f5b0bf0bd949ee4386cc7a;hpb=80fc89019bcb7fb7e0e1fb8bb111b708be49d19f;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
index fc46cc725..25c15c575 100644
--- a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
@@ -181,7 +181,7 @@ EXTEND
     [ defs = LIST1 [
         name = IDENT;
         args = LIST1 [arg = arg -> arg];
-        index_name = OPT [ IDENT "on"; idx = IDENT -> idx ];
+        index_name = OPT [ "on"; idx = IDENT -> idx ];
         ty = OPT [ SYMBOL ":" ; t = term -> t ];
         SYMBOL <:unicode<def>> (* ≝ *);
         t1 = term ->
@@ -318,43 +318,54 @@ EXTEND
   ident_list0: [
     [ PAREN "["; idents = LIST0 IDENT SEP SYMBOL ";"; PAREN "]" -> idents ]
   ];
+  tactic_term_list1: [
+    [ tactic_terms = LIST1 tactic_term SEP SYMBOL "," -> tactic_terms ]
+  ];
   reduction_kind: [
     [ [ IDENT "reduce" ] -> `Reduce
     | [ IDENT "simplify" ] -> `Simpl
     | [ IDENT "whd" ] -> `Whd 
     | [ IDENT "normalize" ] -> `Normalize ]
   ];
+  sequent_pattern_spec : [
+   [ hyp_paths =
+      LIST0
+       [ id = IDENT ;
+         path = OPT [SYMBOL ":" ; path = term -> path ] ->
+         (id,match path with Some p -> p | None -> CicAst.UserInput) ]
+       SEP SYMBOL ";";
+     goal_path = OPT [ SYMBOL <:unicode<vdash>>; term = term -> term ] ->
+      let goal_path =
+       match goal_path with
+          None -> CicAst.UserInput
+        | Some goal_path -> goal_path
+      in
+       hyp_paths,goal_path
+   ]
+  ];
   pattern_spec: [
-    [ wanted = OPT term;
-      hyp_paths_and_goal_path =
-       OPT [
-        "in";
-        hyp_paths =
-         LIST0
-          [ id = IDENT ;
-            path = OPT [SYMBOL ":" ; path = term -> path ] ->
-            (id,match path with Some p -> p | None -> CicAst.UserInput) ]
-          SEP SYMBOL ";";
-        goal_path = OPT [ SYMBOL <:unicode<vdash>>; term = term -> term ] ->
-         let goal_path =
-          match goal_path with
-             None -> CicAst.UserInput
-           | Some goal_path -> goal_path
-         in
-          hyp_paths,goal_path
-       ] ->
-         let hyp_paths,goal_path =
-          match hyp_paths_and_goal_path with
-             None -> [], CicAst.UserInput
-           | Some (hyp_paths,goal_path) -> hyp_paths,goal_path
+    [ res = OPT [
+       "in";
+       wanted_and_sps =
+        [ "match" ; wanted = term ;
+          sps = OPT [ "in"; sps = sequent_pattern_spec -> sps ] ->
+           Some wanted,sps
+        | sps = sequent_pattern_spec ->
+           None,Some sps
+        ] ->
+         let wanted,hyp_paths,goal_path =
+          match wanted_and_sps with
+             wanted,None -> wanted, [], CicAst.UserInput
+           | wanted,Some (hyp_paths,goal_path) -> wanted,hyp_paths,goal_path
          in
-          wanted, hyp_paths, goal_path ]
+          wanted, hyp_paths, goal_path ] ->
+      match res with
+         None -> None,[],CicAst.UserInput
+       | Some ps -> ps]
   ];
   direction: [
-    [ IDENT "left" -> `Left
-    | SYMBOL ">" -> `Left
-    | IDENT "right" -> `Right
-    | SYMBOL "<" -> `Right ]
+    [ SYMBOL ">" -> `LeftToRight
+    | SYMBOL "<" -> `RightToLeft ]
   ];
   tactic: [
     [ IDENT "absurd"; t = tactic_term ->
@@ -365,7 +376,7 @@ EXTEND
         TacticAst.Assumption loc
     | IDENT "auto";
       depth = OPT [ IDENT "depth"; SYMBOL "="; i = NUM -> int_of_string i ];
-      width = OPT [ IDENT "depth"; SYMBOL "="; i = NUM -> int_of_string i ] -> 
+      width = OPT [ IDENT "width"; SYMBOL "="; i = NUM -> int_of_string i ] -> 
           TacticAst.Auto (loc,depth,width)
     | IDENT "clear"; id = IDENT ->
         TacticAst.Clear (loc,id)
@@ -383,7 +394,7 @@ EXTEND
         TacticAst.Cut (loc, ident, t)
     | IDENT "decide"; IDENT "equality" ->
         TacticAst.DecideEquality loc
-    | IDENT "decompose"; where = term ->
+    | IDENT "decompose"; where = tactic_term ->
         TacticAst.Decompose (loc, where)
     | IDENT "discriminate"; t = tactic_term ->
         TacticAst.Discriminate (loc, t)
@@ -397,29 +408,39 @@ EXTEND
     | IDENT "exists" ->
         TacticAst.Exists loc
     | IDENT "fail" -> TacticAst.Fail loc
-    | IDENT "fold"; kind = reduction_kind; p = pattern_spec ->
-        TacticAst.Fold (loc, kind, p)
+    | IDENT "fold"; kind = reduction_kind; t = tactic_term; p = pattern_spec ->
+       let (pt,_,_) = p in
+        if pt <> None then
+         raise
+          (Parse_error
+            (loc,"the pattern cannot specify the term to replace, only its paths in the hypotheses and in the conclusion"))
+        else
+         TacticAst.Fold (loc, kind, t, p)
     | IDENT "fourier" ->
         TacticAst.Fourier loc
-    | IDENT "fwd"; t = term ->
-        TacticAst.FwdSimpl (loc, t)
+    | IDENT "fwd"; hyp = IDENT; idents = OPT ident_list0 ->
+        let idents = match idents with None -> [] | Some idents -> idents in
+        TacticAst.FwdSimpl (loc, hyp, idents)
     | IDENT "generalize"; p=pattern_spec; id = OPT ["as" ; id = IDENT -> id] ->
        TacticAst.Generalize (loc,p,id)
     | IDENT "goal"; n = NUM ->
         TacticAst.Goal (loc, int_of_string n)
     | IDENT "id" -> TacticAst.IdTac loc
-    | IDENT "injection"; t = term ->
+    | IDENT "injection"; t = tactic_term ->
         TacticAst.Injection (loc, t)
-    | IDENT "intros"; num = OPT [num = int -> num]; idents = OPT ident_list0 ->
-        let idents = match idents with None -> [] | Some idents -> idents in
-        TacticAst.Intros (loc, num, idents)
     | IDENT "intro"; ident = OPT IDENT ->
         let idents = match ident with None -> [] | Some id -> [id] in
         TacticAst.Intros (loc, Some 1, idents)
-    | IDENT "lapply"; what = tactic_term; 
-      to_what = OPT [ "to" ; t = tactic_term -> t ];
-      ident = OPT [ "using" ; id = IDENT -> id ] ->
-        TacticAst.LApply (loc, to_what, what, ident)
+    | IDENT "intros"; num = OPT [num = int -> num]; idents = OPT ident_list0 ->
+        let idents = match idents with None -> [] | Some idents -> idents in
+        TacticAst.Intros (loc, num, idents)
+    | IDENT "lapply"; 
+      depth = OPT [ IDENT "depth"; SYMBOL "="; i = NUM -> int_of_string i ];
+      what = tactic_term; 
+      to_what = OPT [ "to" ; t = tactic_term_list1 -> t ];
+      ident = OPT [ "using" ; ident = IDENT -> ident ] ->
+        let to_what = match to_what with None -> [] | Some to_what -> to_what in
+        TacticAst.LApply (loc, depth, to_what, what, ident)
     | IDENT "left" -> TacticAst.Left loc
     | IDENT "letin"; where = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term ->
         TacticAst.LetIn (loc, t, where)
@@ -429,7 +450,7 @@ EXTEND
         TacticAst.Reflexivity loc
     | IDENT "replace"; p = pattern_spec; "with"; t = tactic_term ->
         TacticAst.Replace (loc, p, t)
-    | IDENT "rewrite" ; d = direction; t = term ; p = pattern_spec ->
+    | IDENT "rewrite" ; d = direction; t = tactic_term ; p = pattern_spec ->
        let (pt,_,_) = p in
         if pt <> None then
          raise
@@ -456,7 +477,7 @@ EXTEND
       ]
     | "then" NONA
       [ tac = tactical;
-        PAREN "["; tacs = LIST0 tactical SEP SYMBOL ";"; PAREN "]" ->
+        PAREN "["; tacs = LIST0 tactical SEP SYMBOL "|"; PAREN "]" ->
           (TacticAst.Then (loc, tac, tacs))
       ]
     | "loops" RIGHTA