X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=4df5354a6759180d1af0d1704284292a4da7d57e;hp=67252e24855b9aa5cae8c0a68c01def1e2587d3b;hb=481515f92d2baa83dea51d2effcbde711aa99e3b;hpb=d560a27ff8431c678d25ecf4d8190b562a766f41

diff --git a/src/parser.h b/src/parser.h
index 67252e2..4df5354 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -12,6 +12,7 @@
 
 #define BSIZE 256
 
+#define PSI_T_POINTER PSI_T_ASTERISK
 typedef int token_t;
 
 /* in php_psi.h */
@@ -25,6 +26,30 @@ typedef struct PSI_Token {
 	char text[1];
 } PSI_Token;
 
+typedef union impl_val {
+	char cval;
+	int8_t i8;
+	uint8_t u8;
+	short sval;
+	int16_t i16;
+	uint16_t u16;
+	int ival;
+	int32_t i32;
+	uint32_t u32;
+	long lval;
+	int64_t i64;
+	uint64_t u64;
+	float fval;
+	double dval;
+	union {
+		zend_bool bval;
+		zend_long lval;
+		zend_string *str;
+	} zend;
+	void *ptr;
+	uint8_t _dbg[sizeof(void *)];
+} impl_val;
+
 typedef struct decl_type {
 	char *name;
 	token_t type;
@@ -135,12 +160,17 @@ typedef struct decl_arg {
 	decl_var *var;
 	decl_struct_layout *layout;
 	struct let_stmt *let;
+	impl_val val;
+	void *ptr;
+	void *mem;
 } decl_arg;
 
 static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) {
 	decl_arg *arg = calloc(1, sizeof(*arg));
 	arg->type = type;
 	arg->var = var;
+	var->arg = arg;
+	arg->ptr = &arg->val;
 	return arg;
 }
 
@@ -234,7 +264,12 @@ typedef struct decl {
 	decl_abi *abi;
 	decl_arg *func;
 	decl_args *args;
-	void *dlptr;
+	struct impl *impl;
+	struct {
+		void *sym;
+		void *info;
+		void **args;
+	} call;
 } decl;
 
 static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
@@ -323,50 +358,6 @@ static inline void free_decl_structs(decl_structs *ss) {
 	free(ss);
 }
 
