X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=199f533317ed7dfce6981ec01778a3fdfd819511;hp=f10f4c49e76e288c38c3c1384c99939231750a33;hb=6509a2053456d0e63b6f383b757289d3016ed1a5;hpb=91f2f40eee4e1d1dd62ad5de06517f9b27b4aaee

diff --git a/src/context.c b/src/context.c
index f10f4c4..199f533 100644
--- a/src/context.c
+++ b/src/context.c
@@ -256,14 +256,7 @@ void psi_context_build(struct psi_context *C, const char *paths)
 					continue;
 				}
 
-				while (0 < psi_parser_scan(&P)) {
-					psi_parser_parse(&P, psi_token_alloc(&P));
-					if (P.num == PSI_T_EOF) {
-						break;
-					}
-				}
-
-				psi_parser_parse(&P, NULL);
+				psi_parser_parse(&P);
 				psi_context_add_data(C, PSI_DATA(&P));
 				psi_parser_dtor(&P);
 			}
@@ -341,7 +334,7 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 				zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
 
 				zc.name = zend_string_dup(name, 1);
-				ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL));
+				ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL, NULL));
 				zend_register_constant(&zc);
 				zend_string_release(name);
 			}
@@ -373,7 +366,22 @@ ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *exec
 		return FAILURE;
 	}
 
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_PRE)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
 	psi_call_frame_do_call(frame);
+
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
 	psi_call_frame_do_return(frame, return_value);
 	psi_call_frame_do_set(frame);
 	psi_call_frame_do_free(frame);