basic support for builtins
[m6w6/ext-psi] / src / context.c
index ba9fabb9cc8e0c0d5ed4542e9f92d96cf1a33f1e..be8bae9cbdf7b8385b5ef3abe7f157ea1e4e9089 100644 (file)
@@ -1,86 +1,32 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
 
 #include "php.h"
 
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_GLOB_H
-# include <glob.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-# include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-#ifdef HAVE_TIME_H
-# include <time.h>
-#endif
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen ((dirent)->d_name)
 # endif
 #endif
 
-#include <sys/param.h>
-#include <dlfcn.h>
 #include <fnmatch.h>
 
-#include "php.h"
 #include "php_scandir.h"
 #include "php_psi.h"
-
+#include "calc.h"
+#include "call.h"
 #include "libjit.h"
 #include "libffi.h"
 
-static struct psi_std_type {
-       token_t type_tag;
-       const char *type_name;
-} psi_std_types[] = {
-       {PSI_T_FLOAT, "float"},
-       {PSI_T_DOUBLE, "double"},
-       {PSI_T_INT8, "int8_t"},
-       {PSI_T_INT16, "int16_t"},
-       {PSI_T_INT32, "int32_t"},
-       {PSI_T_INT64, "int64_t"},
-       {PSI_T_UINT8, "uint8_t"},
-       {PSI_T_UINT16, "uint16_t"},
-       {PSI_T_UINT32, "uint32_t"},
-       {PSI_T_UINT64, "uint64_t"},
-       {0}
-};
-
-static struct psi_predef_type {
-       token_t type_tag;
-       const char *type_name;
-       const char *alias;
-} psi_predef_types[] = {
-       PSI_TYPES
-       {0}
-};
-
-static struct psi_predef_const {
-       token_t type_tag;
-       const char *type_name;
-       const char *var_name;
-       const char *val_text;
-       token_t val_type_tag;
-} psi_predef_consts[] = {
-       PSI_CONSTS
-       {0}
-};
-
-PSI_MACROS
-
-int psi_glob(const char *pattern, int flags,
-               int (*errfunc) (const char *epath, int eerrno),
-               glob_t *pglob) {
-       size_t offs = flags & GLOB_DOOFFS ? pglob->gl_offs : 0;
-       int rv = glob(pattern, flags, errfunc, pglob);
-       if (pglob->gl_pathv) {
-               while (offs--) {
-                       pglob->gl_pathv[offs] = NULL;
-               }
-       }
-       return rv;
-}
-
-static struct psi_func_redir {
-       const char *name;
-       void (*func)(void);
-} psi_func_redirs[] = {
-       {"glob", (void (*)(void)) psi_glob},
-       PSI_REDIRS
-       {0}
-};
-
-static struct psi_predef_decl {
-       token_t type_tag;
-       const char *type_name;
-       const char *var_name;
-       size_t pointer_level;
-       size_t array_size;
-} psi_predef_decls[] = {
-       PSI_DECLS
-       {0}
-};
-
-static struct psi_predef_struct {
-       token_t type_tag;
-       const char *type_name;
-       const char *var_name;
-       size_t offset;
-       size_t size;
-       size_t pointer_level;
-       size_t array_size;
-} psi_predef_structs[] = {
-       PSI_STRUCTS
-       {0}
-};
-
-static int validate_lib(PSI_Data *data, void **dlopened) {
-       char lib[MAXPATHLEN];
-       const char *ptr = data->psi.file.ln;
-       size_t len;
-
-       if (!ptr) {
-               /* FIXME: assume stdlib */
-               return 1;
-       } else if (!strchr(ptr, '/')) {
-               len = snprintf(lib, MAXPATHLEN, "lib%s.%s", ptr, PHP_PSI_SHLIB_SUFFIX);
-               if (MAXPATHLEN == len) {
-                       data->error(PSI_WARNING, "Library name too long: '%s'", ptr);
-               }
-               lib[len] = 0;
-               ptr = lib;
-       }
-       if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
-               data->error(PSI_WARNING, "Could not open library '%s': %s.",
-                               data->psi.file.ln, dlerror());
-               return 0;
-       }
-       return 1;
-}
-
-static inline int locate_decl_type_alias(decl_typedefs *defs, decl_type *type) {
-       size_t i;
-       struct psi_std_type *stdtyp;
-
-       if (type->real) {
-               return 1;
-       }
-       for (i = 0; i < defs->count; ++i) {
-               decl_typedef *def = defs->list[i];
-
-               if (def->type->type != type->type && !strcmp(def->alias, type->name)) {
-                       type->real = def->type;
-                       return 1;
-               }
-       }
-       for (stdtyp = &psi_std_types[0]; stdtyp->type_tag; ++stdtyp) {
-               if (!strcmp(type->name, stdtyp->type_name)) {
-                       type->type = stdtyp->type_tag;
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type) {
-       size_t i;
-
-       if (type->strct) {
-               return 1;
-       }
-       for (i = 0; i < structs->count; ++i) {
-               if (!strcmp(structs->list[i]->name, type->name)) {
-                       type->strct = structs->list[i];
-                       return 1;
-               }
-       }
-       return 0;
-}
+#include "token.h"
+#include "parser.h"
 
-static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
-       switch (type->type) {
-       case PSI_T_NAME:
-               if (!data->defs || !locate_decl_type_alias(data->defs, type)) {
-                       return 0;
-               }
-               if (type->real) {
-                       return validate_decl_type(data, type->real);
-               }
-               return 1;
-       case PSI_T_STRUCT:
-               if (!data->structs || !locate_decl_type_struct(data->structs, type)) {
-                       return 0;
-               }
-               break;
-       }
-       return 1;
-}
-static inline int validate_decl_typedef(PSI_Data *data, decl_typedef *def) {
-       if (!validate_decl_type(data, def->type)) {
-               data->error(PSI_WARNING, "Type '%s' cannot be aliased to %s'%s'",
-                       def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",def->alias);
-               return 0;
-       }
-       /* FIXME: check def->alias */
-       return 1;
-}
+#include "php_psi_posix.h"
 
-static inline int validate_constant(PSI_Data *data, constant *c) {
-       /* FIXME */
-       return 1;
-}
-
-static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
-       if (!validate_decl_type(data, arg->type)) {
-               data->error(PSI_WARNING, "Cannot use '%s'(%d) as type for decl var '%s'"
-                               " in %s on line %zu at col %zu",
-                       arg->type->name, arg->type->type, arg->var->name,
-                       arg->type->token->file, arg->type->token->line, arg->type->token->col);
-               return 0;
-       }
-       return 1;
-}
-
-static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
-       size_t i;
-
-       for (i = 0; i < s->args->count; ++i) {
-               if (!validate_decl_arg(data, s->args->args[i])) {
-                       return 0;
-               }
-       }
-
-       for (i = 0; i < s->args->count; ++i) {
-               decl_arg *darg = s->args->args[i];
-
-               if (!validate_decl_arg(data, darg)) {
-                       return 0;
-               }
-
-               ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
-               darg->var->arg = darg;
-
-               if (!darg->layout) {
-                       token_t t;
-
-                       if (darg->var->pointer_level && (!darg->var->array_size || darg->var->pointer_level == 1)) {
-                               t = PSI_T_POINTER;
-                       } else {
-                               t = real_decl_type(darg->type)->type;
-                       }
-
-                       if (i) {
-                               decl_arg *last = s->args->args[i-1];
-                               darg->layout = init_decl_struct_layout(
-                                               psi_t_align(t, last->layout->pos + last->layout->len),
-                                               psi_t_size(t) * darg->var->array_size);
-                       } else {
-                               darg->layout = init_decl_struct_layout(0, psi_t_size(t));
-                       }
-               }
-               if (s->size < darg->layout->pos + darg->layout->len) {
-                       s->size = darg->layout->pos + darg->layout->len;
-               }
-       }
-       return 1;
-}
-
-static const char * const abi_ccs[] = {
-               "default", /* \                 */
-               "extern",  /*  > - all the same */
-               "cdecl",   /* /                 */
-               "stdcall",
-               "fastcall",
-};
-static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
-       size_t i;
-
-       for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
-               if (strcasecmp(abi->convention, abi_ccs[i])) {
-                       return 1;
-               }
-       }
-       data->error(PSI_WARNING, "Invalid calling convention: '%s'", abi->convention);
-       return 0;
-}
-static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
+PHP_MINIT_FUNCTION(psi_context)
 {
-       struct psi_func_redir *redir;
-
-       if (!strcmp(func->var->name, "dlsym")) {
-               data->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
-               return 0;
-       }
+       unsigned flags = 0;
+       struct psi_context_ops *ops = NULL;
 
-       if (!validate_decl_arg(data, func)) {
-               return 0;
-       }
-       for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
-               if (!strcmp(func->var->name, redir->name)) {
-                       decl->call.sym = redir->func;
-               }
-       }
-       if (!decl->call.sym) {
-#ifndef RTLD_NEXT
-# define RTLD_NEXT ((void *) -1l)
+#ifdef HAVE_LIBJIT
+       if (!strcasecmp(PSI_G(engine), "jit")) {
+               ops = psi_libjit_ops();
+       } else
+#endif
+#ifdef HAVE_LIBFFI
+               ops = psi_libffi_ops();
 #endif
-               decl->call.sym = dlsym(dl ?: RTLD_NEXT, func->var->name);
-               if (!decl->call.sym) {
-                       data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
-                               func->var->name, dlerror());
-               }
-       }
-       return 1;
-}
-
-static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
-       if (!validate_decl_abi(data, decl->abi)) {
-               return 0;
-       }
-       if (!validate_decl_func(data, dl, decl, decl->func)) {
-               return 0;
-       }
-       if (decl->args) {
-               size_t i;
-
-               for (i = 0; i < decl->args->count; ++i) {
-                       if (!validate_decl_arg(data, decl->args->args[i])) {
-                               return 0;
-                       }
-               }
-       }
-       return 1;
-}
-static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args, decl_arg *func) {
-       size_t i;
-
-       for (i = 0; i < args->count; ++i) {
-               decl_arg *arg = args->args[i];
-
-               if (!strcmp(var->name, arg->var->name)) {
-                       ZEND_ASSERT(!var->arg || var->arg == arg);
-                       return var->arg = arg;
-               }
-       }
-       if (func && !strcmp(var->name, func->var->name)) {
-               return var->arg = func;
-       }
-
-       return NULL;
-}
-static inline decl_arg *locate_struct_member(decl_struct *s, decl_var *var) {
-       if (s->args) {
-               return locate_decl_var_arg(var, s->args, NULL);
-       }
-
-       return NULL;
-}
-static inline constant *locate_num_exp_constant(num_exp *exp, constants *consts) {
-       size_t i;
-
-       for (i = 0; i < consts->count; ++i) {
-               constant *cnst = consts->list[i];
-
-               if (!strcmp(cnst->name, exp->u.numb)) {
-                       free(exp->u.numb);
-                       return exp->u.cnst = cnst;
-               }
-       }
-
-       return NULL;
-}
-static inline int validate_num_exp(PSI_Data *data, decl_args *dargs, decl_arg *func, num_exp *exp) {
-       if (exp->operand) {
-               switch (exp->operator) {
-               case PSI_T_PLUS:
-                       exp->calculator = psi_calc_add;
-                       break;
-               case PSI_T_MINUS:
-                       exp->calculator = psi_calc_sub;
-                       break;
-               case PSI_T_ASTERISK:
-                       exp->calculator = psi_calc_mul;
-                       break;
-               case PSI_T_SLASH:
-                       exp->calculator = psi_calc_div;
-                       break;
-               EMPTY_SWITCH_DEFAULT_CASE();
-               }
-               if (!validate_num_exp(data, dargs, func, exp->operand)) {
-                       return 0;
-               }
-       }
-       switch (exp->t) {
-       case PSI_T_NAME:
-               if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
-                       data->error(PSI_WARNING, "Unknown variable '%s' in numeric expression",
-                                       exp->u.dvar->name);
-                       return 0;
-               }
-               return 1;
-       case PSI_T_NSNAME:
-               if (!locate_num_exp_constant(exp, data->consts)) {
-                       data->error(PSI_WARNING, "Unknown constant '%s' in numeric expression",
-                                       exp->u.numb);
-                       return 0;
-               }
-               return 1;
-       case PSI_T_NUMBER:
-               return 1;
-       default:
-               return 0;
-       }
-}
-static inline int validate_set_value_handler(set_value *set) {
-       switch (set->func->type) {
-       case PSI_T_TO_BOOL:
-               set->func->handler = psi_to_bool;
-               break;
-       case PSI_T_TO_INT:
-               set->func->handler = psi_to_int;
-               break;
-       case PSI_T_TO_FLOAT:
-               set->func->handler = psi_to_double;
-               break;
-       case PSI_T_TO_STRING:
-               set->func->handler = psi_to_string;
-               break;
-       case PSI_T_TO_ARRAY:
-               set->func->handler = psi_to_array;
-               break;
-       case PSI_T_TO_OBJECT:
-               set->func->handler = psi_to_object;
-               break;
-       case PSI_T_VOID:
-               set->func->handler = psi_to_void;
-               break;
-       default:
-               return 0;
-       }
-       return 1;
-}
-static inline void decl_var_arg_v(decl_args *args, va_list argp) {
-       int argc;
-       decl_arg **argv;
-
-       memset(args, 0, sizeof(*args));
-
-       while ((argc = va_arg(argp, int))) {
-               argv = va_arg(argp, decl_arg **);
-               while (argc--) {
-                       add_decl_arg(args, *argv++);
-               }
-       }
-}
-static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
-       size_t i;
-       decl_type *ref_type;
-       decl_var *set_var = set->vars->vars[0];
-
-       if (!validate_set_value_handler(set)) {
-               data->error(PSI_WARNING, "Invalid cast '%s'", set->func->name);
-               return 0;
-       }
-
-       for (i = 0; i < set->vars->count; ++i) {
-               decl_var *svar = set->vars->vars[i];
-               if (!svar->arg && !locate_decl_var_arg(svar, ref_list, NULL)) {
-                       data->error(PSI_WARNING, "Unknown variable '%s'", svar->name);
-                       return 0;
-               }
-       }
-
-       if (!ref) {
-               ref = set_var->arg;
-       }
-       ref_type = real_decl_type(ref->type);
-
-       if (set->count) {
-               int is_to_array = (set->func->type == PSI_T_TO_ARRAY);
-               int is_pointer_to_struct = (ref_type->type == PSI_T_STRUCT && ref->var->pointer_level);
 
-               if (!is_to_array && !is_pointer_to_struct) {
-                       data->error(E_WARNING, "Inner `set` statement casts only work with "
-                                       "to_array() casts on structs or pointers: %s(%s...", set->func->name, set->vars->vars[0]->name);
-                       return 0;
-               }
+       if (!ops) {
+               php_error(E_WARNING, "No PSI engine found");
+               return FAILURE;
        }
-       if (set->num) {
-               if (!validate_num_exp(data, ref_list, ref, set->num)) {
-                       return 0;
-               }
-       }
-
-       if (ref_type->type == PSI_T_STRUCT) {
-               /* to_array(struct, to_...) */
-               for (i = 0; i < set->count; ++i) {
-                       decl_var *sub_var = set->inner[i]->vars->vars[0];
-                       decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
 
-                       set->inner[i]->outer.set = set;
-                       if (sub_ref) {
-                               if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
-                                       return 0;
-                               }
-                       }
-               }
-       } else if (set->count == 1) {
-               /* to_array(ptr, to_string(*ptr)) */
-               decl_var *sub_var = set->inner[0]->vars->vars[0];
-               decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list, ref);
-
-               set->inner[0]->outer.set = set;
-               if (sub_ref) {
-                       if (strcmp(sub_var->name, set_var->name)) {
-                               data->error(E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
-                               return 0;
-                       }
-                       if (!validate_set_value_ex(data, set->inner[0], sub_ref, ref_list)) {
-                               return 0;
-                       }
-               }
-       } else if (set->count > 1) {
-               data->error(E_WARNING, "Inner `set` statement casts on pointers may only occur once");
-               return 0;
+       PSI_G(ops) = ops;
+       if (ops->load && SUCCESS != ops->load()) {
+               return FAILURE;
        }
 
-       return 1;
-}
-static inline int validate_set_value(PSI_Data *data, set_value *set, ...) {
-       va_list argp;
-       decl_args args = {0};
-       int check;
-
-       va_start(argp, set);
-       decl_var_arg_v(&args, argp);
-       va_end(argp);
-
-       check = validate_set_value_ex(data, set, NULL, &args);
-       if (args.args) {
-               free(args.args);
-       }
-       return check;
-}
-static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
-       if (decls) {
-               size_t i;
-
-               for (i = 0; i < decls->count; ++i) {
-                       if (!strcmp(decls->list[i]->func->var->name, ret->set->vars->vars[0]->name)) {
-                               ret->decl = decls->list[i]->func;
-                               return decls->list[i];
-                       }
-               }
-       }
-
-       return NULL;
-}
-static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
-       return_stmt *ret;
-
-       /* we must have exactly one ret stmt delcaring the native func to call */
-       /* and which type cast to apply */
-       if (impl->stmts->ret.count != 1) {
-               if (impl->stmts->ret.count > 1) {
-                       data->error(PSI_WARNING, "Too many `return` statements for implmentation %s;"
-                                       " found %zu, exactly one is needed",
-                                       impl->func->name, impl->stmts->ret.count);
-               } else {
-                       data->error(PSI_WARNING, "Missing `return` statement for implementation %s",
-                                       impl->func->name);
-               }
-               return 0;
+       if (psi_check_env("PSI_DEBUG")) {
+               flags |= PSI_DEBUG;
        }
-
-       ret = impl->stmts->ret.list[0];
-
-       if (!(impl->decl = locate_impl_decl(data->decls, ret))) {
-               data->error(PSI_WARNING, "Missing declaration for implementation %s",
-                               impl->func->name);
-               return 0;
+       if (psi_check_env("PSI_SILENT")) {
+               flags |= PSI_SILENT;
        }
 
-       if (!validate_set_value(data, ret->set, 1, &ret->decl, impl->decl->args ? (int) impl->decl->args->count : 0, impl->decl->args ? impl->decl->args->args : NULL, 0)) {
-               return 0;
-       }
+       PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
+       psi_context_build(PSI_G(context), PSI_G(directory));
 
-       impl->decl->impl = impl;
-
-       return 1;
+       return SUCCESS;
 }
 
-static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j;
-       /* we can have multiple let stmts */
-
-       /* check that we have a decl arg for every let stmt */
-       for (i = 0; i < impl->stmts->let.count; ++i) {
-               let_stmt *let = impl->stmts->let.list[i];
-               decl_var *let_var;
-               int check = 0;
-
-               if (let->val && let->val->kind == PSI_LET_TMP) {
-                       let_var = let->val->data.var;
-               } else {
-                       let_var = let->var;
-               }
-
-               if (!locate_decl_var_arg(let_var, impl->decl->args, impl->decl->func)) {
-                       data->error(PSI_WARNING, "Unknown variable '%s' in `let` statement"
-                                       " of implementation '%s'", let_var->name, impl->func->name);
-                       return 0;
-               }
-
-               switch (let->val->kind) {
-               case PSI_LET_NULL:
-                       break;
-               case PSI_LET_TMP:
-                       /* e.g. let bar = &strval($bar); // decl_arg(char **bar) */
-                       /* e.g. let foo = *bar;  */
-                       let->var->pointer_level = let->val->data.var->pointer_level;
-                       let->var->arg = init_decl_arg(
-                                       init_decl_type(
-                                                       real_decl_type(let->val->data.var->arg->type)->type,
-                                                       real_decl_type(let->val->data.var->arg->type)->name),
-                                       init_decl_var(
-                                                       let->var->name,
-                                                       let->var->pointer_level,
-                                                       let->var->array_size));
-                       break;
-               case PSI_LET_NUMEXP:
-                       if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.num)) {
-                               return 0;
-                       }
-                       break;
-               case PSI_LET_CALLOC:
-                       if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.alloc->nmemb)) {
-                               return 0;
-                       }
-                       if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.alloc->size)) {
-                               return 0;
-                       }
-                       break;
-               case PSI_LET_FUNC:
-                       if (impl->func->args) {
-                               for (j = 0; j < impl->func->args->count; ++j) {
-                                       impl_arg *iarg = impl->func->args->args[j];
-
-                                       if (!strcmp(let->val->data.func->var->name, iarg->var->name)) {
-                                               let->val->data.func->arg = iarg;
-                                               check = 1;
-                                               break;
-                                       }
-                               }
-                       }
-                       if (!check) {
-                               data->error(PSI_WARNING, "Unknown value '$%s' of `let` statement"
-                                               " for variable '%s' of implementation '%s'",
-                                               let->val->data.func->var->name, let->var->name, impl->func->name);
-                               return 0;
-                       }
-                       break;
-               }
-       }
-
-       /* check that we have a let stmt for every decl arg */
-       if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-               decl_arg *darg = impl->decl->args->args[i];
-               int check = 0;
-
-               for (j = 0; j < impl->stmts->let.count; ++j) {
-                       let_stmt *let = impl->stmts->let.list[j];
-
-                       if (!strcmp(let->var->name, darg->var->name)) {
-                               darg->let = let;
-                               check = 1;
-                               break;
-                       }
-               }
-               if (!check) {
-                       data->error(PSI_WARNING, "Missing `let` statement for arg '%s %.*s%s'"
-                                       " of declaration '%s' for implementation '%s'",
-                                       darg->type->name, (int) darg->var->pointer_level, "*****",
-                                       darg->var->name, impl->decl->func->var->name, impl->func->name);
-                       return 0;
-               }
-       }
-
-       return 1;
-}
-static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j, k;
-       /* we can have any count of set stmts; processing out vars */
-       /* check that set stmts reference known variables */
-       for (i = 0; i < impl->stmts->set.count; ++i) {
-               set_stmt *set = impl->stmts->set.list[i];
-               int check = 0;
-
-               if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
-                       impl_arg *iarg = impl->func->args->args[j];
-
-                       if (!strcmp(set->var->name, iarg->var->name)) {
-                               set->arg = iarg;
-                               check = 1;
-                               break;
-                       }
-               }
-               if (!check) {
-                       data->error(PSI_WARNING, "Unknown variable '$%s' of `set` statement"
-                                       " of implementation '%s'",
-                                       set->var->name, impl->func->name);
-                       return 0;
-               }
-
-               for (j = 0; j < set->val->vars->count; ++j) {
-                       decl_var *set_var = set->val->vars->vars[j];
-
-                       check = 0;
-                       if (impl->decl->args) {
-                               for (k = 0; k < impl->decl->args->count; ++k) {
-                                       decl_arg *set_arg = impl->decl->args->args[k];
-
-                                       if (!strcmp(set_var->name, set_arg->var->name)) {
-                                               check = 1;
-                                               set_var->arg = set_arg;
-                                               if (!validate_set_value(data, set->val, 1, &set_arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
-                                                       return 0;
-                                               }
-                                               break;
-                                       }
-                               }
-                       }
-                       if (!check) {
-                               for (k = 0; k < impl->stmts->let.count; ++k) {
-                                       let_stmt *let = impl->stmts->let.list[k];
-
-                                       /* check temp vars */
-                                       if (let->val && let->val->kind == PSI_LET_TMP) {
-                                               if (!strcmp(set_var->name, let->var->name)) {
-                                                       check = 1;
-                                                       set_var->arg = let->var->arg;
-                                                       if (!validate_set_value(data, set->val, 1, &set_var->arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
-                                                               return 0;
-                                                       }
-                                                       break;
-                                               }
-                                       }
-                               }
-                       }
+PHP_MSHUTDOWN_FUNCTION(psi_context)
+{
+       if (psi_check_env("PSI_DUMP")) {
+               struct psi_dump dump = {{.hn = stdout}, (psi_dump_cb) fprintf};
 
-                       if (!check) {
-                               data->error(PSI_WARNING, "Unknown value '%s' of `set` statement"
-                                               " for variable '$%s' of implementation '%s'",
-                                               set_var->name, set->arg->var->name, impl->func->name);
-                               return 0;
-                       }
-               }
+               psi_context_dump(&dump, PSI_G(context));
        }
-       return 1;
-}
-static inline decl *locate_free_decl(decls *decls, free_call *f) {
-       if (decls)  {
-               size_t i;
-
-               for (i = 0; i < decls->count; ++i) {
-                       if (!strcmp(decls->list[i]->func->var->name, f->func)) {
-                               f->decl = decls->list[i];
-                               return decls->list[i];
-                       }
-               }
-       }
-
-       return NULL;
-}
-static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j, k, l;
-       /* we can have any count of free stmts; freeing any out vars */
-       for (i = 0; i < impl->stmts->fre.count; ++i) {
-               free_stmt *fre = impl->stmts->fre.list[i];
-
-               for (j = 0; j < fre->calls->count; ++j) {
-                       free_call *free_call = fre->calls->list[j];
-
-                       /* first find the decl of the free func */
-                       if (!locate_free_decl(data->decls, free_call)) {
-                               data->error(PSI_WARNING, "Unknown function '%s' in `free` statement"
-                                               " of implementation '%s'", free_call->func, impl->func->name);
-                               return 0;
-                       }
-                       if (!impl->decl->args) {
-                               data->error(PSI_WARNING, "Declaration '%s' of implementation '%s'"
-                                               " does not have any arguments to free",
-                                               impl->decl->func->var->name, impl->func->name);
-                       }
-
-                       /* now check for known vars */
-                       for (l = 0; l < free_call->vars->count; ++l) {
-                               int check = 0;
-                               decl_var *free_var = free_call->vars->vars[l];
 
-                               for (k = 0; k < impl->decl->args->count; ++k) {
-                                       decl_arg *free_arg = impl->decl->args->args[k];
+       psi_context_free(&PSI_G(context));
 
-                                       if (!strcmp(free_var->name, free_arg->var->name)) {
-                                               check = 1;
-                                               free_var->arg = free_arg;
-                                               break;
-                                       }
-                               }
-
-                               if (!check) {
-                                       data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
-                                                       " of implementation '%s'",
-                                                       free_var->name, impl->func->name);
-                                       return 0;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
-       if (!impl->stmts) {
-               data->error(PSI_WARNING, "Missing body for implementation %s!",
-                               impl->func->name);
-               return 0;
-       }
-
-       if (!validate_impl_ret_stmt(data, impl)) {
-               return 0;
-       }
-
-       if (!validate_impl_let_stmts(data, impl)) {
-               return 0;
-       }
-       if (!validate_impl_set_stmts(data, impl)) {
-               return 0;
-       }
-       if (!validate_impl_free_stmts(data, impl)) {
-               return 0;
+       if (PSI_G(ops)->free) {
+               PSI_G(ops)->free();
        }
 
-       return 1;
+       return SUCCESS;
 }
 
-PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error)
+struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags)
 {
-       size_t i;
-       PSI_Data T;
-       struct psi_predef_type *predef_type;
-       struct psi_predef_const *predef_const;
-       struct psi_predef_struct *predef_struct;
-       struct psi_predef_decl *predef_decl;
-
        if (!C) {
-               C = malloc(sizeof(*C));
+               C = pemalloc(sizeof(*C), 1);
        }
        memset(C, 0, sizeof(*C));
 
-       C->error = error;
+       psi_data_ctor(PSI_DATA(C), error, flags);
        C->ops = ops;
 
        if (ops->init) {
                ops->init(C);
        }
 
-       ZEND_ASSERT(ops->call != NULL);
-       ZEND_ASSERT(ops->compile != NULL);
-
-       /* build up predefs in a temporary PSI_Data for validation */
-       memset(&T, 0, sizeof(T));
-       T.error = error;
-
-       for (predef_type = &psi_predef_types[0]; predef_type->type_tag; ++predef_type) {
-               decl_type *type = init_decl_type(predef_type->type_tag, predef_type->type_name);
-               decl_typedef *def = init_decl_typedef(predef_type->alias, type);
-
-               T.defs = add_decl_typedef(T.defs, def);
-       }
-       for (predef_const = &psi_predef_consts[0]; predef_const->type_tag; ++predef_const) {
-               impl_def_val *val = init_impl_def_val(predef_const->val_type_tag, predef_const->val_text);
-               const_type *type = init_const_type(predef_const->type_tag, predef_const->type_name);
-               constant *constant = init_constant(type, predef_const->var_name, val);
-
-               T.consts = add_constant(T.consts, constant);
-       }
-       for (predef_struct = &psi_predef_structs[0]; predef_struct->type_tag; ++predef_struct) {
-               struct psi_predef_struct *member;
-               decl_args *dargs = init_decl_args(NULL);
-               decl_struct *dstruct = init_decl_struct(predef_struct->var_name, dargs);
-
-               dstruct->size = predef_struct->size;
-               for (member = &predef_struct[1]; member->type_tag; ++member) {
-                       decl_type *type;
-                       decl_var *dvar;
-                       decl_arg *darg;
-
-                       type = init_decl_type(member->type_tag, member->type_name);
-                       dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size);
-                       darg = init_decl_arg(type, dvar);
-                       darg->layout = init_decl_struct_layout(member->offset, member->size);
-                       dargs = add_decl_arg(dargs, darg);
-               }
-
-               T.structs = add_decl_struct(T.structs, dstruct);
-               predef_struct = member;
-       }
-       for (predef_decl = &psi_predef_decls[0]; predef_decl->type_tag; ++predef_decl) {
-               struct psi_predef_decl *farg;
-               decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
-               decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
-               decl_arg *func = init_decl_arg(ftype, fname);
-               decl_args *args = init_decl_args(NULL);
-               decl *decl = init_decl(init_decl_abi("default"), func, args);
-
-
-               for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
-                       decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
-                       decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
-                       decl_arg *darg = init_decl_arg(arg_type, arg_var);
-                       args = add_decl_arg(args, darg);
-               }
-
-               T.decls = add_decl(T.decls, decl);
-               predef_decl = farg;
-       }
-
-       for (i = 0; i < T.defs->count; ++i) {
-               decl_typedef *def = T.defs->list[i];
-
-               if (validate_decl_typedef(&T, def)) {
-                       C->defs = add_decl_typedef(C->defs, def);
-               }
-       }
-
-       for (i = 0; i < T.consts->count; ++i) {
-               constant *constant = T.consts->list[i];
-
-               if (validate_constant(&T, constant)) {
-                       C->consts = add_constant(C->consts, constant);
-               }
-       }
-
-       for (i = 0; i < T.structs->count; ++i) {
-               decl_struct *dstruct = T.structs->list[i];
-
-               if (validate_decl_struct(&T, dstruct)) {
-                       C->structs = add_decl_struct(C->structs, dstruct);
-               }
-       }
-
-       for (i = 0; i < T.decls->count; ++i) {
-               decl *decl = T.decls->list[i];
-
-               if (validate_decl(&T, NULL, decl)) {
-                       C->decls = add_decl(C->decls, decl);
-               }
-       }
-
-       C->count = 1;
-       C->data = malloc(sizeof(*C->data));
-       PSI_DataExchange(C->data, &T);
+       assert(ops->call != NULL);
+       assert(ops->compile != NULL);
 
        return C;
 }
 
-int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
-{
-       PSI_Data *D;
-       void *dlopened = NULL;
-       size_t count = C->count++;
-
-       C->data = realloc(C->data, C->count * sizeof(*C->data));
-       D = PSI_DataExchange(&C->data[count], PSI_DATA(P));
-
-       if (D->defs) {
-               size_t i;
-
-               for (i = 0; i < D->defs->count; ++i) {
-                       if (validate_decl_typedef(PSI_DATA(C), D->defs->list[i])) {
-                               C->defs = add_decl_typedef(C->defs, D->defs->list[i]);
-                       }
-               }
-       }
-       if (D->structs) {
-               size_t i;
-
-               for (i = 0; i < D->structs->count; ++i) {
-                       if (validate_decl_struct(PSI_DATA(C), D->structs->list[i])) {
-                               C->structs = add_decl_struct(C->structs, D->structs->list[i]);
-                       }
-               }
-       }
-       if (D->consts) {
-               size_t i;
-
-               for (i = 0; i < D->consts->count; ++i) {
-                       if (validate_constant(PSI_DATA(C), D->consts->list[i])) {
-                               C->consts = add_constant(C->consts, D->consts->list[i]);
-                       }
-               }
-       }
-
-       if (!validate_lib(D, &dlopened)) {
-               return 0;
-       }
-
-       add_decl_lib(&C->psi.libs, dlopened);
-
-       if (D->decls) {
-               size_t i;
-
-               for (i = 0; i < D->decls->count; ++i) {
-                       if (validate_decl(PSI_DATA(C), dlopened, D->decls->list[i])) {
-                               C->decls = add_decl(C->decls, D->decls->list[i]);
-                       }
-               }
-       }
-       if (D->impls) {
-               size_t i;
-
-               for (i = 0; i < D->impls->count; ++i) {
-                       if (validate_impl_stmts(PSI_DATA(C), D->impls->list[i])) {
-                               C->impls = add_impl(C->impls, D->impls->list[i]);
-                       }
-               }
-       }
-
-       return 1;
-}
-
 static int psi_select_dirent(const struct dirent *entry)
 {
 #ifndef FNM_CASEFOLD
-#define FNM_CASEFOLD 0
+# define FNM_CASEFOLD 0
 #endif
        return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
 }
 
-void PSI_ContextBuild(PSI_Context *C, const char *paths)
+static bool psi_context_add(struct psi_context *C, struct psi_parser *P)
 {
-       int i, n, flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : 0;
-       char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
-       struct dirent **entries = NULL;
+       bool valid;
+       struct psi_data *D;
+       struct psi_validate_scope scope = {0};
 
+       C->data = safe_perealloc(C->data, (C->count + 1), sizeof(*C->data), 0, 1);
+       D = psi_data_exchange(&C->data[C->count++], PSI_DATA(P));
+
+       psi_validate_scope_ctor(&scope);
+       scope.cpp = P->preproc;
+       valid = psi_validate(&scope, PSI_DATA(C), D);
+       psi_validate_scope_dtor(&scope);
+
+       return valid;
+}
+
+void psi_context_build(struct psi_context *C, const char *paths)
+{
+       int i, n;
+       char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
+       struct dirent **entries;
 
        do {
                sep = strchr(ptr, ':');
@@ -1130,33 +170,33 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
                        *sep = 0;
                }
 
+               entries = NULL;
                n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
 
                if (n > 0) {
                        for (i = 0; i < n; ++i) {
                                char psi[MAXPATHLEN];
-                               PSI_Parser P;
+                               struct psi_parser P;
+                               struct psi_parser_input *I;
 
                                if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
-                                       C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
+                                       C->error(PSI_DATA(C), NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
                                                ptr, entries[i]->d_name);
                                }
-                               if (!PSI_ParserInit(&P, psi, C->error, flags)) {
-                                       C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
+                               if (!psi_parser_init(&P, C->error, C->flags)) {
+                                       C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
                                                psi, strerror(errno));
                                        continue;
                                }
-
-                               while (0 < PSI_ParserScan(&P)) {
-                                       PSI_ParserParse(&P, PSI_TokenAlloc(&P));
-                                       if (P.num == PSI_T_EOF) {
-                                               break;
-                                       }
+                               if (!(I = psi_parser_open_file(&P, psi, true))) {
+                                       C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to open PSI file (%s): %s",
+                                               psi, strerror(errno));
+                                       continue;
                                }
-
-                               PSI_ParserParse(&P, NULL);
-                               PSI_ContextValidate(C, &P);
-                               PSI_ParserDtor(&P);
+                               psi_parser_parse(&P, I);
+                               psi_context_add(C, &P);
+                               psi_parser_dtor(&P);
+                               psi_parser_input_free(&I);
                        }
                }
 
@@ -1171,321 +211,139 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
        } while (sep);
 
 
