X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.c;h=fc723641dcca1e363399a35b933e248143c998c0;hp=ae899490e00f504ede567147db6b4326435e9ebc;hb=0682ecb84dfe1de08b609c6c0ae641b06f3fa481;hpb=93d6b7f962a82b725d1918684297d68221b0b733

diff --git a/src/cpp.c b/src/cpp.c
index ae89949..fc72364 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -54,18 +54,45 @@ static bool psi_cpp_pragma_once(struct psi_cpp *cpp, struct psi_cpp_macro_decl *
 static bool psi_cpp_pragma_lib(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
 {
 	struct psi_token *lib = NULL;
-	char *libname;
+	zend_string *libname;
 
 	if (!psi_plist_get(decl->tokens, 0, &lib)
 			|| !lib || lib->type != PSI_T_QUOTED_STRING) {
 		return false;
 	}
 
+	libname = zend_string_copy(lib->text);
 	cpp->parser->file.libnames = psi_plist_add(cpp->parser->file.libnames,
 			&libname);
 	return true;
 }
 
+static bool psi_cpp_pragma_blacklist_decl(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
+{
+	struct psi_token *name;
+
+	if (!psi_plist_get(decl->tokens, 0, &name)
+			|| !name || name->type != PSI_T_QUOTED_STRING) {
+		return false;
+	}
+
+	psi_blacklist_add_decl(name->text->val, name->text->len);
+	return true;
+}
+
+static bool psi_cpp_pragma_blacklist_var(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
+{
+	struct psi_token *name;
+
+	if (!psi_plist_get(decl->tokens, 0, &name)
+			|| !name || name->type != PSI_T_QUOTED_STRING) {
+		return false;
+	}
+
+	psi_blacklist_add_var(name->text->val, name->text->len);
+	return true;
+}
+
 PHP_MINIT_FUNCTION(psi_cpp);
 PHP_MINIT_FUNCTION(psi_cpp)
 {
@@ -101,6 +128,8 @@ PHP_MINIT_FUNCTION(psi_cpp)
 	zend_hash_init(&psi_cpp_pragmas, 0, NULL, NULL, 1);
 	PSI_CPP_PRAGMA(once);
 	PSI_CPP_PRAGMA(lib);
+	PSI_CPP_PRAGMA(blacklist_decl);
+	PSI_CPP_PRAGMA(blacklist_var);
 
 	return SUCCESS;
 }
@@ -486,11 +515,15 @@ bool psi_cpp_undef(struct psi_cpp *cpp, struct psi_token *tok)
 bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp)
 {
 	struct psi_validate_scope scope = {0};
+	unsigned flags = cpp->parser->flags;
 
 	scope.cpp = cpp;
+	cpp->parser->flags |= PSI_SILENT;
 	if (!psi_num_exp_validate(PSI_DATA(cpp->parser), exp->data.num, &scope)) {
+		cpp->parser->flags = flags;
 		return false;
 	}
+	cpp->parser->flags = flags;
 	if (!psi_num_exp_get_long(exp->data.num, NULL, cpp)) {
 		return false;
 	}
@@ -499,7 +532,7 @@ bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp)
 
 bool psi_cpp_pragma(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
 {
-	psi_cpp_pragma_func *fn;
+	psi_cpp_pragma_func fn;
 
 	fn = zend_hash_find_ptr(&psi_cpp_pragmas, decl->token->text);
 	if (!fn) {