st/lang_2023
1
0
Fork 0
mirror of https://codeberg.org/ProgramSnail/lang_2023.git synced 2026-01-25 13:07:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

grammar refactoring: base visitor class fixed

Browse source
This commit is contained in:
ProgramSnail 2023-04-09 14:13:47 +03:00
parent ff893d3ebd
commit 77c7ac0b2f
3 changed files with 112 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

28
include/interpreter_tree.hpp
View file

@ -6,10 +6,6 @@
#include <optional>
#include <memory>
// for clangd
#include "node.hpp"
namespace interpreter::tokens {
// ----------------- Declarations -----------------
@ -84,66 +80,51 @@ using FlowControl = std::variant<
struct Block;
//
struct NameExpression;
struct ScopedStatement;
using SubExpressionToken = std::variant<
std::unique_ptr<NameExpression>,
std::unique_ptr<ScopedStatement>>;
//
struct FunctionCallExpression;
struct BinaryOperatorExpression;
struct ArrayExpression;
struct ReferenceExpression;
using SubExpression = std::variant<
std::unique_ptr<FunctionCallExpression>,
std::unique_ptr<BinaryOperatorExpression>,
std::unique_ptr<SubExpressionToken>,
std::unique_ptr<ArrayExpression>,
std::unique_ptr<ReferenceExpression>>;
//
enum class LoopControlExpression {
Break,
Continue,
};
//
struct ReturnExpression;
using PrefixedExpression = std::variant<
std::unique_ptr<ReturnExpression>,
std::unique_ptr<LoopControlExpression>,
std::unique_ptr<Block>>;
//
struct LambdaFunction;
struct TypeConstructor;
struct UnaryOperatorExpression;
using Expression = std::variant<
std::unique_ptr<LambdaFunction>,
std::unique_ptr<TypeConstructor>,
std::unique_ptr<PrefixedExpression>,
std::unique_ptr<UnaryOperatorExpression>,
std::unique_ptr<SubExpression>>;
//
struct TupleExpression;
struct VariantExpression;
using SuperExpression = std::variant<
std::unique_ptr<FlowControl>,
std::unique_ptr<TupleExpression>,
std::unique_ptr<VariantExpression>,
std::unique_ptr<Expression>>;
//
struct ScopedStatement;
@ -158,15 +139,16 @@ struct ReferenceExpression;
struct FunctionCallExpression;
//
struct TypeExpression;
using FunctionArgument = std::variant<
SubExpressionToken,
std::unique_ptr<TypeExpression>>;
//
struct TupleExpression;
struct VariantExpression;
struct ReturnExpression;
struct TypeConstructor;
struct LambdaFunction;
struct ArrayExpression;
@ -429,7 +411,7 @@ struct UnaryOperatorExpression {
struct ReferenceExpression {
std::vector<ReferenceType> references;
ScopedStatement expression;
}
};
// Simple Expressions -----------------
@ -522,7 +504,7 @@ struct TypeExpression {
struct ExtendedScopedAnyType {
std::vector<ReferenceType> references;
AnyType type;
}
};
// Typeclass -----------------