X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fnum_exp.c;fp=src%2Ftypes%2Fnum_exp.c;h=72f374e521b09f1a5b3a509b182bfc56edc8c757;hp=4b8846a6312cd56b00727755f57f87c066a4e5e1;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=d57dd73ddbd960613cfc06bc4c9473b71d3598ef

diff --git a/src/types/num_exp.c b/src/types/num_exp.c
index 4b8846a..72f374e 100644
--- a/src/types/num_exp.c
+++ b/src/types/num_exp.c
@@ -216,9 +216,7 @@ void psi_num_exp_free(struct psi_num_exp **c_ptr)
 			assert(0);
 		}
 
-		if (c->token) {
-			free(c->token);
-		}
+		psi_token_free(&c->token);
 
 		free(c);
 	}
@@ -306,7 +304,7 @@ struct psi_plist *psi_num_exp_tokens(struct psi_num_exp *exp,
 		list = psi_plist_add(list, &ntoken);
 		ntoken = psi_token_copy(exp->data.c.typ->token);
 		list = psi_plist_add(list, &ntoken);
-		ntoken = psi_token_init(PSI_T_RPAREN, ")", 1, ntoken->col+ntoken->size, ntoken->line, ntoken->file);
+		ntoken = psi_token_init(PSI_T_RPAREN, ")", 1, ntoken->col+ntoken->text->len, ntoken->line, ntoken->file);
 		list = psi_plist_add(list, &ntoken);
 		break;
 
@@ -323,7 +321,7 @@ struct psi_plist *psi_num_exp_tokens(struct psi_num_exp *exp,
 		list = psi_plist_add(list, &ntoken);
 		list = psi_num_exp_tokens(exp->data.u, list);
 		psi_plist_top(list, &ntoken);
-		ntoken = psi_token_init(PSI_T_RPAREN, ")", 1, ntoken->col+ntoken->size, ntoken->line, ntoken->file);
+		ntoken = psi_token_init(PSI_T_RPAREN, ")", 1, ntoken->col+ntoken->text->len, ntoken->line, ntoken->file);
 		list = psi_plist_add(list, &ntoken);
 		break;
 
@@ -363,7 +361,7 @@ struct psi_plist *psi_num_exp_tokens(struct psi_num_exp *exp,
 		list = psi_plist_add(list, &ntoken);
 		list = psi_num_exp_tokens(exp->data.t.truthy, list);
 		psi_plist_top(list, &ntoken);
-		ntoken = psi_token_init(PSI_T_COLON, ":", 1, ntoken->col+ntoken->size, ntoken->line, ntoken->file);
+		ntoken = psi_token_init(PSI_T_COLON, ":", 1, ntoken->col+ntoken->text->len, ntoken->line, ntoken->file);
 		list = psi_plist_add(list, &ntoken);
 		list = psi_plist_add(list, &ntoken);
 		list = psi_num_exp_tokens(exp->data.t.falsy, list);