Rename AST types to type expressions

This commit is contained in:
2025-03-02 23:35:07 +01:00
parent 09f204bd16
commit 16266b63ce
12 changed files with 325 additions and 241 deletions

View File

@ -46,6 +46,8 @@ elna_OBJS = \
elna/driver.o \
elna/lexer.o \
elna/parser.o \
elna/semantic.o \
elna/symbol.o \
elna/result.o \
$(END)
@ -134,7 +136,7 @@ elna.stagefeedback: stagefeedback-start
-mv elna/*$(objext) stagefeedback/elna
ELNA_INCLUDES = -I $(srcdir)/elna/include -I elna/generated
ELNA_CXXFLAGS = -std=c++11
ELNA_CXXFLAGS = -std=c++14
elna/%.o: elna/boot/%.cc elna/generated/parser.hh elna/generated/location.hh
$(COMPILE) $(ELNA_CXXFLAGS) $(ELNA_INCLUDES) $<

View File

@ -751,13 +751,13 @@ namespace gcc
this->current_expression = NULL_TREE;
}
tree generic_visitor::build_procedure_type(boot::procedure_type& type)
tree generic_visitor::build_procedure_type(boot::procedure_type_expression& type)
{
std::vector<tree> parameter_types(type.parameters.size());
for (std::size_t i = 0; i < type.parameters.size(); ++i)
{
boot::top_type& parameter_type = type.parameters.at(i)->variable_type();
boot::type_expression& parameter_type = type.parameters.at(i)->variable_type();
parameter_type.accept(this);
parameter_types[i] = this->current_expression;
}
@ -1102,7 +1102,7 @@ namespace gcc
this->current_expression = NULL_TREE;
}
void generic_visitor::visit(boot::basic_type *type)
void generic_visitor::visit(boot::primitive_type_expression *type)
{
tree symbol = this->lookup(type->base_name());
@ -1119,7 +1119,7 @@ namespace gcc
}
}
void generic_visitor::visit(boot::array_type *type)
void generic_visitor::visit(boot::array_type_expression *type)
{
tree lower_bound = build_int_cst_type(integer_type_node, 0);
tree upper_bound = build_int_cst_type(integer_type_node, type->size);
@ -1133,7 +1133,7 @@ namespace gcc
}
}
void generic_visitor::visit(boot::pointer_type *type)
void generic_visitor::visit(boot::pointer_type_expression *type)
{
type->base().accept(this);
@ -1143,7 +1143,7 @@ namespace gcc
}
}
void generic_visitor::visit(boot::record_type *type)
void generic_visitor::visit(boot::record_type_expression *type)
{
std::set<std::string> field_names;
tree record_type_node = make_node(RECORD_TYPE);
@ -1172,7 +1172,7 @@ namespace gcc
this->current_expression = record_type_node;
}
void generic_visitor::visit(boot::union_type *type)
void generic_visitor::visit(boot::union_type_expression *type)
{
std::set<std::string> field_names;
tree union_type_node = make_node(UNION_TYPE);
@ -1201,7 +1201,7 @@ namespace gcc
this->current_expression = union_type_node;
}
void generic_visitor::visit(boot::procedure_type *type)
void generic_visitor::visit(boot::procedure_type_expression *type)
{
tree procedure_type_node = build_procedure_type(*type);
this->current_expression = build_pointer_type_for_mode(procedure_type_node, VOIDmode, true);

View File

@ -30,6 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include <fstream>
#include "elna/boot/driver.h"
#include "elna/boot/semantic.h"
#include "elna/gcc/elna-tree.h"
#include "elna/gcc/elna-generic.h"
#include "elna/gcc/elna-diagnostic.h"
@ -88,8 +89,10 @@ static void elna_parse_file(const char *filename)
}
else
{
elna::boot::name_analysis_visitor name_analysis_visitor{ std::make_shared<elna::boot::symbol_table<>>() };
elna::gcc::generic_visitor generic_visitor{ std::make_shared<elna::gcc::symbol_table>() };
name_analysis_visitor.visit(driver.tree.get());
generic_visitor.visit(driver.tree.get());
}
linemap_add(line_table, LC_LEAVE, 0, NULL, 0);