Use context.Replace when possible.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index 37b7068cd455f4a88b35e9931508d58090ff2c72..222ac9d6ce5404ada185ee029fe2cd8cf68dd569 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -114,6 +114,14 @@ CYStatement *CYBreak::Replace(CYContext &context) {
     return this;
 }
 
     return this;
 }
 

+CYExpression *CYCall::AddArgument(CYContext &context, CYExpression *value) {
+    CYArgument **argument(&arguments_);
+    while (*argument != NULL)
+        argument = &(*argument)->next_;
+    *argument = $ CYArgument(value);
+    return this;
+}
+

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


@@ -124,7 +132,13 @@ namespace cy {
 namespace Syntax {
 
 void Catch::Replace(CYContext &context) { $T()
 namespace Syntax {
 
 void Catch::Replace(CYContext &context) { $T()

+    CYScope scope(CYScopeCatch, context, code_.statements_);
+
+    context.Replace(name_);
+    context.scope_->Declare(context, name_, CYIdentifierCatch);
+

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

+    scope.Close();

 }
 
 } }
 }
 
 } }


@@ -164,6 +178,35 @@ CYExpression *CYCondition::Replace(CYContext &context) {
     return this;
 }
 
     return this;
 }
 

+void CYContext::NonLocal(CYStatement *&statements) {
+    CYContext &context(*this);
+
+    if (nextlocal_ != NULL && nextlocal_->identifier_ != NULL) {
+        CYIdentifier *cye($I("$cye")->Replace(context));
+        CYIdentifier *unique(nextlocal_->identifier_->Replace(context));
+
+        CYStatement *declare(
+            $ CYVar($L1($L(unique, $ CYObject()))));
+
+        cy::Syntax::Catch *rescue(
+            $ cy::Syntax::Catch(cye, $$->*
+                $ CYIf($ CYIdentical($M($V(cye), $S("$cyk")), $V(unique)), $$->*
+                    $ CYReturn($M($V(cye), $S("$cyv"))))->*
+                $ cy::Syntax::Throw($V(cye))));
+
+        context.Replace(declare);
+        rescue->Replace(context);
+
+        statements = $$->*
+            declare->*
+            $ cy::Syntax::Try(statements, rescue, NULL);
+    }
+}
+
+CYIdentifier *CYContext::Unique() {
+    return $ CYIdentifier(apr_psprintf($pool, "$cy%u", unique_++));
+}
+

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


@@ -174,13 +217,13 @@ CYAssignment *CYDeclaration::Assignment(CYContext &context) {
 }
 
 CYExpression *CYDeclaration::ForEachIn(CYContext &context) {
 }
 
 CYExpression *CYDeclaration::ForEachIn(CYContext &context) {

-    return $ CYVariable(identifier_);
+    return $V(identifier_);

 }
 
 CYExpression *CYDeclaration::Replace(CYContext &context) {
     context.Replace(identifier_);
     context.scope_->Declare(context, identifier_, CYIdentifierVariable);
 }
 
 CYExpression *CYDeclaration::Replace(CYContext &context) {
     context.Replace(identifier_);
     context.scope_->Declare(context, identifier_, CYIdentifierVariable);

-    return $ CYVariable(identifier_);
+    return $V(identifier_);

 }
 
 CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
 }
 
 CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)


@@ -246,6 +289,10 @@ CYStatement *CYExpress::Replace(CYContext &context) {
     return this;
 }
 
     return this;
 }
 

+CYExpression *CYExpression::AddArgument(CYContext &context, CYExpression *value) {
+    return $C1(this, value);
+}
+

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


