X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=55f4f9d75f6d57067adacc2e8a43950530cc2dcd;hp=737524fb4cbece4f2fe66dd7f79d18f7c20b3846;hb=e16c15d5936c3b57b05e49570fb9526920de8188;hpb=f18f62c084371e0da16305db4de27bfa124934c1

diff --git a/src/parser.h b/src/parser.h
index 737524f..55f4f9d 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 */
@@ -20,12 +21,37 @@ size_t psi_t_size(token_t);
 
 typedef struct PSI_Token {
 	token_t type;
-	unsigned line;
-	size_t size;
-	char text[1];
+	size_t size, line, col;
+	char *text, *file;
+	char buf[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 {
+	PSI_Token *token;
 	char *name;
 	token_t type;
 	struct decl_type *real;
@@ -135,12 +161,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;
 }
 
@@ -187,6 +218,7 @@ static inline void free_decl_vars(decl_vars *vars) {
 typedef struct decl_args {
 	decl_arg **args;
 	size_t count;
+	unsigned varargs:1;
 } decl_args;
 
 static inline decl_args *init_decl_args(decl_arg *arg) {
@@ -328,54 +360,6 @@ static inline void free_decl_structs(decl_structs *ss) {
 	free(ss);
 }
 
-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;
-
-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;
-}
 typedef struct impl_type {
 	char *name;
 	token_t type;
@@ -428,6 +412,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;
@@ -456,6 +502,7 @@ static inline void free_impl_arg(impl_arg *arg) {
 typedef struct impl_args {
 	impl_arg **args;
 	size_t count;
+	impl_arg *vararg;
 } impl_args;
 
 static inline impl_args *init_impl_args(impl_arg *arg) {
@@ -507,79 +554,164 @@ 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);
 }
 
 typedef struct let_func {
 	token_t type;
 	char *name;
-	let_calloc *alloc;
+	impl_var *var;
+	impl_arg *arg;
 } let_func;
 
-static inline let_func *init_let_func(token_t type, const char *name, let_calloc *alloc) {
+static inline let_func *init_let_func(token_t type, const char *name, impl_var *var) {
 	let_func *func = calloc(1, sizeof(*func));
 	func->type = type;
 	func->name = strdup(name);
-	func->alloc = alloc;
+	func->var = var;
 	return func;
 }
 
 static inline void free_let_func(let_func *func) {
-	if (func->alloc) {
-		free_let_calloc(func->alloc);
-	}
+	free_impl_var(func->var);
 	free(func->name);
 	free(func);
 }
 
-typedef struct let_value {
-	let_func *func;
-	impl_var *var;
-	unsigned is_reference:1;
-} let_value;
-
-static inline let_value *init_let_value(let_func *func, impl_var *var, int is_reference) {
-	let_value *val = calloc(1, sizeof(*val));
-	val->is_reference = is_reference;
-	val->func = func;
-	val->var = var;
-	return val;
+#define PSI_LET_REFERENCE 0x1;
+typedef struct let_val {
+	enum let_val_kind {
+		PSI_LET_NULL,
+		PSI_LET_NUMEXP,
+		PSI_LET_CALLOC,
+		PSI_LET_FUNC,
+		PSI_LET_TMP,
+	} kind;
+	union {
+		num_exp *num;
+		let_calloc *alloc;
+		let_func *func;
+		decl_var *var;
+	} data;
+	union {
+		struct {
+			unsigned is_reference:1;
+		} one;
+		unsigned all;
+	} flags;
+} let_val;
+
+static inline let_val *init_let_val(enum let_val_kind kind, void *data) {
+	let_val *let = calloc(1, sizeof(*let));
+	switch (let->kind = kind) {
+	case PSI_LET_NULL:
+		break;
+	case PSI_LET_NUMEXP:
+		let->data.num = data;
+		break;
+	case PSI_LET_CALLOC:
+		let->data.alloc = data;
+		break;
+	case PSI_LET_FUNC:
+		let->data.func = data;
+		break;
+	case PSI_LET_TMP:
+		let->data.var = data;
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return let;
 }
 
-static inline void free_let_value(let_value *val) {
-	if (val->func) {
-		free_let_func(val->func);
-	}
-	if (val->var) {
-		free_impl_var(val->var);
+static inline void free_let_val(let_val *let) {
+	switch (let->kind) {
+	case PSI_LET_NULL:
+		break;
+	case PSI_LET_NUMEXP:
+		free_num_exp(let->data.num);
+		break;
+	case PSI_LET_CALLOC:
+		free_let_calloc(let->data.alloc);
+		break;
+	case PSI_LET_FUNC:
+		free_let_func(let->data.func);
+		break;
+	case PSI_LET_TMP:
+		free_decl_var(let->data.var);
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-	free(val);
+	free(let);
 }
 
 typedef struct let_stmt {
 	decl_var *var;
-	let_value *val;
-	impl_arg *arg;
-	impl_val out;
+	let_val *val;
+
 	void *ptr;
-	void *mem;
 } let_stmt;
 
-static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
+static inline let_stmt *init_let_stmt(decl_var *var, let_val *val) {
 	let_stmt *let = calloc(1, sizeof(*let));
 	let->var = var;
 	let->val = val;
@@ -587,10 +719,13 @@ static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
 }
 
 static inline void free_let_stmt(let_stmt *stmt) {
-	free_decl_var(stmt->var);
 	if (stmt->val) {
-		free_let_value(stmt->val);
+		if (stmt->val->kind == PSI_LET_TMP && stmt->var->arg) {
+			free_decl_arg(stmt->var->arg);
+		}
+		free_let_val(stmt->val);
 	}
+	free_decl_var(stmt->var);
 	free(stmt);
 }
 
@@ -617,6 +752,7 @@ 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;
@@ -647,6 +783,9 @@ static inline void free_set_value(set_value *val) {
 		}
 		free(val->inner);
 	}
+	if (val->num) {
+		free_num_exp(val->num);
+	}
 	free(val);
 }
 
@@ -702,6 +841,7 @@ static inline free_call *init_free_call(const char *func, decl_vars *vars) {
 
 static inline void free_free_call(free_call *f) {
 	free(f->func);
+	free_decl_vars(f->vars);
 	free(f);
 }
 
@@ -901,72 +1041,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;
@@ -1005,6 +1079,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; \
@@ -1055,38 +1169,58 @@ typedef struct PSI_Parser {
 	unsigned flags;
 	unsigned errors;
 	void *proc;
-	size_t line;
+	size_t line, col;
 	token_t num;
 	char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
 } PSI_Parser;
 
 static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 	PSI_Token *T;
-	size_t token_len;
+	size_t token_len, fname_len;
+	token_t token_typ;
 
-	if (P->cur <= P->tok) {
+	if (P->cur < P->tok) {
 		return NULL;
 	}
 
+	token_typ = P->num;
 	token_len = P->cur - P->tok;
+	fname_len = strlen(P->psi.file.fn);
 
-	T = calloc(1, sizeof(*T) + token_len);
-	T->type = P->num;
-	T->line = P->line;
+	T = calloc(1, sizeof(*T) + token_len + fname_len + 1);
+	T->type = token_typ;
 	T->size = token_len;
-	T->text[token_len] = 0;
+	T->line = P->line;
+	T->col = P->col;
+	T->file = &T->buf[0];
+	T->text = &T->buf[fname_len + 1];
+
+	memcpy(T->file, P->psi.file.fn, fname_len);
 	memcpy(T->text, P->tok, token_len);
 
 	return T;
 }
 
+static inline PSI_Token *PSI_TokenCopy(PSI_Token *src) {
+	size_t fname_len = strlen(src->file);
+	size_t strct_len = sizeof(*src) + src->size + fname_len + 1;
+	PSI_Token *ptr = malloc(strct_len);
+
+	memcpy(ptr, src, strct_len);
+
+	ptr->file = &ptr->buf[0];
+	ptr->text = &ptr->buf[fname_len + 1];
+
+	return ptr;
+}
+
 #define PSI_PARSER_DEBUG 0x1
 
 PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb error, unsigned flags);
 void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...);
 size_t PSI_ParserFill(PSI_Parser *P, size_t n);
 token_t PSI_ParserScan(PSI_Parser *P);
-void PSI_ParserParse(PSI_Parser *P, PSI_Token *T);
+void PSI_ParserParse(PSI_Parser *P, PSI_Token *src);
 void PSI_ParserDtor(PSI_Parser *P);
 void PSI_ParserFree(PSI_Parser **P);