X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.c;h=18c74375fe0b84eb18cd5fadf0994e7774755762;hp=832b040a08665db86a534f600e90693a1a979b71;hb=16e375c9503246b179550cd97c0739c916dc802a;hpb=f76cbab7698c988217d56a96f3ef68005cddd5ec

diff --git a/src/token.c b/src/token.c
index 832b040..18c7437 100644
--- a/src/token.c
+++ b/src/token.c
@@ -23,7 +23,11 @@
  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 <ctype.h>
 
@@ -48,7 +52,8 @@ struct psi_token *psi_token_init(token_t token_typ, const char *token_txt,
 	T->file = zend_string_copy(file);
 	T->text = psi_string_init_interned(token_txt, token_len, 1);
 #if PSI_DEBUG_TOKEN_ALLOC
-	PSI_DEBUG_PRINT(cpp->parser, "PSI: token_init %p\n", T);
+	fprintf(stderr, "PSI: token_init %p\t", T);
+	psi_token_dump(NULL, T);
 #endif
 	return T;
 }
@@ -57,7 +62,8 @@ void psi_token_free(struct psi_token **token_ptr) {
 	if (*token_ptr) {
 		struct psi_token *token = *token_ptr;
 #if PSI_DEBUG_TOKEN_ALLOC
-		PSI_DEBUG_PRINT(cpp->parser, "PSI: token_free %p\n", token);
+		fprintf(stderr, "PSI: token_free %p\t", token);
+		psi_token_dump(NULL, token);
 #endif
 		*token_ptr = NULL;
 		zend_string_release(token->text);
@@ -71,7 +77,8 @@ struct psi_token *psi_token_copy(struct psi_token *src) {
 
 	*ptr = *src;
 #if PSI_DEBUG_TOKEN_ALLOC
-	PSI_DEBUG_PRINT(cpp->parser, "PSI: token_copy %p <= %p\n", ptr, src);
+	fprintf(stderr, "PSI: token_copy %p\t", ptr);
+	psi_token_dump(NULL, src);
 #endif
 	ptr->text = zend_string_copy(ptr->text);
 	ptr->file = zend_string_copy(ptr->file);
@@ -110,7 +117,7 @@ struct psi_token *psi_token_cat(const char *sep, unsigned argc, ...) {
 	T->text = smart_str_extract(&text);
 
 #if PSI_DEBUG_TOKEN_ALLOC
-	PSI_DEBUG_PRINT(cpp->parser, "PSI: token_cat  %p\n", T);
+	fprintf(stderr, "PSI: token_cat  %p\n", T);
 #endif
 	return T;
 }
@@ -189,6 +196,11 @@ void psi_token_dump(struct psi_dump *dump, struct psi_token *t)
 {
 	size_t i;
 
+	if (!t) {
+		PSI_DUMP(dump, "TOKEN deleted\n");
+		return;
+	}
+
 	PSI_DUMP(dump, "TOKEN %p (%u) ", t, t->type);
 	if (t->type == PSI_T_EOF) {
 		PSI_DUMP(dump, "EOF");