find_symbols_visitor, global_info fixed

This commit is contained in:
ProgramSnail 2023-04-29 18:42:30 +03:00
parent 4d0b527416
commit a512a92f92
9 changed files with 289 additions and 277 deletions

View file

@ -5,7 +5,7 @@
#include <unordered_map>
// for clangd
#include "symbols_info.hpp"
#include "definitions.hpp"
#include "type_manager.hpp"
#include "utils.hpp"
@ -19,11 +19,10 @@ public:
friend GlobalInfo;
NamespaceVisitor() = delete;
public:
void AddImport(ImportInfo&& import_info, const std::optional<std::string>& name = std::nullopt);
void AddImport(definition::Import&& import_info, const std::optional<std::string>& name = std::nullopt);
void AddEnterNamespace(const std::string& name,
const std::optional<NamespaceInfo::Modifier>& modifier = std::nullopt,
const std::optional<std::string>& variable = std::nullopt);
const std::optional<definition::Namespace::Modifier>& modifier = std::nullopt);
void EnterNamespace(const std::string& name);
@ -32,29 +31,35 @@ public:
void ToGlobalNamespace();
utils::IdType AddFunctionDeclaration(const std::string& name,
FunctionDeclarationInfo&& function_declaration_info);
definition::FunctionDeclaration&& function_declaration_info);
utils::IdType AddFunctionDefinition(const std::string& name,
FunctionDefinitionInfo&& function_definition_info);
definition::FunctionDefinition&& function_definition_info);
utils::IdType AddType(const std::string& type, TypeInfo&& type_info);
utils::IdType AddType(const std::string& type, definition::Type&& type_info);
utils::IdType AddTypeclass(const std::string& typeclass, TypeclassInfo&& typeclass_info);
utils::IdType AddTypeclass(const std::string& typeclass, definition::Typeclass&& typeclass_info);
std::optional<NamespaceInfo*> FindNamespace(const std::optional<std::vector<std::string>>& path);
utils::IdType AddConstructor(const std::string& constructor,
definition::Constructor&& constructor_info);
std::optional<std::vector<utils::IdType>> FindFunction(const std::optional<std::vector<std::string>>& path,
const std::string& name);
std::optional<definition::Namespace*> FindNamespace(const std::optional<std::vector<std::string>>& path);
std::optional<std::vector<utils::IdType>> FindMethod(const std::optional<std::vector<std::string>>& path,
std::optional<utils::IdType> FindFunction(const std::optional<std::vector<std::string>>& path,
const std::string& name);
std::optional<utils::IdType> FindMethod(const std::optional<std::vector<std::string>>& path,
const std::string& type,
const std::string& name);
std::optional<std::vector<utils::IdType>> FindType(const std::optional<std::vector<std::string>>& path,
const std::string type);
std::optional<utils::IdType> FindType(const std::optional<std::vector<std::string>>& path,
const std::string& type);
std::optional<std::vector<utils::IdType>> FindTypeclass(const std::optional<std::vector<std::string>>& path,
const std::string typeclass);
std::optional<utils::IdType> FindTypeclass(const std::optional<std::vector<std::string>>& path,
const std::string& typeclass);
std::optional<utils::IdType> FindConstructor(const std::optional<std::vector<std::string>>& path,
const std::string& typeclass);
NamespaceVisitor CreateVisitor() {
return global_info_.CreateVisitor();
@ -77,12 +82,12 @@ public:
template<typename T>
std::optional<T> FindSomething(const std::optional<std::vector<std::string>>& path,
std::function<std::optional<T>(NamespaceInfo*)> search_func);
std::function<std::optional<T>(definition::Namespace*)> search_func);
std::optional<NamespaceInfo*> FindNamespaceIn(NamespaceInfo* current_namespace,
std::optional<definition::Namespace*> FindNamespaceIn(definition::Namespace* current_namespace,
const std::vector<std::string>& path);
private:
std::vector<NamespaceInfo*> namespace_stack_;
std::vector<definition::Namespace*> namespace_stack_;
std::vector<std::string> current_path_;
GlobalInfo& global_info_;
@ -97,30 +102,36 @@ public:
}
// TODO: remember about vector realloc
FunctionInfo* GetFunctionInfo(utils::IdType id) {
definition::Function* GetFunctionInfo(utils::IdType id) {
return &functions_[id];
}
// TODO: remember about vector realloc
TypeInfo* GetTypeInfo(utils::IdType id) {
definition::Type* GetTypeInfo(utils::IdType id) {
return &types_[id];
}
// TODO: remember about vector realloc
TypeclassInfo* GetTypeclassInfo(utils::IdType id) {
definition::Typeclass* GetTypeclassInfo(utils::IdType id) {
return &typeclasses_[id];
}
// TODO: remember about vector realloc
definition::Constructor* GetConstructorInfo(utils::IdType id) {
return &constructors_[id];
}
private:
std::vector<FunctionInfo> functions_;
std::vector<TypeInfo> types_;
std::vector<TypeclassInfo> typeclasses_;
std::vector<definition::Function> functions_;
std::vector<definition::Type> types_;
std::vector<definition::Typeclass> typeclasses_;
std::vector<definition::Constructor> constructors_;
type::TypeManager type_manager_;
NamespaceInfo global_namespace_;
std::vector<ImportInfo> imports_;
std::unordered_map<std::string, ImportInfo> usages_;
definition::Namespace global_namespace_;
std::vector<definition::Import> imports_;
std::unordered_map<std::string, definition::Import> usages_;
};
} // namespace info