Regression: translating typedef of array.

jacob-carlborg · Sep 26, 2016 · 42a5f02 · 42a5f02
1 parent b09b2d3
commit 42a5f02
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/dstep/translator/MacroDefinition.d b/dstep/translator/MacroDefinition.d
@@ -1855,7 +1855,7 @@ Expression parseExpr(ref Token[] tokens, Cursor[string] table, bool defined)
     if (auto expr = parseTokenConcat(tokens))
         return expr;
 
-    if (auto expr = parseCondExpr(tokens, table))
+    if (auto expr = parseCondExpr(tokens, table, defined))
         return expr;
 
     return null;

diff --git a/dstep/translator/Translator.d b/dstep/translator/Translator.d
@@ -240,7 +240,8 @@ class Translator
             if (child.kind == CXCursorKind.CXCursor_TypeRef)
                 child = child.referenced;
 
-            if (child.kind != CXCursorKind.CXCursor_ParmDecl)
+            if (child.isDeclaration &&
+                child.kind != CXCursorKind.CXCursor_ParmDecl)
             {
                 if (child.spelling == cursor.spelling ||
                     child.spelling == "" ||

diff --git a/unit_tests/UnitTests.d b/unit_tests/UnitTests.d
@@ -432,6 +432,8 @@ extern (C):
 extern __gshared int a;
 D", options);
 
+}
+
 // Translate function pointer type with unnamed parameter.
 unittest
 {
@@ -464,6 +466,19 @@ D");
 
 }
 
+// Translate array typedef.
+unittest
+{
+    assertTranslates(q"C
+typedef double foo[2];
+C", q"D
+extern (C):
+
+alias double[2] foo;
+D");
+
+}
+
 // Reduce typedefs when underlying type is alias of primitive type.
 unittest
 {