X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationParser.ml;h=85b89451118d4cdf8cf923a4f9b2fbe7b242e916;hb=08ecc780b3b0a4cac7ed72cf68c310e4eeffa2c1;hp=767aa3d1579d80ae74ff5ddda550f00251fe75c8;hpb=dbcc29c0e46454c7e31b485135900ceab38627e1;p=helm.git diff --git a/helm/ocaml/cic_notation/cicNotationParser.ml b/helm/ocaml/cic_notation/cicNotationParser.ml index 767aa3d15..85b894511 100644 --- a/helm/ocaml/cic_notation/cicNotationParser.ml +++ b/helm/ocaml/cic_notation/cicNotationParser.ml @@ -31,27 +31,23 @@ open CicNotationPt exception Parse_error of Token.flocation * string exception Level_not_found of int -let grammar = Grammar.gcreate CicNotationLexer.notation_lexer +let level1_pattern_grammar = + Grammar.gcreate CicNotationLexer.level1_pattern_lexer +let level2_ast_grammar = Grammar.gcreate CicNotationLexer.level2_ast_lexer +let level2_meta_grammar = Grammar.gcreate CicNotationLexer.level2_meta_lexer let min_precedence = 0 let max_precedence = 100 -let default_precedence = 50 -let level1_pattern = Grammar.Entry.create grammar "level1_pattern" -let level2_pattern = Grammar.Entry.create grammar "level2_pattern" -let level3_term = Grammar.Entry.create grammar "level3_term" -let l2_pattern = Grammar.Entry.create grammar "l2_pattern" -let notation = Grammar.Entry.create grammar "notation" (* level1 <-> level 2 *) -let interpretation = - Grammar.Entry.create grammar "interpretation" (* level2 <-> level 3 *) -let phrase = Grammar.Entry.create grammar "phrase" +let level1_pattern = + Grammar.Entry.create level1_pattern_grammar "level1_pattern" +let level2_ast = Grammar.Entry.create level2_ast_grammar "level2_ast" +let term = Grammar.Entry.create level2_ast_grammar "term" +let let_defs = Grammar.Entry.create level2_ast_grammar "let_defs" +let level2_meta = Grammar.Entry.create level2_meta_grammar "level2_meta" let return_term loc term = () -let fail floc msg = - let (x, y) = loc_of_floc floc in - failwith (sprintf "Error at characters %d - %d: %s" x y msg) - let int_of_string s = try Pervasives.int_of_string s @@ -60,16 +56,17 @@ let int_of_string s = (** {2 Grammar extension} *) -let symbol s = Gramext.Stoken ("SYMBOL", s) -let ident s = Gramext.Stoken ("IDENT", s) -let number s = Gramext.Stoken ("NUMBER", s) -let term = Gramext.Sself +let gram_symbol s = Gramext.Stoken ("SYMBOL", s) +let gram_ident s = Gramext.Stoken ("IDENT", s) +let gram_number s = Gramext.Stoken ("NUMBER", s) +let gram_keyword s = Gramext.Stoken ("", s) +let gram_term = Gramext.Sself -let g_symbol_of_literal = +let gram_of_literal = function - | `Symbol s -> symbol s - | `Keyword s -> ident s - | `Number s -> number s + | `Symbol s -> gram_symbol s + | `Keyword s -> gram_keyword s + | `Number s -> gram_number s type binding = | NoBinding @@ -79,40 +76,30 @@ type binding = let make_action action bindings = let rec aux (vl : CicNotationEnv.t) = function - [] -> - prerr_endline "aux: make_action"; - Gramext.action (fun (loc: location) -> action vl loc) - | NoBinding :: tl -> - prerr_endline "aux: none"; - Gramext.action (fun _ -> aux vl tl) - (* LUCA: DEFCON 2 BEGIN *) + [] -> Gramext.action (fun (loc: location) -> action vl loc) + | NoBinding :: tl -> Gramext.action (fun _ -> aux vl tl) + (* LUCA: DEFCON 5 BEGIN *) | Binding (name, TermType) :: tl -> - prerr_endline "aux: term"; Gramext.action - (fun (v:term) -> aux ((name, (TermType, (TermValue v)))::vl) tl) + (fun (v:term) -> aux ((name, (TermType, TermValue v))::vl) tl) | Binding (name, StringType) :: tl -> - prerr_endline "aux: string"; Gramext.action (fun (v:string) -> - aux ((name, (StringType, (StringValue v))) :: vl) tl) + aux ((name, (StringType, StringValue v)) :: vl) tl) | Binding (name, NumType) :: tl -> - prerr_endline "aux: num"; Gramext.action - (fun (v:string) -> aux ((name, (NumType, (NumValue v))) :: vl) tl) + (fun (v:string) -> aux ((name, (NumType, NumValue v)) :: vl) tl) | Binding (name, OptType t) :: tl -> - prerr_endline "aux: opt"; Gramext.action (fun (v:'a option) -> - aux ((name, (OptType t, (OptValue v))) :: vl) tl) + aux ((name, (OptType t, OptValue v)) :: vl) tl) | Binding (name, ListType t) :: tl -> - prerr_endline "aux: list"; Gramext.action (fun (v:'a list) -> - aux ((name, (ListType t, (ListValue v))) :: vl) tl) + aux ((name, (ListType t, ListValue v)) :: vl) tl) | Env _ :: tl -> - prerr_endline "aux: env"; Gramext.action (fun (v:CicNotationEnv.t) -> aux (v @ vl) tl) - (* LUCA: DEFCON 2 END *) + (* LUCA: DEFCON 5 END *) in aux [] (List.rev bindings) @@ -139,23 +126,26 @@ let extract_term_production pattern = assert false and aux_literal = function - | `Symbol s -> [NoBinding, symbol s] - | `Keyword s -> [NoBinding, ident s] - | `Number s -> [NoBinding, number s] + | `Symbol s -> [NoBinding, gram_symbol s] + | `Keyword s -> + (* assumption: s will be registered as a keyword with the lexer *) + [NoBinding, gram_keyword s] + | `Number s -> [NoBinding, gram_number s] and aux_layout = function - | Sub (p1, p2) -> aux p1 @ [NoBinding, symbol "\\SUB"] @ aux p2 - | Sup (p1, p2) -> aux p1 @ [NoBinding, symbol "\\SUP"] @ aux p2 - | Below (p1, p2) -> aux p1 @ [NoBinding, symbol "\\BELOW"] @ aux p2 - | Above (p1, p2) -> aux p1 @ [NoBinding, symbol "\\ABOVE"] @ aux p2 - | Frac (p1, p2) -> aux p1 @ [NoBinding, symbol "\\FRAC"] @ aux p2 - | Atop (p1, p2) -> aux p1 @ [NoBinding, symbol "\\ATOP"] @ aux p2 - | Over (p1, p2) -> aux p1 @ [NoBinding, symbol "\\OVER"] @ aux p2 + | Sub (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\sub"] @ aux p2 + | Sup (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\sup"] @ aux p2 + | Below (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\below"] @ aux p2 + | Above (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\above"] @ aux p2 + | Frac (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\frac"] @ aux p2 + | Atop (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\atop"] @ aux p2 + | Over (p1, p2) -> aux p1 @ [NoBinding, gram_symbol "\\over"] @ aux p2 | Root (p1, p2) -> - [NoBinding, symbol "\\ROOT"] @ aux p2 @ [NoBinding, symbol "\\OF"] - @ aux p1 - | Sqrt p -> [NoBinding, symbol "\\SQRT"] @ aux p + [NoBinding, gram_symbol "\\root"] @ aux p2 + @ [NoBinding, gram_symbol "\\of"] @ aux p1 + | Sqrt p -> [NoBinding, gram_symbol "\\sqrt"] @ aux p | Break -> [] | Box (_, pl) -> List.flatten (List.map aux pl) + | Group pl -> List.flatten (List.map aux pl) and aux_magic magic = match magic with | Opt p -> @@ -172,9 +162,8 @@ let extract_term_production pattern = | List0 (p, _) | List1 (p, _) -> let p_bindings, p_atoms, p_names, p_action = inner_pattern p in - let env0 = List.map list_binding_of_name p_names in +(* let env0 = List.map list_binding_of_name p_names in let grow_env_entry env n v = - prerr_endline "grow_env_entry"; List.map (function | (n', (ty, ListValue vl)) as entry -> @@ -183,39 +172,36 @@ let extract_term_production pattern = env in let grow_env env_i env = - prerr_endline "grow_env"; List.fold_left (fun env (n, (_, v)) -> grow_env_entry env n v) env env_i - in + in *) let action (env_list : CicNotationEnv.t list) (loc : location) = - prerr_endline "list action"; - List.fold_right grow_env env_list env0 + CicNotationEnv.coalesce_env p_names env_list in - let g_symbol s = + let gram_of_list s = match magic with | List0 (_, None) -> Gramext.Slist0 s | List1 (_, None) -> Gramext.Slist1 s - | List0 (_, Some l) -> Gramext.Slist0sep (s, g_symbol_of_literal l) - | List1 (_, Some l) -> Gramext.Slist1sep (s, g_symbol_of_literal l) + | List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l) + | List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l) | _ -> assert false in [ Env (List.map list_declaration p_names), Gramext.srules - [ [ g_symbol (Gramext.srules [ p_atoms, p_action ]) ], + [ [ gram_of_list (Gramext.srules [ p_atoms, p_action ]) ], Gramext.action action ] ] | _ -> assert false and aux_variable = function - | NumVar s -> [Binding (s, NumType), number ""] - | TermVar s -> [Binding (s, TermType), term] - | IdentVar s -> [Binding (s, StringType), ident ""] + | NumVar s -> [Binding (s, NumType), gram_number ""] + | TermVar s -> [Binding (s, TermType), gram_term] + | IdentVar s -> [Binding (s, StringType), gram_ident ""] | Ascription (p, s) -> assert false (* TODO *) | FreshVar _ -> assert false and inner_pattern p = let p_bindings, p_atoms = List.split (aux p) in let p_names = flatten_opt p_bindings in - let _ = prerr_endline ("inner names: " ^ String.concat " " (List.map fst p_names)) in let action = make_action (fun (env : CicNotationEnv.t) (loc : location) -> env) p_bindings @@ -224,149 +210,210 @@ let extract_term_production pattern = in aux pattern -let level_of_int precedence = +let level_of precedence associativity = if precedence < min_precedence || precedence > max_precedence then raise (Level_not_found precedence); - string_of_int precedence + let assoc_string = + match associativity with + | Gramext.NonA -> "N" + | Gramext.LeftA -> "L" + | Gramext.RightA -> "R" + in + string_of_int precedence ^ assoc_string type rule_id = Token.t Gramext.g_symbol list -let extend level1_pattern ?(precedence = default_precedence) - ?associativity action -= + (* mapping: rule_id -> owned keywords. (rule_id, string list) Hashtbl.t *) +let owned_keywords = Hashtbl.create 23 + +let extend level1_pattern ~precedence ~associativity action = let p_bindings, p_atoms = List.split (extract_term_production level1_pattern) in - let level = level_of_int precedence in + let level = level_of precedence associativity in let p_names = flatten_opt p_bindings in let _ = - prerr_endline (string_of_int (List.length p_bindings)); Grammar.extend - [ Grammar.Entry.obj (l2_pattern: 'a Grammar.Entry.e), + [ Grammar.Entry.obj (term: 'a Grammar.Entry.e), Some (Gramext.Level level), [ None, - associativity, + Some associativity, [ p_atoms, (make_action (fun (env: CicNotationEnv.t) (loc: location) -> (action env loc)) p_bindings) ]]] in - p_atoms - -let delete atoms = Grammar.delete_rule l2_pattern atoms + let keywords = CicNotationUtil.keywords_of_term level1_pattern in + let rule_id = p_atoms in + List.iter CicNotationLexer.add_level2_ast_keyword keywords; + Hashtbl.add owned_keywords rule_id keywords; (* keywords may be [] *) + rule_id + +let delete rule_id = + let atoms = rule_id in + (try + let keywords = Hashtbl.find owned_keywords rule_id in + List.iter CicNotationLexer.remove_level2_ast_keyword keywords + with Not_found -> assert false); + Grammar.delete_rule term atoms (** {2 Grammar} *) -let boxify = function - | [ a ] -> a - | l -> Layout (Box (H, l)) +let parse_level1_pattern_ref = ref (fun _ -> assert false) +let parse_level2_ast_ref = ref (fun _ -> assert false) +let parse_level2_meta_ref = ref (fun _ -> assert false) + +let fold_cluster binder terms ty body = + List.fold_right + (fun term body -> Binder (binder, (term, ty), body)) + terms body (* terms are names: either Ident or FreshVar *) let fold_binder binder pt_names body = - let fold_cluster binder terms ty body = - List.fold_right - (fun term body -> Binder (binder, (term, ty), body)) - terms body (* terms are names: either Ident or FreshVar *) - in List.fold_right (fun (names, ty) body -> fold_cluster binder names ty body) pt_names body let return_term loc term = AttributedTerm (`Loc loc, term) -let _ = (* create empty precedence level for "l2_pattern" *) +let _ = (* create empty precedence level for "term" *) let mk_level_list first last = let rec aux acc = function | i when i < first -> acc - | i -> aux ((Some (string_of_int i), None, []) :: acc) (i - 1) + | i -> + aux + ((Some (string_of_int i ^ "N"), Some Gramext.NonA, []) + :: (Some (string_of_int i ^ "L"), Some Gramext.LeftA, []) + :: (Some (string_of_int i ^ "R"), Some Gramext.RightA, []) + :: acc) + (i - 1) in aux [] last in Grammar.extend - [ Grammar.Entry.obj (l2_pattern: 'a Grammar.Entry.e), + [ Grammar.Entry.obj (term: 'a Grammar.Entry.e), None, mk_level_list min_precedence max_precedence ] -EXTEND - GLOBAL: level1_pattern level2_pattern level3_term - l2_pattern - notation interpretation - phrase; (* {{{ Grammar for concrete syntax patterns, notation level 1 *) - level1_pattern: [ [ p = l1_simple_pattern -> p ] ]; +EXTEND + GLOBAL: level1_pattern; + + level1_pattern: [ [ p = l1_pattern; EOI -> CicNotationUtil.boxify p ] ]; l1_pattern: [ [ p = LIST1 l1_simple_pattern -> p ] ]; literal: [ [ s = SYMBOL -> `Symbol s - | k = KEYWORD -> `Keyword k + | k = QKEYWORD -> `Keyword k | n = NUMBER -> `Number n ] ]; - sep: [ [ SYMBOL "\\SEP"; sep = literal -> sep ] ]; -(* row_sep: [ [ SYMBOL "\\ROWSEP"; sep = literal -> sep ] ]; - field_sep: [ [ SYMBOL "\\FIELDSEP"; sep = literal -> sep ] ]; *) + sep: [ [ "sep"; sep = literal -> sep ] ]; +(* row_sep: [ [ "rowsep"; sep = literal -> sep ] ]; + field_sep: [ [ "fieldsep"; sep = literal -> sep ] ]; *) l1_magic_pattern: [ - [ SYMBOL "\\LIST0"; p = l1_simple_pattern; sep = OPT sep -> List0 (p, sep) - | SYMBOL "\\LIST1"; p = l1_simple_pattern; sep = OPT sep -> List1 (p, sep) - | SYMBOL "\\OPT"; p = l1_simple_pattern -> Opt p + [ "list0"; p = l1_simple_pattern; sep = OPT sep -> List0 (p, sep) + | "list1"; p = l1_simple_pattern; sep = OPT sep -> List1 (p, sep) + | "opt"; p = l1_simple_pattern -> Opt p ] ]; l1_pattern_variable: [ - [ SYMBOL "\\TERM"; id = IDENT -> TermVar id - | SYMBOL "\\NUM"; id = IDENT -> NumVar id - | SYMBOL "\\IDENT"; id = IDENT -> IdentVar id + [ "term"; id = IDENT -> TermVar id + | "number"; id = IDENT -> NumVar id + | "ident"; id = IDENT -> IdentVar id ] ]; l1_simple_pattern: [ "layout" LEFTA - [ p1 = SELF; SYMBOL "\\SUB"; p2 = SELF -> + [ p1 = SELF; SYMBOL "\\sub"; p2 = SELF -> return_term loc (Layout (Sub (p1, p2))) - | p1 = SELF; SYMBOL "\\SUP"; p2 = SELF -> + | p1 = SELF; SYMBOL "\\sup"; p2 = SELF -> return_term loc (Layout (Sup (p1, p2))) - | p1 = SELF; SYMBOL "\\BELOW"; p2 = SELF -> + | p1 = SELF; SYMBOL "\\below"; p2 = SELF -> return_term loc (Layout (Below (p1, p2))) - | p1 = SELF; SYMBOL "\\ABOVE"; p2 = SELF -> + | p1 = SELF; SYMBOL "\\above"; p2 = SELF -> return_term loc (Layout (Above (p1, p2))) - | p1 = SELF; SYMBOL "\\OVER"; p2 = SELF -> + | p1 = SELF; SYMBOL "\\over"; p2 = SELF -> return_term loc (Layout (Over (p1, p2))) - | p1 = SELF; SYMBOL "\\ATOP"; p2 = SELF -> + | p1 = SELF; SYMBOL "\\atop"; p2 = SELF -> return_term loc (Layout (Atop (p1, p2))) -(* | SYMBOL "\\ARRAY"; p = SELF; csep = OPT field_sep; rsep = OPT row_sep -> +(* | "array"; p = SELF; csep = OPT field_sep; rsep = OPT row_sep -> return_term loc (Array (p, csep, rsep)) *) - | SYMBOL "\\FRAC"; p1 = SELF; p2 = SELF -> + | SYMBOL "\\frac"; p1 = SELF; p2 = SELF -> return_term loc (Layout (Frac (p1, p2))) - | SYMBOL "\\SQRT"; p = SELF -> return_term loc (Layout (Sqrt p)) - | SYMBOL "\\ROOT"; index = SELF; SYMBOL "\\OF"; arg = SELF -> - return_term loc (Layout (Root (arg, index))); - | SYMBOL "\\HBOX"; DELIM "\\["; p = l1_pattern; DELIM "\\]" -> - return_term loc (Layout (Box (H, p))) - | SYMBOL "\\VBOX"; DELIM "\\["; p = l1_pattern; DELIM "\\]" -> - return_term loc (Layout (Box (V, p))) - | SYMBOL "\\BREAK" -> return_term loc (Layout Break) - | DELIM "\\["; p = l1_pattern; DELIM "\\]" -> - return_term loc (boxify p) - | p = SELF; SYMBOL "\\AS"; id = IDENT -> - return_term loc (Variable (Ascription (p, id))) + | SYMBOL "\\sqrt"; p = SELF -> return_term loc (Layout (Sqrt p)) + | SYMBOL "\\root"; index = SELF; SYMBOL "\\OF"; arg = SELF -> + return_term loc (Layout (Root (arg, index))) + | "hbox"; LPAREN; p = l1_pattern; RPAREN -> + return_term loc (Layout (Box ((H, false, false), p))) + | "vbox"; LPAREN; p = l1_pattern; RPAREN -> + return_term loc (Layout (Box ((V, false, false), p))) + | "hvbox"; LPAREN; p = l1_pattern; RPAREN -> + return_term loc (Layout (Box ((HV, false, false), p))) + | "hovbox"; LPAREN; p = l1_pattern; RPAREN -> + return_term loc (Layout (Box ((HOV, false, false), p))) + | "break" -> return_term loc (Layout Break) +(* | SYMBOL "\\SPACE" -> return_term loc (Layout Space) *) + | LPAREN; p = l1_pattern; RPAREN -> + return_term loc (CicNotationUtil.group p) ] | "simple" NONA - [ i = IDENT -> return_term loc (Ident (i, None)) + [ i = IDENT -> return_term loc (Variable (TermVar i)) | m = l1_magic_pattern -> return_term loc (Magic m) | v = l1_pattern_variable -> return_term loc (Variable v) | l = literal -> return_term loc (Literal l) ] ]; + END +(* }}} *) + +(* {{{ Grammar for ast magics, notation level 2 *) +EXTEND + GLOBAL: level2_meta; + l2_variable: [ + [ "term"; id = IDENT -> TermVar id + | "number"; id = IDENT -> NumVar id + | "ident"; id = IDENT -> IdentVar id + | "fresh"; id = IDENT -> FreshVar id + | "anonymous" -> TermVar "_" + | id = IDENT -> TermVar id + ] + ]; + l2_magic: [ + [ "fold"; kind = [ "left" -> `Left | "right" -> `Right ]; + base = level2_meta; "rec"; id = IDENT; recursive = level2_meta -> + Fold (kind, base, [id], recursive) + | "default"; some = level2_meta; none = level2_meta -> Default (some, none) + | "if"; p_test = level2_meta; + "then"; p_true = level2_meta; + "else"; p_false = level2_meta -> + If (p_test, p_true, p_false) + | "fail" -> Fail + ] + ]; + level2_meta: [ + [ magic = l2_magic -> Magic magic + | var = l2_variable -> Variable var + | blob = UNPARSED_AST -> !parse_level2_ast_ref (Stream.of_string blob) + ] + ]; +END (* }}} *) + (* {{{ Grammar for ast patterns, notation level 2 *) - level2_pattern: [ [ p = l2_pattern -> p ] ]; +EXTEND + GLOBAL: level2_ast term let_defs; + level2_ast: [ [ p = term -> p ] ]; sort: [ - [ SYMBOL "\\PROP" -> `Prop - | SYMBOL "\\SET" -> `Set - | SYMBOL "\\TYPE" -> `Type + [ "Prop" -> `Prop + | "Set" -> `Set + | "Type" -> `Type + | "CProp" -> `CProp ] ]; explicit_subst: [ [ SYMBOL "\\subst"; (* to avoid catching frequent "a [1]" cases *) SYMBOL "["; substs = LIST1 [ - i = IDENT; SYMBOL <:unicode> (* ≔ *); t = l2_pattern -> (i, t) + i = IDENT; SYMBOL <:unicode> (* ≔ *); t = term -> (i, t) ] SEP SYMBOL ";"; SYMBOL "]" -> substs @@ -374,20 +421,20 @@ EXTEND ]; meta_subst: [ [ s = SYMBOL "_" -> None - | p = l2_pattern -> Some p ] + | p = term -> Some p ] ]; meta_substs: [ [ SYMBOL "["; substs = LIST0 meta_subst; SYMBOL "]" -> substs ] ]; possibly_typed_name: [ - [ SYMBOL "("; id = bound_name; SYMBOL ":"; typ = l2_pattern; SYMBOL ")" -> + [ LPAREN; id = single_arg; SYMBOL ":"; typ = term; RPAREN -> id, Some typ - | id = bound_name -> id, None + | arg = single_arg -> arg, None ] ]; match_pattern: [ [ id = IDENT -> id, [] - | SYMBOL "("; id = IDENT; vars = LIST1 possibly_typed_name; SYMBOL ")" -> + | LPAREN; id = IDENT; vars = LIST1 possibly_typed_name; RPAREN -> id, vars ] ]; @@ -398,36 +445,41 @@ EXTEND | SYMBOL <:unicode> (* λ *) -> `Lambda ] ]; - bound_name: [ - [ i = IDENT -> Ident (i, None) - | SYMBOL "\\FRESH"; i = IDENT -> Variable (FreshVar i) - ] + arg: [ + [ LPAREN; names = LIST1 IDENT SEP SYMBOL ","; + SYMBOL ":"; ty = term; RPAREN -> + List.map (fun n -> Ident (n, None)) names, Some ty + | name = IDENT -> [Ident (name, None)], None + | blob = UNPARSED_META -> + let meta = !parse_level2_meta_ref (Stream.of_string blob) in + match meta with + | Variable (FreshVar _) -> [meta], None + | Variable (TermVar "_") -> [Ident ("_", None)], None + | _ -> failwith "Invalid bound name." + ] ]; - bound_names: [ - [ vars = LIST1 bound_name SEP SYMBOL ","; - ty = OPT [ SYMBOL ":"; p = l2_pattern -> p ] -> - [ vars, ty ] - | clusters = LIST1 [ - SYMBOL "("; - vars = LIST1 bound_name SEP SYMBOL ","; - ty = OPT [ SYMBOL ":"; p = l2_pattern -> p ]; - SYMBOL ")" -> - vars, ty - ] -> - clusters + single_arg: [ + [ name = IDENT -> Ident (name, None) + | blob = UNPARSED_META -> + let meta = !parse_level2_meta_ref (Stream.of_string blob) in + match meta with + | Variable (FreshVar _) -> meta + | Variable (TermVar "_") -> Ident ("_", None) + | _ -> failwith "Invalid index name." ] ]; induction_kind: [ - [ IDENT "rec" -> `Inductive - | IDENT "corec" -> `CoInductive + [ "rec" -> `Inductive + | "corec" -> `CoInductive ] ]; let_defs: [ [ defs = LIST1 [ - name = bound_name; args = bound_names; - index_name = OPT [ IDENT "on"; id = bound_name -> id ]; - ty = OPT [ SYMBOL ":" ; p = l2_pattern -> p ]; - SYMBOL <:unicode> (* ≝ *); body = l2_pattern -> + name = single_arg; + args = LIST1 arg; + index_name = OPT [ "on"; id = single_arg -> id ]; + ty = OPT [ SYMBOL ":" ; p = term -> p ]; + SYMBOL <:unicode> (* ≝ *); body = term -> let body = fold_binder `Lambda args body in let ty = match ty with @@ -451,52 +503,44 @@ EXTEND let index = match index_name with | None -> 0 - | Some name -> find_arg name 0 args + | Some index_name -> find_arg index_name 0 args in (name, ty), body, index - ] SEP IDENT "and" -> + ] SEP "and" -> defs ] ]; - l2_pattern_variable: [ - [ SYMBOL "\\TERM"; id = IDENT -> TermVar id - | SYMBOL "\\NUM"; id = IDENT -> NumVar id - | SYMBOL "\\IDENT"; id = IDENT -> IdentVar id - | SYMBOL "\\FRESH"; id = IDENT -> FreshVar id + binder_vars: [ + [ vars = [ + l = LIST1 single_arg SEP SYMBOL "," -> l + | SYMBOL "_" -> [Ident ("_", None)] ]; + typ = OPT [ SYMBOL ":"; t = term -> t ] -> (vars, typ) + | LPAREN; + vars = [ + l = LIST1 single_arg SEP SYMBOL "," -> l + | SYMBOL "_" -> [Ident ("_", None)] ]; + typ = OPT [ SYMBOL ":"; t = term -> t ]; + RPAREN -> (vars, typ) ] ]; - l2_magic_pattern: [ - [ SYMBOL "\\FOLD"; - kind = [ IDENT "left" -> `Left | IDENT "right" -> `Right ]; - DELIM "\\["; base = l2_pattern; DELIM "\\]"; - SYMBOL "\\LAMBDA"; id = IDENT; - DELIM "\\["; recursive = l2_pattern; DELIM "\\]" -> - Fold (kind, base, [id], recursive) - | SYMBOL "\\DEFAULT"; - DELIM "\\["; some = l2_pattern; DELIM "\\]"; - DELIM "\\["; none = l2_pattern; DELIM "\\]" -> - Default (some, none) + term: LEVEL "10N" [ (* let in *) + [ "let"; var = possibly_typed_name; SYMBOL <:unicode> (* ≝ *); + p1 = term; "in"; p2 = term -> + return_term loc (LetIn (var, p1, p2)) + | "let"; k = induction_kind; defs = let_defs; "in"; + body = term -> + return_term loc (LetRec (k, defs, body)) ] ]; - l2_pattern: LEVEL "10" (* let in *) - [ "10" NONA - [ IDENT "let"; var = possibly_typed_name; SYMBOL <:unicode> (* ≝ *); - p1 = l2_pattern; "in"; p2 = l2_pattern -> - return_term loc (LetIn (var, p1, p2)) - | IDENT "let"; k = induction_kind; defs = let_defs; IDENT "in"; - body = l2_pattern -> - return_term loc (LetRec (k, defs, body)) - ] - ]; - l2_pattern: LEVEL "20" (* binder *) - [ "20" RIGHTA - [ b = binder; names = bound_names; SYMBOL "."; body = l2_pattern -> - return_term loc (fold_binder b names body) + term: LEVEL "20R" (* binder *) + [ + [ b = binder; (vars, typ) = binder_vars; SYMBOL "."; body = term -> + return_term loc (fold_cluster b vars typ body) ] ]; - l2_pattern: LEVEL "70" (* apply *) - [ "70" LEFTA - [ p1 = l2_pattern; p2 = l2_pattern -> + term: LEVEL "70L" (* apply *) + [ + [ p1 = term; p2 = term -> let rec aux = function | Appl (hd :: tl) | AttributedTerm (_, Appl (hd :: tl)) -> @@ -506,90 +550,37 @@ EXTEND return_term loc (Appl (aux p1 @ [p2])) ] ]; - l2_pattern: LEVEL "90" (* simple *) - [ "90" NONA + term: LEVEL "90N" (* simple *) + [ [ id = IDENT -> return_term loc (Ident (id, None)) | id = IDENT; s = explicit_subst -> return_term loc (Ident (id, Some s)) | s = CSYMBOL -> return_term loc (Symbol (s, 0)) | u = URI -> return_term loc (Uri (u, None)) - | n = NUMBER -> prerr_endline "number"; return_term loc (Num (n, 0)) + | n = NUMBER -> return_term loc (Num (n, 0)) | IMPLICIT -> return_term loc (Implicit) + | PLACEHOLDER -> return_term loc UserInput | m = META -> return_term loc (Meta (int_of_string m, [])) | m = META; s = meta_substs -> return_term loc (Meta (int_of_string m, s)) | s = sort -> return_term loc (Sort s) - | outtyp = OPT [ SYMBOL "["; ty = l2_pattern; SYMBOL "]" -> ty ]; - IDENT "match"; t = l2_pattern; - indty_ident = OPT [ SYMBOL ":"; id = IDENT -> id ]; - IDENT "with"; SYMBOL "["; + | outtyp = OPT [ SYMBOL "["; ty = term; SYMBOL "]" -> ty ]; + "match"; t = term; + indty_ident = OPT [ "in"; id = IDENT -> id ]; + "with"; SYMBOL "["; patterns = LIST0 [ lhs = match_pattern; SYMBOL <:unicode> (* ⇒ *); - rhs = l2_pattern -> + rhs = term -> lhs, rhs ] SEP SYMBOL "|"; SYMBOL "]" -> return_term loc (Case (t, indty_ident, outtyp, patterns)) - | SYMBOL "("; p1 = l2_pattern; SYMBOL ":"; p2 = l2_pattern; SYMBOL ")" -> - return_term loc (Appl [ Symbol ("cast", 0); p1; p2 ]) - | SYMBOL "("; p = l2_pattern; SYMBOL ")" -> p - | v = l2_pattern_variable -> return_term loc (Variable v) - | m = l2_magic_pattern -> return_term loc (Magic m) + | LPAREN; p1 = term; SYMBOL ":"; p2 = term; RPAREN -> + return_term loc (Cast (p1, p2)) + | LPAREN; p = term; RPAREN -> p + | blob = UNPARSED_META -> !parse_level2_meta_ref (Stream.of_string blob) ] ]; -(* }}} *) -(* {{{ Grammar for interpretation, notation level 3 *) - argument: [ - [ id = IDENT -> IdentArg id - | SYMBOL <:unicode> (* η *); SYMBOL "."; a = SELF -> EtaArg (None, a) - | SYMBOL <:unicode> (* η *); id = IDENT; SYMBOL "."; a = SELF -> - EtaArg (Some id, a) - ] - ]; - level3_term: [ - [ u = URI -> UriPattern u - | a = argument -> ArgPattern a - | SYMBOL "("; terms = LIST1 SELF; SYMBOL ")" -> - (match terms with - | [] -> assert false - | [term] -> term - | terms -> ApplPattern terms) - ] - ]; -(* }}} *) -(* {{{ Notation glues *) - associativity: [ - [ IDENT "left"; IDENT "associative" -> Gramext.LeftA - | IDENT "right"; IDENT "associative" -> Gramext.RightA - | IDENT "non"; IDENT "associative" -> Gramext.NonA - ] - ]; - precedence: [ - [ IDENT "with"; IDENT "precedence"; n = NUMBER -> int_of_string n ] - ]; - notation: [ - [ p1 = level1_pattern; - assoc = OPT associativity; prec = OPT precedence; - IDENT "for"; p2 = level2_pattern -> - (p1, assoc, prec, p2) - ] - ]; - interpretation: [ - [ s = CSYMBOL; args = LIST1 argument; SYMBOL "="; t = level3_term -> - (s, args, t) - ] - ]; -(* }}} *) -(* {{{ Top-level phrases *) - phrase: [ - [ IDENT "print"; p2 = level2_pattern; SYMBOL "." -> Print p2 - | IDENT "notation"; (l1, assoc, prec, l2) = notation; SYMBOL "." -> - Notation (l1, assoc, prec, l2) - | IDENT "interpretation"; (symbol, args, l3) = interpretation; SYMBOL "." -> - Interpretation ((symbol, args), l3) - | IDENT "render"; u = URI; SYMBOL "." -> Render (UriManager.uri_of_string u) - ] - ]; -(* }}} *) END +(* }}} *) (** {2 API implementation} *) @@ -602,19 +593,22 @@ let exc_located_wrapper f = | Stdpp.Exc_located (floc, exn) -> raise (Parse_error (floc, (Printexc.to_string exn))) -let parse_syntax_pattern stream = +let parse_level1_pattern stream = exc_located_wrapper (fun () -> Grammar.Entry.parse level1_pattern stream) -let parse_ast_pattern stream = - exc_located_wrapper (fun () -> Grammar.Entry.parse level2_pattern stream) -let parse_interpretation stream = - exc_located_wrapper (fun () -> Grammar.Entry.parse level3_term stream) -let parse_phrase stream = - exc_located_wrapper (fun () -> Grammar.Entry.parse phrase stream) +let parse_level2_ast stream = + exc_located_wrapper (fun () -> Grammar.Entry.parse level2_ast stream) +let parse_level2_meta stream = + exc_located_wrapper (fun () -> Grammar.Entry.parse level2_meta stream) + +let _ = + parse_level1_pattern_ref := parse_level1_pattern; + parse_level2_ast_ref := parse_level2_ast; + parse_level2_meta_ref := parse_level2_meta (** {2 Debugging} *) let print_l2_pattern () = - Grammar.print_entry Format.std_formatter (Grammar.Entry.obj l2_pattern); + Grammar.print_entry Format.std_formatter (Grammar.Entry.obj term); Format.pp_print_flush Format.std_formatter (); flush stdout