-typedef union impl_val {
-	char cval;
-	int8_t i8;
-	short sval;
-	int16_t i16;
-	int ival;
-	int32_t i32;
-	long lval;
-	int64_t i64;
-	float fval;
-	double dval;
-	union {
-		zend_bool bval;
-		zend_long lval;
-		zend_string *str;
-	} zend;
-	void *ptr;
-	uint8_t _dbg[sizeof(void *)];
-} impl_val;
-
-static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
-	unsigned i;
-
-	if (var->arg->var != var) for (i = 0; i < var->pointer_level; ++i) {
-		ret_val = *(void **) ret_val;
-	}
-	return ret_val;
-}
-
-static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
-	impl_val *val, *val_ptr;
-	unsigned i;
-
-	if (!var->pointer_level && real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
-		return ptr;
-	}
-	val = val_ptr = calloc(var->pointer_level, sizeof(void *));
-	for (i = 1; i < var->pointer_level; ++i) {
-		val_ptr->ptr = (void **) val_ptr + 1;
-		val_ptr = val_ptr->ptr;
-	}
-	val_ptr->ptr = ptr;
-	return val;
-}
 typedef struct impl_type {
 	char *name;
 	token_t type;
@@ -419,6 +410,68 @@ static inline void free_impl_def_val(impl_def_val *def) {
 	free(def);
 }
 
+typedef struct const_type {
+	token_t type;
+	char *name;
+} const_type;
+
+static inline const_type *init_const_type(token_t type, const char *name) {
+	const_type *ct = calloc(1, sizeof(*ct));
+	ct->type = type;
+	ct->name = strdup(name);
+	return ct;
+}
+
+static inline void free_const_type(const_type *type) {
+	free(type->name);
+	free(type);
+}
+
+typedef struct constant {
+	const_type *type;
+	char *name;
+	impl_def_val *val;
+} constant;
+
+static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
+	constant *c = calloc(1, sizeof(*c));
+	c->type = type;
+	c->name = strdup(name);
+	c->val = val;
+	return c;
+}
+
+static inline void free_constant(constant *constant) {
+	free_const_type(constant->type);
+	free(constant->name);
+	free_impl_def_val(constant->val);
+	free(constant);
+}
+
+typedef struct constants {
+	size_t count;
+	constant **list;
+} constants;
+
+static inline constants *add_constant(constants *constants, constant *constant) {
+	if (!constants) {
+		constants = calloc(1, sizeof(*constants));
+	}
+	constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
+	constants->list[constants->count-1] = constant;
+	return constants;
+}
+
+static inline void free_constants(constants *c) {
+	size_t i;
+
+	for (i = 0; i < c->count; ++i) {
+		free_constant(c->list[i]);
+	}
+	free(c->list);
+	free(c);
+}
+
 typedef struct impl_arg {
 	impl_type *type;
 	impl_var *var;
@@ -498,20 +551,66 @@ static inline void free_impl_func(impl_func *f) {
 	free(f);
 }
 
+typedef struct num_exp {
+	token_t t;
+	union {
+		char *numb;
+		constant *cnst;
+		decl_var *dvar;
+	} u;
+	token_t operator;
+	int (*calculator)(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res);
+	struct num_exp *operand;
+} num_exp;
+
+static inline num_exp *init_num_exp(token_t t, void *num) {
+	num_exp *exp = calloc(1, sizeof(*exp));
+	switch (exp->t = t) {
+	case PSI_T_NUMBER:
+	case PSI_T_NSNAME:
+		exp->u.numb = strdup(num);
+		break;
+	case PSI_T_NAME:
+		exp->u.dvar = num;
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return exp;
+}
+
+static inline void free_num_exp(num_exp *exp) {
+	switch (exp->t) {
+	case PSI_T_NUMBER:
+		free(exp->u.numb);
+		break;
+	case PSI_T_NSNAME:
+		break;
+	case PSI_T_NAME:
+		free_decl_var(exp->u.dvar);
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	if (exp->operand) {
+		free_num_exp(exp->operand);
+	}
+	free(exp);
+}
+
 typedef struct let_calloc {
-	size_t n;
-	decl_type *type;
+	num_exp *nmemb;
+	num_exp *size;
 } let_calloc;
 
-static inline let_calloc *init_let_calloc(long n, decl_type *type) {
+static inline let_calloc *init_let_calloc(num_exp *nmemb, num_exp *size) {
 	let_calloc *alloc = calloc(1, sizeof(*alloc));
-	alloc->n = n;
-	alloc->type = type;
+	alloc->nmemb = nmemb;
+	alloc->size = size;
 	return alloc;
 }
 
 static inline void free_let_calloc(let_calloc *alloc) {
-	free_decl_type(alloc->type);
+	free_num_exp(alloc->nmemb);
+	free_num_exp(alloc->size);
 	free(alloc);
 }
 
@@ -565,9 +664,7 @@ typedef struct let_stmt {
 	decl_var *var;
 	let_value *val;
 	impl_arg *arg;
-	impl_val out;
 	void *ptr;
-	void *mem;
 } let_stmt;
 
 static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
@@ -590,7 +687,7 @@ struct set_value;
 typedef struct set_func {
 	token_t type;
 	char *name;
-	void (*handler)(zval *, token_t, impl_val *, struct set_value *set, decl_var *);
+	void (*handler)(zval *, struct set_value *set, impl_val *ret_val);
 } set_func;
 
 static inline set_func *init_set_func(token_t type, const char *name) {
@@ -608,6 +705,11 @@ static inline void free_set_func(set_func *func) {
 typedef struct set_value {
 	set_func *func;
 	decl_vars *vars;
+	num_exp *num;
+	struct {
+		struct set_value *set;
+		impl_val *val;
+	} outer;
 	struct set_value **inner;
 	size_t count;
 } set_value;
@@ -888,72 +990,6 @@ static void free_impls(impls *impls) {
 	free(impls);
 }
 
-typedef struct const_type {
-	token_t type;
-	char *name;
-} const_type;
-
-static inline const_type *init_const_type(token_t type, const char *name) {
-	const_type *ct = calloc(1, sizeof(*ct));
-	ct->type = type;
-	ct->name = strdup(name);
-	return ct;
-}
-
-static inline void free_const_type(const_type *type) {
-	free(type->name);
-	free(type);
-}
-
-typedef struct constant {
-	const_type *type;
-	char *name;
-	impl_def_val *val;
-} constant;
-
-static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
-	constant *c = calloc(1, sizeof(*c));
-	c->type = type;
-	c->name = strdup(name);
-	c->val = val;
-	return c;
-}
-
-static inline void free_constant(constant *constant) {
-	free_const_type(constant->type);
-	free(constant->name);
-	free_impl_def_val(constant->val);
-	free(constant);
-}
-
-typedef struct constants {
-	size_t count;
-	constant **list;
-} constants;
-
-static inline constants *add_constant(constants *constants, constant *constant) {
-	if (!constants) {
-		constants = calloc(1, sizeof(*constants));
-	}
-	constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
-	constants->list[constants->count-1] = constant;
-	return constants;
-}
-
-static inline void free_constants(constants *c) {
-	size_t i;
-
-	for (i = 0; i < c->count; ++i) {
-		free_constant(c->list[i]);
-	}
-	free(c->list);
-	free(c);
-}
-
-#define PSI_ERROR 16
-#define PSI_WARNING 32
-typedef void (*psi_error_cb)(int type, const char *msg, ...);
-
 typedef struct decl_file {
 	char *ln;
 	char *fn;
@@ -992,6 +1028,46 @@ static inline void add_decl_lib(decl_libs *libs, void *dlopened) {
 	libs->dl[libs->count-1] = dlopened;
 }
 
+static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
+	unsigned i;
+
+	if (var->arg->var != var) for (i = 1; i < var->pointer_level; ++i) {
+		ret_val = *(void **) ret_val;
+	}
+	return ret_val;
+}
+
+static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
+	impl_val *val, *val_ptr;
+	unsigned i;
+
+	if (!var->pointer_level && real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
+		return ptr;
+	}
+	val = val_ptr = calloc(var->pointer_level + 1, sizeof(void *));
+	for (i = 1; i < var->pointer_level; ++i) {
+		val_ptr->ptr = (void **) val_ptr + 1;
+		val_ptr = val_ptr->ptr;
+	}
+	val_ptr->ptr = ptr;
+	return val;
+}
+
+static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
+	void *ptr = (char *) struct_ptr->ptr + set_arg->layout->pos;
+	impl_val *val = enref_impl_val(ptr, set_arg->var);
+
+	if (val != ptr) {
+		*to_free = val;
+	}
+
+	return val;
+}
+
+#define PSI_ERROR 16
+#define PSI_WARNING 32
+typedef void (*psi_error_cb)(int type, const char *msg, ...);
+
 #define PSI_DATA(D) ((PSI_Data *) (D))
 #define PSI_DATA_MEMBERS \
 	constants *consts; \
@@ -1051,7 +1127,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 	PSI_Token *T;
 	size_t token_len;
 
-	if (P->cur <= P->tok) {
+	if (P->cur < P->tok) {
 		return NULL;
 	}