michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(frontends/lean/parser): add tactic abort command

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-12-05 17:15:19 -08:00
parent 34654ad06b
commit e069ce640b
3 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/frontends/lean/parser.cpp
View file

@ -96,7 +96,8 @@ static name g_exit_kwd("Exit");
static name g_apply("apply"); static name g_apply("apply");
static name g_done("done"); static name g_done("done");
static name g_back("back"); static name g_back("back");
static list<name> g_tactic_cmds = { g_apply, g_done, g_back }; static name g_abort("abort");
static list<name> g_tactic_cmds = { g_apply, g_done, g_back, g_abort };
/** \brief Table/List with all builtin command keywords */ /** \brief Table/List with all builtin command keywords */
static list<name> g_command_keywords = {g_definition_kwd, g_variable_kwd, g_variables_kwd, g_theorem_kwd, g_axiom_kwd, g_universe_kwd, g_eval_kwd, static list<name> g_command_keywords = {g_definition_kwd, g_variable_kwd, g_variables_kwd, g_theorem_kwd, g_axiom_kwd, g_universe_kwd, g_eval_kwd,
g_show_kwd, g_check_kwd, g_infix_kwd, g_infixl_kwd, g_infixr_kwd, g_notation_kwd, g_echo_kwd, g_show_kwd, g_check_kwd, g_infix_kwd, g_infixl_kwd, g_infixr_kwd, g_notation_kwd, g_echo_kwd,
@ -1333,8 +1334,9 @@ class parser::imp {
proof_state ini = s; proof_state ini = s;
proof_state_seq_stack stack; proof_state_seq_stack stack;
expr pr; expr pr;
bool done = false; enum class status { Continue, Done, Eof, Abort };
while (!done) { status st = status::Continue;
while (st == status::Continue) {
protected_call( protected_call(
[&]() { [&]() {
auto p = pos(); auto p = pos();
@ -1347,7 +1349,7 @@ class parser::imp {
next(); next();
break; break;
case scanner::token::Eof: case scanner::token::Eof:
done = true; st = status::Eof;
break; break;
case scanner::token::Id: case scanner::token::Id:
id = curr_name(); id = curr_name();
@ -1358,7 +1360,10 @@ class parser::imp {
} else if (id == g_done) { } else if (id == g_done) {
pr = tactic_done(s); pr = tactic_done(s);
if (pr) if (pr)
done = true; st = status::Done;
} else if (id == g_abort) {
next();
st = status::Abort;
} else { } else {
next(); next();
throw tactic_cmd_error(sstream() << "invalid tactic command '" << id << "'", p, s); throw tactic_cmd_error(sstream() << "invalid tactic command '" << id << "'", p, s);
@ -1379,10 +1384,11 @@ class parser::imp {
next(); next();
}); });
} }
if (pr) { switch (st) {
return pr; case status::Done: return pr;
} else { case status::Eof: throw parser_error("invalid tactic command, unexpected end of file", pos());
throw parser_error("invalid tactic command, unexpected end of file", pos()); case status::Abort: throw parser_error("failed to prove theorem, proof has been aborted", pos());
default: lean_unreachable(); // LCOV_EXCL_LINE
} }
} }

9
tests/lean/interactive/t2.lean Normal file
View file

@ -0,0 +1,9 @@
Theorem T2 (a b : Bool) : a => b => a /\ b.
apply imp_tactic.
apply imp_tactic2.
foo.
apply imp_tactic.
abort.
Variables a b : Bool.
Show Environment 2.

21
tests/lean/interactive/t2.lean.expected.out Normal file
View file

@ -0,0 +1,21 @@
Type Ctrl-D or 'Exit.' to exit or 'Help.' for help.
# Set: pp::colors
Set: pp::unicode
Proof state:
a : Bool, b : Bool ⊢ a ⇒ b ⇒ a ∧ b
## Proof state:
H : a, a : Bool, b : Bool ⊢ b ⇒ a ∧ b
## Error (line: 6, pos: 0) unknown tactic 'imp_tactic2'
Proof state:
H : a, a : Bool, b : Bool ⊢ b ⇒ a ∧ b
## Error (line: 7, pos: 0) invalid tactic command 'foo'
Proof state:
H : a, a : Bool, b : Bool ⊢ b ⇒ a ∧ b
## Proof state:
H::1 : b, H : a, a : Bool, b : Bool ⊢ a ∧ b
## Error (line: 9, pos: 5) failed to prove theorem, proof has been aborted
# # Assumed: a
Assumed: b
# Variable a : Bool
Variable b : Bool
#