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

feat(kernel/environment): add trust level field

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-04-21 13:38:39 -07:00
parent ee58a83e25
commit bfeb51ce58
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/kernel/environment.cpp
View file

@ -19,20 +19,20 @@ public:
} }
}; };
environment_header::environment_header(bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension const> ext): environment_header::environment_header(unsigned trust_lvl, bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension const> ext):
m_proof_irrel(proof_irrel), m_eta(eta), m_norm_ext(std::move(ext)) {} m_trust_lvl(trust_lvl), m_proof_irrel(proof_irrel), m_eta(eta), m_norm_ext(std::move(ext)) {}
environment_extension::~environment_extension() {} environment_extension::~environment_extension() {}
environment::environment(header const & h, definitions const & d, extensions const & exts): environment::environment(header const & h, definitions const & d, extensions const & exts):
m_header(h), m_definitions(d), m_extensions(exts) {} m_header(h), m_definitions(d), m_extensions(exts) {}
environment::environment(bool proof_irrel, bool eta): environment::environment(unsigned trust_lvl, bool proof_irrel, bool eta):
environment(proof_irrel, eta, std::unique_ptr<normalizer_extension>(new noop_normalizer_extension())) environment(trust_lvl, proof_irrel, eta, std::unique_ptr<normalizer_extension>(new noop_normalizer_extension()))
{} {}
environment::environment(bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension> ext): environment::environment(unsigned trust_lvl, bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension> ext):
m_header(std::make_shared<environment_header>(proof_irrel, eta, std::move(ext))), m_header(std::make_shared<environment_header>(trust_lvl, proof_irrel, eta, std::move(ext))),
m_extensions(std::make_shared<environment_extensions const>()) m_extensions(std::make_shared<environment_extensions const>())
{} {}

19
src/kernel/environment.h
View file

@ -35,12 +35,18 @@ public:
Moreover if environment B is an extension of environment A, then A and B share the same header. Moreover if environment B is an extension of environment A, then A and B share the same header.
*/ */
class environment_header { class environment_header {
bool m_proof_irrel; //!< true if the kernel assumes proof irrelevance /* In the following field, 0 means untrusted mode (i.e., check everything),
bool m_eta; //!< true if the kernel uses eta-reduction in convertability checks >= 1 means do not check imported modules, and do not check macros
with level less than the value of this field.
*/
unsigned m_trust_lvl; //!the given one.
bool m_proof_irrel; //!< true if the kernel assumes proof irrelevance
bool m_eta; //!< true if the kernel uses eta-reduction in convertability checks
std::unique_ptr<normalizer_extension const> m_norm_ext; std::unique_ptr<normalizer_extension const> m_norm_ext;
void dealloc(); void dealloc();
public: public:
environment_header(bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension const> ext); environment_header(unsigned trust_lvl, bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension const> ext);
unsigned trust_lvl() const { return m_trust_lvl; }
bool proof_irrel() const { return m_proof_irrel; } bool proof_irrel() const { return m_proof_irrel; }
bool eta() const { return m_eta; } bool eta() const { return m_eta; }
normalizer_extension const & norm_ext() const { return *(m_norm_ext.get()); } normalizer_extension const & norm_ext() const { return *(m_norm_ext.get()); }
@ -73,12 +79,15 @@ class environment {
environment(header const & h, definitions const & d, extensions const & ext); environment(header const & h, definitions const & d, extensions const & ext);
public: public:
environment(bool proof_irrel = true, bool eta = true); environment(unsigned trust_lvl = 0, bool proof_irrel = true, bool eta = true);
environment(bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension> ext); environment(unsigned trust_lvl, bool proof_irrel, bool eta, std::unique_ptr<normalizer_extension> ext);
~environment(); ~environment();
std::shared_ptr<environment_header const> get_header() const { return m_header; } std::shared_ptr<environment_header const> get_header() const { return m_header; }
/** \brief Return the trust level of this environment. */
unsigned trust_lvl() const { return m_header->trust_lvl(); }
/** \brief Return true iff the environment assumes proof irrelevance */ /** \brief Return true iff the environment assumes proof irrelevance */
bool proof_irrel() const { return m_header->proof_irrel(); } bool proof_irrel() const { return m_header->proof_irrel(); }