X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fcontext.c;h=3ab1d218797685340360eda838aad56a9f610c52;hb=4ecafb11128dc652013564387ab33b8b9110f039;hp=3f94d422e8f00848bac0bdca970c71c10729fe3b;hpb=772c1e688a51b32331fae7993429b3a03d766d8d;p=m6w6%2Fext-psi

diff --git a/src/context.c b/src/context.c
index 3f94d42..3ab1d21 100644
--- a/src/context.c
+++ b/src/context.c
@@ -173,6 +173,35 @@ static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
 	return 1;
 }
 
+static int psi_sort_struct_arg_cmp(const void *_a, const void *_b) {
+	decl_arg *a = *(decl_arg **)_a, *b = *(decl_arg **)_b;
+
+	if (a->layout->pos == b->layout->pos) {
+		if (a->layout->len == b->layout->len) {
+			return 0;
+		} else if (a->layout->len > b->layout->len) {
+			return -1;
+		} else {
+			return 1;
+		}
+	} else if (a->layout->pos > b->layout->pos) {
+		return 1;
+	} else {
+		return -1;
+	}
+}
+static void psi_sort_struct_arg_swp(void *a, void *b) {
+	decl_arg **_a = a, **_b = b, *_c;
+
+	_c = *_b;
+	*_b = *_a;
+	*_a = _c;
+}
+static inline void psi_sort_struct_args(decl_struct *s) {
+	zend_insert_sort(s->args->args, s->args->count, sizeof(*s->args->args),
+			psi_sort_struct_arg_cmp, psi_sort_struct_arg_swp);
+}
+
 static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
 	size_t i;
 
@@ -214,6 +243,9 @@ static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
 			s->size = darg->layout->pos + darg->layout->len;
 		}
 	}
+
+	psi_sort_struct_args(s);
+
 	return 1;
 }
 
@@ -1243,7 +1275,7 @@ static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
 		dprintf(fd, ", ");
 		dump_num_exp(fd, set->num);
 	}
-	if (set->inner) {
+	if (set->inner && set->func->type != PSI_T_ELLIPSIS) {
 		dprintf(fd, ",\n");
 		for (i = 0; i < set->count; ++i) {
 			dump_impl_set_value(fd, set->inner[i], level+1);
@@ -1391,6 +1423,9 @@ void PSI_ContextDump(PSI_Context *C, int fd)
 							dprintf(fd, "%s($%s)", let->val->data.func->name,
 									let->val->data.func->var->name);
 							break;
+						case PSI_LET_NUMEXP:
+							dump_num_exp(fd, let->val->data.num);
+							break;
 
 						EMPTY_SWITCH_DEFAULT_CASE();
 						}