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

visitor, print_visitor and build_visitor fixed

Browse source
This commit is contained in:
ProgramSnail 2023-04-29 13:44:34 +03:00
parent 776b6cccc6
commit 4d0b527416
9 changed files with 212 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/build_visitor.hpp
View file

@ -20,11 +20,12 @@ private:
// Sources -----------------
void Visit(SourceFile* node) override;
void Visit(Sources* node) override;
// Namespaces, partitions -----------------
void Visit(PartitionSources* node) override;
void Visit(Partition* node) override;
void Visit(NamespaceSources* node) override;
void Visit(Namespace* node) override;
// Definitions -----------------
@ -38,6 +39,8 @@ private:
void Visit(AbstractTypeDefinitionStatement* node) override;
void Visit(TypeclassDefinitionStatement* node) override;
void Visit(NamespaceStatement& node) override; // variant
void Visit(PartitionStatement& node) override; // variant
void Visit(SourceStatement& node) override; // variant
// Definition parts

47
include/interpreter_tree.hpp
View file

@ -25,12 +25,13 @@ using TypeclassIdentifier = std::string;
// Sources -----------------
struct SourceFile;
struct Sources;
// Namespaces, partitions -----------------
struct Partition;
struct PartitionSources;
struct Namespace;
struct NamespaceSources;
// Definitions -----------------
@ -43,15 +44,24 @@ struct TypeDefinitionStatement;
struct AbstractTypeDefinitionStatement;
struct TypeclassDefinitionStatement;
using SourceStatement = std::variant<
std::unique_ptr<ImportStatement>,
//
using NamespaceStatement = std::variant<
std::unique_ptr<AliasDefinitionStatement>,
std::unique_ptr<FunctionDeclaration>,
std::unique_ptr<FunctionDefinitionStatement>,
std::unique_ptr<TypeDefinitionStatement>,
std::unique_ptr<Namespace>>;
//
using PartitionStatement = std::variant<
std::unique_ptr<AbstractTypeDefinitionStatement>,
std::unique_ptr<TypeclassDefinitionStatement>,
std::unique_ptr<Namespace>>;
std::unique_ptr<NamespaceStatement>>;
//
using SourceStatement = std::variant<
std::unique_ptr<ImportStatement>,
std::unique_ptr<Partition>,
std::unique_ptr<PartitionStatement>>;
//
// Definition parts
@ -257,22 +267,13 @@ using Pattern = std::variant<
// ----------------- Sources -----------------
struct SourceFile {
std::vector<std::variant<SourceStatement, Partition>> statements;
};
struct Sources {
std::vector<SourceStatement> statements;
};
// ----------------- Namespaces, partittions -----------------
struct Namespace {
enum Modifier { Const, Var };
std::optional<Modifier> modifier; // modifier => variable namespace
TypeIdentifier type;
std::unique_ptr<Sources> scope;
std::optional<utils::IdType> type_id_;
struct PartitionSources {
std::vector<PartitionStatement> statements;
};
struct Partition {
@ -283,7 +284,20 @@ struct Partition {
};
PartitionName name;
std::unique_ptr<Sources> scope;
PartitionSources scope;
};
struct NamespaceSources {
std::vector<NamespaceStatement> statements;
};
struct Namespace {
enum Modifier { Const, Var };
std::optional<Modifier> modifier; // modifier => variable namespace
TypeIdentifier type;
NamespaceSources scope;
std::optional<utils::IdType> type_id_;
};
// ----------------- Definitions -----------------
@ -559,7 +573,6 @@ struct ExtendedScopedAnyType {
// Typeclass -----------------
struct TypeclassExpression {
std::vector<TypeSubExpression> path;
TypeclassSubExpression typeclass;
utils::IdType type_id_;

5
include/parse_token_types.hpp
View file

@ -7,8 +7,11 @@ namespace parser::tokens {
// Sources -----------------
const std::string SourceFile = "source_file";
const std::string Sources = "sources";
const std::string SourceStatement = "source_statement";
const std::string PartitionSources = "partition_sources";
const std::string PartitionStatement = "partition_statement";
const std::string NamespaceSources = "namespace_sources";
const std::string NamespaceStatement = "namespace_statement";
// Namespaces, partitions -----------------

3
include/print_visitor.hpp
View file

@ -15,11 +15,12 @@ private:
// Sources -----------------
void Visit(SourceFile* node) override;
void Visit(Sources* node) override;
// Namespaces, partitions -----------------
void Visit(PartitionSources* node) override;
void Visit(Partition* node) override;
void Visit(NamespaceSources* node) override;
void Visit(Namespace* node) override;
// Definitions -----------------

5
include/visitor.hpp
View file

@ -17,11 +17,12 @@ protected:
// Sources -----------------
virtual void Visit(SourceFile* node);
virtual void Visit(Sources* node);
// Namespaces, partitions -----------------
virtual void Visit(PartitionSources* node);
virtual void Visit(Partition* node);
virtual void Visit(NamespaceSources* node);
virtual void Visit(Namespace* node);
// Definitions -----------------
@ -35,6 +36,8 @@ protected:
virtual void Visit(AbstractTypeDefinitionStatement* node);
virtual void Visit(TypeclassDefinitionStatement* node);
virtual void Visit(NamespaceStatement& node); // variant
virtual void Visit(PartitionStatement& node); // variant
virtual void Visit(SourceStatement& node); // variant
// Definition parts