Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / types / decl_enum_item.c

diff --git a/src/types/decl_enum_item.c b/src/types/decl_enum_item.c
index e39f0b071837e03843b9a04c320ba69074b8c109..7410e01d7621b3b319b15a6582d59bb895db9bef 100644 (file)
--- a/src/types/decl_enum_item.c
+++ b/src/types/decl_enum_item.c
@@ -47,7 +47,7 @@ void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
                if (i->num) {
                        if (i->num == &i->inc) {
                                switch (i->inc.op) {
-                               case 0:
+                               case PSI_T_NUMBER:
                                        psi_number_free(&i->inc.data.n);
                                        break;
                                case PSI_T_PLUS:
@@ -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,21 +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.data.n = psi_number_init(PSI_T_INT64, &nil);
+                       item->inc.op = PSI_T_NUMBER;
+                       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);
+       item->val = psi_num_exp_get_long(item->num, NULL, NULL);
 
        return true;
 }