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

grammar refactoring: part of build_visitor fixed

Browse source
This commit is contained in:
ProgramSnail 2023-04-09 18:49:52 +03:00
parent 2d2bb9ec65
commit 64653e6a6a
6 changed files with 245 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

65
include/build_visitor.hpp
View file

@ -16,8 +16,6 @@ public:
}
private:
// // void Visit(Node* node) override;
// Sources -----------------
void Visit(SourceFile* node) override;
@ -31,28 +29,21 @@ 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;
void Visit(SourceStatement& node) override; // variant
void Visit(ImportSymbol& node) override; // variant
// 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;
void Visit(FunctionDeclarationType& node) override; // variant
// Flow control -----------------
@ -68,10 +59,9 @@ private:
// Statements, expressions, blocks, etc. -----------------
void Visit(Block* node) override;
void Visit(ScopedStatement* node) override;
void Visit(BlockStatement& node) override; // variant
void Visit(LoopControlExpression& node) override; // enum
void Visit(Block* node) override;
void Visit(SubExpressionToken& node) override; // variant
void Visit(SubExpression& node) override; // variant
@ -79,29 +69,31 @@ private:
void Visit(Expression& node) override; // variant
void Visit(SuperExpression& node) override; // variant
void Visit(BlockStatement& node) override; // variant
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;
void Visit(FunctionArgument& node) override; // variant
// Lambda
void Visit(TupleExpression* node) override;
void Visit(VariantExpression* node) override;
void Visit(ReturnExpression* node) override;
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;
@ -109,9 +101,11 @@ private:
void Visit(AnyName& node) override; // variant
// 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;
@ -119,18 +113,25 @@ private:
void Visit(TypeExpression* node) override;
void Visit(AnyType& node) override; // variant
void Visit(TypeSubExpression& node) override; // variant
void Visit(TypeParameter& node) override; // variant
void Visit(ExtendedScopedAnyType* node) override;
// Typeclass
void Visit(AnnotatedTypeclass* node) override;
void Visit(ParametrizedTypeclass* node) override;
void Visit(TypeclassExpression* node) override;
void Visit(TypeclassUsage& node) override; // variant
// Typeclass & Type
void Visit(TypeParameter& node) override; // variant
void Visit(TypeSubExpression& node) override; // variant
// Identifiers, constants, etc. -----------------
void Visit(ExtendedName* node) override;
void Visit(AnyIdentifier* node) override; // std::string
void Visit(FloatNumberLiteral* node) override;
@ -140,7 +141,7 @@ private:
void Visit(Literal& node) override; // variant
void Visit(NameSubSuperExpression& node) override; // variant
void Visit(NameSubExpression& node) override; // variant
private:
const parser::ParseTree& parse_tree_;
parser::ParseTree::Node current_node_;

9
include/interpreter_tree.hpp
View file

@ -215,7 +215,9 @@ using TypeSubExpression = std::variant<
// Comments [IGNORE] -----------------
// Identifiers, constants, etc. -----------------
using ExtendedName = std::string;
struct ExtendedName {
std::string name;
};
struct FloatNumberLiteral;
struct NumberLiteral;
@ -255,7 +257,8 @@ struct Sources {
// ----------------- Namespaces, partittions -----------------
struct Namespace {
enum { Const, Var } modifier;
enum Modifier { Const, Var };
std::optional<Modifier> modifier;
std::optional<ExtendedName> name;
TypeIdentifier type;
std::unique_ptr<Sources> scope;
@ -315,7 +318,7 @@ struct TypeDefinitionStatement {
struct AbstractTypeDefinitionStatement {
enum { Basic, Abstract } modifier;
std::unique_ptr<AnnotatedType> definition;
std::unique_ptr<AnnotatedType> type;
};
struct TypeclassDefinitionStatement {

2
include/print_visitor.hpp
View file

@ -101,6 +101,8 @@ private:
// Identifiers, constants, etc. -----------------
void Visit(ExtendedName* node) override;
void Visit(AnyIdentifier* node) override; // std::string
void Visit(FloatNumberLiteral* node) override;

2
include/visitor.hpp
View file

@ -128,6 +128,8 @@ protected:
// Identifiers, constants, etc. -----------------
virtual void Visit(ExtendedName* node) {}
virtual void Visit(AnyIdentifier* node) {} // std::string
virtual void Visit(FloatNumberLiteral* node) {}