Fix type renaming of array types with non-constant size

tautschnig · tautschnig · commit 32b6124529c8 · 2016-05-18T17:10:37.000Z
diff --git a/src/ansi-c/type2name.cpp b/src/ansi-c/type2name.cpp
@@ -187,10 +187,10 @@ static std::string type2name(
   {
     const array_typet &t=to_array_type(type);
     mp_integer size;
-    if(to_integer(t.size(), size))
-      result+="ARR?";
-    else if(t.size().id()==ID_symbol)
+    if(t.size().id()==ID_symbol)
       result+="ARR"+t.size().get_string(ID_identifier);
+    else if(to_integer(t.size(), size))
+      result+="ARR?";
     else
       result+="ARR"+integer2string(size);
   }

Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,10 @@ static std::string type2name(`
`187`	`187`	`{`
`188`	`188`	`const array_typet &t=to_array_type(type);`
`189`	`189`	`mp_integer size;`
`190`		`- if(to_integer(t.size(), size))`
`191`		`- result+="ARR?";`
`192`		`- else if(t.size().id()==ID_symbol)`
	`190`	`+ if(t.size().id()==ID_symbol)`
`193`	`191`	`result+="ARR"+t.size().get_string(ID_identifier);`
	`192`	`+ else if(to_integer(t.size(), size))`
	`193`	`+ result+="ARR?";`
`194`	`194`	`else`
`195`	`195`	`result+="ARR"+integer2string(size);`
`196`	`196`	`}`