mirror of
https://codeberg.org/ProgramSnail/lang_2023.git
synced 2025-12-28 17:58:44 +00:00
visitor, print_visitor and build_visitor fixed
This commit is contained in:
ProgramSnail
parent
776b6cccc6
commit
4d0b527416
9 changed files with 212 additions and 139 deletions
|
|
@ -16,30 +16,8 @@ void BuildVisitor::Visit(SourceFile* node) {
|
|||
node->statements.resize(statement_count);
|
||||
|
||||
for (size_t i = 0; i < statement_count; ++i) {
|
||||
current_node_ = parse_node.NthNamedChild(i);
|
||||
auto current_node_type = current_node_.GetType();
|
||||
|
||||
if (current_node_type == parser::tokens::SourceStatement) {
|
||||
node->statements[i].emplace<SourceStatement>();
|
||||
Visit(std::get<SourceStatement>(node->statements[i]));
|
||||
} else if (current_node_type == parser::tokens::Partition) {
|
||||
node->statements[i].emplace<Partition>();
|
||||
Visit(&std::get<Partition>(node->statements[i]) );
|
||||
}
|
||||
}
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(Sources* node) {
|
||||
auto parse_node = current_node_;
|
||||
size_t statement_count = parse_node.NamedChildCount();
|
||||
|
||||
node->statements.resize(statement_count);
|
||||
|
||||
for (size_t i = 0; i < statement_count; ++i) {
|
||||
current_node_ = parse_node.NthNamedChild(i);
|
||||
Visit(node->statements[i]);
|
||||
current_node_ = parse_node.NthNamedChild(i);
|
||||
Visit(node->statements[i]);
|
||||
}
|
||||
|
||||
current_node_ = parse_node;
|
||||
|
|
@ -47,6 +25,53 @@ void BuildVisitor::Visit(Sources* node) {
|
|||
|
||||
// Namespaces, partitions -----------------
|
||||
|
||||
void BuildVisitor::Visit(PartitionSources* node) {
|
||||
auto parse_node = current_node_;
|
||||
size_t statement_count = parse_node.NamedChildCount();
|
||||
|
||||
node->statements.resize(statement_count);
|
||||
|
||||
for (size_t i = 0; i < statement_count; ++i) {
|
||||
current_node_ = parse_node.NthNamedChild(i);
|
||||
Visit(node->statements[i]);
|
||||
}
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(Partition* node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
std::string name = parse_node.ChildByFieldName("name").GetValue();
|
||||
|
||||
if (name == "TEST") {
|
||||
node->name = Partition::Test;
|
||||
} else if (name == "INTERFACE") {
|
||||
node->name = Partition::Interface;
|
||||
} else if (name == "CODE") {
|
||||
node->name = Partition::Code;
|
||||
}
|
||||
|
||||
current_node_ = parse_node.ChildByFieldName("scope");
|
||||
Visit(&node->scope);
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(NamespaceSources* node) {
|
||||
auto parse_node = current_node_;
|
||||
size_t statement_count = parse_node.NamedChildCount();
|
||||
|
||||
node->statements.resize(statement_count);
|
||||
|
||||
for (size_t i = 0; i < statement_count; ++i) {
|
||||
current_node_ = parse_node.NthNamedChild(i);
|
||||
Visit(node->statements[i]);
|
||||
}
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(Namespace* node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
|
|
@ -65,28 +90,7 @@ void BuildVisitor::Visit(Namespace* node) {
|
|||
Visit(&node->type);
|
||||
|
||||
current_node_ = parse_node.ChildByFieldName("scope");
|
||||
node->scope = std::make_unique<Sources>();
|
||||
Visit(node->scope.get());
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(Partition* node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
std::string name = parse_node.ChildByFieldName("name").GetValue();
|
||||
|
||||
if (name == "TEST") {
|
||||
node->name = Partition::Test;
|
||||
} else if (name == "INTERFACE") {
|
||||
node->name = Partition::Interface;
|
||||
} else if (name == "CODE") {
|
||||
node->name = Partition::Code;
|
||||
}
|
||||
|
||||
current_node_ = parse_node.ChildByFieldName("scope");
|
||||
node->scope = std::make_unique<Sources>();
|
||||
Visit(node->scope.get());
|
||||
Visit(&node->scope);
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
|
@ -279,17 +283,14 @@ void BuildVisitor::Visit(TypeclassDefinitionStatement* node) {
|
|||
|
||||
//
|
||||
|
||||
void BuildVisitor::Visit(SourceStatement& node) {
|
||||
void BuildVisitor::Visit(NamespaceStatement& node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
current_node_ = parse_node.NthNamedChild(0);
|
||||
|
||||
std::string current_node_type = current_node_.GetType();
|
||||
|
||||
if (current_node_type == parser::tokens::ImportStatement) { // optimize ??
|
||||
node = std::make_unique<ImportStatement>();
|
||||
Visit(std::get<std::unique_ptr<ImportStatement>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::AliasDefinitionStatement) {
|
||||
if (current_node_type == parser::tokens::AliasDefinitionStatement) { // optimize ??
|
||||
node = std::make_unique<AliasDefinitionStatement>();
|
||||
Visit(std::get<std::unique_ptr<AliasDefinitionStatement>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::FunctionDeclaration) {
|
||||
|
|
@ -301,15 +302,55 @@ void BuildVisitor::Visit(SourceStatement& node) {
|
|||
} else if (current_node_type == parser::tokens::TypeDefinitionStatement) {
|
||||
node = std::make_unique<TypeDefinitionStatement>();
|
||||
Visit(std::get<std::unique_ptr<TypeDefinitionStatement>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::AbstractTypeDefinitionStatement) {
|
||||
} else if (current_node_type == parser::tokens::Namespace) {
|
||||
node = std::make_unique<Namespace>();
|
||||
Visit(std::get<std::unique_ptr<Namespace>>(node).get());
|
||||
} else {
|
||||
// error
|
||||
}
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(PartitionStatement& node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
current_node_ = parse_node.NthNamedChild(0);
|
||||
|
||||
std::string current_node_type = current_node_.GetType();
|
||||
|
||||
if (current_node_type == parser::tokens::AbstractTypeDefinitionStatement) { // optimize ??
|
||||
node = std::make_unique<AbstractTypeDefinitionStatement>();
|
||||
Visit(std::get<std::unique_ptr<AbstractTypeDefinitionStatement>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::TypeclassDefinitionStatement) {
|
||||
node = std::make_unique<TypeclassDefinitionStatement>();
|
||||
Visit(std::get<std::unique_ptr<TypeclassDefinitionStatement>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::Namespace) {
|
||||
node = std::make_unique<Namespace>();
|
||||
Visit(std::get<std::unique_ptr<Namespace>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::NamespaceStatement) {
|
||||
node = std::make_unique<NamespaceStatement>();
|
||||
Visit(*std::get<std::unique_ptr<NamespaceStatement>>(node));
|
||||
} else {
|
||||
// error
|
||||
}
|
||||
|
||||
current_node_ = parse_node;
|
||||
}
|
||||
|
||||
void BuildVisitor::Visit(SourceStatement& node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
current_node_ = parse_node.NthNamedChild(0);
|
||||
|
||||
std::string current_node_type = current_node_.GetType();
|
||||
|
||||
if (current_node_type == parser::tokens::ImportStatement) { // optimize ??
|
||||
node = std::make_unique<ImportStatement>();
|
||||
Visit(std::get<std::unique_ptr<ImportStatement>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::Partition) {
|
||||
node = std::make_unique<Partition>();
|
||||
Visit(std::get<std::unique_ptr<Partition>>(node).get());
|
||||
} else if (current_node_type == parser::tokens::PartitionStatement) {
|
||||
node = std::make_unique<PartitionStatement>();
|
||||
Visit(*std::get<std::unique_ptr<PartitionStatement>>(node));
|
||||
} else {
|
||||
// error
|
||||
}
|
||||
|
|
@ -1330,17 +1371,6 @@ void BuildVisitor::Visit(ExtendedScopedAnyType* node) {
|
|||
void BuildVisitor::Visit(TypeclassExpression* node) {
|
||||
auto parse_node = current_node_;
|
||||
|
||||
size_t child_count = parse_node.NamedChildCount();
|
||||
|
||||
if (child_count > 1) {
|
||||
node->path.resize(child_count - 1);
|
||||
|
||||
for (size_t i = 0; i + 1 < child_count; ++i) {
|
||||
current_node_ = parse_node.NthNamedChild(i);
|
||||
Visit(node->path[i]);
|
||||
}
|
||||
}
|
||||
|
||||
current_node_ = parse_node.ChildByFieldName("typeclass");
|
||||
Visit(node->typeclass);
|
||||
|
||||
|
|
|
|||
|
|
@ -8,27 +8,21 @@ namespace interpreter {
|
|||
void PrintVisitor::Visit(SourceFile* node) {
|
||||
out_ << "[SourceFile] (\n\n";
|
||||
for (auto& statement : node->statements) {
|
||||
if (std::holds_alternative<Partition>(statement)) {
|
||||
Visit(&std::get<Partition>(statement));
|
||||
} else if (std::holds_alternative<SourceStatement>(statement)) {
|
||||
Visitor::Visit(std::get<SourceStatement>(statement));
|
||||
} else {
|
||||
// error
|
||||
}
|
||||
Visitor::Visit(statement);
|
||||
}
|
||||
out_ << "\n)\n";
|
||||
}
|
||||
|
||||
void PrintVisitor::Visit(Sources* node) {
|
||||
out_ << "[Sources](\n";
|
||||
// Namespaces, partitions -----------------
|
||||
|
||||
void PrintVisitor::Visit(PartitionSources* node) {
|
||||
out_ << "[PartitionSources](\n";
|
||||
for (auto& statement : node->statements) {
|
||||
Visitor::Visit(statement);
|
||||
}
|
||||
out_ << ")\n";
|
||||
}
|
||||
|
||||
// Namespaces, partitions -----------------
|
||||
|
||||
void PrintVisitor::Visit(Partition* node) {
|
||||
out_ << "[Partition] ";
|
||||
switch (node->name) {
|
||||
|
|
@ -43,10 +37,18 @@ void PrintVisitor::Visit(Partition* node) {
|
|||
break;
|
||||
}
|
||||
out_ << " {\n";
|
||||
Visit(node->scope.get());
|
||||
Visit(&node->scope);
|
||||
out_ << "}\n";
|
||||
}
|
||||
|
||||
void PrintVisitor::Visit(NamespaceSources* node) {
|
||||
out_ << "[NamespaceSources](\n";
|
||||
for (auto& statement : node->statements) {
|
||||
Visitor::Visit(statement);
|
||||
}
|
||||
out_ << ")\n";
|
||||
}
|
||||
|
||||
void PrintVisitor::Visit(Namespace* node) {
|
||||
out_ << "[Namespace] ";
|
||||
if (node->modifier.has_value()) {
|
||||
|
|
@ -61,7 +63,7 @@ void PrintVisitor::Visit(Namespace* node) {
|
|||
}
|
||||
Visit(&node->type);
|
||||
out_ << "{\n";
|
||||
Visit(node->scope.get());
|
||||
Visit(&node->scope);
|
||||
out_ << "}\n";
|
||||
}
|
||||
|
||||
|
|
@ -658,10 +660,6 @@ void PrintVisitor::Visit(ExtendedScopedAnyType* node) {
|
|||
|
||||
void PrintVisitor::Visit(TypeclassExpression* node) {
|
||||
out_ << "[TypeclassExpression] (";
|
||||
for (auto& type : node->path) {
|
||||
Visitor::Visit(type);
|
||||
out_ << "::";
|
||||
}
|
||||
Visitor::Visit(node->typeclass);
|
||||
out_ << ')';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,31 +5,56 @@ namespace interpreter {
|
|||
|
||||
// Definitions -----------------
|
||||
|
||||
void Visitor::Visit(NamespaceStatement& node) {
|
||||
switch (node.index()) {
|
||||
case 0:
|
||||
Visit(std::get<std::unique_ptr<AliasDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 1:
|
||||
Visit(std::get<std::unique_ptr<FunctionDeclaration>>(node).get());
|
||||
break;
|
||||
case 2:
|
||||
Visit(std::get<std::unique_ptr<FunctionDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 3:
|
||||
Visit(std::get<std::unique_ptr<TypeDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 4:
|
||||
Visit(std::get<std::unique_ptr<Namespace>>(node).get());
|
||||
break;
|
||||
default:
|
||||
// error
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Visitor::Visit(PartitionStatement& node) {
|
||||
switch (node.index()) {
|
||||
case 0:
|
||||
Visit(std::get<std::unique_ptr<AbstractTypeDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 1:
|
||||
Visit(std::get<std::unique_ptr<TypeclassDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 2:
|
||||
Visit(*std::get<std::unique_ptr<NamespaceStatement>>(node));
|
||||
break;
|
||||
default:
|
||||
// error
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Visitor::Visit(SourceStatement& node) {
|
||||
switch (node.index()) {
|
||||
case 0:
|
||||
Visit(std::get<std::unique_ptr<ImportStatement>>(node).get());
|
||||
break;
|
||||
case 1:
|
||||
Visit(std::get<std::unique_ptr<AliasDefinitionStatement>>(node).get());
|
||||
Visit(std::get<std::unique_ptr<Partition>>(node).get());
|
||||
break;
|
||||
case 2:
|
||||
Visit(std::get<std::unique_ptr<FunctionDeclaration>>(node).get());
|
||||
break;
|
||||
case 3:
|
||||
Visit(std::get<std::unique_ptr<FunctionDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 4:
|
||||
Visit(std::get<std::unique_ptr<TypeDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 5:
|
||||
Visit(std::get<std::unique_ptr<AbstractTypeDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 6:
|
||||
Visit(std::get<std::unique_ptr<TypeclassDefinitionStatement>>(node).get());
|
||||
break;
|
||||
case 7:
|
||||
Visit(std::get<std::unique_ptr<Namespace>>(node).get());
|
||||
Visit(*std::get<std::unique_ptr<PartitionStatement>>(node));
|
||||
break;
|
||||
default:
|
||||
// error
|
||||
|
|
@ -345,18 +370,6 @@ void Visitor::Visit(Literal& node) {
|
|||
// Sources -----------------
|
||||
|
||||
void Visitor::Visit(SourceFile* node) {
|
||||
for (auto& statement : node->statements) {
|
||||
if (std::holds_alternative<Partition>(statement)) {
|
||||
Visit(&std::get<Partition>(statement));
|
||||
} else if (std::holds_alternative<SourceStatement>(statement)) {
|
||||
Visit(std::get<SourceStatement>(statement));
|
||||
} else {
|
||||
// error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Visitor::Visit(Sources* node) {
|
||||
for (auto& statement : node->statements) {
|
||||
Visit(statement);
|
||||
}
|
||||
|
|
@ -364,13 +377,25 @@ void Visitor::Visit(Sources* node) {
|
|||
|
||||
// Namespaces, partitions -----------------
|
||||
|
||||
void Visitor::Visit(PartitionSources* node) {
|
||||
for (auto& statement : node->statements) {
|
||||
Visit(statement);
|
||||
}
|
||||
}
|
||||
|
||||
void Visitor::Visit(Partition* node) {
|
||||
Visit(node->scope.get());
|
||||
Visit(&node->scope);
|
||||
}
|
||||
|
||||
void Visitor::Visit(NamespaceSources* node) {
|
||||
for (auto& statement : node->statements) {
|
||||
Visit(statement);
|
||||
}
|
||||
}
|
||||
|
||||
void Visitor::Visit(Namespace* node) {
|
||||
Visit(&node->type);
|
||||
Visit(node->scope.get());
|
||||
Visit(&node->scope);
|
||||
}
|
||||
|
||||
// Definitions -----------------
|
||||
|
|
@ -684,9 +709,6 @@ void Visitor::Visit(ExtendedScopedAnyType* node) {
|
|||
// Typeclass
|
||||
|
||||
void Visitor::Visit(TypeclassExpression* node) {
|
||||
for (auto& type : node->path) {
|
||||
Visit(type);
|
||||
}
|
||||
Visit(node->typeclass);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue