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

refactor(frontends/lean): rename action::is_compatible to action::is_equal

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-07-30 12:37:35 -07:00
parent 450131692a
commit 5238da9ac7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -324,7 +324,7 @@ notation_entry parse_notation_core(parser & p, bool overload, buffer<token_entry
// new notation is still compatible with the existing one // new notation is still compatible with the existing one
transition const & new_trans = ts.back(); transition const & new_trans = ts.back();
if (auto at = pt->find(new_trans.get_token())) { if (auto at = pt->find(new_trans.get_token())) {
if (new_trans.get_action().is_compatible(at->first)) { if (new_trans.get_action().is_equal(at->first)) {
pt = at->second; pt = at->second;
} else { } else {
// new notation is not compatible with existing one // new notation is not compatible with existing one

10
src/frontends/lean/parse_table.cpp
View file

@ -106,7 +106,7 @@ expr const & action::get_initial() const { return to_exprs_action(m_ptr)->m_ini;
bool action::is_fold_right() const { return to_exprs_action(m_ptr)->m_fold_right; } bool action::is_fold_right() const { return to_exprs_action(m_ptr)->m_fold_right; }
parse_fn const & action::get_parse_fn() const { return to_ext_action(m_ptr)->m_parse_fn; } parse_fn const & action::get_parse_fn() const { return to_ext_action(m_ptr)->m_parse_fn; }
std::string const & action::get_lua_fn() const { return to_ext_lua_action(m_ptr)->m_lua_fn; } std::string const & action::get_lua_fn() const { return to_ext_lua_action(m_ptr)->m_lua_fn; }
bool action::is_compatible(action const & a) const { bool action::is_equal(action const & a) const {
if (kind() != a.kind()) if (kind() != a.kind())
return false; return false;
switch (kind()) { switch (kind()) {
@ -276,7 +276,7 @@ parse_table parse_table::add_core(unsigned num, transition const * ts, expr cons
if (it) { if (it) {
action const & act = it->first; action const & act = it->first;
parse_table const & child = it->second; parse_table const & child = it->second;
if (act.is_compatible(ts->get_action())) { if (act.is_equal(ts->get_action())) {
new_child = child.add_core(num-1, ts+1, a, overload); new_child = child.add_core(num-1, ts+1, a, overload);
} else { } else {
new_child = parse_table().add_core(num-1, ts+1, a, overload); new_child = parse_table().add_core(num-1, ts+1, a, overload);
@ -374,8 +374,8 @@ static int mk_ext_lua_action(lua_State * L) {
lua_pop(L, 1); lua_pop(L, 1);
return push_notation_action(L, mk_ext_lua_action(fn)); return push_notation_action(L, mk_ext_lua_action(fn));
} }
static int is_compatible(lua_State * L) { static int is_equal(lua_State * L) {
return push_boolean(L, to_notation_action(L, 1).is_compatible(to_notation_action(L, 2))); return push_boolean(L, to_notation_action(L, 1).is_equal(to_notation_action(L, 2)));
} }
static void check_action(lua_State * L, int idx, std::initializer_list<action_kind> const & ks) { static void check_action(lua_State * L, int idx, std::initializer_list<action_kind> const & ks) {
action_kind k = to_notation_action(L, idx).kind(); action_kind k = to_notation_action(L, idx).kind();
@ -414,7 +414,7 @@ static int fn(lua_State * L) {
static const struct luaL_Reg notation_action_m[] = { static const struct luaL_Reg notation_action_m[] = {
{"__gc", notation_action_gc}, {"__gc", notation_action_gc},
{"is_compatible", safe_function<is_compatible>}, {"is_equal", safe_function<is_equal>},
{"kind", safe_function<kind>}, {"kind", safe_function<kind>},
{"rbp", safe_function<rbp>}, {"rbp", safe_function<rbp>},
{"sep", safe_function<sep>}, {"sep", safe_function<sep>},

2
src/frontends/lean/parse_table.h
View file

@ -76,7 +76,7 @@ public:
parse_fn const & get_parse_fn() const; parse_fn const & get_parse_fn() const;
std::string const & get_lua_fn() const; std::string const & get_lua_fn() const;
bool is_compatible(action const & a) const; bool is_equal(action const & a) const;
void display(std::ostream & out) const; void display(std::ostream & out) const;
}; };