max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

dev(frontends/lean/parser): add local_context

Browse source
This commit is contained in:
Leonardo de Moura 2016-03-30 16:33:17 -07:00
parent e806700648
commit a1bc662eca
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -576,7 +576,7 @@ void parser::push_local_scope(bool save_options) {
opts = m_ios.get_options();
m_parser_scope_stack = cons(parser_scope_stack_elem(opts, m_level_variables, m_variables, m_include_vars,
m_undef_ids.size(), m_next_inst_idx, m_has_params, m_local_level_decls,
m_local_decls),
m_local_context, m_local_decls),
m_parser_scope_stack);
}
@ -590,6 +590,7 @@ void parser::pop_local_scope() {
updt_options();
}
m_local_level_decls = s.m_local_level_decls;
m_local_context = s.m_local_context;
m_local_decls = s.m_local_decls;
m_level_variables = s.m_level_variables;
m_variables = s.m_variables;
@ -2305,7 +2306,7 @@ void parser::save_snapshot() {
if (!m_snapshot_vector)
return;
if (m_snapshot_vector->empty() || static_cast<int>(m_snapshot_vector->back().m_line) != m_scanner.get_line())
m_snapshot_vector->push_back(snapshot(m_env, m_local_level_decls, m_local_decls,
m_snapshot_vector->push_back(snapshot(m_env, m_local_level_decls, m_local_context, m_local_decls,
m_level_variables, m_variables, m_include_vars,
m_ios.get_options(), m_parser_scope_stack, m_scanner.get_line()));
}

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

@ -15,6 +15,7 @@ Author: Leonardo de Moura
#include "kernel/expr_maps.h"
#include "library/io_state.h"
#include "library/io_state_stream.h"
#include "library/local_context.h"
#include "library/definition_cache.h"
#include "library/declaration_index.h"
#include "frontends/lean/scanner.h"
@ -51,12 +52,14 @@ struct parser_scope_stack_elem {
unsigned m_next_inst_idx;
bool m_has_params;
local_level_decls m_local_level_decls;
local_expr_decls m_local_decls;
local_context m_local_context;
local_expr_decls m_local_decls; // TODO(Leo): delete
parser_scope_stack_elem(optional<options> const & o, name_set const & lvs, name_set const & vs, name_set const & ivs,
unsigned num_undef_ids, unsigned next_inst_idx, bool has_params,
local_level_decls const & lld, local_expr_decls const & led):
local_level_decls const & lld, local_context const & lctx, local_expr_decls const & led):
m_options(o), m_level_variables(lvs), m_variables(vs), m_include_vars(ivs),
m_num_undef_ids(num_undef_ids), m_next_inst_idx(next_inst_idx), m_has_params(has_params), m_local_level_decls(lld), m_local_decls(led) {}
m_num_undef_ids(num_undef_ids), m_next_inst_idx(next_inst_idx), m_has_params(has_params),
m_local_level_decls(lld), m_local_context(lctx), m_local_decls(led) {}
};
typedef list<parser_scope_stack_elem> parser_scope_stack;
@ -64,6 +67,7 @@ typedef list<parser_scope_stack_elem> parser_scope_stack;
struct snapshot {
environment m_env;
local_level_decls m_lds;
local_context m_lctx;
local_expr_decls m_eds;
name_set m_lvars; // subset of m_lds that is tagged as level variable
name_set m_vars; // subset of m_eds that is tagged as variable
@ -73,10 +77,10 @@ struct snapshot {
unsigned m_line;
snapshot():m_line(0) {}
snapshot(environment const & env, options const & o):m_env(env), m_options(o), m_line(1) {}
snapshot(environment const & env, local_level_decls const & lds,
snapshot(environment const & env, local_level_decls const & lds, local_context const & lctx,
local_expr_decls const & eds, name_set const & lvars, name_set const & vars,
name_set const & includes, options const & opts, parser_scope_stack const & pss, unsigned line):
m_env(env), m_lds(lds), m_eds(eds), m_lvars(lvars), m_vars(vars), m_include_vars(includes),
m_env(env), m_lds(lds), m_lctx(lctx), m_eds(eds), m_lvars(lvars), m_vars(vars), m_include_vars(includes),
m_options(opts), m_parser_scope_stack(pss), m_line(line) {}
};
@ -97,7 +101,8 @@ class parser {
scanner::token_kind m_curr;
optional<std::string> m_base_dir;
local_level_decls m_local_level_decls;
local_expr_decls m_local_decls;
local_context m_local_context;
local_expr_decls m_local_decls; // TODO(Leo): delete
bool m_has_params; // true context context contains parameters
name_set m_level_variables;
name_set m_variables; // subset of m_local_decls that is marked as variables