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

fixes, colored errors

Browse source
This commit is contained in:
ProgramSnail 2023-05-13 22:40:33 +03:00
parent 4b4756b657
commit 047ead6fa3
11 changed files with 166 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/find_symbols_visitor.cpp
View file

@ -1,3 +1,5 @@
#include <iostream>
// for clangd
#include "../include/find_symbols_visitor.hpp"
@ -8,7 +10,7 @@ namespace interpreter {
// Namespaces, partitions -----------------
void FindSymbolsVisitor::Visit(Namespace* node) {
namespace_visitor_.AddEnterNamespace(node->type, node->modifier, node->base);
namespace_visitor_.AddEnterNamespace(node->type, node->modifier, node->base);
Visitor::Visit(&node->scope);
@ -19,27 +21,19 @@ void FindSymbolsVisitor::Visit(Namespace* node) {
// TODO: add imported symbols to symbol table (global info)
void FindSymbolsVisitor::Visit(ImportStatement* node) {
is_in_statement_ = true;
info::definition::Import info;
info.module_name = node->module_name;
info.symbols = node->symbols;
namespace_visitor_.AddImport(std::move(info), node->name);
is_in_statement_ = false;
}
void FindSymbolsVisitor::Visit(AliasDefinitionStatement* node) {
is_in_statement_ = true;
info::definition::Type info;
info::definition::AliasType alias_info;
alias_info.modifier = node->modifier;
// TODO: deduce parameter requirements
alias_info.parameters = node->parameters;
alias_info.value.node = node->value.get();
alias_info.node = node;
@ -47,14 +41,9 @@ void FindSymbolsVisitor::Visit(AliasDefinitionStatement* node) {
info.type = std::move(alias_info);
node->type_id_ = namespace_visitor_.AddType(node->type, std::move(info), node->base);
is_in_statement_ = false;
}
void FindSymbolsVisitor::Visit(FunctionDeclaration* node) {
bool was_in_statement = is_in_statement_;
is_in_statement_ = true;
info::definition::FunctionDeclaration info;
info.parameters.resize(node->parameters.size());
@ -71,17 +60,10 @@ void FindSymbolsVisitor::Visit(FunctionDeclaration* node) {
info.node = node;
if (was_in_statement) {
current_info_ = std::move(info);
} else {
node->function_id_ = namespace_visitor_.AddFunctionDeclaration(node->name, std::move(info));
is_in_statement_ = false;
}
node->function_id_ = namespace_visitor_.AddFunctionDeclaration(node->name, std::move(info), node->base);
}
void FindSymbolsVisitor::Visit(FunctionDefinitionStatement* node) {
is_in_statement_ = true;
info::definition::FunctionDefinition info;
auto definition = node->definition.get();
@ -93,14 +75,10 @@ void FindSymbolsVisitor::Visit(FunctionDefinitionStatement* node) {
info.node = node;
node->function_id_ = namespace_visitor_.AddFunctionDefinition(definition->name, std::move(info));
is_in_statement_ = false;
node->function_id_ = namespace_visitor_.AddFunctionDefinition(definition->name, std::move(info), node->base);
}
void FindSymbolsVisitor::Visit(TypeDefinitionStatement* node) {
is_in_statement_ = true;
info::definition::Type info;
auto definition = node->definition.get();
@ -127,13 +105,9 @@ void FindSymbolsVisitor::Visit(TypeDefinitionStatement* node) {
info.type = std::move(any_type_info);
node->type_id_ = namespace_visitor_.AddType(type, std::move(info), node->base);
is_in_statement_ = false;
}
void FindSymbolsVisitor::Visit(AbstractTypeDefinitionStatement* node) {
is_in_statement_ = true;
info::definition::AbstractType info;
Visit(node->type.get());
@ -145,17 +119,15 @@ void FindSymbolsVisitor::Visit(AbstractTypeDefinitionStatement* node) {
std::string type = info.type.type;
node->type_id_ = namespace_visitor_.AddAbstractType(type, std::move(info), node->base);
is_in_statement_ = false;
}
void FindSymbolsVisitor::Visit(TypeclassDefinitionStatement* node) {
is_in_statement_ = true;
info::definition::Typeclass info;
auto definition = node->definition.get();
std::string& type_name = definition->type.get()->type;
info.parameters.resize(definition->parameters.size());
for (size_t i = 0; i < definition->parameters.size(); ++i) {
Visit(definition->parameters[i].get());
@ -163,32 +135,25 @@ void FindSymbolsVisitor::Visit(TypeclassDefinitionStatement* node) {
current_info_.reset();
}
info.function_requirements.resize(node->function_requirements.size());
namespace_visitor_.AddEnterNamespace(type_name, std::nullopt, node->base);
for (size_t i = 0; i < node->function_requirements.size(); ++i) {
Visit(node->function_requirements[i].get());
info.function_requirements[i] = std::move(std::any_cast<info::definition::FunctionDeclaration>(current_info_));
current_info_.reset();
}
namespace_visitor_.ExitNamespace();
info.method_requirements.resize(node->method_requirements.size());
namespace_visitor_.AddEnterNamespace(type_name, utils::IsConstModifier::Var, node->base);
for (size_t i = 0; i < node->method_requirements.size(); ++i) {
Visit(node->method_requirements[i].get());
info.method_requirements[i] = std::move(std::any_cast<info::definition::FunctionDeclaration>(current_info_));
current_info_.reset();
}
namespace_visitor_.ExitNamespace();
node->typeclass_id_ = namespace_visitor_.AddTypeclass(definition->type.get()->type, std::move(info), node->base);
info.node = node;
is_in_statement_ = false;
node->typeclass_id_ = namespace_visitor_.AddTypeclass(type_name, std::move(info), node->base);
}
void FindSymbolsVisitor::Visit(PartitionStatement* node) {
is_in_statement_ = true;
node->executable_id_ = namespace_visitor_.AddPartition(node->name.path, node);
// TODO: typecheck error on same tests
is_in_statement_ = false;
}
// Definition parts