Merge pull request #2547 from WalterBright/revert-pull-1325

revert pull 1325
dlang · Sep 10, 2013 · fe5dfc5 · fe5dfc5
2 parents 6db24cd + b10b018
commit fe5dfc5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 52 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -879,21 +879,13 @@ void VarDeclaration::semantic(Scope *sc)
                 e = new ErrorExp();
             }
             init = new ExpInitializer(e->loc, e);
-
-            sc = sc->push();
-            if (storage_class & STCmanifest) sc->flags |= SCOPEstaticif;
             type = init->inferType(sc);
-            sc = sc->pop();
-
             if (type->ty == Tsarray)
                 type = type->nextOf()->arrayOf();
         }
         else
         {
-            sc = sc->push();
-            if (storage_class & STCmanifest) sc->flags |= SCOPEstaticif;
             type = init->inferType(sc);
-            sc = sc->pop();
         }
 
         if (needctfe) sc = sc->endCTFE();
@@ -1412,7 +1404,6 @@ void VarDeclaration::semantic(Scope *sc)
     {
         sc = sc->push();
         sc->stc &= ~(STC_TYPECTOR | STCpure | STCnothrow | STCref | STCdisable);
-        if (storage_class & STCmanifest) sc->flags |= SCOPEstaticif;
 
         ArrayInitializer *ai = init->isArrayInitializer();
         if (ai && tb->ty == Taarray)

diff --git a/test/runnable/declaration.d b/test/runnable/declaration.d
@@ -198,48 +198,6 @@ void test8942()
     }
 }
 
-/***************************************************/
-// 9073
-
-bool foo9073(bool expected, alias pred)()
-{
-    static if (expected)
-    {
-        enum isLessThan = (is(typeof(pred) : string) && pred == "a < b");
-    }
-    else
-    {
-        static if (is(typeof(pred) : string) && pred == "a < b")
-            enum isLessThan = true;
-        else
-            enum isLessThan = false;
-    }
-    return isLessThan;
-}
-
-template Failure9073() { static assert(0); enum Failure9073 = false; }
-template AndAnd9073a(alias pred) { enum bool AndAnd9073a = (is(typeof(pred) : string) && pred == "a < b"); }
-template AndAnd9073b(alias pred) { enum      AndAnd9073b = (is(typeof(pred) : string) && pred == "a < b"); }
-template   OrOr9073a(alias pred) { enum bool   OrOr9073a = (is(typeof(pred) : string) || Failure9073!()); }
-template   OrOr9073b(alias pred) { enum        OrOr9073b = (is(typeof(pred) : string) || Failure9073!()); }
-
-void test9073()
-{
-    assert(foo9073!(true,  "a < b")() == true);
-    assert(foo9073!(false, "a < b")() == true);
-    assert(foo9073!(true,  (a,b) => a<b)() == false);
-    assert(foo9073!(false, (a,b) => a<b)() == false);
-
-    static assert( AndAnd9073a!("a < b"));
-    static assert( AndAnd9073b!("a < b"));
-    static assert(!AndAnd9073a!((a,b)=>true));
-    static assert(!AndAnd9073b!((a,b)=>true));
-    static assert( OrOr9073a!("a < b"));
-    static assert( OrOr9073b!("a < b"));
-    static assert(!__traits(compiles, OrOr9073a!((a,b)=>true)));
-    static assert(!__traits(compiles, OrOr9073b!((a,b)=>true)));
-}
-
 /***************************************************/
 // 10144
 
@@ -313,7 +271,6 @@ int main()
     test8147();
     test8410();
     test8942();
-    test9073();
     test10142();
 
     printf("Success\n");