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

feat(frontends/lean): add 'prefix' notation declaration command

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-07-03 21:37:56 -07:00
parent 6d773a2ba4
commit ce282a549a
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/standard/logic.lean
View file

@ -13,8 +13,7 @@ inductive true : Bool :=
| trivial : true
definition not (a : Bool) := a → false
precedence `¬`:40
notation `¬` a:prev := not a
prefix `¬`:40 := not
notation `assume` binders `,` r:(scoped f, f) := r
notation `take` binders `,` r:(scoped f, f) := r

2
src/emacs/lean-mode.el
View file

@ -24,7 +24,7 @@
(define-generic-mode
'lean-mode ;; name of the mode to create
'("--") ;; comments start with
'("import" "abbreviation" "definition" "parameter" "parameters" "proof" "qed" "conjecture" "hypothesis" "lemma" "corollary" "variable" "variables" "print" "theorem" "axiom" "inductive" "with" "universe" "alias" "help" "environment" "options" "precedence" "postfix" "calc_trans" "calc_subst" "calc_refl" "infix" "infixl" "infixr" "notation" "eval" "check" "exit" "coercion" "end" "using" "namespace" "builtin" "section" "set_option" "add_rewrite") ;; some keywords
'("import" "abbreviation" "definition" "parameter" "parameters" "proof" "qed" "conjecture" "hypothesis" "lemma" "corollary" "variable" "variables" "print" "theorem" "axiom" "inductive" "with" "universe" "alias" "help" "environment" "options" "precedence" "postfix" "prefix" "calc_trans" "calc_subst" "calc_refl" "infix" "infixl" "infixr" "notation" "eval" "check" "exit" "coercion" "end" "using" "namespace" "builtin" "section" "set_option" "add_rewrite") ;; some keywords
'(("\\_<\\(Bool\\|Int\\|Nat\\|Real\\|Type\\|TypeU\\|ℕ\\|ℤ\\)\\_>" . 'font-lock-type-face)
("\\_<\\(calc\\|have\\|show\\|by\\|in\\|let\\|forall\\|fun\\|exists\\|if\\|then\\|else\\|assume\\|take\\|obtain\\|from\\)\\_>" . font-lock-keyword-face)
("\"[^\"]*\"" . 'font-lock-string-face)

17
src/frontends/lean/notation_cmd.cpp
View file

@ -27,6 +27,7 @@ static name g_infix("infix");
static name g_infixl("infixl");
static name g_infixr("infixr");
static name g_postfix("postfix");
static name g_prefix("prefix");
static name g_notation("notation");
static name g_call("call");
@ -68,7 +69,7 @@ environment precedence_cmd(parser & p) {
return add_token(p.env(), tk.c_str(), prec);
}
enum class mixfix_kind { infixl, infixr, postfix };
enum class mixfix_kind { infixl, infixr, postfix, prefix };
using notation::mk_expr_action;
using notation::mk_binder_action;
@ -116,6 +117,10 @@ static std::pair<notation_entry, optional<token_entry>> parse_mixfix_notation(pa
return mk_pair(notation_entry(false, list<transition>(transition(tks, mk_skip_action())),
mk_app(f, Var(0)), overload),
new_token);
case mixfix_kind::prefix:
return mk_pair(notation_entry(true, list<transition>(transition(tks, mk_expr_action(*prec))),
mk_app(f, Var(0)), overload),
new_token);
}
lean_unreachable(); // LCOV_EXCL_LINE
}
@ -139,6 +144,7 @@ static environment mixfix_cmd(parser & p, mixfix_kind k, bool overload) {
environment infixl_cmd_core(parser & p, bool overload) { return mixfix_cmd(p, mixfix_kind::infixl, overload); }
environment infixr_cmd_core(parser & p, bool overload) { return mixfix_cmd(p, mixfix_kind::infixr, overload); }
environment postfix_cmd_core(parser & p, bool overload) { return mixfix_cmd(p, mixfix_kind::postfix, overload); }
environment prefix_cmd_core(parser & p, bool overload) { return mixfix_cmd(p, mixfix_kind::prefix, overload); }
static name parse_quoted_symbol_or_token(parser & p, buffer<token_entry> & new_tokens) {
if (p.curr_is_quoted_symbol()) {
@ -349,7 +355,7 @@ environment notation_cmd_core(parser & p, bool overload) {
bool curr_is_notation_decl(parser & p) {
return p.curr_is_token(g_infix) || p.curr_is_token(g_infixl) || p.curr_is_token(g_infixr) ||
p.curr_is_token(g_postfix) || p.curr_is_token(g_notation);
p.curr_is_token(g_postfix) || p.curr_is_token(g_prefix) || p.curr_is_token(g_notation);
}
notation_entry parse_notation(parser & p, bool overload, buffer<token_entry> & new_tokens) {
@ -362,11 +368,14 @@ notation_entry parse_notation(parser & p, bool overload, buffer<token_entry> & n
} else if (p.curr_is_token(g_postfix)) {
p.next();
return parse_mixfix_notation(p, mixfix_kind::postfix, overload, new_tokens);
} else if (p.curr_is_token(g_prefix)) {
p.next();
return parse_mixfix_notation(p, mixfix_kind::prefix, overload, new_tokens);
} else if (p.curr_is_token(g_notation)) {
p.next();
return parse_notation_core(p, overload, new_tokens);
} else {
throw parser_error("invalid notation, 'infix', 'infixl', 'infixr', 'postfix' or 'notation' expected", p.pos());
throw parser_error("invalid notation, 'infix', 'infixl', 'infixr', 'prefix', 'postfix' or 'notation' expected", p.pos());
}
}
@ -374,6 +383,7 @@ environment notation_cmd(parser & p) { return notation_cmd_core(p, true); }
environment infixl_cmd(parser & p) { return infixl_cmd_core(p, true); }
environment infixr_cmd(parser & p) { return infixr_cmd_core(p, true); }
environment postfix_cmd(parser & p) { return postfix_cmd_core(p, true); }
environment prefix_cmd(parser & p) { return prefix_cmd_core(p, true); }
void register_notation_cmds(cmd_table & r) {
add_cmd(r, cmd_info("precedence", "set token left binding power", precedence_cmd));
@ -381,6 +391,7 @@ void register_notation_cmds(cmd_table & r) {
add_cmd(r, cmd_info("infix", "declare a new infix (left) notation", infixl_cmd));
add_cmd(r, cmd_info("infixr", "declare a new infix (right) notation", infixr_cmd));
add_cmd(r, cmd_info("postfix", "declare a new postfix notation", postfix_cmd));
add_cmd(r, cmd_info("prefix", "declare a new prefix notation", prefix_cmd));
add_cmd(r, cmd_info("notation", "declare a new notation", notation_cmd));
}
}

1
src/frontends/lean/notation_cmd.h
View file

@ -16,6 +16,7 @@ environment notation_cmd_core(parser & p, bool overload);
environment infixl_cmd_core(parser & p, bool overload);
environment infixr_cmd_core(parser & p, bool overload);
environment postfix_cmd_core(parser & p, bool overload);
environment prefix_cmd_core(parser & p, bool overload);
/** \brief Return true iff the current token is a notation declaration */
bool curr_is_notation_decl(parser & p);

6
src/frontends/lean/token_table.cpp
View file

@ -66,9 +66,9 @@ token_table init_token_table() {
"variables", "[private]", "[inline]", "[fact]", "abbreviation",
"evaluate", "check", "print", "end", "namespace", "section", "import",
"abbreviation", "inductive", "record", "structure", "module", "universe",
"precedence", "infixl", "infixr", "infix", "postfix", "notation", "exit", "set_option",
"using", "calc_subst", "calc_refl", "calc_trans", "add_proof_qed", "reset_proof_qed",
"#setline", nullptr};
"precedence", "infixl", "infixr", "infix", "postfix", "prefix", "notation",
"exit", "set_option", "using", "calc_subst", "calc_refl", "calc_trans",
"add_proof_qed", "reset_proof_qed", "#setline", nullptr};
std::pair<char const *, char const *> aliases[] =
{{g_lambda_unicode, "fun"}, {"forall", "Pi"}, {g_forall_unicode, "Pi"}, {g_pi_unicode, "Pi"},