Make type_env a class.
This commit is contained in:
parent
0e3f16139d
commit
ba418d357f
|
@ -69,7 +69,7 @@ void compiler::translate() {
|
||||||
}
|
}
|
||||||
for(auto& defn : global_defs.defs_defn) {
|
for(auto& defn : global_defs.defs_defn) {
|
||||||
auto& function = defn.second->into_global(global_scp);
|
auto& function = defn.second->into_global(global_scp);
|
||||||
function.body->env->parent->set_mangled_name(defn.first, function.name);
|
function.body->env->get_parent()->set_mangled_name(defn.first, function.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
#include "type.hpp"
|
#include "type.hpp"
|
||||||
#include "error.hpp"
|
#include "error.hpp"
|
||||||
|
|
||||||
|
type_env_ptr type_env::get_parent() {
|
||||||
|
return parent;
|
||||||
|
}
|
||||||
|
|
||||||
void type_env::find_free(const type_mgr& mgr, std::set<std::string>& into) const {
|
void type_env::find_free(const type_mgr& mgr, std::set<std::string>& into) const {
|
||||||
if(parent != nullptr) parent->find_free(mgr, into);
|
if(parent != nullptr) parent->find_free(mgr, into);
|
||||||
for(auto& binding : names) {
|
for(auto& binding : names) {
|
||||||
|
|
|
@ -10,7 +10,8 @@ using type_env_ptr = std::shared_ptr<type_env>;
|
||||||
|
|
||||||
enum class visibility { global,local };
|
enum class visibility { global,local };
|
||||||
|
|
||||||
struct type_env {
|
class type_env {
|
||||||
|
private:
|
||||||
struct variable_data {
|
struct variable_data {
|
||||||
type_scheme_ptr type;
|
type_scheme_ptr type;
|
||||||
visibility vis;
|
visibility vis;
|
||||||
|
@ -26,9 +27,11 @@ struct type_env {
|
||||||
std::map<std::string, variable_data> names;
|
std::map<std::string, variable_data> names;
|
||||||
std::map<std::string, type_ptr> type_names;
|
std::map<std::string, type_ptr> type_names;
|
||||||
|
|
||||||
|
public:
|
||||||
type_env(type_env_ptr p) : parent(std::move(p)) {}
|
type_env(type_env_ptr p) : parent(std::move(p)) {}
|
||||||
type_env() : type_env(nullptr) {}
|
type_env() : type_env(nullptr) {}
|
||||||
|
|
||||||
|
type_env_ptr get_parent();
|
||||||
void find_free(const type_mgr& mgr, std::set<std::string>& into) const;
|
void find_free(const type_mgr& mgr, std::set<std::string>& into) const;
|
||||||
void find_free_except(const type_mgr& mgr, const group& avoid,
|
void find_free_except(const type_mgr& mgr, const group& avoid,
|
||||||
std::set<std::string>& into) const;
|
std::set<std::string>& into) const;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user