aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
-rw-r--r--pre-process.c7
-rw-r--r--validation/preprocessor/dump-macros.c5
2 files changed, 12 insertions, 0 deletions
diff --git a/pre-process.c b/pre-process.c
index 8abd5e6e..f9480fd4 100644
--- a/pre-process.c
+++ b/pre-process.c
@@ -2196,6 +2196,13 @@ static void dump_macro(struct symbol *sym)
switch (token_type(token)) {
case TOKEN_UNTAINT:
break;
+ case TOKEN_CONCAT:
+ printf("## ");
+ break;
+ case TOKEN_STR_ARGUMENT:
+ printf("#");
+ /* fall-through */
+ case TOKEN_QUOTED_ARGUMENT:
case TOKEN_MACRO_ARGUMENT:
token = args[token->argnum];
/* fall-through */
diff --git a/validation/preprocessor/dump-macros.c b/validation/preprocessor/dump-macros.c
index 4dbb9620..5a964649 100644
--- a/validation/preprocessor/dump-macros.c
+++ b/validation/preprocessor/dump-macros.c
@@ -6,6 +6,9 @@
#define DEF xyz
#define NYDEF ydef
+
+#define STRING(x) #x
+#define CONCAT(x,y) x ## y
/*
* check-name: dump-macros
* check-command: sparse -E -dD -DIJK=ijk -UNDEF -UNYDEF $file
@@ -15,4 +18,6 @@ check-output-pattern(1): #define __CHECKER__ 1
check-output-contains: #define IJK ijk
check-output-contains: #define DEF xyz
check-output-contains: #define NYDEF ydef
+check-output-contains: #define STRING(x) #x
+check-output-contains: #define CONCAT(x, y) x ## y
*/