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

refactor(library/definitions_cache): rename to definition_cache

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-08-14 18:12:12 -07:00
parent cb8297e948
commit dc3e9a15d2
7 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/frontends/lean/parser.cpp
View file

@ -1299,7 +1299,7 @@ void parser::save_type_info(expr const & e) {
}
bool parse_commands(environment & env, io_state & ios, std::istream & in, char const * strm_name, bool use_exceptions,
unsigned num_threads, definitions_cache * cache, declaration_index * index) {
unsigned num_threads, definition_cache * cache, declaration_index * index) {
parser p(env, ios, in, strm_name, use_exceptions, num_threads);
p.set_cache(cache);
p.set_index(index);
@ -1310,7 +1310,7 @@ bool parse_commands(environment & env, io_state & ios, std::istream & in, char c
}
bool parse_commands(environment & env, io_state & ios, char const * fname, bool use_exceptions, unsigned num_threads,
definitions_cache * cache, declaration_index * index) {
definition_cache * cache, declaration_index * index) {
std::ifstream in(fname);
if (in.bad() || in.fail())
throw exception(sstream() << "failed to open file '" << fname << "'");

10
src/frontends/lean/parser.h
View file

@ -20,7 +20,7 @@ Author: Leonardo de Moura
#include "library/io_state.h"
#include "library/io_state_stream.h"
#include "library/kernel_bindings.h"
#include "library/definitions_cache.h"
#include "library/definition_cache.h"
#include "library/declaration_index.h"
#include "frontends/lean/scanner.h"
#include "frontends/lean/elaborator.h"
@ -94,7 +94,7 @@ class parser {
std::vector<type_info_data> m_pre_info_data; // type information before elaboration
// cache support
definitions_cache * m_cache;
definition_cache * m_cache;
// index support
declaration_index * m_index;
@ -179,7 +179,7 @@ public:
snapshot_vector * sv = nullptr, info_manager * im = nullptr);
~parser();
void set_cache(definitions_cache * c) { m_cache = c; }
void set_cache(definition_cache * c) { m_cache = c; }
void cache_definition(name const & n, expr const & pre_type, expr const & pre_value,
level_param_names const & ls, expr const & type, expr const & value);
/** \brief Try to find an elaborated definition for (n, pre_type, pre_value) in the cache */
@ -333,8 +333,8 @@ public:
};
bool parse_commands(environment & env, io_state & ios, std::istream & in, char const * strm_name,
bool use_exceptions, unsigned num_threads, definitions_cache * cache = nullptr,
bool use_exceptions, unsigned num_threads, definition_cache * cache = nullptr,
declaration_index * index = nullptr);
bool parse_commands(environment & env, io_state & ios, char const * fname, bool use_exceptions, unsigned num_threads,
definitions_cache * cache = nullptr, declaration_index * index = nullptr);
definition_cache * cache = nullptr, declaration_index * index = nullptr);
}

4
src/frontends/lean/server.h
View file

@ -8,7 +8,7 @@ Author: Leonardo de Moura
#include <vector>
#include <string>
#include <unordered_map>
#include "library/definitions_cache.h"
#include "library/definition_cache.h"
#include "frontends/lean/parser.h"
#include "frontends/lean/info_manager.h"
@ -40,7 +40,7 @@ class server {
std::ostream & m_out;
unsigned m_num_threads;
snapshot m_empty_snapshot;
definitions_cache m_cache;
definition_cache m_cache;
void load_file(std::string const & fname);
void visit_file(std::string const & fname);

2
src/library/CMakeLists.txt
View file

@ -7,6 +7,6 @@ add_library(library deep_copy.cpp expr_lt.cpp io_state.cpp occurs.cpp
standard_kernel.cpp hott_kernel.cpp
unifier.cpp unifier_plugin.cpp inductive_unifier_plugin.cpp
explicit.cpp num.cpp string.cpp opaque_hints.cpp head_map.cpp
match.cpp definitions_cache.cpp declaration_index.cpp)
match.cpp definition_cache.cpp declaration_index.cpp)
target_link_libraries(library ${LEAN_LIBS})

14
src/library/definitions_cache.cpp → src/library/definition_cache.cpp
View file

