Change PTYPE to IDENTPAR in parser/lexer

parser/parser.ml

@@ -94,7 +94,7 @@ let is_fun_decl =
      (fun strm ->
        match Stream.npeek 3 strm with
 	 | [ KEYWORD "fun", _; IDENT _, _; KEYWORD "(", _ ]
-       | [ PTYPE _, _; _ ; _ ]
+       | [ IDENTPAR _, _; _ ; _ ]
 	 | [ IDENT _, _; KEYWORD "(", _; _ ] -> ()
 	 | _ -> raise Stream.Failure
      )
@@ -141,7 +141,7 @@ EXTEND Gram
 	  [ mk _loc (LetDecl (p,e)) ]
     | (_,p,e1) = let_binding; "in"; e2 = expr LEVEL "top"->
         [ mk _loc (EvalStatement (exp _loc (let_in e1 p e2))) ]
-    | "type"; x = PTYPE; pargs = LIST1 [ x = PVAR -> ident x ] SEP ","; ")"; "="; t = pat ->
+    | "type"; x = IDENTPAR; pargs = LIST1 [ x = PVAR -> ident x ] SEP ","; ")"; "="; t = pat ->
           [ mk _loc (TypeDecl ((lop _loc,ident x),pargs,t)) ]
     | "type"; x = located_ident; "="; t = pat ->
         [ mk _loc (TypeDecl (x,[],t)) ]
@@ -492,7 +492,7 @@ EXTEND Gram
 
  fun_decl: [
    [ f = OPT located_ident; "("; (a,b) = fun_decl_after_lparen -> (f,a,b)
-   | f = PTYPE; (a,b) = fun_decl_after_lparen -> (Some (lop _loc,ident f),a,b)
+   | f = IDENTPAR; (a,b) = fun_decl_after_lparen -> (Some (lop _loc,ident f),a,b)
    ]
  ];
 
@@ -606,7 +606,7 @@ EXTEND Gram
 	  mk _loc (Constant (ident a,c))
       | "!"; a = IDENT ->
 	  mk _loc (Internal (Types.abstract (Types.Abstracts.atom a)))
-      | id = PTYPE; pargs = LIST1 pat SEP ","; ")" ->
+      | id = IDENTPAR; pargs = LIST1 pat SEP ","; ")" ->
             mk _loc (PatVar ([ident id],pargs))
       | ids = LIST1 ident_or_keyword SEP "." ->
           mk _loc (PatVar (List.map ident ids,[]))

parser/ulexer.ml

@@ -52,7 +52,7 @@ type token =
   | STRING of string
   | STRING2 of string
   | PVAR of string
-  | PTYPE of string
+  | IDENTPAR of string
   | EOI
 
 module Token = struct
@@ -73,7 +73,7 @@ module Token = struct
     | STRING2 s -> sf "STRING \'%s\'" s
                       (* here it's not %S since the string is already escaped *)
     | PVAR s -> sf "PVAR \'%S\'" s
-    | PTYPE s -> sf "PTYPE \'%S\'" s
+    | IDENTPAR s -> sf "IDENTPAR \'%S\'" s
     | ANY_IN_NS s -> sf "ANY_IN_NS %S" s
     | EOI -> sf "EOI"
 
@@ -86,7 +86,7 @@ module Token = struct
 
   let extract_string =
     function
-      | PTYPE s | KEYWORD s | IDENT s | INT s | CHAR s | STRING s | STRING2 s | PVAR s |
+      | IDENTPAR s | KEYWORD s | IDENT s | INT s | CHAR s | STRING s | STRING2 s | PVAR s |
 	  ANY_IN_NS s -> s
       | tok ->
         invalid_arg ("Cannot extract a string from this token: "^
@@ -206,7 +206,7 @@ let rec token = lexer
  | xml_blank+ -> token lexbuf
  | qname "(" ->
      let s = L.utf8_sub_lexeme lexbuf 0 (L.lexeme_length lexbuf - 1) in
-     return lexbuf (PTYPE s)
+     return lexbuf (IDENTPAR s)
  | qname ->
      let s = L.utf8_lexeme lexbuf in
      return lexbuf (IDENT s)
@@ -263,7 +263,7 @@ and token2 = lexer
  | xml_blank+ -> token2 lexbuf
  | qname "(" ->
      let s = L.utf8_sub_lexeme lexbuf 0 (L.lexeme_length lexbuf - 1) in
-     return lexbuf (PTYPE s)
+     return lexbuf (IDENTPAR s)
  | qname ->
      let s = L.utf8_lexeme lexbuf in
      return lexbuf (IDENT s)
@@ -331,7 +331,7 @@ and token2toplevel = lexer
  | xml_blank+ -> token2toplevel lexbuf
  | qname "(" ->
      let s = L.utf8_sub_lexeme lexbuf 0 (L.lexeme_length lexbuf - 1) in
-     return lexbuf (PTYPE s)
+     return lexbuf (IDENTPAR s)
  | qname ->
      let s = L.utf8_lexeme lexbuf in
      return lexbuf (IDENT s)

parser/ulexer.mli

@@ -9,7 +9,7 @@ type token =
   | STRING of string
   | STRING2 of string
   | PVAR of string
-  | PTYPE of string
+  | IDENTPAR of string
   | EOI
 
 exception Error of int * int * string