@@ -299,15 +346,15 @@ CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
 }
 
 CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *statement) const {
 }
 
 CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *statement) const {

-    return $ CYForIn($ CYVariable(name_), set_, CYComprehension::Replace(context, statement));
+    return $ CYForIn($V(name_), set_, CYComprehension::Replace(context, statement));

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

-    CYVariable *cys($V("$cys")), *cyt($V("$cyt"));
+    CYIdentifier *cys($I("$cys")), *cyt($I("$cyt"));

 
 

-    return $ CYLet($L2($L($I("$cys"), set_), $L($I("$cyt"))), $$->*
-        $ CYForIn(cyt, cys, $ CYBlock($$->*
-            $E($ CYAssign(initialiser_->ForEachIn(context), $M(cys, cyt)))->*
+    return $ CYLet($L2($L(cys, set_), $L(cyt)), $$->*
+        $ CYForIn($V(cyt), $V(cys), $ CYBlock($$->*
+            $E($ CYAssign(initialiser_->ForEachIn(context), $M($V(cys), $V(cyt))))->*

             code_
         ))
     );
             code_
         ))
     );


@@ -318,12 +365,12 @@ CYFunctionParameter *CYForEachInComprehension::Parameter(CYContext &context) con
 }
 
 CYStatement *CYForEachInComprehension::Replace(CYContext &context, CYStatement *statement) const {
 }
 
 CYStatement *CYForEachInComprehension::Replace(CYContext &context, CYStatement *statement) const {

-    CYVariable *cys($V("$cys")), *name($ CYVariable(name_));
+    CYIdentifier *cys($I("cys"));

 
     return $E($C0($F(NULL, $P1("$cys"), $$->*
 
     return $E($C0($F(NULL, $P1("$cys"), $$->*

-        $E($ CYAssign(cys, set_))->*
-        $ CYForIn(name, cys, $ CYBlock($$->*
-            $E($ CYAssign(name, $M(cys, name)))->*
+        $E($ CYAssign($V(cys), set_))->*
+        $ CYForIn($V(name_), $V(cys), $ CYBlock($$->*
+            $E($ CYAssign($V(name_), $M($V(cys), $V(name_))))->*

             CYComprehension::Replace(context, statement)
         ))
     )));
             CYComprehension::Replace(context, statement)
         ))
     )));


@@ -338,17 +385,36 @@ void CYFunction::Replace_(CYContext &context, bool outer) {
     if (outer)
         Inject(context);
 
     if (outer)
         Inject(context);
 

-    parent_ = context.scope_;
-    context.scope_ = this;
+    CYScope scope(CYScopeFunction, context, code_.statements_);
+
+    CYNonLocal *nonlocal(context.nonlocal_);
+    CYNonLocal *nextlocal(context.nextlocal_);
+
+    bool localize;
+    if (nonlocal_ != NULL) {
+        localize = false;
+        context.nonlocal_ = nonlocal_;
+    } else {
+        localize = true;
+        nonlocal_ = $ CYNonLocal();
+        context.nextlocal_ = nonlocal_;
+    }

 
     if (!outer && name_ != NULL)
         Inject(context);
 
 
     if (!outer && name_ != NULL)
         Inject(context);
 

-    parameters_->Replace(context);
+    if (parameters_ != NULL)
+        parameters_ = parameters_->Replace(context, code_);
+

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

-    context.scope_ = parent_;
-    Scope(context, code_.statements_);
+    if (localize)
+        context.NonLocal(code_.statements_);
+
+    context.nextlocal_ = nextlocal;
+    context.nonlocal_ = nonlocal;
+
+    scope.Close();

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


@@ -356,10 +422,12 @@ CYExpression *CYFunctionExpression::Replace(CYContext &context) {
     return this;
 }
 
     return this;
 }
 

-void CYFunctionParameter::Replace(CYContext &context) { $T()
-    name_ = name_->Replace(context);
+CYFunctionParameter *CYFunctionParameter::Replace(CYContext &context, CYBlock &code) {
+    context.Replace(name_);

     context.scope_->Declare(context, name_, CYIdentifierArgument);
     context.scope_->Declare(context, name_, CYIdentifierArgument);

-    next_->Replace(context);
+    if (next_ != NULL)
+        next_ = next_->Replace(context, code);
+    return this;

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


@@ -368,8 +436,9 @@ CYStatement *CYFunctionStatement::Replace(CYContext &context) {
 }
 
 CYIdentifier *CYIdentifier::Replace(CYContext &context) {
 }
 
 CYIdentifier *CYIdentifier::Replace(CYContext &context) {

-    if (replace_ == NULL)
-        replace_ = context.scope_->Lookup(context, this);
+    if (replace_ != NULL && replace_ != this)
+        return replace_->Replace(context);
+    replace_ = context.scope_->Lookup(context, this);

     return replace_;
 }
 
     return replace_;
 }
 


@@ -418,12 +487,25 @@ void CYMember::Replace_(CYContext &context) {
     context.Replace(property_);
 }
 
     context.Replace(property_);
 }
 

-CYExpression *CYNew::Replace(CYContext &context) {
+namespace cy {
+namespace Syntax {
+
+CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
+    CYArgument **argument(&arguments_);
+    while (*argument != NULL)
+        argument = &(*argument)->next_;
+    *argument = $ CYArgument(value);
+    return this;
+}
+
+CYExpression *New::Replace(CYContext &context) {

     context.Replace(constructor_);
     arguments_->Replace(context);
     return this;
 }
 
     context.Replace(constructor_);
     arguments_->Replace(context);
     return this;
 }
 

+} }
+

 CYNumber *CYNull::Number(CYContext &context) {
     return $D(0);
 }
 CYNumber *CYNull::Number(CYContext &context) {
     return $D(0);
 }


