projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[m6w6/ext-psi]
/
php_psi.h
diff --git
a/php_psi.h
b/php_psi.h
index 85a3805811f58440d49476f81d0453b8fc6d666f..8bac82658ba70b42261bd7d915479dee286af5c4 100644
(file)
--- a/
php_psi.h
+++ b/
php_psi.h
@@
-18,10
+18,11
@@
extern zend_module_entry psi_module_entry;
#include "TSRM.h"
#endif
#include "TSRM.h"
#endif
-#include "parser.h"
#include "context.h"
#include "context.h"
-void psi_error(int type, const char *msg, ...);
+void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...);
+void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...);
+void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv);
static inline int psi_check_env(const char *var) {
char *set = getenv(var);
static inline int psi_check_env(const char *var) {
char *set = getenv(var);
@@
-54,17
+55,18
@@
void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val);
+void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val);
void psi_to_array(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_object(zval *return_value, set_value *set, impl_val *ret_val);
void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl);
void psi_to_array(zval *return_value, set_value *set, impl_val *ret_val);
void psi_to_object(zval *return_value, set_value *set, impl_val *ret_val);
void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl);
-int psi_calc_num_exp(num_exp *exp, impl_val *
ref
, impl_val *res);
+int psi_calc_num_exp(num_exp *exp, impl_val *
strct
, impl_val *res);
-static inline zend_long psi_long_num_exp(num_exp *exp, impl_val *
ref
) {
+static inline zend_long psi_long_num_exp(num_exp *exp, impl_val *
strct
) {
impl_val val = {0};
impl_val val = {0};
- switch (psi_calc_num_exp(exp,
ref
, &val)) {
+ switch (psi_calc_num_exp(exp,
strct
, &val)) {
case PSI_T_UINT8: return val.u8;
case PSI_T_UINT16: return val.u16;
case PSI_T_UINT32: return val.u32;
case PSI_T_UINT8: return val.u8;
case PSI_T_UINT16: return val.u16;
case PSI_T_UINT32: return val.u32;