-       if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
-               C->error(PSI_WARNING, "Failed to register functions!");
+       if (psi_context_compile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
+               C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to register functions!");
        }
 
        free(cpy);
-
 }
 
-zend_function_entry *PSI_ContextCompile(PSI_Context *C)
+zend_function_entry *psi_context_compile(struct psi_context *C)
 {
-       size_t i;
+       zend_constant zc;
+
+       ZEND_CONSTANT_SET_FLAGS(&zc, CONST_CS|CONST_PERSISTENT, EG(current_module)->module_number);
 
        if (C->consts) {
-               zend_constant zc;
+               size_t i = 0;
+               struct psi_const *c;
 
-               zc.flags = CONST_PERSISTENT|CONST_CS;
-               zc.module_number = EG(current_module)->module_number;
+               while (psi_plist_get(C->consts, i++, &c)) {
 
-               for (i = 0; i < C->consts->count; ++i) {
-                       constant *c = C->consts->list[i];
+                       if (zend_get_constant(c->name)) {
+                               continue;
+                       }
 
-                       zc.name = zend_string_init(c->name + (c->name[0] == '\\'), strlen(c->name) - (c->name[0] == '\\'), 1);
-                       ZVAL_NEW_STR(&zc.value, zend_string_init(c->val->text, strlen(c->val->text), 1));
+                       zc.name = zend_string_copy(c->name);
 
-                       switch (c->type->type) {
+                       switch (c->type ? c->type->type : c->val->type) {
                        case PSI_T_BOOL:
-                               convert_to_boolean(&zc.value);
+                               ZVAL_BOOL(&zc.value, c->val->ival.zend.bval);
                                break;
                        case PSI_T_INT:
-                               convert_to_long(&zc.value);
+                               ZVAL_LONG(&zc.value, c->val->ival.zend.lval);
                                break;
                        case PSI_T_FLOAT:
-                               convert_to_double(&zc.value);
+                       case PSI_T_DOUBLE:
+                               ZVAL_DOUBLE(&zc.value, c->val->ival.dval);
+                               break;
+                       case PSI_T_STRING:
+                       case PSI_T_QUOTED_STRING:
+                               ZVAL_NEW_STR(&zc.value, zend_string_copy(c->val->ival.zend.str));
+                               if (ZSTR_IS_INTERNED(Z_STR(zc.value))) {
+                                       Z_TYPE_FLAGS(zc.value) = 0;
+                               }
+                               break;
+                       default:
+                               assert(0);
                                break;
                        }
+
                        zend_register_constant(&zc);
                }
        }
 
-       return C->closures = C->ops->compile(C);
-}
+       if (C->enums) {
+               size_t i = 0;
+               struct psi_decl_enum *e;
 
+               while (psi_plist_get(C->enums, i++, &e)) {
+                       size_t j = 0;
+                       struct psi_decl_enum_item *item;
 
-void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl)
-{
-       C->ops->call(C, ret_val, decl);
-}
+                       while (psi_plist_get(e->items, j++, &item)) {
+                               zend_string *name;
 
-static inline void dump_decl_type(int fd, decl_type *t) {
-       const char *pre;
+                               if (psi_decl_type_is_anon(e->name, "enum")) {
+                                       name = strpprintf(0, "psi\\%s", item->name->val);
+                               } else {
+                                       name = strpprintf(0, "psi\\%s\\%s", e->name->val, item->name->val);
+                               }
 
-       switch (t->type) {
-       case PSI_T_STRUCT:
-               pre = "struct ";
-               break;
-       default:
-               pre = "";
-       }
-       dprintf(fd, "%s%s", pre, t->name);
-}
-static inline void dump_decl_var(int fd, decl_var *v) {
-       dprintf(fd, "%.*s%s", v->pointer_level-!!v->array_size, "**********", v->name);
-       if (v->array_size) {
-               dprintf(fd, "[%u]", v->array_size);
-       }
-}
-static inline void dump_decl_arg(int fd, decl_arg *a) {
-       dump_decl_type(fd, a->type);
-       dprintf(fd, " ");
-       dump_decl_var(fd, a->var);
-}
-static inline void dump_level(int fd, unsigned level) {
-       dprintf(fd, "%.*s", level, "\t\t\t\t\t\t\t\t\t");
-}
-static inline void dump_num_exp(int fd, num_exp *exp) {
-       while (exp) {
-               switch (exp->t) {
-               case PSI_T_NUMBER:
-                       dprintf(fd, "%s", exp->u.numb);
-                       break;
-               case PSI_T_NSNAME:
-                       dprintf(fd, "%s", exp->u.cnst->name);
-                       break;
-               case PSI_T_NAME:
-                       dump_decl_var(fd, exp->u.dvar);
-                       break;
-               EMPTY_SWITCH_DEFAULT_CASE();
-               }
-               if (exp->operand) {
-                       char op;
-
-                       switch (exp->operator) {
-                       case PSI_T_PLUS:        op = '+'; break;
-                       case PSI_T_MINUS:       op = '-'; break;
-                       case PSI_T_ASTERISK:op = '*'; break;
-                       case PSI_T_SLASH:       op = '/'; break;
-                       EMPTY_SWITCH_DEFAULT_CASE();
+                               if (zend_get_constant(name)) {
+                                       zend_string_release(name);
+                                       continue;
+                               }
+
+                               zc.name = zend_string_dup(name, 1);
+                               ZVAL_LONG(&zc.value, psi_num_exp_get_long(item->num, NULL, NULL));
+                               zend_register_constant(&zc);
+                               zend_string_release(name);
                        }
-                       dprintf(fd, " %c ", op);
                }
-               exp = exp->operand;
        }
+
+       return C->closures = C->ops->compile(C);
 }
-static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
-       size_t i;
 
-       if (level > 1) {
-               /* only if not directly after `set ...` */
-               dump_level(fd, level);
-       }
-       dprintf(fd, "%s(", set->func->name);
 
-       for (i = 0; i < set->vars->count; ++i) {
-               decl_var *svar = set->vars->vars[i];
-               if (i) {
-                       dprintf(fd, ", ");
-               }
-               dump_decl_var(fd, svar);
-       }
-       if (set->num) {
-               dprintf(fd, ", ");
-               dump_num_exp(fd, set->num);
-       }
-       if (set->inner) {
-               dprintf(fd, ",\n");
-               for (i = 0; i < set->count; ++i) {
-                       dump_impl_set_value(fd, set->inner[i], level+1);
-               }
-               /* only if inner stmts, i.e. with new lines, were dumped */
-               dump_level(fd, level);
-       }
-       if (level > 1) {
-               dprintf(fd, "),\n");
-       } else {
-               dprintf(fd, ");\n");
-       }
-}
-void PSI_ContextDump(PSI_Context *C, int fd)
+ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *execute_data, zval *return_value, struct psi_impl *impl)
 {
-       size_t i, j, k, l;
+       struct psi_call_frame *frame;
 
-#ifdef HAVE_LIBJIT
-       if (C->ops == PSI_Libjit()) {
-               dprintf(fd, "// psi.engine=jit\n");
-       }
-#endif
-#ifdef HAVE_LIBFFI
-       if (C->ops == PSI_Libffi()) {
-               dprintf(fd, "// psi.engine=ffi\n");
-       }
-#endif
-       dprintf(fd, "\n");
+       frame = psi_call_frame_init(C, impl->decl, impl);
 
-       if (C->defs) {
-               for (i = 0; i < C->defs->count; ++i) {
-                       decl_typedef *tdef = C->defs->list[i];
+       if (SUCCESS != psi_call_frame_parse_args(frame, execute_data)) {
+               psi_call_frame_free(frame);
 
-                       dprintf(fd, "typedef ");
-                       dump_decl_type(fd, tdef->type);
-                       dprintf(fd, " %s;\n", tdef->alias);
-               }
-               dprintf(fd, "\n");
+               return FAILURE;
        }
 
-       if (C->structs) {
-               for (i = 0; i < C->structs->count; ++i) {
-                       decl_struct *strct = C->structs->list[i];
+       psi_call_frame_enter(frame);
 
-                       dprintf(fd, "struct %s::(%zu) {\n", strct->name, strct->size);
-                       if (strct->args) for (j = 0; j < strct->args->count; ++j) {
-                               decl_arg *sarg = strct->args->args[j];
+       if (SUCCESS != psi_call_frame_do_let(frame)) {
+               psi_call_frame_do_return(frame, return_value);
+               psi_call_frame_free(frame);
 
-                               dprintf(fd, "\t");
-                               dump_decl_arg(fd, sarg);
-                               dprintf(fd, "::(%zu, %zu);\n", sarg->layout->pos, sarg->layout->len);
-                       }
-                       dprintf(fd, "}\n");
-               }
-               dprintf(fd, "\n");
-       }
-       if (C->consts) {
-               for (i = 0; i < C->consts->count; ++i) {
-                       constant *cnst = C->consts->list[i];
-
-                       dprintf(fd, "const %s %s = ", cnst->type->name, cnst->name);
-                       if (cnst->val->type == PSI_T_QUOTED_STRING) {
-                               dprintf(fd, "\"%s\";\n", cnst->val->text);
-                       } else {
-                               dprintf(fd, "%s;\n", cnst->val->text);
-                       }
-               }
-               dprintf(fd, "\n");
+               return FAILURE;
        }
-       if (C->decls) {
-               for (i = 0; i < C->decls->count; ++i) {
-                       decl *decl = C->decls->list[i];
-
-                       dprintf(fd, "%s ", decl->abi->convention);
-                       dump_decl_arg(fd, decl->func);
-                       dprintf(fd, "(");
-                       if (decl->args) {
-                               for (j = 0; j < decl->args->count; ++j) {
-                                       if (j) {
-                                               dprintf(fd, ", ");
-                                       }
-                                       dump_decl_arg(fd, decl->args->args[j]);
-                               }
-                               if (decl->args->varargs) {
-                                       dprintf(fd, ", ...");
-                               }
-                       }
-                       dprintf(fd, ");\n");
-               }
-               dprintf(fd, "\n");
+
+       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;
        }
-       if (C->impls) {
-               for (i = 0; i < C->impls->count; ++i) {
-                       impl *impl = C->impls->list[i];
-
-                       dprintf(fd, "function %s(", impl->func->name);
-                       if (impl->func->args) {
-                               for (j = 0; j < impl->func->args->count; ++j) {
-                                       impl_arg *iarg = impl->func->args->args[j];
-
-                                       dprintf(fd, "%s%s %s$%s",
-                                                       j ? ", " : "",
-                                                       iarg->type->name,
-                                                       iarg->var->reference ? "&" : "",
-                                                       iarg->var->name);
-                                       if (iarg->def) {
-                                               dprintf(fd, " = %s", iarg->def->text);
-                                       }
-                               }
-                               if (impl->func->args->vararg) {
-                                       impl_arg *vararg = impl->func->args->vararg;
 
-                                       dprintf(fd, ", %s %s...$%s",
-                                                       vararg->type->name,
-                                                       vararg->var->reference ? "&" : "",
-                                                       vararg->var->name);
-                               }
-                       }
-                       dprintf(fd, ") : %s%s {\n",
-                                       impl->func->return_reference ? "&":"",
-                                       impl->func->return_type->name);
-                       if (impl->stmts) {
-                               for (j = 0; j < impl->stmts->let.count; ++j) {
-                                       let_stmt *let = impl->stmts->let.list[j];
-
-                                       dprintf(fd, "\tlet %s", let->var->name);
-                                       if (let->val) {
-                                               dprintf(fd, " = %s", let->val->flags.one.is_reference ? "&" : "");
-                                               switch (let->val->kind) {
-                                               case PSI_LET_NULL:
-                                                       dprintf(fd, "NULL");
-                                                       break;
-                                               case PSI_LET_TMP:
-                                                       dump_decl_var(fd, let->val->data.var);
-                                                       break;
-                                               case PSI_LET_CALLOC:
-                                                       dprintf(fd, "calloc(");
-                                                       dump_num_exp(fd, let->val->data.alloc->nmemb);
-                                                       dprintf(fd, ", ");
-                                                       dump_num_exp(fd, let->val->data.alloc->size);
-                                                       dprintf(fd, ")");
-                                                       break;
-                                               case PSI_LET_FUNC:
-                                                       dprintf(fd, "%s($%s)", let->val->data.func->name,
-                                                                       let->val->data.func->var->name);
-                                                       break;
-
-                                               EMPTY_SWITCH_DEFAULT_CASE();
-                                               }
-                                               dprintf(fd, ";\n");
-                                       }
-                               }
-                               for (j = 0; j < impl->stmts->ret.count; ++j) {
-                                       return_stmt *ret = impl->stmts->ret.list[j];
+       C->ops->call(frame);
 
-                                       dprintf(fd, "\treturn ");
-                                       dump_impl_set_value(fd, ret->set, 1);
-                               }
-                               for (j = 0; j < impl->stmts->set.count; ++j) {
-                                       set_stmt *set = impl->stmts->set.list[j];
+       if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+               psi_call_frame_do_return(frame, return_value);
+               psi_call_frame_free(frame);
 
-                                       dprintf(fd, "\tset $%s = ", set->var->name);
-                                       dump_impl_set_value(fd, set->val, 1);
-                               }
-                               for (j = 0; j < impl->stmts->fre.count; ++j) {
-                                       free_stmt *fre = impl->stmts->fre.list[j];
-
-                                       dprintf(fd, "\tfree ");
-                                       for (k = 0; k < fre->calls->count; ++k) {
-                                               free_call *call = fre->calls->list[k];
-
-                                               if (k) {
-                                                       dprintf(fd, ", ");
-                                               }
-                                               dprintf(fd, "%s(", call->func);
-                                               for (l = 0; l < call->vars->count; ++l) {
-                                                       decl_var *fvar = call->vars->vars[l];
-
-                                                       dump_decl_var(fd, fvar);
-                                               }
-                                               dprintf(fd, ");\n");
-                                       }
-                               }
-                       }
-                       dprintf(fd, "}\n");
-               }
-               dprintf(fd, "\n");
+               return FAILURE;
        }
+
+       psi_call_frame_do_return(frame, return_value);
+       psi_call_frame_do_set(frame);
+       psi_call_frame_do_free(frame);
+       psi_call_frame_free(frame);
+
+       return SUCCESS;
 }
 
-void PSI_ContextDtor(PSI_Context *C)
+
+void psi_context_dtor(struct psi_context *C)
 {
        size_t i;
        zend_function_entry *zfe;
@@ -1494,11 +352,11 @@ void PSI_ContextDtor(PSI_Context *C)
                C->ops->dtor(C);
        }
 
-       free_decl_libs(&C->psi.libs);
+       psi_data_dtor(PSI_DATA(C));
 
        if (C->data) {
                for (i = 0; i < C->count; ++i) {
-                       PSI_DataDtor(&C->data[i]);
+                       psi_data_dtor(&C->data[i]);
                }
                free(C->data);
        }
@@ -1509,46 +367,32 @@ void PSI_ContextDtor(PSI_Context *C)
                }
                free(C->closures);
        }
-
-       if (C->consts) {
-               if (C->consts->list) {
-                       free(C->consts->list);
-               }
-               free(C->consts);
-       }
-       if (C->defs) {
-               if (C->defs->list) {
-                       free(C->defs->list);
-               }
-               free(C->defs);
-       }
-       if (C->structs) {
-               if (C->structs->list) {
-                       free(C->structs->list);
-               }
-               free(C->structs);
-       }
-       if (C->decls) {
-               if (C->decls->list) {
-                       free(C->decls->list);
-               }
-               free(C->decls);
-       }
-       if (C->impls) {
-               if (C->impls->list) {
-                       free(C->impls->list);
-               }
-               free(C->impls);
-       }
-
-       memset(C, 0, sizeof(*C));
 }
 
-void PSI_ContextFree(PSI_Context **C)
+void psi_context_free(struct psi_context **C)
 {
        if (*C) {
-               PSI_ContextDtor(*C);
+               psi_context_dtor(*C);
                free(*C);
                *C = NULL;
        }
 }
+
+void psi_context_dump(struct psi_dump *dump, struct psi_context *C)
+{
+       size_t i;
+
+       PSI_DUMP(dump, "// psi.engine=%s\n// %lu files\n",
+                       (char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL),
+                       C->count);
+
+       psi_data_dump(dump, PSI_DATA(C));
+
+#if 0
+       if (C->flags & PSI_DEBUG) {
+               for (i = 0; i < C->count; ++i) {
+                       psi_data_dump(fd, &C->data[i]);
+               }
+       }
+#endif
+}