@@ -438,7 +520,7 @@ CYNumber *CYNumber::Number(CYContext &context) {
 
 CYString *CYNumber::String(CYContext &context) {
     // XXX: there is a precise algorithm for this
 
 CYString *CYNumber::String(CYContext &context) {
     // XXX: there is a precise algorithm for this

-    return $S(apr_psprintf(context.pool_, "%.17g", Value()));
+    return $S(apr_psprintf($pool, "%.17g", Value()));

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


@@ -446,6 +528,19 @@ CYExpression *CYObject::Replace(CYContext &context) {
     return this;
 }
 
     return this;
 }
 

+CYFunctionParameter *CYOptionalFunctionParameter::Replace(CYContext &context, CYBlock &code) {
+    CYFunctionParameter *parameter($ CYFunctionParameter(name_, next_));
+    parameter = parameter->Replace(context, code);
+    context.Replace(initializer_);
+
+    CYVariable *name($V(name_));
+    code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(name), $S("undefined")), $$->*
+        $E($ CYAssign(name, initializer_))
+    ));
+
+    return parameter;
+}
+

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


@@ -460,31 +555,49 @@ CYExpression *CYPrefix::Replace(CYContext &context) {
 #define MappingSet "0etnirsoalfucdphmgyvbxTwSNECAFjDLkMOIBPqzRH$_WXUVGYKQJZ"
 //#define MappingSet "0abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"
 
 #define MappingSet "0etnirsoalfucdphmgyvbxTwSNECAFjDLkMOIBPqzRH$_WXUVGYKQJZ"
 //#define MappingSet "0abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"
 

-void CYProgram::Replace(CYContext &context) {
-    parent_ = context.scope_;
-    CYProgram *program(context.program_);
+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;
+        }
+    };

 
 

