Verify lexer tokens are always default reductions.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index 472908671fe2479b4bc228cb5645142733d63479..2cb447499c7df2fc9428e3ef19d3678aee822f5c 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -533,6 +533,8 @@ void CYFunction::Replace(CYContext &context) {
 
     CYScope scope(!localize, context);
 
+    $I("arguments")->Replace(context, CYIdentifierMagic);
+
     parameters_->Replace(context, code_);
 
     context.ReplaceAll(code_);
@@ -745,7 +747,7 @@ CYExpression *CYPrefix::Replace(CYContext &context) {
 }
 
 CYProperty *CYProperty::ReplaceAll(CYContext &context, CYBuilder &builder, CYExpression *self, bool update) {
-    update |= name_->Computed();
+    update |= Update();
     if (update)
         Replace(context, builder, self, false);
     if (next_ != NULL)
@@ -765,6 +767,10 @@ void CYProperty::Replace(CYContext &context, CYBuilder &builder, CYExpression *s
     Replace(context, builder, self, name, protect);
 }
 
+bool CYProperty::Update() const {
+    return name_->Computed();
+}
+
 void CYPropertyGetter::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
     CYIdentifier *unique(context.Unique());
     builder.declarations_
@@ -786,6 +792,10 @@ void CYPropertyMethod::Replace(CYContext &context, CYBuilder &builder, CYExpress
             CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("value"), $V(unique), $ CYPropertyValue($S("writable"), $ CYTrue()))));
 }
 
+bool CYPropertyMethod::Update() const {
+    return true;
+}
+
 void CYPropertySetter::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
     CYIdentifier *unique(context.Unique());
     builder.declarations_
@@ -914,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()
 
@@ -1249,7 +1249,10 @@ CYStatement *CYWhile::Replace(CYContext &context) {
 
 CYStatement *CYWith::Replace(CYContext &context) {
     context.Replace(scope_);
+    CYScope scope(true, context);
+    scope.Damage();
     context.ReplaceAll(code_);
+    scope.Close(context);
     return this;
 }