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

feat(frontends/lean): better default for atomic notation

Browse source
This commit is contained in:
Leonardo de Moura 2014-11-14 16:25:13 -08:00
parent 67de3b06f3
commit 7685516d1e
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,11 +89,7 @@ struct notation_modifiers {
} }
}; };
static auto parse_mixfix_notation(parser & p, mixfix_kind k, bool overload, bool reserve) -> pair<notation_entry, optional<token_entry>> {
static auto parse_mixfix_notation(parser & p, mixfix_kind k, bool overload, bool reserve)
-> pair<notation_entry, optional<token_entry>> {
notation_modifiers mod; notation_modifiers mod;
mod.parse(p); mod.parse(p);
std::string tk = parse_symbol(p, "invalid notation declaration, quoted symbol or identifier expected"); std::string tk = parse_symbol(p, "invalid notation declaration, quoted symbol or identifier expected");
@ -202,11 +198,11 @@ static auto parse_mixfix_notation(parser & p, mixfix_kind k, bool overload, bool
check_notation_expr(f, f_pos); check_notation_expr(f, f_pos);
switch (k) { switch (k) {
case mixfix_kind::infixl: case mixfix_kind::infixl:
#if defined(__GNUC__) && !defined(__CLANG__) #if defined(__GNUC__) && !defined(__CLANG__)
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
return mk_pair(notation_entry(false, to_list(transition(tks, mk_expr_action(*prec))), return mk_pair(notation_entry(false, to_list(transition(tks, mk_expr_action(*prec))),
mk_app(f, Var(1), Var(0)), overload, reserve, mod.m_parse_only), new_token); mk_app(f, Var(1), Var(0)), overload, reserve, mod.m_parse_only), new_token);
#endif #endif
case mixfix_kind::infixr: case mixfix_kind::infixr:
return mk_pair(notation_entry(false, to_list(transition(tks, mk_expr_action(*prec))), return mk_pair(notation_entry(false, to_list(transition(tks, mk_expr_action(*prec))),
mk_app(f, Var(1), Var(0)), overload, reserve, mod.m_parse_only), new_token); mk_app(f, Var(1), Var(0)), overload, reserve, mod.m_parse_only), new_token);
@ -229,7 +225,8 @@ static notation_entry parse_mixfix_notation(parser & p, mixfix_kind k, bool over
return nt.first; return nt.first;
} }
static name parse_quoted_symbol_or_token(parser & p, buffer<token_entry> & new_tokens) { static name parse_quoted_symbol_or_token(parser & p, buffer<token_entry> & new_tokens, bool & used_default) {
used_default = false;
if (p.curr_is_quoted_symbol()) { if (p.curr_is_quoted_symbol()) {
environment const & env = p.env(); environment const & env = p.env();
auto tk = p.get_name_val(); auto tk = p.get_name_val();
@ -245,6 +242,7 @@ static name parse_quoted_symbol_or_token(parser & p, buffer<token_entry> & new_t
new_tokens.push_back(token_entry(tkcs, prec)); new_tokens.push_back(token_entry(tkcs, prec));
} else if (!get_precedence(get_token_table(env), tkcs)) { } else if (!get_precedence(get_token_table(env), tkcs)) {
new_tokens.push_back(token_entry(tkcs, LEAN_DEFAULT_PRECEDENCE)); new_tokens.push_back(token_entry(tkcs, LEAN_DEFAULT_PRECEDENCE));
used_default = true;
} }
return tk; return tk;
} else if (p.curr_is_keyword()) { } else if (p.curr_is_keyword()) {
@ -257,6 +255,11 @@ static name parse_quoted_symbol_or_token(parser & p, buffer<token_entry> & new_t
} }
} }
static name parse_quoted_symbol_or_token(parser & p, buffer<token_entry> & new_tokens) {
bool dummy;
return parse_quoted_symbol_or_token(p, new_tokens, dummy);
}
static expr parse_notation_expr(parser & p, buffer<expr> const & locals) { static expr parse_notation_expr(parser & p, buffer<expr> const & locals) {
auto pos = p.pos(); auto pos = p.pos();
expr r = p.parse_expr(); expr r = p.parse_expr();
@ -427,9 +430,10 @@ static notation_entry parse_notation_core(parser & p, bool overload, bool reserv
if (!reserve) if (!reserve)
reserved_pt = get_reserved_nud_table(p.env()); reserved_pt = get_reserved_nud_table(p.env());
} }
bool used_default = false;
while ((!reserve && !p.curr_is_token(get_assign_tk())) || while ((!reserve && !p.curr_is_token(get_assign_tk())) ||
(reserve && !p.curr_is_command() && !p.curr_is_eof())) { (reserve && !p.curr_is_command() && !p.curr_is_eof())) {
name tk = parse_quoted_symbol_or_token(p, new_tokens); name tk = parse_quoted_symbol_or_token(p, new_tokens, used_default);
if (auto at = find_next(reserved_pt, tk)) { if (auto at = find_next(reserved_pt, tk)) {
action const & a = at->first; action const & a = at->first;
reserved_pt = at->second; reserved_pt = at->second;
@ -496,6 +500,11 @@ static notation_entry parse_notation_core(parser & p, bool overload, bool reserv
} }
pt = find_match(pt, ts.back()); pt = find_match(pt, ts.back());
} }
// for atomic notation where binding power was not set, we set it to max
if (used_default && ts.size() == 1 && ts.back().get_action().kind() == notation::action_kind::Skip) {
lean_assert(!new_tokens.empty());
new_tokens.back().m_prec = get_max_prec();
}
expr n; expr n;
if (reserve) { if (reserve) {
// reserve notation commands do not have a denotation // reserve notation commands do not have a denotation

3
tests/lean/run/atomic2.lean Normal file
View file

@ -0,0 +1,3 @@
notation `foo` := Type.{1}
constant f : Type → Type
check foo → f foo → foo