-#ifndef _PSI_CONTEXT_H
-#define _PSI_CONTEXT_H
-
-#define PSI_ERROR 16
-#define PSI_WARNING 32
-typedef void (*PSI_ContextErrorFunc)(int type, const char *msg, ...);
-
-typedef struct PSI_ContextOps {
- void (*init)(struct PSI_Context *C);
- void (*dtor)(struct PSI_Context *C);
- zend_function_entry *(*compile)(struct PSI_Context *C, struct PSI_Data *D);
-} PSI_ContextOps;
-
-typedef struct PSI_Context {
- void *opaque;
- PSI_ContextErrorFunc error;
- struct PSI_ContextOps *ops;
- struct PSI_Data *data;
- zend_function_entry **closures;
+/*******************************************************************************
+ 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.
+*******************************************************************************/
+
+#ifndef PSI_CONTEXT_H
+#define PSI_CONTEXT_H
+
+/* zend_function_entry */
+#include "Zend/zend_API.h"
+
+struct psi_context;
+struct psi_token;
+struct psi_parser;
+struct psi_call_frame;
+struct impl_vararg;
+struct psi_decl;
+struct psi_impl;
+
+enum psi_context_query {
+ PSI_CONTEXT_QUERY_SELF, /* ffi/jit */
+ PSI_CONTEXT_QUERY_TYPE, /* impl type token_t to native ffi_type/jit_type */
+};
+
+struct psi_context_ops {
+ void (*init)(struct psi_context *C);
+ void (*dtor)(struct psi_context *C);
+ zend_function_entry *(*compile)(struct psi_context *C);
+ void (*call)(struct psi_context *C, struct psi_call_frame *frame, struct psi_decl *psi_decl, void *rval, void **args);
+ void (*call_va)(struct psi_context *C, struct psi_call_frame *frame, struct psi_decl *psi_decl, void *rval, void **args, size_t va_count, void **va_types);
+ void *(*query)(struct psi_context *C, enum psi_context_query q, void *arg);
+};
+
+#include "data.h"
+
+struct psi_context {
+ PSI_DATA_MEMBERS;
+ void *context;
+ struct psi_context_ops *ops;
+ zend_function_entry *closures;
+ struct psi_data *data;