merge test cases

test/runnable/bug5962.d

@@ -1,14 +1,14 @@
-// 5962
-
-struct S
-{
-          auto g()(){ return 1; }
-    const auto g()(){ return 2; }
-}
-void main()
-{
-    auto ms = S();
-    assert(ms.g() == 1);
-    auto cs = const(S)();
-    assert(cs.g() == 2);
-}
+// 5962
+
+struct S
+{
+          auto g()(){ return 1; }
+    const auto g()(){ return 2; }
+}
+void main()
+{
+    auto ms = S();
+    assert(ms.g() == 1);
+    auto cs = const(S)();
+    assert(cs.g() == 2);
+}

test/runnable/template9.d

@@ -1,5 +1,7 @@
 // PERMUTE_ARGS:
 
+module breaker;
+
 import std.c.stdio;
 
 /**********************************/
@@ -184,6 +186,21 @@ void test9()
     assert((new CTest9()).f2() == 10);
 }
 
+/**********************************/
+// 5015
+
+import breaker;
+
+static if (is(ElemType!(int))){}
+
+template ElemType(T) {
+  alias _ElemType!(T).type ElemType;
+}
+
+template _ElemType(T) {
+    alias r type;
+}
+
 /**********************************/
 
 int main()

test/runnable/xtest46.d

@@ -3075,6 +3075,23 @@ ref func2521_7() {
     return val;
 }
 
+/***************************************************/
+// 5962
+
+struct S156
+{
+          auto g()(){ return 1; }
+    const auto g()(){ return 2; }
+}
+
+void test156()
+{
+    auto ms = S156();
+    assert(ms.g() == 1);
+    auto cs = const(S156)();
+    assert(cs.g() == 2);
+}
+
 /***************************************************/
 
 int main()
@@ -3234,6 +3251,7 @@ int main()
     test153();
     test154();
     test155();
+    test156();
 
     printf("Success\n");
     return 0;