st/lang_2023
1
0
Fork 0
mirror of https://codeberg.org/ProgramSnail/lang_2023.git synced 2025-12-06 06:58:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

link_symbols_visitor improvements

Browse source
This commit is contained in:
ProgramSnail 2023-05-02 16:51:47 +03:00
parent 496d3819d9
commit 0dc8880c58
5 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/definitions.hpp
View file

@ -90,6 +90,8 @@ struct Namespace {
std::unordered_map<std::string, Namespace> namespaces; std::unordered_map<std::string, Namespace> namespaces;
std::unordered_map<std::string, Namespace> variable_namespaces; std::unordered_map<std::string, Namespace> variable_namespaces;
Namespace* parent_namespace = nullptr;;
std::optional<Modifier> modifier; // modifier => variable namespace std::optional<Modifier> modifier; // modifier => variable namespace
std::string type_name; std::string type_name;
}; };

2
include/global_info.hpp
View file

@ -21,7 +21,7 @@ public:
struct Path { struct Path {
std::vector<std::optional<utils::IdType>> path_types; std::vector<std::optional<utils::IdType>> path_types;
definition::Namespace* result; definition::Namespace* result;
} };
void AddImport(definition::Import&& import_info, const std::optional<std::string>& name = std::nullopt); void AddImport(definition::Import&& import_info, const std::optional<std::string>& name = std::nullopt);

3
include/interpreter_tree.hpp
View file

@ -557,6 +557,9 @@ struct TypeExpression {
TypeSubExpression type; TypeSubExpression type;
std::optional<size_t> array_size; // if array; 0 - dynamic size std::optional<size_t> array_size; // if array; 0 - dynamic size
std::optional<utils::IdType> type_id_;
std::optional<utils::IdType> constructor_id_;
}; };
struct ExtendedScopedAnyType { struct ExtendedScopedAnyType {

2
src/global_info.cpp
View file

@ -27,6 +27,8 @@ void GlobalInfo::NamespaceVisitor::AddEnterNamespace(const std::string& name,
namespace_stack_.push_back(namespace_info); namespace_stack_.push_back(namespace_info);
} }
namespace_info->parent_namespace = namespace_stack_.back();
namespace_info->type_name = name; namespace_info->type_name = name;
current_path_.push_back(name); current_path_.push_back(name);
} }

30
src/link_symbols_visitor.cpp
View file

@ -50,6 +50,7 @@ void LinkSymbolsVisitor::Visit(Namespace* node) {
// Type // Type
// TODO: link internal stages // TODO: link internal stages
// TODO: find constructors ?
void LinkSymbolsVisitor::Visit(TypeExpression* node) { // TODO: check void LinkSymbolsVisitor::Visit(TypeExpression* node) { // TODO: check
std::vector<std::string> path; std::vector<std::string> path;
path.reserve(node->path.size()); path.reserve(node->path.size());
@ -58,12 +59,31 @@ void LinkSymbolsVisitor::Visit(TypeExpression* node) { // TODO: check
path.push_back(NameFromTypeSubExpression(path_type)); path.push_back(NameFromTypeSubExpression(path_type));
} }
std::optional<utils::IdType> maybe_type = namespace_visitor_.FindType(path, NameFromTypeSubExpression(node->type)); node->type_id_ = namespace_visitor_.FindType(path, NameFromTypeSubExpression(node->type));
node->type_id_ = namespace_visitor_.FindType(path, NameFromTypeSubExpression(node->type));
if (maybe_type.has_value()) { if (!node->type_id_.has_value() && !node->constructor_id_.has_value()) {
node->type_id_ = maybe_type.value(); error_handling::HandleTypecheckError("Type or constructor not found");
} else { }
error_handling::HandleTypecheckError("Type not found");
std::optional<info::definition::Namespace*> maybe_type_namespace = namespace_visitor_.FindNamespace(path);
if (maybe_type_namespace.has_value()) {
info::definition::Namespace* type_namespace = maybe_type_namespace.value();
for (ssize_t i = (ssize_t)node->path.size(); i >= 0; --i) {
info::definition::Namespace* parent_namespace = type_namespace->parent_namespace;
auto maybe_type = parent_namespace->types.find(type_namespace->type_name); // TODO: make method ??
if (maybe_type.has_value()) {
node->path[i]->
}
if (parent_namespace == nullptr) {
error_handling::HandleInternalError("Parent namespace is null in type expression", "LinkSymbolsVisitor");
}
type_namespace = parent_namespace;
}
} }
} }