X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_enum_item.c;h=7410e01d7621b3b319b15a6582d59bb895db9bef;hb=f15858adf036b3010895526eaf6d1b9711d48bc9;hp=ad78dddb41dc0a88579ede901579501abc1b2b45;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2;p=m6w6%2Fext-psi

diff --git a/src/types/decl_enum_item.c b/src/types/decl_enum_item.c
index ad78ddd..7410e01 100644
--- a/src/types/decl_enum_item.c
+++ b/src/types/decl_enum_item.c
@@ -78,6 +78,8 @@ void psi_decl_enum_item_dump(int fd, struct psi_decl_enum_item *item)
 bool psi_decl_enum_item_validate(struct psi_data *data,
 		struct psi_decl_enum *enm, struct psi_decl_enum_item *item, size_t seq)
 {
+	struct psi_validate_scope scope = {0};
+
 	if (!item->num) {
 		if (seq) {
 			int64_t one = 1;
@@ -86,22 +88,23 @@ bool psi_decl_enum_item_validate(struct psi_data *data,
 			item->inc.data.b.lhs = psi_num_exp_init_unary(PSI_T_LPAREN,
 					psi_num_exp_copy(item->prev->num));
 			item->inc.data.b.rhs = psi_num_exp_init_num(
-							psi_number_init(PSI_T_INT64, &one));
+							psi_number_init(PSI_T_INT64, &one, 0));
 			item->num = &item->inc;
 		} else {
 			int64_t nil = 0;
 
 			item->inc.op = PSI_T_NUMBER;
-			item->inc.data.n = psi_number_init(PSI_T_INT64, &nil);
+			item->inc.data.n = psi_number_init(PSI_T_INT64, &nil, 0);
 			item->num = &item->inc;
 		}
 	}
 
-	if (!psi_num_exp_validate(data, item->num, NULL, NULL, NULL, NULL, enm)) {
+	scope.current_enum = enm;
+	if (!psi_num_exp_validate(data, item->num, &scope)) {
 		return false;
 	}
 
-	item->val = psi_long_num_exp(item->num, NULL, NULL);
+	item->val = psi_num_exp_get_long(item->num, NULL, NULL);
 
 	return true;
 }