Added CalEventIsAllDay to Bridge.def for Element.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index fe935572086d0ae45f0dd0de494492696a044b9c..c06c2a514e91711346494fab13feb64c38c579b5 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -1,4 +1,4 @@
-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler

  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -38,11 +38,10 @@
 /* }}} */
 
 #include "Parser.hpp"
 /* }}} */
 
 #include "Parser.hpp"

+#include "Replace.hpp"

 
 #include <iomanip>
 
 
 #include <iomanip>
 

-#include "Replace.hpp"
-

 CYExpression *CYAdd::Replace(CYContext &context) {
     CYInfix::Replace(context);
 
 CYExpression *CYAdd::Replace(CYContext &context) {
     CYInfix::Replace(context);
 


@@ -56,11 +55,11 @@ CYExpression *CYAdd::Replace(CYContext &context) {
         if (lhs == NULL) {
             lhs = lhp->String(context);
             if (lhs == NULL)
         if (lhs == NULL) {
             lhs = lhp->String(context);
             if (lhs == NULL)

-                return NULL;
+                return this;

         } else if (rhs == NULL) {
             rhs = rhp->String(context);
             if (rhs == NULL)
         } else if (rhs == NULL) {
             rhs = rhp->String(context);
             if (rhs == NULL)

-                return NULL;
+                return this;

         }
 
         return lhs->Concat(context, rhs);
         }
 
         return lhs->Concat(context, rhs);


@@ -70,7 +69,7 @@ CYExpression *CYAdd::Replace(CYContext &context) {
         if (CYNumber *rhn = rhp->Number(context))
             return $D(lhn->Value() + rhn->Value());
 
         if (CYNumber *rhn = rhp->Number(context))
             return $D(lhn->Value() + rhn->Value());
 

-    return NULL;
+    return this;

 }
 
 CYExpression *CYAddressOf::Replace(CYContext &context) {
 }
 
 CYExpression *CYAddressOf::Replace(CYContext &context) {


@@ -85,7 +84,7 @@ void CYArgument::Replace(CYContext &context) { $T()
 
 CYExpression *CYArray::Replace(CYContext &context) {
     elements_->Replace(context);
 
 CYExpression *CYArray::Replace(CYContext &context) {
     elements_->Replace(context);

-    return NULL;
+    return this;

 }
 
 CYExpression *CYArrayComprehension::Replace(CYContext &context) {
 }
 
 CYExpression *CYArrayComprehension::Replace(CYContext &context) {


@@ -101,22 +100,24 @@ CYExpression *CYArrayComprehension::Replace(CYContext &context) {
 CYExpression *CYAssignment::Replace(CYContext &context) {
     context.Replace(lhs_);
     context.Replace(rhs_);
 CYExpression *CYAssignment::Replace(CYContext &context) {
     context.Replace(lhs_);
     context.Replace(rhs_);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYBlock::Replace(CYContext &context) {
     statements_ = statements_->ReplaceAll(context);
 }
 
 CYStatement *CYBlock::Replace(CYContext &context) {
     statements_ = statements_->ReplaceAll(context);

-    return NULL;
+    if (statements_ == NULL)
+        return $ CYEmpty();
+    return this;

 }
 
 CYStatement *CYBreak::Replace(CYContext &context) {
 }
 
 CYStatement *CYBreak::Replace(CYContext &context) {

-    return NULL;
+    return this;

 }
 
 CYExpression *CYCall::Replace(CYContext &context) {
     context.Replace(function_);
     arguments_->Replace(context);
 }
 
 CYExpression *CYCall::Replace(CYContext &context) {
     context.Replace(function_);
     arguments_->Replace(context);

-    return NULL;
+    return this;

 }
 
 namespace cy {
 }
 
 namespace cy {


@@ -134,9 +135,13 @@ void CYClause::Replace(CYContext &context) { $T()
     next_->Replace(context);
 }
 
     next_->Replace(context);
 }
 

+CYStatement *CYComment::Replace(CYContext &context) {
+    return this;
+}
+

 CYExpression *CYCompound::Replace(CYContext &context) {
     expressions_ = expressions_->ReplaceAll(context);
 CYExpression *CYCompound::Replace(CYContext &context) {
     expressions_ = expressions_->ReplaceAll(context);

-    return NULL;
+    return expressions_ == NULL ? NULL : this;

 }
 
 CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
 }
 
 CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)


@@ -156,39 +161,56 @@ CYExpression *CYCondition::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(true_);
     context.Replace(false_);
     context.Replace(test_);
     context.Replace(true_);
     context.Replace(false_);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYContinue::Replace(CYContext &context) {
 }
 
 CYStatement *CYContinue::Replace(CYContext &context) {

-    return NULL;
+    return this;
+}
+
+CYAssignment *CYDeclaration::Assignment(CYContext &context) {
+    CYExpression *variable(Replace(context));
+    return initialiser_ == NULL ? NULL : $ CYAssign(variable, initialiser_);

 }
 
 CYExpression *CYDeclaration::ForEachIn(CYContext &context) {
     return $ CYVariable(identifier_);
 }
 
 }
 
 CYExpression *CYDeclaration::ForEachIn(CYContext &context) {
     return $ CYVariable(identifier_);
 }
 

-void CYDeclaration::Replace(CYContext &context) {
-    context.Replace(initialiser_);
+CYExpression *CYDeclaration::Replace(CYContext &context) {
+    context.Replace(identifier_);
+    context.scope_->Declare(context, identifier_, CYIdentifierVariable);
+    return $ CYVariable(identifier_);

 }
 
 CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
     return $ CYProperty(declaration_->identifier_, declaration_->initialiser_ ?: $U, next_->Property(context));
 }
 
 }
 
 CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
     return $ CYProperty(declaration_->identifier_, declaration_->initialiser_ ?: $U, next_->Property(context));
 }
 

-void CYDeclarations::Replace(CYContext &context) { $T()
-    declaration_->Replace(context);
-    next_->Replace(context);
+CYCompound *CYDeclarations::Replace(CYContext &context) {
+    CYCompound *compound;
+    if (next_ == NULL) compound:
+        compound = $ CYCompound();
+    else {
+        compound = next_->Replace(context);
+        if (compound == NULL)
+            goto compound;
+    }
+
+    if (CYAssignment *assignment = declaration_->Assignment(context))
+        compound->AddPrev(assignment);
+    return compound;

 }
 
 CYExpression *CYDirectMember::Replace(CYContext &context) {
     Replace_(context);
 }
 
 CYExpression *CYDirectMember::Replace(CYContext &context) {
     Replace_(context);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYDoWhile::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(code_);
 }
 
 CYStatement *CYDoWhile::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(code_);

-    return NULL;
+    return this;

 }
 
 void CYElement::Replace(CYContext &context) { $T()
 }
 
 void CYElement::Replace(CYContext &context) { $T()


@@ -196,13 +218,32 @@ void CYElement::Replace(CYContext &context) { $T()
     next_->Replace(context);
 }
 
     next_->Replace(context);
 }
 

+CYStatement *CYEmpty::Collapse(CYContext &context) {
+    return next_;
+}
+

 CYStatement *CYEmpty::Replace(CYContext &context) {
 CYStatement *CYEmpty::Replace(CYContext &context) {

-    return NULL;
+    return this;
+}
+
+CYStatement *CYExpress::Collapse(CYContext &context) {
+    if (CYExpress *express = dynamic_cast<CYExpress *>(next_)) {
+        CYCompound *next(dynamic_cast<CYCompound *>(express->expression_));
+        if (next == NULL)
+            next = $ CYCompound(express->expression_);
+        next->AddPrev(expression_);
+        expression_ = next;
+        SetNext(express->next_);
+    }
+
+    return this;

 }
 
 CYStatement *CYExpress::Replace(CYContext &context) {
     context.Replace(expression_);
 }
 
 CYStatement *CYExpress::Replace(CYContext &context) {
     context.Replace(expression_);

-    return NULL;
+    if (expression_ == NULL)
+        return $ CYEmpty();
+    return this;

 }
 
 CYExpression *CYExpression::ClassName(CYContext &context, bool object) {
 }
 
 CYExpression *CYExpression::ClassName(CYContext &context, bool object) {


@@ -238,18 +279,19 @@ void CYFinally::Replace(CYContext &context) { $T()
 }
 
 CYStatement *CYFor::Replace(CYContext &context) {
 }
 
 CYStatement *CYFor::Replace(CYContext &context) {

-    // XXX: initialiser_
+    context.Replace(initialiser_);

     context.Replace(test_);
     context.Replace(increment_);
     context.Replace(code_);
     context.Replace(test_);
     context.Replace(increment_);
     context.Replace(code_);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYForIn::Replace(CYContext &context) {
 }
 
 CYStatement *CYForIn::Replace(CYContext &context) {

-    // XXX: initialiser_
+    // XXX: this actually might need a prefix statement
+    context.Replace(initialiser_);

     context.Replace(set_);
     context.Replace(code_);
     context.Replace(set_);
     context.Replace(code_);

-    return NULL;
+    return this;

 }
 
 CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
 }
 
 CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {


@@ -287,25 +329,57 @@ CYStatement *CYForEachInComprehension::Replace(CYContext &context, CYStatement *
     )));
 }
 
     )));
 }
 

-void CYFunction::Replace_(CYContext &context) {
+void CYFunction::Inject(CYContext &context) {
+    context.Replace(name_);
+    context.scope_->Declare(context, name_, CYIdentifierOther);
+}
+
+void CYFunction::Replace_(CYContext &context, bool outer) {
+    if (outer)
+        Inject(context);
+
+    CYScope scope;
+    scope.parent_ = context.scope_;
+    context.scope_ = &scope;
+
+    if (!outer && name_ != NULL)
+        Inject(context);
+
+    parameters_->Replace(context);

     code_.Replace(context);
     code_.Replace(context);

+
+    context.scope_ = scope.parent_;
+    scope.Scope(context, code_.statements_);

 }
 
 CYExpression *CYFunctionExpression::Replace(CYContext &context) {
 }
 
 CYExpression *CYFunctionExpression::Replace(CYContext &context) {

-    Replace_(context);
-    return NULL;
+    Replace_(context, false);
+    return this;
+}
+
+void CYFunctionParameter::Replace(CYContext &context) { $T()
+    name_ = name_->Replace(context);
+    context.scope_->Declare(context, name_, CYIdentifierArgument);
+    next_->Replace(context);

 }
 
 CYStatement *CYFunctionStatement::Replace(CYContext &context) {
 }
 
 CYStatement *CYFunctionStatement::Replace(CYContext &context) {

-    Replace_(context);
-    return NULL;
+    Replace_(context, true);
+    return this;
+}
+
+CYIdentifier *CYIdentifier::Replace(CYContext &context) {
+    if (replace_ != NULL && replace_ != this)
+        return replace_->Replace(context);
+    replace_ = context.scope_->Lookup(context, this);
+    return replace_;

 }
 
 CYStatement *CYIf::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(true_);
     context.Replace(false_);
 }
 
 CYStatement *CYIf::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(true_);
     context.Replace(false_);

-    return NULL;
+    return this;

 }
 
 CYFunctionParameter *CYIfComprehension::Parameter(CYContext &context) const {
 }
 
 CYFunctionParameter *CYIfComprehension::Parameter(CYContext &context) const {


@@ -329,12 +403,12 @@ CYExpression *CYIndirectMember::Replace(CYContext &context) {
 CYExpression *CYInfix::Replace(CYContext &context) {
     context.Replace(lhs_);
     context.Replace(rhs_);
 CYExpression *CYInfix::Replace(CYContext &context) {
     context.Replace(lhs_);
     context.Replace(rhs_);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYLabel::Replace(CYContext &context) {
     context.Replace(statement_);
 }
 
 CYStatement *CYLabel::Replace(CYContext &context) {
     context.Replace(statement_);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYLet::Replace(CYContext &context) {
 }
 
 CYStatement *CYLet::Replace(CYContext &context) {


@@ -349,7 +423,7 @@ void CYMember::Replace_(CYContext &context) {
 CYExpression *CYNew::Replace(CYContext &context) {
     context.Replace(constructor_);
     arguments_->Replace(context);
 CYExpression *CYNew::Replace(CYContext &context) {
     context.Replace(constructor_);
     arguments_->Replace(context);

-    return NULL;
+    return this;

 }
 
 CYNumber *CYNull::Number(CYContext &context) {
 }
 
 CYNumber *CYNull::Number(CYContext &context) {


@@ -371,21 +445,90 @@ CYString *CYNumber::String(CYContext &context) {
 
 CYExpression *CYObject::Replace(CYContext &context) {
     properties_->Replace(context);
 
 CYExpression *CYObject::Replace(CYContext &context) {
     properties_->Replace(context);

-    return NULL;
+    return this;

 }
 
 CYExpression *CYPostfix::Replace(CYContext &context) {
     context.Replace(lhs_);
 }
 
 CYExpression *CYPostfix::Replace(CYContext &context) {
     context.Replace(lhs_);

-    return NULL;
+    return this;

 }
 
 CYExpression *CYPrefix::Replace(CYContext &context) {
     context.Replace(rhs_);
 }
 
 CYExpression *CYPrefix::Replace(CYContext &context) {
     context.Replace(rhs_);

-    return NULL;
+    return this;
+}
+
+// XXX: this is evil evil black magic. don't ask, don't tell... don't believe!
+#define MappingSet "0etnirsoalfucdphmgyvbxTwSNECAFjDLkMOIBPqzRH$_WXUVGYKQJZ"
+//#define MappingSet "0abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"
+
+namespace {
+    struct IdentifierUsageLess :
+        std::binary_function<CYIdentifier *, CYIdentifier *, bool>
+    {
+        _finline bool operator ()(CYIdentifier *lhs, CYIdentifier *rhs) const {
+            if (lhs->usage_ != rhs->usage_)
+                return lhs->usage_ > rhs->usage_;
+            return lhs < rhs;
+        }
+    };
+
+    typedef std::set<CYIdentifier *, IdentifierUsageLess> IdentifierUsages;

 }
 
 void CYProgram::Replace(CYContext &context) {
 }
 
 void CYProgram::Replace(CYContext &context) {

+    CYScope scope;
+    scope.parent_ = context.scope_;
+    context.scope_ = &scope;

     statements_ = statements_->ReplaceAll(context);
     statements_ = statements_->ReplaceAll(context);

+    context.scope_ = scope.parent_;
+    scope.Scope(context, statements_);
+
+    size_t offset(0);
+
+    CYCStringSet external;
+    for (CYIdentifierValueSet::const_iterator i(scope.identifiers_.begin()); i != scope.identifiers_.end(); ++i)
+        external.insert((*i)->Word());
+
+    IdentifierUsages usages;
+
+    if (offset < context.rename_.size())
+        for (CYIdentifier *i(context.rename_[offset].identifier_); i != NULL; i = i->next_)
+             usages.insert(i);
+
+    // XXX: totalling the probable occurrences and sorting by them would improve the result
+    for (CYIdentifierUsageVector::const_iterator i(context.rename_.begin()); i != context.rename_.end(); ++i, ++offset) {
+        //std::cout << *i << ":" << (*i)->offset_ << std::endl;
+
+        const char *name;
+
+        if (context.options_.verbose_)
+            name = apr_psprintf(context.pool_, "$%"APR_SIZE_T_FMT"", offset);
+        else {
+            char id[8];
+            id[7] = '\0';
+
+          id:
+            unsigned position(7), local(offset + 1);
+
+            do {
+                unsigned index(local % (sizeof(MappingSet) - 1));
+                local /= sizeof(MappingSet) - 1;
+                id[--position] = MappingSet[index];
+            } while (local != 0);
+
+            if (external.find(id + position) != external.end()) {
+                ++offset;
+                goto id;
+            }
+
+            name = apr_pstrmemdup(context.pool_, id + position, 7 - position);
+            // XXX: at some point, this could become a keyword
+        }
+
+        for (CYIdentifier *identifier(i->identifier_); identifier != NULL; identifier = identifier->next_)
+            identifier->Set(name);
+    }

 }
 
 void CYProperty::Replace(CYContext &context) { $T()
 }
 
 void CYProperty::Replace(CYContext &context) { $T()


@@ -395,19 +538,120 @@ void CYProperty::Replace(CYContext &context) { $T()
 
 CYStatement *CYReturn::Replace(CYContext &context) {
     context.Replace(value_);
 
 CYStatement *CYReturn::Replace(CYContext &context) {
     context.Replace(value_);

-    return NULL;
+    return this;
+}
+
+void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {
+    internal_.insert(CYIdentifierAddressFlagsMap::value_type(identifier, flags));
+}
+
+CYIdentifier *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {
+    std::pair<CYIdentifierValueSet::iterator, bool> insert(identifiers_.insert(identifier));
+    return *insert.first;
+}
+
+void CYScope::Merge(CYContext &context, CYIdentifier *identifier) {
+    std::pair<CYIdentifierValueSet::iterator, bool> insert(identifiers_.insert(identifier));
+    if (!insert.second) {
+        if ((*insert.first)->offset_ < identifier->offset_)
+            (*insert.first)->offset_ = identifier->offset_;
+        identifier->replace_ = *insert.first;
+        (*insert.first)->usage_ += identifier->usage_ + 1;
+    }
+}
+
+namespace {
+    struct IdentifierOffset {
+        size_t offset_;
+        CYIdentifierFlags flags_;
+        size_t usage_;
+        CYIdentifier *identifier_;
+
+        IdentifierOffset(CYIdentifier *identifier, CYIdentifierFlags flags) :
+            offset_(identifier->offset_),
+            flags_(flags),
+            usage_(identifier->usage_),
+            identifier_(identifier)
+        {
+        }
+    };
+
+    struct IdentifierOffsetLess :
+        std::binary_function<const IdentifierOffset &, const IdentifierOffset &, bool>
+    {
+        _finline bool operator ()(const IdentifierOffset &lhs, const IdentifierOffset &rhs) const {
+            if (lhs.offset_ != rhs.offset_)
+                return lhs.offset_ < rhs.offset_;
+            if (lhs.flags_ != rhs.flags_)
+                return lhs.flags_ < rhs.flags_;
+            /*if (lhs.usage_ != rhs.usage_)
+                return lhs.usage_ < rhs.usage_;*/
+            return lhs.identifier_ < rhs.identifier_;
+        }
+    };
+
+    typedef std::set<IdentifierOffset, IdentifierOffsetLess> IdentifierOffsets;
+}
+
+void CYScope::Scope(CYContext &context, CYStatement *&statements) {
+    if (parent_ == NULL)
+        return;
+
+    CYDeclarations *last(NULL), *curr(NULL);
+
+    IdentifierOffsets offsets;
+
+    for (CYIdentifierAddressFlagsMap::const_iterator i(internal_.begin()); i != internal_.end(); ++i)
+        if (i->second != CYIdentifierMagic)
+            offsets.insert(IdentifierOffset(i->first, i->second));
+
+    size_t offset(0);
+
+    for (IdentifierOffsets::const_iterator i(offsets.begin()); i != offsets.end(); ++i) {
+        if (i->flags_ == CYIdentifierVariable) {
+            CYDeclarations *next($ CYDeclarations($ CYDeclaration(i->identifier_)));
+            if (last == NULL)
+                last = next;
+            if (curr != NULL)
+                curr->SetNext(next);
+            curr = next;
+        }
+
+        if (offset < i->offset_)
+            offset = i->offset_;
+        if (context.rename_.size() <= offset)
+            context.rename_.resize(offset + 1);
+
+        CYIdentifierUsage &rename(context.rename_[offset++]);
+        i->identifier_->SetNext(rename.identifier_);
+        rename.identifier_ = i->identifier_;
+        rename.usage_ += i->identifier_->usage_ + 1;
+    }
+
+    if (last != NULL) {
+        CYVar *var($ CYVar(last));
+        var->SetNext(statements);
+        statements = var;
+    }
+
+    for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
+        if (internal_.find(*i) == internal_.end()) {
+            //std::cout << *i << '=' << offset << std::endl;
+            if ((*i)->offset_ < offset)
+                (*i)->offset_ = offset;
+            parent_->Merge(context, *i);
+        }
+}
+
+CYStatement *CYStatement::Collapse(CYContext &context) {
+    return this;

 }
 
 CYStatement *CYStatement::ReplaceAll(CYContext &context) { $T(NULL)
     CYStatement *replace(this);
     context.Replace(replace);
 }
 
 CYStatement *CYStatement::ReplaceAll(CYContext &context) { $T(NULL)
     CYStatement *replace(this);
     context.Replace(replace);

-
-    if (CYStatement *next = next_->ReplaceAll(context))
-        replace->SetNext(next);
-    else
-        replace->SetNext(next_);
-
-    return replace;
+    replace->SetNext(next_->ReplaceAll(context));
+    return replace->Collapse(context);

 }
 
 CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
 }
 
 CYString *CYString::Concat(CYContext &context, CYString *rhs) const {


@@ -416,7 +660,7 @@ CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
     memcpy(value, value_, size_);
     memcpy(value + size_, rhs->value_, rhs->size_);
     value[size] = '\0';
     memcpy(value, value_, size_);
     memcpy(value + size_, rhs->value_, rhs->size_);
     value[size] = '\0';

-    return $S(value);
+    return $S(value, size);

 }
 
 CYNumber *CYString::Number(CYContext &context) {
 }
 
 CYNumber *CYString::Number(CYContext &context) {


@@ -431,11 +675,11 @@ CYString *CYString::String(CYContext &context) {
 CYStatement *CYSwitch::Replace(CYContext &context) {
     context.Replace(value_);
     clauses_->Replace(context);
 CYStatement *CYSwitch::Replace(CYContext &context) {
     context.Replace(value_);
     clauses_->Replace(context);

-    return NULL;
+    return this;

 }
 
 CYExpression *CYThis::Replace(CYContext &context) {
 }
 
 CYExpression *CYThis::Replace(CYContext &context) {

-    return NULL;
+    return this;

 }
 
 namespace cy {
 }
 
 namespace cy {


@@ -443,13 +687,13 @@ namespace Syntax {
 
 CYStatement *Throw::Replace(CYContext &context) {
     context.Replace(value_);
 
 CYStatement *Throw::Replace(CYContext &context) {
     context.Replace(value_);

-    return NULL;
+    return this;

 }
 
 } }
 
 CYExpression *CYTrivial::Replace(CYContext &context) {
 }
 
 } }
 
 CYExpression *CYTrivial::Replace(CYContext &context) {

-    return NULL;
+    return this;

 }
 
 CYNumber *CYTrue::Number(CYContext &context) {
 }
 
 CYNumber *CYTrue::Number(CYContext &context) {


@@ -467,30 +711,30 @@ CYStatement *Try::Replace(CYContext &context) {
     code_.Replace(context);
     catch_->Replace(context);
     finally_->Replace(context);
     code_.Replace(context);
     catch_->Replace(context);
     finally_->Replace(context);

-    return NULL;
+    return this;

 }
 
 } }
 
 CYStatement *CYVar::Replace(CYContext &context) {
 }
 
 } }
 
 CYStatement *CYVar::Replace(CYContext &context) {

-    declarations_->Replace(context);
-    return NULL;
+    return $E(declarations_->Replace(context));

 }
 
 CYExpression *CYVariable::Replace(CYContext &context) {
 }
 
 CYExpression *CYVariable::Replace(CYContext &context) {

-    return NULL;
+    name_ = name_->Replace(context);
+    return this;

 }
 
 CYStatement *CYWhile::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(code_);
 }
 
 CYStatement *CYWhile::Replace(CYContext &context) {
     context.Replace(test_);
     context.Replace(code_);

-    return NULL;
+    return this;

 }
 
 CYStatement *CYWith::Replace(CYContext &context) {
     context.Replace(scope_);
     context.Replace(code_);
 }
 
 CYStatement *CYWith::Replace(CYContext &context) {
     context.Replace(scope_);
     context.Replace(code_);

-    return NULL;
+    return this;

 }
 
 CYExpression *CYWord::ClassName(CYContext &context, bool object) {
 }
 
 CYExpression *CYWord::ClassName(CYContext &context, bool object) {