prerr_endline "</NEW_TEXTUAL_PARSER>"
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
+
open Printf
+open DisambiguateTypes
exception Parse_error of string
-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 choice_of_uri uri =
+ let term = CicUtil.term_of_uri uri in
+ (uri, (fun _ _ _ -> term))
let grammar = Grammar.gcreate CicTextualLexer2.cic_lexer
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 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 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 int_opt = function
+ | None -> None
+ | Some lexeme -> Some (int_of_string lexeme)
+
EXTEND
- GLOBAL: term term0 tactic tactical tactical0;
+ GLOBAL: term term0 tactic tactical tactical0 command;
int: [
[ num = NUM ->
try
int_of_string num
with Failure _ ->
- let (x, y) = loc in
+ let (x, y) = CicAst.loc_of_floc loc in
raise (Parse_error (sprintf
"integer literal expected at characters %d-%d" x y))
]
]
];
substituted_name: [ (* a subs.name is an explicit substitution subject *)
- [ s = [ IDENT | SYMBOL ];
+ [ s = IDENT;
subst = OPT [
- SYMBOL "\subst"; (* to avoid catching frequent "a [1]" cases *)
+ SYMBOL "\\subst"; (* to avoid catching frequent "a [1]" cases *)
PAREN "[";
substs = LIST1 [
i = IDENT; SYMBOL <:unicode<Assign>> (* ≔ *); t = term -> (i, t)
PAREN "]" ->
substs
] ->
- (match subst with
- | Some l -> CicAst.Ident (s, l)
- | None -> CicAst.Ident (s, []))
+ CicAst.Ident (s, subst)
]
];
name: [ (* as substituted_name with no explicit substitution *)
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<def>> (* ≝ *); *)
- t1 = term;
- IDENT "in"; t2 = term ->
+ t1 = term; "in"; t2 = term ->
return_term loc (CicAst.LetIn (var, t1, t2))
| "let"; ind_kind = [ "corec" -> `CoInductive | "rec"-> `Inductive ];
defs = LIST1 [
SYMBOL "="; (* SYMBOL <:unicode<def>> (* ≝ *); *)
t1 = term ->
(var, t1, (match index with None -> 0 | Some i -> i))
- ] SEP (IDENT "and");
- IDENT "in"; body = term ->
+ ] SEP "and";
+ "in"; body = term ->
return_term loc (CicAst.LetRec (ind_kind, defs, body))
]
| "binder" RIGHTA
return_term loc
(CicAst.Binder (`Pi, (Cic.Anonymous, Some t1), t2))
]
- | "eq" LEFTA
+ | "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])
+ ]
| "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 = [
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 [ "in"; ident = IDENT -> ident ] -> where ] ];
+ tactic_where: [
+ [ where = OPT [ "in"; ident = IDENT -> ident ] -> where ]
+ ];
tactic_term: [ [ t = term -> t ] ];
ident_list0: [
[ PAREN "["; idents = LIST0 IDENT SEP SYMBOL ";"; PAREN "]" -> idents ]
| "whd" -> `Whd ]
];
tactic: [
- [ IDENT "absurd" -> return_tactic loc TacticAst.Absurd
- | IDENT "apply"; t = tactic_term -> return_tactic loc (TacticAst.Apply t)
- | IDENT "assumption" -> return_tactic loc TacticAst.Assumption
- | IDENT "change"; t1 = tactic_term; "with"; t2 = tactic_term;
+ [ [ IDENT "absurd" | IDENT "Absurd" ]; t = tactic_term ->
+ return_tactic loc (TacticAst.Absurd t)
+ | [ 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" ];
+ t1 = tactic_term; "with"; t2 = tactic_term;
where = tactic_where ->
return_tactic loc (TacticAst.Change (t1, t2, where))
(* TODO Change_pattern *)
- | IDENT "contradiction" -> return_tactic loc TacticAst.Contradiction
- | IDENT "cut"; t = tactic_term -> return_tactic loc (TacticAst.Cut t)
- | IDENT "decompose"; principles = ident_list1; where = IDENT ->
+ | [ 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" ];
+ principles = ident_list1; where = IDENT ->
return_tactic loc (TacticAst.Decompose (where, principles))
- | IDENT "discriminate"; hyp = IDENT ->
+ | [ IDENT "discriminate" | IDENT "Discriminate" ];
+ hyp = IDENT ->
return_tactic loc (TacticAst.Discriminate hyp)
- | IDENT "elim"; IDENT "type"; t = tactic_term ->
+ | [ IDENT "elimType" | IDENT "ElimType" ]; t = tactic_term ->
return_tactic loc (TacticAst.ElimType t)
- | IDENT "elim"; t1 = tactic_term;
- using = OPT [ IDENT "using"; using = tactic_term -> using ] ->
+ | [ IDENT "elim" | IDENT "Elim" ];
+ t1 = tactic_term;
+ using = OPT [ "using"; using = tactic_term -> using ] ->
return_tactic loc (TacticAst.Elim (t1, using))
- | IDENT "exact"; t = tactic_term -> return_tactic loc (TacticAst.Exact t)
- | IDENT "exists" -> return_tactic loc TacticAst.Exists
- | IDENT "fold"; kind = reduction_kind; t = tactic_term ->
+ | [ 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" ];
+ kind = reduction_kind; t = tactic_term ->
return_tactic loc (TacticAst.Fold (kind, t))
- | IDENT "fourier" -> return_tactic loc TacticAst.Fourier
- | IDENT "injection"; ident = IDENT ->
+ | [ IDENT "fourier" | IDENT "Fourier" ] ->
+ return_tactic loc TacticAst.Fourier
+ | [ IDENT "hint" | IDENT "Hint" ] -> return_tactic loc TacticAst.Hint
+ | [ IDENT "injection" | IDENT "Injection" ]; ident = IDENT ->
return_tactic loc (TacticAst.Injection ident)
- | IDENT "intros";
+ | [ IDENT "intros" | 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" -> return_tactic loc TacticAst.Left
- | "let"; t = tactic_term; IDENT "in"; where = IDENT ->
+ | [ IDENT "intro" | IDENT "Intro" ] ->
+ return_tactic loc (TacticAst.Intros (Some 1, []))
+ | [ IDENT "left" | IDENT "Left" ] -> return_tactic loc TacticAst.Left
+ | [ "let" | "Let" ];
+ t = tactic_term; "in"; where = IDENT ->
return_tactic loc (TacticAst.LetIn (t, where))
(* TODO Reduce *)
- | IDENT "reflexivity" -> return_tactic loc TacticAst.Reflexivity
- | IDENT "replace"; t1 = tactic_term; "with"; t2 = tactic_term ->
+ | [ IDENT "reflexivity" | IDENT "Reflexivity" ] ->
+ return_tactic loc TacticAst.Reflexivity
+ | [ IDENT "replace" | IDENT "Replace" ];
+ t1 = tactic_term; "with"; t2 = tactic_term ->
return_tactic loc (TacticAst.Replace (t1, t2))
(* TODO Rewrite *)
(* TODO Replace_pattern *)
- | IDENT "right" -> return_tactic loc TacticAst.Right
- | IDENT "ring" -> return_tactic loc TacticAst.Ring
- | IDENT "split" -> return_tactic loc TacticAst.Split
- | IDENT "symmetry" -> return_tactic loc TacticAst.Symmetry
- | IDENT "transitivity"; t = tactic_term ->
+ | [ 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" ];
+ t = tactic_term ->
return_tactic loc (TacticAst.Transitivity t)
]
];
- tactical0 : [ [ t = tactical; SYMBOL "." -> t ] ];
+ tactical0: [ [ t = tactical; SYMBOL ";;" -> t ] ];
tactical:
- [ "sequence" LEFTA
+ [ "command" NONA
+ [ cmd = command -> return_tactical loc (TacticAst.Command cmd) ]
+ | "sequence" LEFTA
[ tactics = LIST1 NEXT SEP SYMBOL ";" ->
return_tactical loc (TacticAst.Seq tactics)
]
return_tactical loc (TacticAst.Then (tac, tacs))
]
| "loops" RIGHTA
- [ IDENT "do"; count = int; tac = tactical ->
+ [ [ IDENT "do" | IDENT "Do" ]; count = int; tac = tactical ->
return_tactical loc (TacticAst.Do (count, tac))
- | IDENT "repeat"; tac = tactical ->
+ | [ IDENT "repeat" | IDENT "Repeat" ]; tac = tactical ->
return_tactical loc (TacticAst.Repeat tac)
]
| "simple" NONA
- [ IDENT "tries";
+ [ [ IDENT "tries" | IDENT "Tries" ];
PAREN "["; tacs = LIST0 tactical SEP SYMBOL ";"; PAREN "]" ->
return_tactical loc (TacticAst.Tries tacs)
- | IDENT "try"; tac = NEXT -> return_tactical loc (TacticAst.Try tac)
- | IDENT "fail" -> return_tactical loc TacticAst.Fail
- | IDENT "id" -> return_tactical loc TacticAst.IdTac
+ | [ 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)
]
];
+ 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
+ ]
+ ];
+ command: [
+ [ [ IDENT "abort" | IDENT "Abort" ] -> return_command loc TacticAst.Abort
+ | [ IDENT "proof" | IDENT "Proof" ] -> return_command loc TacticAst.Proof
+ | [ IDENT "quit" | IDENT "Quit" ] -> return_command loc TacticAst.Quit
+ | [ IDENT "qed" | IDENT "Qed" ] ->
+ return_command loc (TacticAst.Qed None)
+ | [ IDENT "save" | IDENT "Save" ]; name = IDENT ->
+ return_command loc (TacticAst.Qed (Some name))
+ | flavour = theorem_flavour; name = OPT IDENT; SYMBOL ":"; typ = term;
+ body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
+ return_command loc (TacticAst.Theorem (flavour, name, typ, body))
+ | [ IDENT "goal" | IDENT "Goal" ]; typ = term;
+ body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
+ return_command loc (TacticAst.Theorem (`Goal, None, typ, body))
+ | [ IDENT "undo" | IDENT "Undo" ]; steps = OPT NUM ->
+ return_command loc (TacticAst.Undo (int_opt steps))
+ | [ IDENT "redo" | IDENT "Redo" ]; steps = OPT NUM ->
+ return_command loc (TacticAst.Redo (int_opt steps))
+ | [ IDENT "check" | IDENT "Check" ]; t = term ->
+ return_command loc (TacticAst.Check t)
+ ]
+ ];
END
-let parse_term stream =
+let exc_located_wrapper f =
try
- Grammar.Entry.parse term0 stream
- with Stdpp.Exc_located ((x, y), exn) ->
+ Lazy.force f
+ with Stdpp.Exc_located (floc, exn) ->
+ let (x, y) = CicAst.loc_of_floc floc in
raise (Parse_error (sprintf "parse error at characters %d-%d: %s" x y
(Printexc.to_string exn)))
+let parse_term stream =
+ exc_located_wrapper (lazy (Grammar.Entry.parse term0 stream))
let parse_tactic stream =
- try
- Grammar.Entry.parse tactic stream
- 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 (lazy (Grammar.Entry.parse tactic stream))
let parse_tactical stream =
- try
- Grammar.Entry.parse tactical0 stream
- 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 (lazy (Grammar.Entry.parse tactical0 stream))
(**/**)
(** {2 Interface for gTopLevel} *)
-open DisambiguateTypes
-
module EnvironmentP3 =
struct
type t = environment
else
try
Grammar.Entry.parse aliases (Stream.of_string s)
- with Stdpp.Exc_located ((x, y), exn) ->
+ with Stdpp.Exc_located (floc, exn) ->
+ let (x, y) = CicAst.loc_of_floc floc in
raise (Parse_error (sprintf "parse error at characters %d-%d: %s" x y
(Printexc.to_string exn)))
end
+(* vim:set encoding=utf8: *)
projects / helm.git / blobdiff