mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 15:48:51 +00:00
Improve init_string determination for constants
This commit is contained in:
@@ -731,6 +731,7 @@ void check_enum_type(CheckerContext *ctx, Type *enum_type, Type *named_type, Ast
|
|||||||
Ast *field = et->fields[i];
|
Ast *field = et->fields[i];
|
||||||
Ast *ident = nullptr;
|
Ast *ident = nullptr;
|
||||||
Ast *init = nullptr;
|
Ast *init = nullptr;
|
||||||
|
u32 entity_flags = 0;
|
||||||
if (field->kind == Ast_FieldValue) {
|
if (field->kind == Ast_FieldValue) {
|
||||||
ast_node(fv, FieldValue, field);
|
ast_node(fv, FieldValue, field);
|
||||||
if (fv->field == nullptr || fv->field->kind != Ast_Ident) {
|
if (fv->field == nullptr || fv->field->kind != Ast_Ident) {
|
||||||
@@ -764,6 +765,7 @@ void check_enum_type(CheckerContext *ctx, Type *enum_type, Type *named_type, Ast
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
iota = exact_binary_operator_value(Token_Add, iota, exact_value_i64(1));
|
iota = exact_binary_operator_value(Token_Add, iota, exact_value_i64(1));
|
||||||
|
entity_flags |= EntityConstantFlag_ImplicitEnumValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -800,6 +802,7 @@ void check_enum_type(CheckerContext *ctx, Type *enum_type, Type *named_type, Ast
|
|||||||
e->identifier = ident;
|
e->identifier = ident;
|
||||||
e->flags |= EntityFlag_Visited;
|
e->flags |= EntityFlag_Visited;
|
||||||
e->state = EntityState_Resolved;
|
e->state = EntityState_Resolved;
|
||||||
|
e->Constant.flags |= entity_flags;
|
||||||
|
|
||||||
if (scope_lookup_current(ctx->scope, name) != nullptr) {
|
if (scope_lookup_current(ctx->scope, name) != nullptr) {
|
||||||
error(ident, "'%.*s' is already declared in this enumeration", LIT(name));
|
error(ident, "'%.*s' is already declared in this enumeration", LIT(name));
|
||||||
|
|||||||
+19
-1
@@ -831,13 +831,31 @@ OdinDocEntityIndex odin_doc_add_entity(OdinDocWriter *w, Entity *e) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OdinDocString init_string = {};
|
||||||
|
if (init_expr) {
|
||||||
|
init_string = odin_doc_expr_string(w, init_expr);
|
||||||
|
} else {
|
||||||
|
if (e->kind == Entity_Constant) {
|
||||||
|
if (e->Constant.flags & EntityConstantFlag_ImplicitEnumValue) {
|
||||||
|
init_string = {}; // Blank
|
||||||
|
} else if (e->Constant.param_value.original_ast_expr) {
|
||||||
|
init_string = odin_doc_expr_string(w, e->Constant.param_value.original_ast_expr);
|
||||||
|
} else {
|
||||||
|
init_string = odin_doc_write_string(w, make_string_c(exact_value_to_string(e->Constant.value)));
|
||||||
|
}
|
||||||
|
} else if (e->kind == Entity_Variable) {
|
||||||
|
if (e->Variable.param_expr) {
|
||||||
|
init_string = odin_doc_expr_string(w, e->Variable.param_expr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
doc_entity.kind = kind;
|
doc_entity.kind = kind;
|
||||||
doc_entity.flags = flags;
|
doc_entity.flags = flags;
|
||||||
doc_entity.pos = odin_doc_token_pos_cast(w, e->token.pos);
|
doc_entity.pos = odin_doc_token_pos_cast(w, e->token.pos);
|
||||||
doc_entity.name = odin_doc_write_string(w, e->token.string);
|
doc_entity.name = odin_doc_write_string(w, e->token.string);
|
||||||
doc_entity.type = 0; // Set later
|
doc_entity.type = 0; // Set later
|
||||||
doc_entity.init_string = odin_doc_expr_string(w, init_expr);
|
doc_entity.init_string = init_string;
|
||||||
doc_entity.comment = odin_doc_comment_group_string(w, comment);
|
doc_entity.comment = odin_doc_comment_group_string(w, comment);
|
||||||
doc_entity.docs = odin_doc_comment_group_string(w, docs);
|
doc_entity.docs = odin_doc_comment_group_string(w, docs);
|
||||||
doc_entity.foreign_library = 0; // Set later
|
doc_entity.foreign_library = 0; // Set later
|
||||||
|
|||||||
+4
-1
@@ -93,7 +93,9 @@ struct ParameterValue {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum EntityConstantFlags : u32 {
|
||||||
|
EntityConstantFlag_ImplicitEnumValue = 1<<0,
|
||||||
|
};
|
||||||
|
|
||||||
// An Entity is a named "thing" in the language
|
// An Entity is a named "thing" in the language
|
||||||
struct Entity {
|
struct Entity {
|
||||||
@@ -126,6 +128,7 @@ struct Entity {
|
|||||||
struct {
|
struct {
|
||||||
ExactValue value;
|
ExactValue value;
|
||||||
ParameterValue param_value;
|
ParameterValue param_value;
|
||||||
|
u32 flags;
|
||||||
} Constant;
|
} Constant;
|
||||||
struct {
|
struct {
|
||||||
Ast *init_expr; // only used for some variables within procedure bodies
|
Ast *init_expr; // only used for some variables within procedure bodies
|
||||||
|
|||||||
Reference in New Issue
Block a user