Merge pull request #1768 from AndrejMitrovic/Fix9755

Issue 9755 - Json template protection attribute output is wrong.
dlang · Mar 20, 2013 · d9b6839 · d9b6839
2 parents 9a5a9e3 + 214b0fd
commit d9b6839
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 0 deletions.
diff --git a/src/template.c b/src/template.c
@@ -422,6 +422,7 @@ TemplateDeclaration::TemplateDeclaration(Loc loc, Identifier *id,
     this->literal = 0;
     this->ismixin = ismixin;
     this->previous = NULL;
+    this->protection = PROTundefined;
 
     // Compute in advance for Ddoc's use
     if (members)
@@ -2478,6 +2479,11 @@ char *TemplateDeclaration::toChars()
     return (char *)buf.extractData();
 }
 
+enum PROT TemplateDeclaration::prot()
+{
+    return protection;
+}
+
 /* ======================== Type ============================================ */
 
 /****

diff --git a/src/template.h b/src/template.h
@@ -88,6 +88,7 @@ struct TemplateDeclaration : ScopeDsymbol
     void emitComment(Scope *sc);
     void toJson(JsonOut *json);
     virtual void jsonProperties(JsonOut *json);
+    enum PROT prot();
 //    void toDocBuffer(OutBuffer *buf);
 
     MATCH matchWithInstance(TemplateInstance *ti, Objects *atypes, Expressions *fargs, int flag);

diff --git a/test/compilable/extra-files/json.out b/test/compilable/extra-files/json.out
@@ -376,6 +376,73 @@
       ]
      }
     ]
+   },
+   {
+    "kind" : "template",
+    "protection" : "private",
+    "line" : 89,
+    "name" : "S1_9755",
+    "parameters" : [
+     {
+      "name" : "T",
+      "kind" : "type"
+     }
+    ],
+    "members" : [
+     {
+      "name" : "S1_9755",
+      "kind" : "struct",
+      "line" : 89,
+      "members" : []
+     }
+    ]
+   },
+   {
+    "kind" : "template",
+    "protection" : "package",
+    "line" : 90,
+    "name" : "S2_9755",
+    "parameters" : [
+     {
+      "name" : "T",
+      "kind" : "type"
+     }
+    ],
+    "members" : [
+     {
+      "name" : "S2_9755",
+      "kind" : "struct",
+      "line" : 90,
+      "members" : []
+     }
+    ]
+   },
+   {
+    "name" : "C_9755",
+    "kind" : "class",
+    "line" : 93,
+    "members" : [
+     {
+      "kind" : "template",
+      "protection" : "protected",
+      "line" : 94,
+      "name" : "CI_9755",
+      "parameters" : [
+       {
+        "name" : "T",
+        "kind" : "type"
+       }
+      ],
+      "members" : [
+       {
+        "name" : "CI_9755",
+        "kind" : "class",
+        "line" : 94,
+        "members" : []
+       }
+      ]
+     }
+    ]
    }
   ]
  }

diff --git a/test/compilable/json.d b/test/compilable/json.d
@@ -84,3 +84,12 @@ struct S
     /** Issue 9480 - Template name should be stripped of parameters */
     this(T)(T t) { }
 }
+
+/** Issue 9755 - Protection not emitted properly for Templates. */
+private struct S1_9755(T) { }
+package struct S2_9755(T) { }
+
+class C_9755
+{
+    protected static class CI_9755(T) { }
+}