-    context.scope_ = this;
-    context.program_ = this;
+    typedef std::set<CYIdentifier *, IdentifierUsageLess> IdentifierUsages;
+}
+
+void CYProgram::Replace(CYContext &context) {
+    CYScope scope(CYScopeProgram, context, statements_);

 
 

+    context.nextlocal_ = $ CYNonLocal();

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

+    context.NonLocal(statements_);

 
 

-    context.scope_ = parent_;
-    context.program_ = program;
-    Scope(context, statements_);
+    scope.Close();

 
     size_t offset(0);
 
     CYCStringSet external;
 
     size_t offset(0);
 
     CYCStringSet external;

-    for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
+    for (CYIdentifierValueSet::const_iterator i(scope.identifiers_.begin()); i != scope.identifiers_.end(); ++i)

         external.insert((*i)->Word());
 
         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
     // XXX: totalling the probable occurrences and sorting by them would improve the result

-    for (CYIdentifierAddressVector::const_iterator i(rename_.begin()); i != rename_.end(); ++i, ++offset) {
+    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_)
         const char *name;
 
         if (context.options_.verbose_)

-            name = apr_psprintf(context.pool_, "$%"APR_SIZE_T_FMT"", offset);
+            name = apr_psprintf($pool, "$%"APR_SIZE_T_FMT"", offset);

         else {
             char id[8];
             id[7] = '\0';
         else {
             char id[8];
             id[7] = '\0';


@@ -503,11 +616,11 @@ void CYProgram::Replace(CYContext &context) {
                 goto id;
             }
 
                 goto id;
             }
 

-            name = apr_pstrmemdup(context.pool_, id + position, 7 - position);
+            name = apr_pstrmemdup($pool, id + position, 7 - position);

             // XXX: at some point, this could become a keyword
         }
 
             // XXX: at some point, this could become a keyword
         }
 

-        for (CYIdentifier *identifier(*i); identifier != NULL; identifier = identifier->next_)
+        for (CYIdentifier *identifier(i->identifier_); identifier != NULL; identifier = identifier->next_)

             identifier->Set(name);
     }
 }
             identifier->Set(name);
     }
 }


@@ -518,12 +631,47 @@ void CYProperty::Replace(CYContext &context) { $T()
 }
 
 CYStatement *CYReturn::Replace(CYContext &context) {
 }
 
 CYStatement *CYReturn::Replace(CYContext &context) {

+    if (context.nonlocal_ != NULL) {
+        CYProperty *value(value_ == NULL ? NULL : $ CYProperty($S("$cyv"), value_));
+        return $ cy::Syntax::Throw($ CYObject(
+            $ CYProperty($S("$cyk"), $V(context.nonlocal_->Target(context)), value)
+        ));
+    }
+

     context.Replace(value_);
     return this;
 }
 
     context.Replace(value_);
     return this;
 }
 

+CYExpression *CYRubyBlock::Replace(CYContext &context) {
+    // XXX: this needs to do something much more epic to handle return
+    return call_->AddArgument(context, proc_->Replace(context));
+}
+
+CYExpression *CYRubyProc::Replace(CYContext &context) {
+    CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
+    function->nonlocal_ = context.nextlocal_;
+    return function;
+}
+
+CYScope::CYScope(CYScopeType type, CYContext &context, CYStatement *&statements) :
+    type_(type),
+    context_(context),
+    statements_(statements),
+    parent_(context.scope_)
+{
+    context_.scope_ = this;
+}
+
+void CYScope::Close() {
+    context_.scope_ = parent_;
+    Scope(context_, statements_);
+}
+

 void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {
 void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {

-    internal_.insert(CYIdentifierAddressFlagsMap::value_type(identifier, flags));
+    if (type_ == CYScopeCatch && flags != CYIdentifierCatch)
+        parent_->Declare(context, identifier, flags);
+    else
+        internal_.insert(CYIdentifierAddressFlagsMap::value_type(identifier, flags));

 }
 
 CYIdentifier *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {
 }
 
 CYIdentifier *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {


@@ -537,6 +685,7 @@ void CYScope::Merge(CYContext &context, CYIdentifier *identifier) {
         if ((*insert.first)->offset_ < identifier->offset_)
             (*insert.first)->offset_ = identifier->offset_;
         identifier->replace_ = *insert.first;
         if ((*insert.first)->offset_ < identifier->offset_)
             (*insert.first)->offset_ = identifier->offset_;
         identifier->replace_ = *insert.first;

+        (*insert.first)->usage_ += identifier->usage_ + 1;

     }
 }
 
     }
 }
 