@ -7,7 +7,7 @@ Author: Leonardo de Moura
#include "util/interrupt.h"
#include "library/placeholder.h"
#include "library/kernel_serializer.h"
#include "library/definitions_cache.h"
#include "library/definition_cache.h"
namespace lean {
/** \brief Similar to expr_eq_fn, but allows different placeholders
@ -118,9 +118,9 @@ public:
bool operator()(expr const & a, expr const & b) { return compare(a, b); }
};
definitions_cache::definitions_cache() {}
definition_cache::definition_cache() {}
void definitions_cache::load(std::istream & in) {
void definition_cache::load(std::istream & in) {
lock_guard<mutex> lc(m_mutex);
deserializer d(in);
unsigned num;
@ -134,18 +134,18 @@ void definitions_cache::load(std::istream & in) {
}
}
void definitions_cache::add_core(name const & n, expr const & pre_type, expr const & pre_value,
void definition_cache::add_core(name const & n, expr const & pre_type, expr const & pre_value,
level_param_names const & ls, expr const & type, expr const & value) {
m_definitions.insert(n, entry(pre_type, pre_value, ls, type, value));
}
void definitions_cache::add(name const & n, expr const & pre_type, expr const & pre_value,
void definition_cache::add(name const & n, expr const & pre_type, expr const & pre_value,
level_param_names const & ls, expr const & type, expr const & value) {
lock_guard<mutex> lc(m_mutex);
add_core(n, pre_type, pre_value, ls, type, value);
}
optional<std::tuple<level_param_names, expr, expr>> definitions_cache::find(name const & n, expr const & pre_type, expr const & pre_value) {
optional<std::tuple<level_param_names, expr, expr>> definition_cache::find(name const & n, expr const & pre_type, expr const & pre_value) {
entry const * it;
{
lock_guard<mutex> lc(m_mutex);
@ -162,7 +162,7 @@ optional<std::tuple<level_param_names, expr, expr>> definitions_cache::find(name
return optional<std::tuple<level_param_names, expr, expr>>();
}
void definitions_cache::save(std::ostream & out) {
void definition_cache::save(std::ostream & out) {
lock_guard<mutex> lc(m_mutex);
serializer s(out);
s << m_definitions.size();

4
src/library/definitions_cache.h → src/library/definition_cache.h
View file

@ -14,14 +14,14 @@ namespace lean {
/** \brief Cache for mapping definitions (type, value) before elaboration to (level_names, type, value)
after elaboration.
*/
class definitions_cache {
class definition_cache {
typedef std::tuple<expr, expr, level_param_names, expr, expr> entry;
mutex m_mutex;
name_map<entry> m_definitions;
void add_core(name const & n, expr const & pre_type, expr const & pre_value, level_param_names const & ls,
expr const & type, expr const & value);
public:
definitions_cache();
definition_cache();
/** \brief Add the cache entry (n, pre_type, pre_value) -> (ls, type, value) */
void add(name const & n, expr const & pre_type, expr const & pre_value, level_param_names const & ls, expr const & type, expr const & value);
/** \brief Return (if available) elaborated (level_names, type, value) for (n, pre_type, pre_value).

8
src/shell/lean.cpp
View file

@ -24,7 +24,7 @@ Author: Leonardo de Moura
#include "library/hott_kernel.h"
#include "library/module.h"
#include "library/io_state_stream.h"
#include "library/definitions_cache.h"
#include "library/definition_cache.h"
#include "library/declaration_index.h"
#include "library/error_handling/error_handling.h"
#include "frontends/lean/parser.h"
@ -45,7 +45,7 @@ using lean::mk_environment;
using lean::mk_hott_environment;
using lean::set_environment;
using lean::set_io_state;
using lean::definitions_cache;
using lean::definition_cache;
using lean::pos_info;
using lean::pos_info_provider;
using lean::optional;
@ -247,8 +247,8 @@ int main(int argc, char ** argv) {
script_state S = lean::get_thread_script_state();
set_environment set1(S, env);
set_io_state set2(S, ios);
definitions_cache cache;
definitions_cache * cache_ptr = nullptr;
definition_cache cache;
definition_cache * cache_ptr = nullptr;
if (use_cache) {
cache_ptr = &cache;
std::ifstream in(cache_name);