#pragma lib

[m6w6/ext-psi] / src / cpp.c

diff --git a/src/cpp.c b/src/cpp.c
index 4b11c25fc4e49ef1d441537612e5ce6d13bdc4b2..ae899490e00f504ede567147db6b4326435e9ebc 100644 (file)
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -41,7 +41,30 @@
 #define PSI_CPP_PREDEF
 #include "php_psi_predef.h"
 
-HashTable psi_cpp_defaults;
+static HashTable psi_cpp_defaults;
+static HashTable psi_cpp_pragmas;
+
+typedef bool (*psi_cpp_pragma_func)(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl);
+
+static bool psi_cpp_pragma_once(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
+{
+       return NULL != zend_hash_add_empty_element(&cpp->once, decl->token->file);
+}
+
+static bool psi_cpp_pragma_lib(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
+{
+       struct psi_token *lib = NULL;
+       char *libname;
+
+       if (!psi_plist_get(decl->tokens, 0, &lib)
+                       || !lib || lib->type != PSI_T_QUOTED_STRING) {
+               return false;
+       }
+
+       cpp->parser->file.libnames = psi_plist_add(cpp->parser->file.libnames,
+                       &libname);
+       return true;
+}
 
 PHP_MINIT_FUNCTION(psi_cpp);
 PHP_MINIT_FUNCTION(psi_cpp)
@@ -73,6 +96,12 @@ PHP_MINIT_FUNCTION(psi_cpp)
 
        psi_parser_dtor(&parser);
 
+#define PSI_CPP_PRAGMA(name) \
+       zend_hash_str_add_ptr(&psi_cpp_pragmas, #name, strlen(#name), psi_cpp_pragma_ ## name)
+       zend_hash_init(&psi_cpp_pragmas, 0, NULL, NULL, 1);
+       PSI_CPP_PRAGMA(once);
+       PSI_CPP_PRAGMA(lib);
+
        return SUCCESS;
 }
 
@@ -317,12 +346,7 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp)
                }
 
                if (do_expansion && psi_cpp_defined(cpp, current)) {
-                       bool expanded = false;
-
                        if (psi_cpp_tokiter_expand(cpp)) {
-                               expanded = true;
-                       }
-                       if (expanded) {
                                continue;
                        }
                }
@@ -334,13 +358,7 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp)
                        bool parsed;
 
                        cpp->do_cpp = false;
-
                        parsed = psi_parser_process(cpp->parser, cpp->tokens.exec, &processed);
-
-                       /* leave EOLs in the input stream, else we might end up
-                        * with a hash not preceded with a new line after include */
-                       psi_cpp_tokiter_add(cpp, current);
-                       psi_plist_pop(cpp->tokens.exec, NULL);
                        psi_plist_clean(cpp->tokens.exec);
 
                        if (!parsed) {
@@ -479,6 +497,18 @@ bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp)
        return true;
 }
 
+bool psi_cpp_pragma(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
+{
+       psi_cpp_pragma_func *fn;
+
+       fn = zend_hash_find_ptr(&psi_cpp_pragmas, decl->token->text);
+       if (!fn) {
+               return false;
+       }
+
+       return fn(cpp, decl);
+}
+
 bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags)
 {
        bool parsed = false;
@@ -515,7 +545,10 @@ bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned
                return false;
        }
 
+       ++cpp->include_level;
        parsed = psi_cpp_process(cpp, &tokens, NULL);
+       --cpp->include_level;
+
        if (!parsed) {
                psi_plist_free(tokens);
                return false;