X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl.h;h=c859daf2b1d48a4ee69414fefd94cb14cc3e24d1;hp=5a51104e4c627aad838397dafbbd41f773cbe9a3;hb=14969a8b4386d7c38e90775e1c57886c9bf3839e;hpb=2f5af21b263403997e154658635d6b6e6eaab453

diff --git a/src/types/decl.h b/src/types/decl.h
index 5a51104..c859daf 100644
--- a/src/types/decl.h
+++ b/src/types/decl.h
@@ -26,26 +26,32 @@
 #ifndef PSI_TYPES_DECL_H
 #define PSI_TYPES_DECL_H
 
-#include "decl_abi.h"
-#include "decl_arg.h"
-#include "decl_args.h"
-#include "decl_callinfo.h"
-
-typedef struct decl {
-	decl_abi *abi;
-	decl_arg *func;
-	decl_args *args;
-	struct impl *impl;
-	decl_callinfo call;
-} decl;
-
-decl *init_decl(decl_abi *abi, decl_arg *func, decl_args *args);
-void free_decl(decl *d);
-void dump_decl(int fd, decl *decl);
-
 struct psi_data;
-
-int validate_decl(struct psi_data *data, void *dl, decl *decl);
-int validate_decl_nodl(struct psi_data *data, decl *decl);
+struct psi_plist;
+struct psi_decl_abi;
+struct psi_decl_arg;
+
+struct psi_decl {
+	struct psi_decl_abi *abi;
+	struct psi_decl_arg *func;
+	struct psi_plist *args;
+	zend_string *redir;
+	void *sym;
+	void *info;
+	void *type;
+	unsigned varargs:1;
+	unsigned extvar:1;
+};
+
+struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args);
+void psi_decl_free(struct psi_decl **d_ptr);
+void psi_decl_dump(struct psi_dump *dump, struct psi_decl *decl);
+
+bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, struct psi_validate_scope *scope);
+bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl, struct psi_validate_scope *scope);
+
+struct psi_decl_arg *psi_decl_get_arg(struct psi_decl *decl, struct psi_decl_var *var);
+
+bool psi_decl_is_blacklisted(const char *name);
 
 #endif