#pragma lib

[m6w6/ext-psi] / src / types / cpp_exp.c

diff --git a/src/types/cpp_exp.c b/src/types/cpp_exp.c
index bfff0d197d443a8a2a6c721b6bd4868b5524f1b3..6b21b75ec6f281e361d603cd64c8c9dbe3f48a02 100644 (file)
--- a/src/types/cpp_exp.c
+++ b/src/types/cpp_exp.c
@@ -23,12 +23,17 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 
 #include <assert.h>
 
 #include "data.h"
 #include "cpp.h"
+#include "debug.h"
 
 struct psi_cpp_exp *psi_cpp_exp_init(token_t type, void *data)
 {
@@ -46,6 +51,7 @@ struct psi_cpp_exp *psi_cpp_exp_init(token_t type, void *data)
                exp->data.tok = data;
                break;
        case PSI_T_DEFINE:
+       case PSI_T_PRAGMA:
                exp->data.decl = data;
                break;
        case PSI_T_IF:
@@ -54,7 +60,6 @@ struct psi_cpp_exp *psi_cpp_exp_init(token_t type, void *data)
                break;
        case PSI_T_ENDIF:
        case PSI_T_ELSE:
-       case PSI_T_PRAGMA_ONCE:
                break;
        default:
                assert(0);
@@ -82,6 +87,7 @@ void psi_cpp_exp_free(struct psi_cpp_exp **exp_ptr)
                        psi_token_free(&exp->data.tok);
                        break;
                case PSI_T_DEFINE:
+               case PSI_T_PRAGMA:
                        psi_cpp_macro_decl_free(&exp->data.decl);
                        break;
                case PSI_T_IF:
@@ -101,9 +107,9 @@ void psi_cpp_exp_free(struct psi_cpp_exp **exp_ptr)
        }
 }
 
-void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
+void psi_cpp_exp_dump(struct psi_dump *dump, struct psi_cpp_exp *exp)
 {
-       dprintf(fd, "#%s ", exp->token->text->val);
+       PSI_DUMP(dump, "#%s ", exp->token->text->val);
        switch (exp->type) {
        case PSI_T_WARNING:
        case PSI_T_ERROR:
@@ -114,23 +120,24 @@ void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
        case PSI_T_UNDEF:
        case PSI_T_IFDEF:
        case PSI_T_IFNDEF:
-               dprintf(fd, "%s", exp->data.tok->text->val);
+               PSI_DUMP(dump, "%s", exp->data.tok->text->val);
                break;
        case PSI_T_IMPORT:
        case PSI_T_INCLUDE:
        case PSI_T_INCLUDE_NEXT:
                if (exp->data.tok->type == PSI_T_CPP_HEADER) {
-                       dprintf(fd, "<%s>", exp->data.tok->text->val);
+                       PSI_DUMP(dump, "<%s>", exp->data.tok->text->val);
                } else {
-                       dprintf(fd, "\"%s\"", exp->data.tok->text->val);
+                       PSI_DUMP(dump, "\"%s\"", exp->data.tok->text->val);
                }
                break;
        case PSI_T_DEFINE:
-               psi_cpp_macro_decl_dump(fd, exp->data.decl);
+       case PSI_T_PRAGMA:
+               psi_cpp_macro_decl_dump(dump, exp->data.decl);
                break;
        case PSI_T_IF:
        case PSI_T_ELIF:
-               psi_num_exp_dump(fd, exp->data.num);
+               psi_num_exp_dump(dump, exp->data.num);
                break;
        case PSI_T_ENDIF:
        case PSI_T_ELSE:
@@ -140,7 +147,7 @@ void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
                assert(0);
                break;
        }
-       dprintf(fd, "\n");
+       PSI_DUMP(dump, "\n");
 }
 
 
@@ -213,6 +220,11 @@ void psi_cpp_exp_exec(struct psi_cpp_exp *exp, struct psi_cpp *cpp, struct psi_d
                        exp->data.decl = NULL;
                }
                break;
+       case PSI_T_PRAGMA:
+               if (!cpp->skip) {
+                       psi_cpp_pragma(cpp, exp->data.decl);
+               }
+               break;
        case PSI_T_IFDEF:
                ++cpp->level;
                if (!cpp->skip) {