dfilter: Display token value for debugging

epan/dfilter/dfilter.c

@@ -374,6 +374,9 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg)
 	yyscan_t	scanner;
 	YY_BUFFER_STATE in_buffer;
 	gboolean failure = FALSE;
+#ifndef WS_DISABLE_DEBUG
+	unsigned token_count = 0;
+#endif
 
 	ws_assert(dfp);
 
@@ -424,7 +427,11 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg)
 			break;
 		}
 
-		ws_debug("Token: %d %s", token, tokenstr(token));
+		ws_log_full(LOG_DOMAIN_DFILTER, LOG_LEVEL_DEBUG,
+				NULL, -1, __func__,
+				"(%u) Token %d %s %s",
+				++token_count, token, tokenstr(token),
+				stnode_token_value(df_lval));
 
 		/* Give the token to the parser */
 		Dfilter(ParserObj, token, df_lval, dfw);

epan/dfilter/syntax-tree.c

@@ -239,7 +239,7 @@ stnode_token_value(stnode_t *node)
 	if (node->token_value) {
 		return node->token_value;
 	}
-	return "<unknown token>";
+	return "<null token value>";
 }
 
 gboolean