let use_fresh_num_instances = false
open Printf
+
open DisambiguateTypes
-exception Parse_error of string
+exception Parse_error of Token.flocation * string
let fresh_num_instance =
let n = ref 0 in
else
(fun () -> 0)
-let choice_of_uri (uri: string) =
- let cic = HelmLibraryObjects.term_of_uri (UriManager.uri_of_string uri) in
- (uri, (fun _ _ _ -> cic))
+let choice_of_uri uri =
+ let term = CicUtil.term_of_uri uri in
+ (uri, (fun _ _ _ -> term))
let grammar = Grammar.gcreate CicTextualLexer2.cic_lexer
let tactical = Grammar.Entry.create grammar "tactical"
let tactical0 = Grammar.Entry.create grammar "tactical0"
let command = Grammar.Entry.create grammar "command"
+let script = Grammar.Entry.create grammar "script"
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_command loc cmd = cmd (* TODO ZACK FIXME uhm ... why we drop loc? *)
let fail floc msg =
let (x, y) = CicAst.loc_of_floc floc in
| Some lexeme -> Some (int_of_string lexeme)
EXTEND
- GLOBAL: term term0 tactic tactical tactical0 command;
+ GLOBAL: term term0 tactic tactical tactical0 command script;
int: [
[ num = NUM ->
try
int_of_string num
- with Failure _ ->
- let (x, y) = CicAst.loc_of_floc 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: [
(head, vars)
]
];
+ constructor: [ [ name = IDENT; SYMBOL ":"; typ = term -> (name, typ) ] ];
term0: [ [ t = term; EOI -> return_term loc t ] ];
term:
[ "letin" NONA
[
b = binder;
(vars, typ) =
- [ vars = LIST1 IDENT;
+ [ vars = LIST1 IDENT SEP SYMBOL ",";
typ = OPT [ SYMBOL ":"; t = term -> t ] -> (vars, typ)
- | PAREN "("; vars = LIST1 IDENT;
+ | PAREN "("; vars = LIST1 IDENT SEP SYMBOL ",";
typ = OPT [ SYMBOL ":"; t = term -> t ]; PAREN ")" -> (vars, typ)
];
- SYMBOL ","; body = term ->
+ SYMBOL "."; body = term ->
let binder =
List.fold_right
(fun var body ->
[ PAREN "["; idents = LIST1 IDENT SEP SYMBOL ";"; PAREN "]" -> idents ]
];
reduction_kind: [
- [ "reduce" -> `Reduce
- | "simpl" -> `Simpl
- | "whd" -> `Whd ]
+ [ [ IDENT "reduce" | IDENT "Reduce" ] -> `Reduce
+ | [ IDENT "simplify" | IDENT "Simplify" ] -> `Simpl
+ | [ IDENT "whd" | IDENT "Whd" ] -> `Whd ]
];
tactic: [
[ [ IDENT "absurd" | IDENT "Absurd" ]; t = tactic_term ->
return_tactic loc (TacticAst.Apply t)
| [ IDENT "assumption" | IDENT "Assumption" ] ->
return_tactic loc TacticAst.Assumption
+ | [ IDENT "auto" | IDENT "Auto" ] -> return_tactic loc TacticAst.Auto
| [ IDENT "change" | IDENT "Change" ];
t1 = tactic_term; "with"; t2 = tactic_term;
where = tactic_where ->
return_tactic loc (TacticAst.Fold (kind, t))
| [ 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" ];
| [ "let" | "Let" ];
t = tactic_term; "in"; where = IDENT ->
return_tactic loc (TacticAst.LetIn (t, where))
- (* TODO Reduce *)
+ | kind = reduction_kind;
+ pat = OPT [
+ "in"; pat = [ IDENT "goal" -> `Goal | IDENT "hyp" -> `Everywhere ] ->
+ pat
+ ];
+ terms = LIST0 term SEP SYMBOL "," ->
+ let tac =
+ (match (pat, terms) with
+ | None, [] -> TacticAst.Reduce (kind, None)
+ | None, terms -> TacticAst.Reduce (kind, Some (terms, `Goal))
+ | Some pat, [] -> TacticAst.Reduce (kind, Some ([], pat))
+ | Some pat, terms -> TacticAst.Reduce (kind, Some (terms, pat)))
+ in
+ return_tactic loc tac
| [ IDENT "reflexivity" | IDENT "Reflexivity" ] ->
return_tactic loc TacticAst.Reflexivity
| [ IDENT "replace" | IDENT "Replace" ];
return_tactic loc (TacticAst.Transitivity t)
]
];
- tactical0: [ [ t = tactical; SYMBOL "." -> t ] ];
+ tactical0: [ [ t = tactical; SYMBOL ";;" -> return_tactical loc t ] ];
tactical:
[ "command" NONA
[ cmd = command -> return_tactical loc (TacticAst.Command cmd) ]
| [ IDENT "theorem" | IDENT "Theorem" ] -> `Theorem
]
];
+ 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<def>>; OPT SYMBOL "|";
+ fst_constructors = LIST0 constructor SEP SYMBOL "|";
+ tl = OPT [ "with";
+ types = LIST1 [
+ name = IDENT; SYMBOL ":"; typ = term; SYMBOL <:unicode<def>>;
+ 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)
+ ] ];
command: [
[ [ IDENT "abort" | IDENT "Abort" ] -> return_command loc TacticAst.Abort
| [ IDENT "proof" | IDENT "Proof" ] -> return_command loc TacticAst.Proof
| 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 "inductive" | IDENT "Inductive" ]; spec = inductive_spec ->
+ let (params, ind_types) = spec in
+ return_command loc (TacticAst.Inductive (params, ind_types))
+ | [ IDENT "coinductive" | 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_command loc (TacticAst.Inductive (params, ind_types))
| [ IDENT "goal" | IDENT "Goal" ]; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
return_command loc (TacticAst.Theorem (`Goal, None, typ, body))
return_command loc (TacticAst.Undo (int_opt steps))
| [ IDENT "redo" | IDENT "Redo" ]; steps = OPT NUM ->
return_command loc (TacticAst.Redo (int_opt steps))
+ | [ IDENT "baseuri" | IDENT "Baseuri" ]; uri = OPT QSTRING ->
+ return_command loc (TacticAst.Baseuri uri)
| [ IDENT "check" | IDENT "Check" ]; t = term ->
return_command loc (TacticAst.Check t)
]
];
+ script_entry: [
+ [ cmd = tactical0 -> Command cmd
+ | s = COMMENT -> Comment (loc, s)
+ ]
+ ];
+ script: [ [ entries = LIST0 script_entry; EOI -> (loc, entries) ] ];
END
let exc_located_wrapper f =
try
- 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)))
+ 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))
+ exc_located_wrapper (fun () -> (Grammar.Entry.parse term0 stream))
let parse_tactic stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse tactic stream))
+ exc_located_wrapper (fun () -> (Grammar.Entry.parse tactic stream))
let parse_tactical stream =
- exc_located_wrapper (lazy (Grammar.Entry.parse tactical0 stream))
+ exc_located_wrapper (fun () -> (Grammar.Entry.parse tactical0 stream))
+let parse_script stream =
+ exc_located_wrapper (fun () -> (Grammar.Entry.parse script stream))
(**/**)
if s = empty then
Environment.empty
else
- try
- Grammar.Entry.parse aliases (Stream.of_string s)
- 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)))
+ exc_located_wrapper
+ (fun () -> Grammar.Entry.parse aliases (Stream.of_string s))
end
(* vim:set encoding=utf8: *)
projects / helm.git / blobdiff