- added entries for capture variables parsing

- factorized function for parsing Cic.names

diff --git a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
index 507d897fbdea8104181ae767e427e3ed9d3b6957..08bbf43ebcc01ea4e06c2e67cd5b6e654018d48c 100644 (file)
--- a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
@@ -52,6 +52,10 @@ let return_term loc term = CicTextualParser2Ast.LocatedTerm (loc, term)
 let fail (x, y) msg =
   failwith (Printf.sprintf "Error at characters %d - %d: %s" x y msg)
 
+let name_of_string = function
+  | "_" -> Cic.Anonymous
+  | s -> Cic.Name s
+
 EXTEND
   GLOBAL: term term0;
   meta_subst: [
@@ -65,6 +69,12 @@ EXTEND
     | SYMBOL <:unicode<forall>> (* ∀ *) -> `Forall
     ]
   ];
+  typed_name: [
+    [ PAREN "("; i = IDENT; SYMBOL ":"; typ = term; PAREN ")" ->
+        (name_of_string i, Some typ)
+    | i = IDENT -> (name_of_string i, None)
+    ]
+  ];
   substituted_name: [ (* a subs.name is an explicit substitution subject *)
     [ s = [ IDENT | SYMBOL ];
       subst = OPT [
@@ -85,15 +95,17 @@ EXTEND
     [ s = [ IDENT | SYMBOL ] -> s ]
   ];
   pattern: [
-    [ n = name -> [n]
-    | PAREN "("; names = LIST1 name; PAREN ")" -> names ]
+    [ n = name -> (n, [])
+    | PAREN "("; head = name; vars = LIST1 typed_name; PAREN ")" ->
+        (head, vars)
+    ]
   ];
   term0: [ [ t = term -> return_term loc t ] ];
   term:
     [ "arrow" RIGHTA
       [ t1 = term; SYMBOL <:unicode<to>>; t2 = term ->
           return_term loc
-            (CicTextualParser2Ast.Binder (`Pi, Cic.Anonymous, Some t1, t2))
+            (CicTextualParser2Ast.Binder (`Pi, (Cic.Anonymous, Some t1), t2))
       ]
     | "binder" RIGHTA
       [
@@ -103,12 +115,8 @@ EXTEND
           let binder =
             List.fold_right
               (fun var body ->
-                let name =
-                  match var with
-                  | "_" -> Cic.Anonymous
-                  | var -> Cic.Name var
-                in
-                CicTextualParser2Ast.Binder (b, name, typ, body))
+                let name = name_of_string var in
+                CicTextualParser2Ast.Binder (b, (name, typ), body))
               vars body
           in
           return_term loc binder
@@ -144,23 +152,22 @@ EXTEND
             return_term loc (CicTextualParser2Ast.Meta (index, substs))
         (* actually "in" and "and" are _not_ keywords. Parsing works anyway
          * since applications are required to be bound by parens *)
-      | "let"; name = IDENT;
+      | "let"; var = typed_name;
 (*         SYMBOL <:unicode<def>> (* ≝ *); *)
         SYMBOL "=";
         t1 = term;
         IDENT "in"; t2 = term ->
-          return_term loc (CicTextualParser2Ast.LetIn (name, t1, t2))
+          return_term loc (CicTextualParser2Ast.LetIn (var, t1, t2))
       | "let"; ind_kind = [ "corec" -> `CoInductive | "rec"-> `Inductive ];
           defs = LIST1 [
-            name = IDENT;
+            var = typed_name;
             index = OPT [ PAREN "("; index = NUM; PAREN ")" ->
               int_of_string index
             ];
-            typ = OPT [ SYMBOL ":"; typ = term -> typ ];
 (*             SYMBOL <:unicode<def>> (* ≝ *); *)
             SYMBOL "=";
             t1 = term ->
-              (name, t1, typ, (match index with None -> 1 | Some i -> i))
+              (var, t1, (match index with None -> 0 | Some i -> i))
           ] SEP (IDENT "and");
           IDENT "in"; body = term ->
             return_term loc (CicTextualParser2Ast.LetRec (ind_kind, defs, body))
@@ -170,8 +177,8 @@ EXTEND
         "with";
         PAREN "[";
         patterns = LIST0 [
-          p = pattern; SYMBOL <:unicode<Rightarrow>> (* ⇒ *); t = term ->
-            (p, t)
+          lhs = pattern; SYMBOL <:unicode<Rightarrow>> (* ⇒ *); rhs = term ->
+            ((lhs: CicTextualParser2Ast.case_pattern), rhs)
         ] SEP SYMBOL "|";
         PAREN "]" ->
           return_term loc