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

grammar refactoring: printer_visitor fixed

Browse source
This commit is contained in:
ProgramSnail 2023-04-09 16:01:07 +03:00
parent 77c7ac0b2f
commit 2d2bb9ec65
3 changed files with 344 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/interpreter_tree.hpp
View file

@ -255,7 +255,7 @@ struct Sources {
// ----------------- Namespaces, partittions -----------------
struct Namespace {
bool is_const;
enum { Const, Var } modifier;
std::optional<ExtendedName> name;
TypeIdentifier type;
std::unique_ptr<Sources> scope;
@ -284,6 +284,7 @@ struct ImportStatement {
};
struct AliasDefinitionStatement {
enum {Alias, Type, Let} modifier;
TypeIdentifier type;
std::vector<AbstractTypeIdentifier> parameters;
std::unique_ptr<ParametrizedType> value;
@ -338,7 +339,7 @@ struct TypeDefinition {
struct DefinitionParameter {
AbstractTypeIdentifier type;
std::vector<std::unique_ptr<TypeclassUsage>> typeclasses;
std::vector<TypeclassUsage> typeclasses;
};
// ----------------- Flow control -----------------
@ -410,10 +411,10 @@ struct UnaryOperatorExpression {
struct ReferenceExpression {
std::vector<ReferenceType> references;
ScopedStatement expression;
std::unique_ptr<ScopedStatement> expression;
};
// Simple Expressions -----------------
// Other Expressions -----------------
struct FunctionCallExpression {
std::unique_ptr<NameExpression> name;
@ -455,19 +456,19 @@ struct NameExpression {
};
struct TupleName {
std::vector<std::unique_ptr<ScopedAnyName>> names;
std::vector<ScopedAnyName> names;
};
struct VariantName {
std::vector<std::unique_ptr<ScopedAnyName>> names;
std::vector<ScopedAnyName> names;
};
struct AnnotatedName {
NameIdentifier name;
std::optional<std::unique_ptr<ScopedAnyType>> type;
std::optional<ScopedAnyType> type;
};
// TODO ?? mark all optional fields ??
// ----------------- Type, typeclass, etc. -----------------
// Type -----------------
@ -477,7 +478,7 @@ struct FunctionType {
struct TupleType {
std::optional<Constructor> type;
std::vector<std::pair<std::optional<ExtendedName>, ExtendedScopedAnyType>> entities;
std::vector<std::pair<std::optional<ExtendedName>, std::unique_ptr<ExtendedScopedAnyType>>> entities;
};
struct VariantType {
@ -487,7 +488,7 @@ struct VariantType {
struct AnnotatedType {
std::unique_ptr<TypeExpression> type_expression;
std::vector<std::unique_ptr<TypeclassUsage>> annotations;
std::vector<TypeclassUsage> annotations;
};
struct ParametrizedType {

43
include/print_visitor.hpp
View file

@ -12,8 +12,6 @@ public:
explicit PrintVisitor(std::ostream& out) : out_(out) {}
private:
void Visit(Node* node) override;
// Sources -----------------
void Visit(SourceFile* node) override;
@ -27,23 +25,19 @@ private:
// Definitions -----------------
void Visit(ImportStatement* node) override;
void Visit(UsageDefinition* node) override;
void Visit(AliasDefinition* node) override;
void Visit(VariableDefinition* node) override;
void Visit(AliasDefinitionStatement* node) override;
void Visit(VariableDefinitionStatement* node) override;
void Visit(FunctionDeclaration* node) override;
void Visit(FunctionDefinition* node) override;
void Visit(AliasTypeDefinition* node) override;
void Visit(TypeDefinition* node) override;
void Visit(TypeclassDefinition* node) override;
void Visit(FunctionDefinitionStatement* node) override;
void Visit(TypeDefinitionStatement* node) override;
void Visit(AbstractTypeDefinitionStatement* node) override;
void Visit(TypeclassDefinitionStatement* node) override;
// Definition parts
void Visit(DefinedName* node) override;
void Visit(DefinedAnnotatedName* node) override;
void Visit(DefinedType* node) override;
void Visit(DefinedTypeclass* node) override;
void Visit(FunctionDefinition* node) override;
void Visit(TypeDefinition* node) override;
void Visit(DefinitionParameter* node) override;
void Visit(DefinitionArgument* node) override;
// Flow control -----------------
@ -58,46 +52,50 @@ private:
// Statements, expressions, blocks, etc. -----------------
void Visit(Block* node) override;
void Visit(ScopedStatement* node) override;
void Visit(LoopControlExpression& node) override; // enum
void Visit(ScopedStatement* node) override;
// Operators
void Visit(BinaryOperatorExpression* node) override;
void Visit(UnaryOperatorExpression* node) override;
void Visit(ReferenceExpression* node) override;
// Simple Expressions
void Visit(FunctionCallExpression* node) override;
void Visit(TupleExpression* node) override;
void Visit(VariantExpression* node) override;
void Visit(ReturnExpression* node) override;
// Lambda
void Visit(TypeConstructor* node) override;
void Visit(LambdaFunction* node) override;
void Visit(ArrayExpression* node) override;
void Visit(LoopControlExpression& node) override; // enum
// Name
void Visit(NameSuperExpression* node) override;
void Visit(NameExpression* node) override;
void Visit(TupleName* node) override;
void Visit(VariantName* node) override;
void Visit(AnnotatedName* node) override;
// Type, typeclass, etc. -----------------
// Type
void Visit(TypeConstructor* node) override;
void Visit(FunctionType* node) override;
void Visit(TupleType* node) override;
void Visit(VariantType* node) override;
void Visit(AnnotatedType* node) override;
void Visit(ParametrizedType* node) override;
void Visit(TypeExpression* node) override;
void Visit(ExtendedScopedAnyType* node) override;
// Typeclass
void Visit(AnnotatedTypeclass* node) override;
void Visit(ParametrizedTypeclass* node) override;
void Visit(TypeclassExpression* node) override;
@ -109,6 +107,7 @@ private:
void Visit(NumberLiteral* node) override;
void Visit(StringLiteral* node) override;
void Visit(CharLiteral* node) override;
private:
std::ostream& out_;
};