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

refactor(kernel): finish formatter interface

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-02-22 23:17:52 -08:00
parent 28516a8dc2
commit 4b7fe064fe
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/kernel/formatter.cpp
View file

@ -151,6 +151,12 @@ public:
virtual format operator()(expr const & e, options const &) {
std::ostringstream s; s << e; return format(s.str());
}
virtual format operator()(object const & /* obj */, options const & /* opts */) {
return format(); // TODO(Leo)
}
virtual format operator()(ro_environment const & /* env */, options const & /* opts */) {
return format(); // TODO(Leo)
}
};
formatter mk_simple_formatter() {
return mk_formatter(simple_formatter_cell());

5
src/kernel/formatter.h
View file

@ -7,6 +7,7 @@ Author: Leonardo de Moura
#pragma once
#include <memory>
#include "util/sexpr/options.h"
#include "kernel/environment.h"
#include "kernel/expr.h"
namespace lean {
@ -18,7 +19,6 @@ public:
virtual ~formatter_cell() {}
/** \brief Format the given expression. */
virtual format operator()(expr const & e, options const & opts) = 0;
#if 0
/** \brief Format the given object */
virtual format operator()(object const & obj, options const & opts) = 0;
/** \brief Format the given environment */
@ -29,7 +29,6 @@ public:
Not every formatter has an associated environment object.
*/
virtual optional<ro_environment> get_environment() const { return optional<ro_environment>(); }
#endif
};
/**
\brief Smart-pointer for the actual formatter object (aka \c formatter_cell).
@ -39,11 +38,9 @@ class formatter {
formatter(formatter_cell * c):m_cell(c) {}
public:
format operator()(expr const & e, options const & opts = options()) const { return (*m_cell)(e, opts); }
#if 0
format operator()(object const & obj, options const & opts = options()) const { return (*m_cell)(obj, opts); }
format operator()(ro_environment const & env, options const & opts = options()) const { return (*m_cell)(env, opts); }
optional<ro_environment> get_environment() { return m_cell->get_environment(); }
#endif
template<typename FCell> friend formatter mk_formatter(FCell && fcell);
};

6
src/library/CMakeLists.txt
View file

@ -1,7 +1,7 @@
add_library(library deep_copy.cpp expr_lt.cpp)
add_library(library deep_copy.cpp expr_lt.cpp io_state_stream.cpp)
# kernel_bindings.cpp
# context_to_lambda.cpp placeholder.cpp substitution.cpp
# fo_unify.cpp bin_op.cpp equality.cpp io_state_stream.cpp printer.cpp
# context_to_lambda.cpp placeholder.cpp
# fo_unify.cpp bin_op.cpp equality.cpp printer.cpp
# hop_match.cpp)
target_link_libraries(library ${LEAN_LIBS})