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

feat(frontends/lean/pp): add 'pp.beta' option, closes #154

Browse source
This commit is contained in:
Leonardo de Moura 2014-09-09 14:10:20 -07:00
parent 65000fa653
commit 2d94584816
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,6 +120,7 @@ void pretty_fn::set_options_core(options const & o) {
m_full_names = get_pp_full_names(o);
m_private_names = get_pp_private_names(o);
m_metavar_args = get_pp_metavar_args(o);
m_beta = get_pp_beta(o);
}
void pretty_fn::set_options(options const & o) {
@ -500,7 +501,10 @@ pretty_fn::pretty_fn(environment const & env, options const & o):
format pretty_fn::operator()(expr const & e) {
m_depth = 0; m_num_steps = 0;
return pp_child(purify(e), 0).first;
if (m_beta)
return pp_child(purify(beta_reduce(e)), 0).first;
else
return pp_child(purify(e), 0).first;
}
formatter_factory mk_pretty_formatter_factory() {

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

@ -42,6 +42,7 @@ private:
bool m_full_names;
bool m_private_names;
bool m_metavar_args;
bool m_beta;
unsigned max_bp() const { return std::numeric_limits<unsigned>::max(); }
name mk_metavar_name(name const & m);

8
src/frontends/lean/pp_options.cpp
View file

@ -42,6 +42,10 @@ Author: Leonardo de Moura
#define LEAN_DEFAULT_PP_METAVAR_ARGS false
#endif
#ifndef LEAN_DEFAULT_PP_BETA
#define LEAN_DEFAULT_PP_BETA false
#endif
namespace lean {
static name g_pp_max_depth {"pp", "max_depth"};
static name g_pp_max_steps {"pp", "max_steps"};
@ -52,6 +56,7 @@ static name g_pp_universes {"pp", "universes"};
static name g_pp_full_names {"pp", "full_names"};
static name g_pp_private_names {"pp", "private_names"};
static name g_pp_metavar_args {"pp", "metavar_args"};
static name g_pp_beta {"pp", "beta"};
name const & get_pp_coercions_option_name() { return g_pp_coercions; }
name const & get_pp_full_names_option_name() { return g_pp_full_names; }
@ -86,6 +91,8 @@ RegisterBoolOption(g_pp_private_names, LEAN_DEFAULT_PP_PRIVATE_NAMES,
"(pretty printer) display internal names assigned to private declarations");
RegisterBoolOption(g_pp_metavar_args, LEAN_DEFAULT_PP_METAVAR_ARGS,
"(pretty printer) display metavariable arguments");
RegisterBoolOption(g_pp_beta, LEAN_DEFAULT_PP_BETA,
"(pretty printer) apply beta-reduction when pretty printing");
unsigned get_pp_max_depth(options const & opts) { return opts.get_unsigned(g_pp_max_depth, LEAN_DEFAULT_PP_MAX_DEPTH); }
unsigned get_pp_max_steps(options const & opts) { return opts.get_unsigned(g_pp_max_steps, LEAN_DEFAULT_PP_MAX_STEPS); }
@ -96,4 +103,5 @@ bool get_pp_universes(options const & opts) { return opts.get_bool(g_pp_
bool get_pp_full_names(options const & opts) { return opts.get_bool(g_pp_full_names, LEAN_DEFAULT_PP_FULL_NAMES); }
bool get_pp_private_names(options const & opts) { return opts.get_bool(g_pp_private_names, LEAN_DEFAULT_PP_PRIVATE_NAMES); }
bool get_pp_metavar_args(options const & opts) { return opts.get_bool(g_pp_metavar_args, LEAN_DEFAULT_PP_METAVAR_ARGS); }
bool get_pp_beta(options const & opts) { return opts.get_bool(g_pp_beta, LEAN_DEFAULT_PP_BETA); }
}

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

@ -19,5 +19,6 @@ bool get_pp_universes(options const & opts);
bool get_pp_full_names(options const & opts);
bool get_pp_private_names(options const & opts);
bool get_pp_metavar_args(options const & opts);
bool get_pp_beta(options const & opts);
list<options> const & get_distinguishing_pp_options();
}