Merge pull request #453 from 9rnsr/fix2856

Issue 2856 - static opIndex does not compile for a templated struct/class
dlang · Nov 16, 2011 · 8857ba8 · 8857ba8
2 parents 57db617 + e1966b1
commit 8857ba8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -4058,6 +4058,10 @@ Expression *ScopeExp::semantic(Scope *sc)
         //printf("sds = %s, '%s'\n", sds->kind(), sds->toChars());
         //printf("\tparent = '%s'\n", sds->parent->toChars());
         sds->semantic(sc);
+
+        AggregateDeclaration *ad = sds->isAggregateDeclaration();
+        if (ad)
+            return (new TypeExp(loc, ad->type))->semantic(sc);
     }
     type = Type::tvoid;
     //printf("-2ScopeExp::semantic() %s\n", toChars());

diff --git a/test/runnable/xtest46.d b/test/runnable/xtest46.d
@@ -4118,6 +4118,20 @@ void test6868()
     char[0] s;  // need
 }
 
+/***************************************************/
+// 2856
+
+struct foo2856    { static void opIndex(int i) { printf("foo\n"); } }
+struct bar2856(T) { static void opIndex(int i) { printf("bar\n"); } }
+
+void test2856()
+{
+    foo2856[1];
+    bar2856!(float)[1];     // Error (# = __LINE__)
+    alias bar2856!(float) B;
+    B[1];                   // Okay
+}
+
 /***************************************************/
 
 int main()
@@ -4316,6 +4330,7 @@ int main()
     test6902();
     test6330();
     test6868();
+    test2856();
 
     printf("Success\n");
     return 0;