From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Wed, 16 Dec 2015 00:37:09 +0000 (-0800)
Subject: Magic identifiers can still be overridden by vars.
X-Git-Tag: v0.9.590~204
X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/f5753712e9895407b4a19043589fb128ce865b12

Magic identifiers can still be overridden by vars.
---

diff --git a/Replace.cpp b/Replace.cpp
index e95f5e1..9ffd0c1 100644
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -924,19 +924,9 @@ CYIdentifierFlags *CYScope::Declare(CYContext &context, CYIdentifier *identifier
     if (existing == NULL)
         return internal_;
 
-    switch (kind) {
-        case CYIdentifierArgument:
-        case CYIdentifierCatch:
-        case CYIdentifierMagic:
-            _assert(false);
-        default:
-            break;
-    }
-
-    if (existing->kind_ == CYIdentifierGlobal)
+    if (kind == CYIdentifierGlobal);
+    else if (existing->kind_ == CYIdentifierGlobal || existing->kind_ == CYIdentifierMagic)
         existing->kind_ = kind;
-    else if (kind == CYIdentifierGlobal)
-        ;
     else if (existing->kind_ == CYIdentifierLexical || kind == CYIdentifierLexical)
         _assert(false); // XXX: throw new SyntaxError()