projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix leaks
[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 c403d97113626e134d8ed0f98e74b992e7ef5a17..7c4914261599380f658394ea3135c541718f0aa6 100644
(file)
--- a/
src/types/decl_enum_item.c
+++ b/
src/types/decl_enum_item.c
@@
-26,11
+26,11
@@
#include "php_psi_stdinc.h"
#include "data.h"
#include "php_psi_stdinc.h"
#include "data.h"
-struct psi_decl_enum_item *psi_decl_enum_item_init(
const char
*name,
+struct psi_decl_enum_item *psi_decl_enum_item_init(
zend_string
*name,
struct psi_num_exp *num)
{
struct psi_decl_enum_item *i = calloc(1, sizeof(*i));
struct psi_num_exp *num)
{
struct psi_decl_enum_item *i = calloc(1, sizeof(*i));
- i->name =
strdup
(name);
+ i->name =
zend_string_copy
(name);
i->num = num;
return i;
}
i->num = num;
return i;
}
@@
-41,9
+41,7
@@
void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
struct psi_decl_enum_item *i = *i_ptr;
*i_ptr = NULL;
struct psi_decl_enum_item *i = *i_ptr;
*i_ptr = NULL;
- if (i->token) {
- free(i->token);
- }
+ psi_token_free(&i->token);
if (i->num) {
if (i->num == &i->inc) {
switch (i->inc.op) {
if (i->num) {
if (i->num == &i->inc) {
switch (i->inc.op) {
@@
-61,14
+59,14
@@
void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
psi_num_exp_free(&i->num);
}
}
psi_num_exp_free(&i->num);
}
}
-
fre
e(i->name);
+
zend_string_releas
e(i->name);
free(i);
}
}
void psi_decl_enum_item_dump(int fd, struct psi_decl_enum_item *item)
{
free(i);
}
}
void psi_decl_enum_item_dump(int fd, struct psi_decl_enum_item *item)
{
- dprintf(fd, "%s", item->name);
+ dprintf(fd, "%s", item->name
->val
);
if (item->num && item->num != &item->inc) {
dprintf(fd, " = ");
psi_num_exp_dump(fd, item->num);
if (item->num && item->num != &item->inc) {
dprintf(fd, " = ");
psi_num_exp_dump(fd, item->num);
@@
-78,6
+76,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)
{
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;
if (!item->num) {
if (seq) {
int64_t one = 1;
@@
-97,11
+97,12
@@
bool psi_decl_enum_item_validate(struct psi_data *data,
}
}
}
}
- 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;
}
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;
}
return true;
}