Fix array pointer stringification.

`int (*)[4];` should not be stringified as `int *[4];` Add stringification tests.

Petr Skocik committed 8 years ago

Commit 73ca09f1 parent 93a4ddf3 files · +19 −1Browse files

Unified · Split

3 files

     case VT_PTR:
         s = type->ref;
         if (t & VT_ARRAY) {
-            snprintf(buf1, sizeof(buf1), "%s[%d]", varstr ? varstr : "", s->c);
+            if (varstr && '*' == *varstr)
+                snprintf(buf1, sizeof(buf1), "(%s)[%d]", varstr, s->c);
+            else
+                snprintf(buf1, sizeof(buf1), "%s[%d]", varstr ? varstr : "", s->c);
             type_to_str(buf, buf_size, &s->type, buf1);
             goto no_var;
         }

@@ -118,4 +118,10 @@ enum e5; · 117 unmodified lines
118	void f3(enum e4 e);	118	void f3(enum e4 e);
119	void f3(enum e5 e);	119	void f3(enum e5 e);
120		120
		121	#elif defined test_ptr_to_str
		122	void f() { _Generic((int const *[]){0}, int:0); }
		123	#elif defined test_fnptr_to_str
		124	void f() { _Generic((int (()(float,char))(double,int)){0}, int:0); }
		125	#elif defined test_array_to_str
		126	void f() { _Generic((int(*)[3]){0}, int:0); }
121	#endif	127	#endif

@@ -44,3 +44,12 @@ · 43 unmodified lines
44		44
45	[test_enum_compat]	45	[test_enum_compat]
46	60_errors_and_warnings.c:119: error: incompatible types for redefinition of 'f3'	46	60_errors_and_warnings.c:119: error: incompatible types for redefinition of 'f3'
		47
		48	[test_ptr_to_str]
		49	60_errors_and_warnings.c:122: error: type 'const int **' does not match any association
		50
		51	[test_fnptr_to_str]
		52	60_errors_and_warnings.c:124: error: type 'int (()(float, char))(double, int)' does not match any association
		53
		54	[test_array_to_str]
		55	60_errors_and_warnings.c:126: error: type 'int (*)[3]' does not match any association

Keyboard shortcuts