patch type_to_str to handle complex function-ptr decls better

Code like: #include <signal.h> int main() { _Generic(signal, int: 0); } should fail with error: type 'extern void (*(int, void (*)(int)))(int)' does not match any association not error: type 'extern void *(int)(int, void *(int))' does not match any association [matz: fix formatting, fix function-to-pointer decay for operands of _Generic, add testcase for this]

Petr Skocik committed 8 years ago

Commit d6d3cf01 parent f0a25ca3 files · +27 −8Browse files

Unified · Split

3 files

tccgen.c +17 −7
tests/tests2/94_generic.c +8 −0
tests/tests2/94_generic.expect +2 −1

tccgen.c+17−7

  */
 #include "tcc.h"
 /********************************************************/
 /* global variables */
         break;
     case VT_FUNC:
         s = type->ref;
-        type_to_str(buf, buf_size, &s->type, varstr);
+        buf1[0]=0;
-        pstrcat(buf, buf_size, "(");
+        if (varstr && '*' == *varstr) {
+            pstrcat(buf1, sizeof(buf1), "(");
+            pstrcat(buf1, sizeof(buf1), varstr);
+            pstrcat(buf1, sizeof(buf1), ")");
+        }
+        pstrcat(buf1, buf_size, "(");
         sa = s->next;
         while (sa != NULL) {
-            type_to_str(buf1, sizeof(buf1), &sa->type, NULL);
+            char buf2[256];
-            pstrcat(buf, buf_size, buf1);
+            type_to_str(buf2, sizeof(buf2), &sa->type, NULL);
+            pstrcat(buf1, sizeof(buf1), buf2);
             sa = sa->next;
             if (sa)
-                pstrcat(buf, buf_size, ", ");
+                pstrcat(buf1, sizeof(buf1), ", ");
         }
-        pstrcat(buf, buf_size, ")");
+        if (s->f.func_type == FUNC_ELLIPSIS)
+            pstrcat(buf1, sizeof(buf1), ", ...");
+        pstrcat(buf1, sizeof(buf1), ")");
+        type_to_str(buf, buf_size, &s->type, buf1);
         goto no_var;
     case VT_PTR:
         s = type->ref;
 	skip('(');
 	expr_type(&controlling_type, expr_eq);
 	controlling_type.t &= ~(VT_CONSTANT | VT_VOLATILE | VT_ARRAY);
+	if ((controlling_type.t & VT_BTYPE) == VT_FUNC)
+	  mk_pointer(&controlling_type);
 	for (;;) {
 	    learn = 0;
 	    skip(',');

tests/tests2/94_generic.c+8−0

 	return 10;
 }
+typedef int (*fptr)(int);
+int foo(int i)
+{
+  return i;
+}
 typedef int int_type1;
 #define gen_sw(a) _Generic(a, const char *: 1, default: 8, int: 123);
 				long long: "long long"));
 	i = _Generic(l, long: 1, int: 2);
 	printf("%d\n", i);
+	i = _Generic(foo, fptr: 3, int: 4);
+	printf("%d\n", i);
 	return 0;
 }

tests/tests2/94_generic.expect+2−1

@@ -10,4 +10,5 @@ · 9 unmodified lines
10	3	10	3
11	4	11	4
12	long	12	long
13	1	13	1
		14	3

patch type_to_str to handle complex function-ptr decls better

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code