From ac084be7f5c73baf5c618867021f988104f4903f Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Wed, 12 Mar 2025 23:56:54 +0100 Subject: [PATCH] Randomize type declaration order --- boot/semantic.cc | 36 ++++++++++++++++++++++++++++-------- boot/symbol.cc | 9 ++++----- gcc/elna-generic.cc | 13 ++----------- include/elna/boot/semantic.h | 16 +++++++++++++--- include/elna/boot/symbol.h | 2 +- 5 files changed, 48 insertions(+), 28 deletions(-) diff --git a/boot/semantic.cc b/boot/semantic.cc index a7187f3..d1b73c2 100644 --- a/boot/semantic.cc +++ b/boot/semantic.cc @@ -21,16 +21,28 @@ namespace elna { namespace boot { - declaration_error::declaration_error(const std::string& identifier, const char *path, const struct position position) + undeclared_error::undeclared_error(const std::string& identifier, const char *path, const struct position position) : error(path, position), identifier(identifier) { } - std::string declaration_error::what() const + std::string undeclared_error::what() const { return "Type '" + identifier + "' not declared"; } + + already_declared_error::already_declared_error(const std::string& identifier, + const char *path, const struct position position) + : error(path, position), identifier(identifier) + { + } + + std::string already_declared_error::what() const + { + return "Symbol '" + identifier + "' has been already declared"; + } + declaration_visitor::declaration_visitor(const char *path, std::shared_ptr symbols) : error_container(path), symbols(symbols) { @@ -40,7 +52,10 @@ namespace boot { for (type_definition *const type : program->types) { - this->unresolved.insert({ type->identifier, std::make_shared() }); + if (!this->unresolved.insert({ type->identifier, std::make_shared() }).second) + { + add_error(type->identifier, this->input_file, type->position()); + } } for (type_definition *const type : program->types) { @@ -64,11 +79,14 @@ namespace boot { this->current_type = type(unresolved_alias->second); } + else if (auto from_symbol_table = this->symbols.lookup(type_expression->name)) + { + this->current_type = from_symbol_table->is_type()->symbol; + } else { - // TODO: - // add_error(type_expression->name, this->input_file, type_expression->position()); - this->current_type = type(std::make_shared(type_expression->name)); + add_error(type_expression->name, this->input_file, type_expression->position()); + this->current_type = type(); } } @@ -91,8 +109,10 @@ namespace boot for (auto& field : type_expression->fields) { field.second->accept(this); - - type_definition->fields.push_back({ field.first, type(this->current_type) }); + if (!this->current_type.empty()) + { + type_definition->fields.push_back({ field.first, type(this->current_type) }); + } } this->current_type = type(type_definition); } diff --git a/boot/symbol.cc b/boot/symbol.cc index 39d4a20..c1de6e6 100644 --- a/boot/symbol.cc +++ b/boot/symbol.cc @@ -15,8 +15,6 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ -#pragma once - #include "elna/boot/symbol.h" namespace elna @@ -68,7 +66,7 @@ namespace boot new (&alias) std::weak_ptr(other.alias); break; case type_tag::primitive: - new (&primitive) std::weak_ptr(other.primitive); + new (&primitive) std::shared_ptr(other.primitive); break; case type_tag::record: new (&record) std::shared_ptr(other.record); @@ -101,7 +99,7 @@ namespace boot new (&alias) std::weak_ptr(std::move(other.alias)); break; case type_tag::primitive: - new (&primitive) std::weak_ptr(std::move(other.primitive)); + new (&primitive) std::shared_ptr(std::move(other.primitive)); break; case type_tag::record: new (&record) std::shared_ptr(std::move(other.record)); @@ -149,6 +147,7 @@ namespace boot case type_tag::alias: break; case type_tag::primitive: + this->primitive.~shared_ptr(); break; case type_tag::record: this->record.~shared_ptr(); @@ -183,7 +182,7 @@ namespace boot { if (tag == type_tag::primitive) { - return this->primitive.lock(); + return this->primitive; } else { diff --git a/gcc/elna-generic.cc b/gcc/elna-generic.cc index 3144b86..db39118 100644 --- a/gcc/elna-generic.cc +++ b/gcc/elna-generic.cc @@ -754,17 +754,8 @@ namespace gcc get_identifier(definition->identifier.c_str()), this->current_expression); auto result = this->symbols->enter(definition->identifier, this->current_expression); - /* if (result) - { */ - TREE_PUBLIC(definition_tree) = definition->exported; - TYPE_NAME(this->current_expression) = get_identifier(definition->identifier.c_str()); - // } - /* else - { - error_at(get_location(&definition->position()), - "type '%s' already declared in this scope", - definition->identifier.c_str()); - } */ + TREE_PUBLIC(definition_tree) = definition->exported; + TYPE_NAME(this->current_expression) = get_identifier(definition->identifier.c_str()); this->current_expression = NULL_TREE; } diff --git a/include/elna/boot/semantic.h b/include/elna/boot/semantic.h index 86e97aa..afbf353 100644 --- a/include/elna/boot/semantic.h +++ b/include/elna/boot/semantic.h @@ -28,14 +28,24 @@ namespace elna { namespace boot { - class declaration_error : public error + class undeclared_error : public error { std::string identifier; public: - declaration_error(const std::string& identifier, const char *path, const struct position position); + undeclared_error(const std::string& identifier, const char *path, const struct position position); - virtual std::string what() const override; + std::string what() const override; + }; + + class already_declared_error : public error + { + std::string identifier; + + public: + already_declared_error(const std::string& identifier, const char *path, const struct position position); + + std::string what() const override; }; class declaration_visitor final : public empty_visitor, public error_container diff --git a/include/elna/boot/symbol.h b/include/elna/boot/symbol.h index 555682b..7e45f2f 100644 --- a/include/elna/boot/symbol.h +++ b/include/elna/boot/symbol.h @@ -50,7 +50,7 @@ namespace boot union { std::weak_ptr alias; - std::weak_ptr primitive; + std::shared_ptr primitive; std::shared_ptr record; std::shared_ptr _union; std::shared_ptr pointer;