Merge pull request #1515 from WalterBright/b18

fix Issue 3404 - JSON output should retain original alias names
dlang · Jan 20, 2013 · bac55b3 · bac55b3
2 parents 73b3b2e + 9f349df
commit bac55b3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/src/json.c b/src/json.c
@@ -267,6 +267,9 @@ void Declaration::toJsonBuffer(OutBuffer *buf)
     if (type)
         JsonProperty(buf, Ptype, type->toChars());
 
+    if (originalType && type != originalType)
+        JsonProperty(buf, "originalType", originalType->toChars());
+
     if (comment)
         JsonProperty(buf, Pcomment, (const char *)comment);
 

diff --git a/test/compilable/extra-files/json.out b/test/compilable/extra-files/json.out
@@ -13,6 +13,21 @@
 "kind" : "enum",
 "protection" : "public",
 "line" : 7}
+,
+{
+"name" : "myInt",
+"kind" : "alias",
+"protection" : "public",
+"type" : "int",
+"line" : 10}
+,
+{
+"name" : "x",
+"kind" : "variable",
+"protection" : "public",
+"type" : "int",
+"originalType" : "myInt",
+"line" : 11}
 ]
 }
 ]
diff --git a/test/compilable/json.d b/test/compilable/json.d
@@ -5,3 +5,7 @@
 struct X;
 
 enum Y;
+
+// 3404
+alias int myInt;
+myInt x;