Fix preprocessor concat with empty arg

Thomas Preud'homme committed 12 years ago

Commit 6e56bb31 parent 9714d2e5 files · +56 −6Browse files

Unified · Split

5 files

tcc.h +1 −0
tccpp.c +37 −5
tests/tests2/67_macro_concat.c +14 −0
tests/tests2/67_macro_concat.expect +2 −0
tests/tests2/Makefile +2 −1

@@ -836,6 +836,7 @@ struct TCCState { · 835 unmodified lines
836	/* <-- */	836	/* <-- */
837		837
838	#define TOK_TWOSHARPS 0xc0 /* ## preprocessing token */	838	#define TOK_TWOSHARPS 0xc0 /* ## preprocessing token */
		839	#define TOK_PLCHLDR 0xc1 /* placeholder token as defined in C99 */
839	#define TOK_UMULL 0xc2 /* unsigned 32x32 -> 64 mul */	840	#define TOK_UMULL 0xc2 /* unsigned 32x32 -> 64 mul */
840	#define TOK_ADDC1 0xc3 /* add with carry generation */	841	#define TOK_ADDC1 0xc3 /* add with carry generation */
841	#define TOK_ADDC2 0xc4 /* add with carry use */	842	#define TOK_ADDC2 0xc4 /* add with carry use */

tccpp.c+37−5

     } while (is_space(tok));
 }
-/* substitute args in macro_str and return allocated string */
+/* substitute arguments in replacement lists in macro_str by the values in
+   args (field d) and return allocated string */
 static int *macro_arg_subst(Sym **nested_list, const int *macro_str, Sym *args)
 {
     int last_tok, t, spc;
                     if (gnu_ext && s->type.t &&
                         last_tok == TOK_TWOSHARPS &&
                         str.len >= 2 && str.str[str.len - 2] == ',') {
-                        if (*st == 0) {
+                        if (*st == TOK_PLCHLDR) {
                             /* suppress ',' '##' */
                             str.len -= 2;
                         } else {
                         tok_str_add2(&str, tok, &tokc);
                     next_nomacro_spc();
                 }
+                if (!str.len)
+                    tok_str_add(&str, TOK_PLCHLDR);
                 str.len -= spc;
                 tok_str_add(&str, 0);
                 sa1 = sym_push2(&args, sa->v & ~SYM_FIELD, sa->type.t, 0);
                 TOK_GET(&t, &ptr, &cval);
                 /* We concatenate the two tokens */
                 cstr_new(&cstr);
-                cstr_cat(&cstr, get_tok_str(tok, &tokc));
+                if (tok != TOK_PLCHLDR)
+                    cstr_cat(&cstr, get_tok_str(tok, &tokc));
                 n = cstr.size;
-                cstr_cat(&cstr, get_tok_str(t, &cval));
+                if (t != TOK_PLCHLDR || tok == TOK_PLCHLDR)
+                    cstr_cat(&cstr, get_tok_str(t, &cval));
                 cstr_ccat(&cstr, '\0');
                 tcc_open_bf(tcc_state, ":paste:", cstr.size);
                 cstr_free(&cstr);
             }
         }
-        if (tok != TOK_NOSUBST)
+        if (tok != TOK_NOSUBST) {
+            const int *oldptr;
+            CValue cval;
+            /* Check if a space need to be added after ## concatenation in
+               order to avoid misinterpreting the newly formed token
+               followed by the next token as being a single token (see
+               macro_concat test) */
+            cstr_new(&cstr);
+            cstr_cat(&cstr, get_tok_str(tok, &tokc));
+            oldptr = ptr;
+            TOK_GET(&t, &ptr, &cval);
+            ptr = oldptr;
+            cstr_cat(&cstr, get_tok_str(t, &cval));
+            cstr_ccat(&cstr, '\0');
+            t = tok;
+            cval = tokc;
+            tcc_open_bf(tcc_state, ":paste:", cstr.size);
+            memcpy(file->buffer, cstr.data, cstr.size);
+            next_nomacro1();
+            if (!*file->buf_ptr) {
+                tok_str_add2(&macro_str1, t, &cval);
+                tok = ' ';
+            }
+            tcc_close();
+            cstr_free(&cstr);
             start_of_nosubsts = -1;
+        }
         tok_str_add2(&macro_str1, tok, &tokc);
     }
     tok_str_add(&macro_str1, 0);

tests/tests2/67_macro_concat.c+14−0

@@ -0,0 +1,14 @@
	1	#include <stdio.h>
	2
	3	#define P(A,B) A ## B ; bob
	4	#define Q(A,B) A ## B+
	5
	6	int main(void)
	7	{
	8	int bob, jim = 21;
	9	bob = P(jim,) *= 2;
	10	printf("jim: %d, bob: %d\n", jim, bob);
	11	jim = 60 Q(+,)3;
	12	printf("jim: %d\n", jim);
	13	return 0;
	14	}

tests/tests2/67_macro_concat.expect+2−0

@@ -0,0 +1,2 @@
	1	jim: 21, bob: 42
	2	jim: 63

tests/tests2/Makefile+2−1

@@ -81,7 +81,8 @@ TESTS = \ · 80 unmodified lines
81	63_local_enumerator_redefinition.test \	81	63_local_enumerator_redefinition.test \
82	64_macro_nesting.test \	82	64_macro_nesting.test \
83	65_macro_concat_start.test \	83	65_macro_concat_start.test \
84	66_macro_concat_end.test	84	66_macro_concat_end.test \
		85	67_macro_concat.test
85		86
86	# 30_hanoi.test -- seg fault in the code, gcc as well	87	# 30_hanoi.test -- seg fault in the code, gcc as well
87	# 34_array_assignment.test -- array assignment is not in C standard	88	# 34_array_assignment.test -- array assignment is not in C standard

Fix preprocessor concat with empty arg

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code