@@ -544,11 +693,13 @@ namespace {
     struct IdentifierOffset {
         size_t offset_;
         CYIdentifierFlags flags_;
     struct IdentifierOffset {
         size_t offset_;
         CYIdentifierFlags flags_;

+        size_t usage_;

         CYIdentifier *identifier_;
 
         CYIdentifier *identifier_;
 

-        IdentifierOffset(size_t offset, CYIdentifierFlags flags, CYIdentifier *identifier) :
-            offset_(offset),
+        IdentifierOffset(CYIdentifier *identifier, CYIdentifierFlags flags) :
+            offset_(identifier->offset_),

             flags_(flags),
             flags_(flags),

+            usage_(identifier->usage_),

             identifier_(identifier)
         {
         }
             identifier_(identifier)
         {
         }


@@ -562,6 +713,8 @@ namespace {
                 return lhs.offset_ < rhs.offset_;
             if (lhs.flags_ != rhs.flags_)
                 return lhs.flags_ < rhs.flags_;
                 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_;
         }
     };
             return lhs.identifier_ < rhs.identifier_;
         }
     };


@@ -570,15 +723,16 @@ namespace {
 }
 
 void CYScope::Scope(CYContext &context, CYStatement *&statements) {
 }
 
 void CYScope::Scope(CYContext &context, CYStatement *&statements) {

+    if (parent_ == NULL)
+        return;
+

     CYDeclarations *last(NULL), *curr(NULL);
     CYDeclarations *last(NULL), *curr(NULL);

-    CYProgram *program(context.program_);

 
     IdentifierOffsets offsets;
 
 
     IdentifierOffsets offsets;
 

-    // XXX: we don't want to do this in order, we want to sort it by probable occurrence

     for (CYIdentifierAddressFlagsMap::const_iterator i(internal_.begin()); i != internal_.end(); ++i)
     for (CYIdentifierAddressFlagsMap::const_iterator i(internal_.begin()); i != internal_.end(); ++i)

-        if (program != NULL && i->second != CYIdentifierMagic)
-            offsets.insert(IdentifierOffset(i->first->offset_, i->second, i->first));
+        if (i->second != CYIdentifierMagic)
+            offsets.insert(IdentifierOffset(i->first, i->second));

 
     size_t offset(0);
 
 
     size_t offset(0);
 


@@ -594,12 +748,13 @@ void CYScope::Scope(CYContext &context, CYStatement *&statements) {
 
         if (offset < i->offset_)
             offset = i->offset_;
 
         if (offset < i->offset_)
             offset = i->offset_;

-        if (program->rename_.size() <= offset)
-            program->rename_.resize(offset + 1);
+        if (context.rename_.size() <= offset)
+            context.rename_.resize(offset + 1);

 
 

-        CYIdentifier *&identifier(program->rename_[offset++]);
-        i->identifier_->SetNext(identifier);
-        identifier = i->identifier_;
+        CYIdentifierUsage &rename(context.rename_[offset++]);
+        i->identifier_->SetNext(rename.identifier_);
+        rename.identifier_ = i->identifier_;
+        rename.usage_ += i->identifier_->usage_ + 1;

     }
 
     if (last != NULL) {
     }
 
     if (last != NULL) {


@@ -610,6 +765,7 @@ void CYScope::Scope(CYContext &context, CYStatement *&statements) {
 
     for (CYIdentifierValueSet::const_iterator i(identifiers_.begin()); i != identifiers_.end(); ++i)
         if (internal_.find(*i) == internal_.end()) {
 
     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);
             if ((*i)->offset_ < offset)
                 (*i)->offset_ = offset;
             parent_->Merge(context, *i);


@@ -629,7 +785,7 @@ CYStatement *CYStatement::ReplaceAll(CYContext &context) { $T(NULL)
 
 CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
     size_t size(size_ + rhs->size_);
 
 CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
     size_t size(size_ + rhs->size_);

-    char *value(new(context.pool_) char[size + 1]);
+    char *value($ char[size + 1]);

     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';


@@ -694,7 +850,7 @@ CYStatement *CYVar::Replace(CYContext &context) {
 }
 
 CYExpression *CYVariable::Replace(CYContext &context) {
 }
 
 CYExpression *CYVariable::Replace(CYContext &context) {

-    name_ = name_->Replace(context);
+    context.Replace(name_);

     return this;
 }
 
     return this;
 }