Verify lexer tokens are always default reductions.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index c78f380ac874e736702b36c19ba7564924b45f8d..2cb447499c7df2fc9428e3ef19d3678aee822f5c 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -533,6 +533,8 @@ void CYFunction::Replace(CYContext &context) {
 
     CYScope scope(!localize, context);
 
 
     CYScope scope(!localize, context);
 

+    $I("arguments")->Replace(context, CYIdentifierMagic);
+

     parameters_->Replace(context, code_);
 
     context.ReplaceAll(code_);
     parameters_->Replace(context, code_);
 
     context.ReplaceAll(code_);


@@ -922,19 +924,9 @@ CYIdentifierFlags *CYScope::Declare(CYContext &context, CYIdentifier *identifier
     if (existing == NULL)
         return internal_;
 
     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;
         existing->kind_ = kind;

-    else if (kind == CYIdentifierGlobal)
-        ;

     else if (existing->kind_ == CYIdentifierLexical || kind == CYIdentifierLexical)
         _assert(false); // XXX: throw new SyntaxError()
 
     else if (existing->kind_ == CYIdentifierLexical || kind == CYIdentifierLexical)
         _assert(false); // XXX: throw new SyntaxError()
 


@@ -1257,7 +1249,10 @@ CYStatement *CYWhile::Replace(CYContext &context) {
 
 CYStatement *CYWith::Replace(CYContext &context) {
     context.Replace(scope_);
 
 CYStatement *CYWith::Replace(CYContext &context) {
     context.Replace(scope_);

+    CYScope scope(true, context);
+    scope.Damage();

     context.ReplaceAll(code_);
     context.ReplaceAll(code_);

+    scope.Close(context);

     return this;
 }
 
     return this;
 }