X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FcicTextualParser2.ml;h=d7096ae79deeeb40e4fbd7e9e9949b76956a29c6;hb=f44a2623c7790b8ad052e967c008869ab017d7e9;hp=2474191fe4f0c9f866b40e8949f40e504e0fd91f;hpb=ae25bae855f66b7ebc9926a80dc38e622f0cff38;p=helm.git
diff --git a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
index 2474191fe..d7096ae79 100644
--- a/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualParser2.ml
@@ -23,7 +23,7 @@
* http://helm.cs.unibo.it/
*)
-let debug = true
+let debug = false
let debug_print s =
if debug then begin
prerr_endline "";
@@ -31,20 +31,33 @@ let debug_print s =
prerr_endline ""
end
+ (** if set to true each number will have a different insance number and can
+ * thus be interpreted differently than others *)
+let use_fresh_num_instances = false
+
+ (** does the lexer return COMMENT tokens? *)
+let return_comments = false
+
open Printf
-exception Parse_error of string
+open DisambiguateTypes
+
+exception Parse_error of Token.flocation * string
-type tactic = (CicAst.term, string) TacticAst.tactic
-type tactical = (CicAst.term, string) TacticAst.tactic TacticAst.tactical
-type command = CicAst.term CommandAst.command
-type script = CicAst.term CommandAst.Script.script
+let cic_lexer = CicTextualLexer2.cic_lexer ~comments:return_comments ()
-let choice_of_uri (uri: string) =
- let cic = HelmLibraryObjects.term_of_uri (UriManager.uri_of_string uri) in
- (uri, (fun _ _ _ -> cic))
+let fresh_num_instance =
+ let n = ref 0 in
+ if use_fresh_num_instances then
+ (fun () -> incr n; !n)
+ else
+ (fun () -> 0)
-let grammar = Grammar.gcreate CicTextualLexer2.cic_lexer
+let choice_of_uri uri =
+ let term = CicUtil.term_of_uri uri in
+ (uri, (fun _ _ _ -> term))
+
+let grammar = Grammar.gcreate cic_lexer
let term = Grammar.Entry.create grammar "term"
let term0 = Grammar.Entry.create grammar "term0"
@@ -52,43 +65,75 @@ let tactic = Grammar.Entry.create grammar "tactic"
let tactical = Grammar.Entry.create grammar "tactical"
let tactical0 = Grammar.Entry.create grammar "tactical0"
let command = Grammar.Entry.create grammar "command"
+let alias_spec = Grammar.Entry.create grammar "alias_spec"
+let macro = Grammar.Entry.create grammar "macro"
let script = Grammar.Entry.create grammar "script"
+let statement = Grammar.Entry.create grammar "statement"
let return_term loc term = CicAst.AttributedTerm (`Loc loc, term)
-let return_tactic loc tactic = TacticAst.LocatedTactic (loc, tactic)
-let return_tactical loc tactical = TacticAst.LocatedTactical (loc, tactical)
-let return_command loc cmd = cmd
-let return_script loc script = script
-let fail (x, y) msg =
+let fail floc msg =
+ let (x, y) = CicAst.loc_of_floc floc in
failwith (Printf.sprintf "Error at characters %d - %d: %s" x y msg)
let name_of_string = function
| "_" -> Cic.Anonymous
| s -> Cic.Name s
+let string_of_name = function
+ | Cic.Anonymous -> "_"
+ | Cic.Name s -> s
+
+let int_opt = function
+ | None -> None
+ | Some lexeme -> Some (int_of_string lexeme)
+
+let int_of_string s =
+ try
+ Pervasives.int_of_string s
+ with Failure _ ->
+ failwith (sprintf "Lexer failure: string_of_int \"%s\" failed" s)
+
+ (** the uri of an inductive type (a ".ind" uri) is not meaningful without an
+ * xpointer. Still, it's likely that an user who wrote "cic:/blabla/foo.ind"
+ * actually meant "cic:/blabla/foo.ind#xpointer(1/1)", i.e. the first inductive
+ * type in a block of mutual inductive types.
+ *
+ * This function performs the expansion foo.ind -> foo#xpointer..., if needed
+ *)
+let ind_expansion uri =
+ let len = String.length uri in
+ if len >= 4 && String.sub uri (len - 4) 4 = ".ind" then
+ uri ^ "#xpointer(1/1)"
+ else
+ uri
+
+let mk_binder_ast binder typ vars body =
+ List.fold_right
+ (fun var body ->
+ let name = name_of_string var in
+ CicAst.Binder (binder, (name, typ), body))
+ vars body
+
EXTEND
- GLOBAL: term term0 tactic tactical tactical0 command script;
+ GLOBAL: term term0 statement;
int: [
[ num = NUM ->
try
int_of_string num
- with Failure _ ->
- let (x, y) = loc in
- raise (Parse_error (sprintf
- "integer literal expected at characters %d-%d" x y))
+ with Failure _ -> raise (Parse_error (loc, "integer literal expected"))
]
];
meta_subst: [
[ s = SYMBOL "_" -> None
| t = term -> Some t ]
];
- binder: [
- [ SYMBOL <:unicode> (* λ *) -> `Lambda
- | SYMBOL <:unicode> (* Î *) -> `Pi
+ binder_low: [
+ [ SYMBOL <:unicode> (* Î *) -> `Pi
| SYMBOL <:unicode> (* â *) -> `Exists
| SYMBOL <:unicode> (* â *) -> `Forall ]
];
+ binder_high: [ [ SYMBOL <:unicode> (* λ *) -> `Lambda ] ];
sort: [
[ "Prop" -> `Prop
| "Set" -> `Set
@@ -97,24 +142,25 @@ EXTEND
];
typed_name: [
[ PAREN "("; i = IDENT; SYMBOL ":"; typ = term; PAREN ")" ->
- (name_of_string i, Some typ)
- | i = IDENT -> (name_of_string i, None)
+ (Cic.Name i, Some typ)
+ | i = IDENT -> (Cic.Name i, None)
]
];
- substituted_name: [ (* a subs.name is an explicit substitution subject *)
- [ s = [ IDENT | SYMBOL ];
- subst = OPT [
- SYMBOL "\subst"; (* to avoid catching frequent "a [1]" cases *)
+ subst: [
+ [ subst = OPT [
+ SYMBOL "\\subst"; (* to avoid catching frequent "a [1]" cases *)
PAREN "[";
substs = LIST1 [
i = IDENT; SYMBOL <:unicode> (* â *); t = term -> (i, t)
] SEP SYMBOL ";";
PAREN "]" ->
substs
- ] ->
- (match subst with
- | Some l -> CicAst.Ident (s, l)
- | None -> CicAst.Ident (s, []))
+ ] -> subst
+ ]
+ ];
+ substituted_name: [ (* a subs.name is an explicit substitution subject *)
+ [ s = IDENT; subst = subst -> CicAst.Ident (s, subst)
+ | s = URI; subst = subst -> CicAst.Uri (ind_expansion s, subst)
]
];
name: [ (* as substituted_name with no explicit substitution *)
@@ -126,64 +172,116 @@ EXTEND
(head, vars)
]
];
+ let_defs:[
+ [ defs = LIST1 [
+ name = IDENT;
+ args = LIST1 [
+ PAREN "(" ; names = LIST1 IDENT SEP SYMBOL ","; SYMBOL ":";
+ ty = term; PAREN ")" ->
+ (names, ty)
+ ];
+ index_name = OPT [ IDENT "on"; idx = IDENT -> idx ];
+ ty = OPT [ SYMBOL ":" ; t = term -> t ];
+ SYMBOL <:unicode> (* â *);
+ t1 = term ->
+ let rec list_of_binder binder ty final_term = function
+ | [] -> final_term
+ | name::tl ->
+ CicAst.Binder (binder, (Cic.Name name, Some ty),
+ list_of_binder binder ty final_term tl)
+ in
+ let rec binder_of_arg_list binder final_term = function
+ | [] -> final_term
+ | (l,ty)::tl ->
+ list_of_binder binder ty
+ (binder_of_arg_list binder final_term tl) l
+ in
+ let t1' = binder_of_arg_list `Lambda t1 args in
+ let ty' =
+ match ty with
+ | None -> None
+ | Some ty -> Some (binder_of_arg_list `Pi ty args)
+ in
+ let rec get_position_of name n = function
+ | [] -> (None,n)
+ | nam::tl ->
+ if nam = name then
+ (Some n,n)
+ else
+ (get_position_of name (n+1) tl)
+ in
+ let rec find_arg name n = function
+ | [] -> (fail loc (sprintf "Argument %s not found" name))
+ | (l,_)::tl ->
+ let (got,len) = get_position_of name 0 l in
+ (match got with
+ | None -> (find_arg name (n+len) tl)
+ | Some where -> n + where)
+ in
+ let index =
+ (match index_name with
+ | None -> 0
+ | (Some name) -> find_arg name 0 args)
+ in
+ ((Cic.Name name,ty'), t1', index)
+ ] SEP "and" -> defs
+ ]];
+ constructor: [ [ name = IDENT; SYMBOL ":"; typ = term -> (name, typ) ] ];
+ binder_vars: [
+ [ vars = LIST1 IDENT SEP SYMBOL ",";
+ typ = OPT [ SYMBOL ":"; t = term -> t ] -> (vars, typ)
+ | PAREN "("; vars = LIST1 IDENT SEP SYMBOL ",";
+ typ = OPT [ SYMBOL ":"; t = term -> t ]; PAREN ")" -> (vars, typ)
+ ]
+ ];
term0: [ [ t = term; EOI -> return_term loc t ] ];
term:
[ "letin" NONA
- (* actually "in" and "and" are _not_ keywords. Parsing works anyway
- * since applications are required to be bound by parens *)
[ "let"; var = typed_name;
- SYMBOL "="; (* SYMBOL <:unicode> (* â *); *)
- t1 = term;
- IDENT "in"; t2 = term ->
+ SYMBOL <:unicode> (* â *);
+ t1 = term; "in"; t2 = term ->
return_term loc (CicAst.LetIn (var, t1, t2))
| "let"; ind_kind = [ "corec" -> `CoInductive | "rec"-> `Inductive ];
- defs = LIST1 [
- var = typed_name;
- index = OPT [ PAREN "("; index = NUM; PAREN ")" ->
- int_of_string index
- ];
- SYMBOL "="; (* SYMBOL <:unicode> (* â *); *)
- t1 = term ->
- (var, t1, (match index with None -> 0 | Some i -> i))
- ] SEP (IDENT "and");
- IDENT "in"; body = term ->
+ defs = let_defs; "in"; body = term ->
return_term loc (CicAst.LetRec (ind_kind, defs, body))
]
| "binder" RIGHTA
[
- b = binder;
- (vars, typ) =
- [ vars = LIST1 IDENT SEP SYMBOL ",";
- typ = OPT [ SYMBOL ":"; t = term -> t ] -> (vars, typ)
- | PAREN "("; vars = LIST1 IDENT SEP SYMBOL ",";
- typ = OPT [ SYMBOL ":"; t = term -> t ]; PAREN ")" -> (vars, typ)
- ];
- SYMBOL "."; body = term ->
- let binder =
- List.fold_right
- (fun var body ->
- let name = name_of_string var in
- CicAst.Binder (b, (name, typ), body))
- vars body
- in
+ b = binder_low; (vars, typ) = binder_vars; SYMBOL "."; body = term ->
+ let binder = mk_binder_ast b typ vars body in
return_term loc binder
| t1 = term; SYMBOL <:unicode> (* â *); t2 = term ->
- return_term loc
- (CicAst.Binder (`Pi, (Cic.Anonymous, Some t1), t2))
+ return_term loc (CicAst.Binder (`Pi, (Cic.Anonymous, Some t1), t2))
]
+ | "logic_add" LEFTA [ (* nothing here by default *) ]
+ | "logic_mult" LEFTA [ (* nothing here by default *) ]
+ | "logic_inv" NONA [ (* nothing here by default *) ]
| "relop" LEFTA
[ t1 = term; SYMBOL "="; t2 = term ->
return_term loc (CicAst.Appl [CicAst.Symbol ("eq", 0); t1; t2])
]
| "add" LEFTA [ (* nothing here by default *) ]
| "mult" LEFTA [ (* nothing here by default *) ]
+ | "power" LEFTA [ (* nothing here by default *) ]
| "inv" NONA [ (* nothing here by default *) ]
+ | "apply" LEFTA
+ [ t1 = term; t2 = term ->
+ let rec aux = function
+ | CicAst.Appl (hd :: tl) -> aux hd @ tl
+ | term -> [term]
+ in
+ CicAst.Appl (aux t1 @ [t2])
+ ]
+ | "binder" RIGHTA
+ [
+ b = binder_high; (vars, typ) = binder_vars; SYMBOL "."; body = term ->
+ let binder = mk_binder_ast b typ vars body in
+ return_term loc binder
+ ]
| "simple" NONA
[ sort = sort -> CicAst.Sort sort
| n = substituted_name -> return_term loc n
- | PAREN "("; head = term; args = LIST1 term; PAREN ")" ->
- return_term loc (CicAst.Appl (head :: args))
- | i = NUM -> return_term loc (CicAst.Num (i, 0))
+ | i = NUM -> return_term loc (CicAst.Num (i, (fresh_num_instance ())))
| IMPLICIT -> return_term loc CicAst.Implicit
| m = META;
substs = [
@@ -203,17 +301,20 @@ EXTEND
"with";
PAREN "[";
patterns = LIST0 [
- lhs = pattern; SYMBOL <:unicode> (* â *); rhs = term ->
+ lhs = pattern; SYMBOL <:unicode> (* â *); rhs = term
+ ->
((lhs: CicAst.case_pattern), rhs)
] SEP SYMBOL "|";
PAREN "]" ->
return_term loc
(CicAst.Case (t, indty_ident, outtyp, patterns))
+ | PAREN "("; t1 = term; SYMBOL ":"; t2 = term; PAREN ")" ->
+ return_term loc (CicAst.Appl [CicAst.Symbol ("cast", 0); t1; t2])
| PAREN "("; t = term; PAREN ")" -> return_term loc t
]
];
tactic_where: [
- [ where = OPT [ IDENT "in"; ident = IDENT -> ident ] -> where ]
+ [ where = OPT [ "in"; ident = IDENT -> ident ] -> where ]
];
tactic_term: [ [ t = term -> t ] ];
ident_list0: [
@@ -223,211 +324,272 @@ EXTEND
[ PAREN "["; idents = LIST1 IDENT SEP SYMBOL ";"; PAREN "]" -> idents ]
];
reduction_kind: [
- [ "reduce" -> `Reduce
- | "simpl" -> `Simpl
- | "whd" -> `Whd ]
+ [ [ IDENT "reduce" ] -> `Reduce
+ | [ IDENT "simplify" ] -> `Simpl
+ | [ IDENT "whd" ] -> `Whd ]
];
tactic: [
- [ [ IDENT "absurd" | IDENT "Absurd" ] -> return_tactic loc TacticAst.Absurd
- | [ IDENT "apply" | IDENT "Apply" ];
- t = tactic_term -> return_tactic loc (TacticAst.Apply t)
- | [ IDENT "assumption" | IDENT "Assumption" ] ->
- return_tactic loc TacticAst.Assumption
- | [ IDENT "change" | IDENT "Change" ];
+ [ [ IDENT "absurd" ]; t = tactic_term ->
+ TacticAst.Absurd (loc, t)
+ | [ IDENT "apply" ]; t = tactic_term ->
+ TacticAst.Apply (loc, t)
+ | [ IDENT "assumption" ] ->
+ TacticAst.Assumption loc
+ | [ IDENT "auto" ] -> TacticAst.Auto loc
+ | [ IDENT "change" ];
t1 = tactic_term; "with"; t2 = tactic_term;
where = tactic_where ->
- return_tactic loc (TacticAst.Change (t1, t2, where))
+ TacticAst.Change (loc, t1, t2, where)
(* TODO Change_pattern *)
- | [ IDENT "contradiction" | IDENT "Contradiction" ] ->
- return_tactic loc TacticAst.Contradiction
- | [ IDENT "cut" | IDENT "Cut" ];
- t = tactic_term -> return_tactic loc (TacticAst.Cut t)
- | [ IDENT "decompose" | IDENT "Decompose" ];
+ | [ IDENT "contradiction" ] ->
+ TacticAst.Contradiction loc
+ | [ IDENT "cut" ];
+ t = tactic_term ->
+ TacticAst.Cut (loc, t)
+ | [ IDENT "decompose" ];
principles = ident_list1; where = IDENT ->
- return_tactic loc (TacticAst.Decompose (where, principles))
- | [ IDENT "discriminate" | IDENT "Discriminate" ];
+ TacticAst.Decompose (loc, where, principles)
+ | [ IDENT "discriminate" ];
hyp = IDENT ->
- return_tactic loc (TacticAst.Discriminate hyp)
- | [ IDENT "elim" | IDENT "Elim" ]; IDENT "type";
- t = tactic_term ->
- return_tactic loc (TacticAst.ElimType t)
- | [ IDENT "elim" | IDENT "Elim" ];
+ TacticAst.Discriminate (loc, hyp)
+ | [ IDENT "elimType" ]; t = tactic_term ->
+ TacticAst.ElimType (loc, t)
+ | [ IDENT "elim" ];
t1 = tactic_term;
using = OPT [ "using"; using = tactic_term -> using ] ->
- return_tactic loc (TacticAst.Elim (t1, using))
- | [ IDENT "exact" | IDENT "Exact" ]; t = tactic_term ->
- return_tactic loc (TacticAst.Exact t)
- | [ IDENT "exists" | IDENT "Exists" ] ->
- return_tactic loc TacticAst.Exists
- | [ IDENT "fold" | IDENT "Fold" ];
+ TacticAst.Elim (loc, t1, using)
+ | [ IDENT "exact" ]; t = tactic_term ->
+ TacticAst.Exact (loc, t)
+ | [ IDENT "exists" ] ->
+ TacticAst.Exists loc
+ | [ IDENT "fold" ];
kind = reduction_kind; t = tactic_term ->
- return_tactic loc (TacticAst.Fold (kind, t))
- | [ IDENT "fourier" | IDENT "Fourier" ] ->
- return_tactic loc TacticAst.Fourier
- | [ IDENT "injection" | IDENT "Injection" ]; ident = IDENT ->
- return_tactic loc (TacticAst.Injection ident)
- | [ IDENT "intros" | IDENT "Intros" ];
+ TacticAst.Fold (loc, kind, t)
+ | [ IDENT "fourier" ] ->
+ TacticAst.Fourier loc
+ | IDENT "goal"; n = NUM -> TacticAst.Goal (loc, int_of_string n)
+ | [ IDENT "hint" ] -> TacticAst.Hint loc
+ | [ IDENT "injection" ]; ident = IDENT ->
+ TacticAst.Injection (loc, ident)
+ | [ IDENT "intros" ];
num = OPT [ num = int -> num ];
idents = OPT ident_list0 ->
let idents = match idents with None -> [] | Some idents -> idents in
- return_tactic loc (TacticAst.Intros (num, idents))
- | [ IDENT "left" | IDENT "Left" ] -> return_tactic loc TacticAst.Left
+ TacticAst.Intros (loc, num, idents)
+ | [ IDENT "intro" ] ->
+ TacticAst.Intros (loc, None, [])
+ | [ IDENT "left" ] -> TacticAst.Left loc
| [ "let" | "Let" ];
- t = tactic_term; IDENT "in"; where = IDENT ->
- return_tactic loc (TacticAst.LetIn (t, where))
- (* TODO Reduce *)
- | [ IDENT "reflexivity" | IDENT "Reflexivity" ] ->
- return_tactic loc TacticAst.Reflexivity
- | [ IDENT "replace" | IDENT "Replace" ];
+ t = tactic_term; "in"; where = IDENT ->
+ TacticAst.LetIn (loc, t, where)
+ | kind = reduction_kind;
+ pat = OPT [
+ "in"; pat = [ IDENT "goal" -> `Goal | IDENT "hyp" -> `Everywhere ] ->
+ pat
+ ];
+ terms = LIST0 term SEP SYMBOL "," ->
+ (match (pat, terms) with
+ | None, [] -> TacticAst.Reduce (loc, kind, None)
+ | None, terms -> TacticAst.Reduce (loc, kind, Some (terms, `Goal))
+ | Some pat, [] -> TacticAst.Reduce (loc, kind, Some ([], pat))
+ | Some pat, terms -> TacticAst.Reduce (loc, kind, Some (terms, pat)))
+ | [ IDENT "reflexivity" ] ->
+ TacticAst.Reflexivity loc
+ | [ IDENT "replace" ];
t1 = tactic_term; "with"; t2 = tactic_term ->
- return_tactic loc (TacticAst.Replace (t1, t2))
+ TacticAst.Replace (loc, t1, t2)
(* TODO Rewrite *)
(* TODO Replace_pattern *)
- | [ IDENT "right" | IDENT "Right" ] -> return_tactic loc TacticAst.Right
- | [ IDENT "ring" | IDENT "Ring" ] -> return_tactic loc TacticAst.Ring
- | [ IDENT "split" | IDENT "Split" ] -> return_tactic loc TacticAst.Split
- | [ IDENT "symmetry" | IDENT "Symmetry" ] ->
- return_tactic loc TacticAst.Symmetry
- | [ IDENT "transitivity" | IDENT "Transitivity" ];
+ | [ IDENT "right" ] -> TacticAst.Right loc
+ | [ IDENT "ring" ] -> TacticAst.Ring loc
+ | [ IDENT "split" ] -> TacticAst.Split loc
+ | [ IDENT "symmetry" ] ->
+ TacticAst.Symmetry loc
+ | [ IDENT "transitivity" ];
t = tactic_term ->
- return_tactic loc (TacticAst.Transitivity t)
+ TacticAst.Transitivity (loc, t)
]
];
- tactical0: [ [ t = tactical; SYMBOL "." -> t ] ];
tactical:
[ "sequence" LEFTA
- [ tactics = LIST1 NEXT SEP SYMBOL ";" ->
- return_tactical loc (TacticAst.Seq tactics)
+ [ tacticals = LIST1 NEXT SEP SYMBOL ";" ->
+ TacticAst.Seq (loc, tacticals)
]
| "then" NONA
[ tac = tactical;
PAREN "["; tacs = LIST0 tactical SEP SYMBOL ";"; PAREN "]" ->
- return_tactical loc (TacticAst.Then (tac, tacs))
+ (TacticAst.Then (loc, tac, tacs))
]
| "loops" RIGHTA
- [ [ IDENT "do" | IDENT "Do" ]; count = int; tac = tactical ->
- return_tactical loc (TacticAst.Do (count, tac))
- | [ IDENT "repeat" | IDENT "Repeat" ]; tac = tactical ->
- return_tactical loc (TacticAst.Repeat tac)
+ [ [ IDENT "do" ]; count = int; tac = tactical ->
+ TacticAst.Do (loc, count, tac)
+ | [ IDENT "repeat" ]; tac = tactical ->
+ TacticAst.Repeat (loc, tac)
]
| "simple" NONA
- [ [ IDENT "tries" | IDENT "Tries" ];
+ [ IDENT "tries";
PAREN "["; tacs = LIST0 tactical SEP SYMBOL ";"; PAREN "]" ->
- return_tactical loc (TacticAst.Tries tacs)
- | [ IDENT "try" | IDENT "Try" ]; tac = NEXT ->
- return_tactical loc (TacticAst.Try tac)
- | [ IDENT "fail" | IDENT "Fail" ] -> return_tactical loc TacticAst.Fail
- | [ IDENT "id" | IDENT "Id" ] -> return_tactical loc TacticAst.IdTac
- | PAREN "("; tac = tactical; PAREN ")" -> return_tactical loc tac
- | tac = tactic -> return_tactical loc (TacticAst.Tactic tac)
+ TacticAst.Tries (loc, tacs)
+ | IDENT "try"; tac = NEXT ->
+ TacticAst.Try (loc, tac)
+ | IDENT "fail" -> TacticAst.Fail loc
+ | IDENT "id" -> TacticAst.IdTac loc
+ | PAREN "("; tac = tactical; PAREN ")" -> tac
+ | tac = tactic -> TacticAst.Tactic (loc, tac)
]
];
- theorem_flavour: [ (* all flavours but Goal *)
- [ [ IDENT "definition" | IDENT "Definition" ] -> `Definition
- | [ IDENT "fact" | IDENT "Fact" ] -> `Fact
- | [ IDENT "lemma" | IDENT "Lemma" ] -> `Lemma
- | [ IDENT "remark" | IDENT "Remark" ] -> `Remark
- | [ IDENT "theorem" | IDENT "Theorem" ] -> `Theorem
-(* | [ IDENT "goal" | IDENT "Goal" ] -> `Goal *)
- ]
- ];
- theorem_cmd: [
- [ flavour = theorem_flavour; name = OPT IDENT; SYMBOL ":"; typ = term;
- body = OPT [ SYMBOL <:unicode> (* â *); body = term -> body ];
- SYMBOL "." ->
- (loc, flavour, name, typ, body)
- | [ IDENT "goal" | IDENT "Goal" ]; typ = term;
- body = OPT [ SYMBOL <:unicode> (* â *); body = term -> body ];
- SYMBOL "." ->
- (loc, `Goal, None, typ, body)
- ]
- ];
- proof_cmd: [ [ [ IDENT "proof" | IDENT "Proof" ]; SYMBOL "." -> loc ] ];
- qed_cmd: [
- [ [ IDENT "qed" | IDENT "Qed" ]; SYMBOL "." -> (loc, None)
- | [ IDENT "save" | IDENT "Save" ]; name = IDENT; SYMBOL "." ->
- (loc, Some name)
- ]
- ];
- command: [
- [ (loc', flavour, name, typ, body) = theorem_cmd ->
- return_command loc (CommandAst.Theorem (loc', flavour, name, typ, body))
- | (loc') = proof_cmd -> return_command loc (CommandAst.Proof loc')
- | (loc, name) = qed_cmd -> return_command loc (CommandAst.Qed (loc, name))
+ theorem_flavour: [
+ [ [ IDENT "definition" ] -> `Definition
+ | [ IDENT "fact" ] -> `Fact
+ | [ IDENT "lemma" ] -> `Lemma
+ | [ IDENT "remark" ] -> `Remark
+ | [ IDENT "theorem" ] -> `Theorem
]
];
- script_entry: [
- [ theorem = theorem_cmd;
- proof = OPT [
- proof_cmd; tacticals = LIST1 tactical0; qed = qed_cmd ->
- (tacticals, qed)
- ] ->
- let (loc', flavour, name', typ, body_verbatim) = theorem in
- let name'' =
- match proof with
- | None | Some (_, (_, None)) -> None
- | Some (_, (_, Some name)) -> Some name
+ inductive_spec: [ [
+ fst_name = IDENT; params = LIST0 [
+ PAREN "("; names = LIST1 IDENT SEP SYMBOL ","; SYMBOL ":";
+ typ = term; PAREN ")" -> (names, typ) ];
+ SYMBOL ":"; fst_typ = term; SYMBOL <:unicode>; OPT SYMBOL "|";
+ fst_constructors = LIST0 constructor SEP SYMBOL "|";
+ tl = OPT [ "with";
+ types = LIST1 [
+ name = IDENT; SYMBOL ":"; typ = term; SYMBOL <:unicode>;
+ OPT SYMBOL "|"; constructors = LIST0 constructor SEP SYMBOL "|" ->
+ (name, true, typ, constructors) ] SEP "with" -> types
+ ] ->
+ let params =
+ List.fold_right
+ (fun (names, typ) acc ->
+ (List.map (fun name -> (name, typ)) names) @ acc)
+ params []
+ in
+ let fst_ind_type = (fst_name, true, fst_typ, fst_constructors) in
+ let tl_ind_types = match tl with None -> [] | Some types -> types in
+ let ind_types = fst_ind_type :: tl_ind_types in
+ (params, ind_types)
+ ] ];
+
+ macro: [[
+ [ IDENT "abort" ] -> TacticAst.Abort loc
+ | [ IDENT "quit" ] -> TacticAst.Quit loc
+ | [ IDENT "print" ]; name = QSTRING -> TacticAst.Print (loc, name)
+ | [ IDENT "undo" ]; steps = OPT NUM ->
+ TacticAst.Undo (loc, int_opt steps)
+ | [ IDENT "redo" ]; steps = OPT NUM ->
+ TacticAst.Redo (loc, int_opt steps)
+ | [ IDENT "check" ]; t = term ->
+ TacticAst.Check (loc, t)
+ | [ IDENT "print" ]; name = QSTRING -> TacticAst.Print (loc, name)
+ ]];
+
+ alias_spec: [
+ [ IDENT "id"; id = QSTRING; SYMBOL "="; uri = QSTRING ->
+ let alpha = "[a-zA-Z]" in
+ let num = "[0-9]+" in
+ let ident_cont = "\\("^alpha^"\\|"^num^"\\|_\\|\\\\\\)" in
+ let ident = "\\("^alpha^ident_cont^"*\\|_"^ident_cont^"+\\)" in
+ let rex = Str.regexp ("^"^ident^"$") in
+ if Str.string_match rex id 0 then
+ let rex = Str.regexp
+ ("^\\(cic:/\\|theory:/\\)"^ident^
+ "\\(/"^ident^"+\\)*\\(\\."^ident^"\\)+"^
+ "\\(#xpointer("^ num^"\\(/"^num^"\\)+)\\)?$")
in
- let name =
- match (name', name'') with
- | Some name, None -> name
- | None, Some name -> name
- | None, None ->
- Stdpp.raise_with_loc loc (Failure "theorem's name is missing")
- | Some name', Some name'' when name' <> name'' ->
- Stdpp.raise_with_loc loc (Failure (sprintf
- "theorem's name mismatch: %s <> %s" name' name''))
- | Some name, _ -> name
+ if Str.string_match rex uri 0 then
+ TacticAst.Ident_alias (id, uri)
+ else
+ raise (Parse_error (loc,sprintf "Not a valid uri: %s" uri))
+ else
+ raise (Parse_error (loc,sprintf "Not a valid identifier: %s" id))
+ | IDENT "symbol"; symbol = QSTRING;
+ instance = OPT [ PAREN "("; IDENT "instance"; n = NUM; PAREN ")" -> n ];
+ SYMBOL "="; dsc = QSTRING ->
+ let instance =
+ match instance with Some i -> int_of_string i | None -> 0
+ in
+ TacticAst.Symbol_alias (symbol, instance, dsc)
+ | IDENT "num";
+ instance = OPT [ PAREN "("; IDENT "instance"; n = NUM; PAREN ")" -> n ];
+ SYMBOL "="; dsc = QSTRING ->
+ let instance =
+ match instance with Some i -> int_of_string i | None -> 0
in
- let body =
- match (body_verbatim, proof) with
- | Some term, None -> CommandAst.Script.Verbatim (loc', term)
- | None, Some (tacticals, (loc'', _)) ->
- CommandAst.Script.Tactics (loc'', tacticals)
- | Some _, Some _ ->
- Stdpp.raise_with_loc loc (Failure (sprintf
- "theorem %s has too many proofs" name))
- | None, None ->
- Stdpp.raise_with_loc loc (Failure (sprintf
- "theorem %s has no proof" name))
+ TacticAst.Number_alias (instance, dsc)
+ ]
+ ];
+
+ command: [[
+ [ IDENT "set" ]; n = QSTRING; v = QSTRING ->
+ TacticAst.Set (loc, n, v)
+ | [ IDENT "qed" ] -> TacticAst.Qed loc
+ | flavour = theorem_flavour; name = OPT IDENT; SYMBOL ":"; typ = term;
+ body = OPT [ SYMBOL <:unicode> (* â *); body = term -> body ] ->
+ TacticAst.Theorem (loc, flavour, name, typ, body)
+ | "let"; ind_kind = [ "corec" -> `CoInductive | "rec"-> `Inductive ];
+ defs = let_defs ->
+ let name,ty =
+ match defs with
+ | ((Cic.Name name,Some ty),_,_) :: _ -> name,ty
+ | ((Cic.Name name,None),_,_) :: _ ->
+ fail loc ("No type given for " ^ name)
+ | _ -> assert false
+ in
+ let body = CicAst.Ident (name,None) in
+ TacticAst.Theorem(loc, `Definition, Some name, ty,
+ Some (CicAst.LetRec (ind_kind, defs, body)))
+
+ | [ IDENT "inductive" ]; spec = inductive_spec ->
+ let (params, ind_types) = spec in
+ TacticAst.Inductive (loc, params, ind_types)
+ | [ IDENT "coinductive" ]; spec = inductive_spec ->
+ let (params, ind_types) = spec in
+ let ind_types = (* set inductive flags to false (coinductive) *)
+ List.map (fun (name, _, term, ctors) -> (name, false, term, ctors))
+ ind_types
in
- return_script loc (CommandAst.Script.Theorem (flavour, name, typ, body))
+ TacticAst.Inductive (loc, params, ind_types)
+ | [ IDENT "coercion" ] ; name = IDENT ->
+ TacticAst.Coercion (loc, CicAst.Ident (name,Some []))
+ | [ IDENT "coercion" ] ; name = URI ->
+ TacticAst.Coercion (loc, CicAst.Uri (name,Some []))
+ | [ IDENT "alias" ]; spec = alias_spec ->
+ TacticAst.Alias (loc, spec)
+ ]];
+
+ statement: [
+ [ cmd = command; SYMBOL "." -> TacticAst.Command (loc, cmd)
+ | tac = tactical; SYMBOL "." -> TacticAst.Tactical (loc, tac)
+ | mac = macro; SYMBOL "." -> TacticAst.Macro (loc, mac)
]
];
- script: [ [ entries = LIST0 script_entry; EOI -> entries ] ];
END
let exc_located_wrapper f =
try
- Lazy.force f
- with Stdpp.Exc_located ((x, y), exn) ->
- raise (Parse_error (sprintf "parse error at characters %d-%d: %s" x y
- (Printexc.to_string exn)))
+ f ()
+ with
+ | Stdpp.Exc_located (floc, Stream.Error msg) ->
+ raise (Parse_error (floc, msg))
+ | Stdpp.Exc_located (floc, exn) ->
+ raise (Parse_error (floc, (Printexc.to_string exn)))
let parse_term stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse term0 stream))
-let parse_tactic stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse tactic stream))
-let parse_tactical stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse tactical0 stream))
-let parse_command stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse command stream))
-let parse_script stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse script stream))
+ exc_located_wrapper (fun () -> (Grammar.Entry.parse term0 stream))
+let parse_statement stream =
+ exc_located_wrapper (fun () -> (Grammar.Entry.parse statement stream))
(**/**)
(** {2 Interface for gTopLevel} *)
-open DisambiguateTypes
-
module EnvironmentP3 =
struct
type t = environment
let empty = ""
- let aliases_grammar = Grammar.gcreate CicTextualLexer2.cic_lexer
+ let aliases_grammar = Grammar.gcreate cic_lexer
let aliases = Grammar.Entry.create aliases_grammar "aliases"
let to_string env =
@@ -436,12 +598,13 @@ module EnvironmentP3 =
(fun domain_item (dsc, _) acc ->
let s =
match domain_item with
- | Id id -> sprintf "alias id %s = %s" id dsc
- | Symbol (symb, instance) ->
- sprintf "alias symbol \"%s\" (instance %d) = \"%s\""
- symb instance dsc
- | Num instance ->
- sprintf "alias num (instance %d) = \"%s\"" instance dsc
+ | Id id ->
+ TacticAstPp.pp_alias (TacticAst.Ident_alias (id, dsc)) ^ "."
+ | Symbol (symb, i) ->
+ TacticAstPp.pp_alias (TacticAst.Symbol_alias (symb, i, dsc))
+ ^ "."
+ | Num i ->
+ TacticAstPp.pp_alias (TacticAst.Number_alias (i, dsc)) ^ "."
in
s :: acc)
env []
@@ -481,11 +644,8 @@ module EnvironmentP3 =
if s = empty then
Environment.empty
else
- try
- Grammar.Entry.parse aliases (Stream.of_string s)
- with Stdpp.Exc_located ((x, y), exn) ->
- raise (Parse_error (sprintf "parse error at characters %d-%d: %s" x y
- (Printexc.to_string exn)))
+ exc_located_wrapper
+ (fun () -> Grammar.Entry.parse aliases (Stream.of_string s))
end
(* vim:set encoding=utf8: *)