Use context.Replace when possible.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index 21157726990d239c37546386a3c664b01f5c3054..222ac9d6ce5404ada185ee029fe2cd8cf68dd569 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -132,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();

 }
 
 } }
 }
 
 } }


@@ -175,23 +181,30 @@ CYExpression *CYCondition::Replace(CYContext &context) {
 void CYContext::NonLocal(CYStatement *&statements) {
     CYContext &context(*this);
 
 void CYContext::NonLocal(CYStatement *&statements) {
     CYContext &context(*this);
 

-    if (nonlocal_->identifier_ != NULL) {
-        CYVariable *cye($V("$cye"));
-        CYVariable *unique($ CYVariable(nonlocal_->identifier_));
+    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 = $$->*
 
         statements = $$->*

-            $E($ CYAssign(unique, $ CYObject()))->*
-            $ cy::Syntax::Try(statements, $ cy::Syntax::Catch(cye->name_, $$->*
-                $ CYIf($ CYIdentical($M(cye, $S("$cyk")), unique), $$->*
-                    $ CYReturn($M(cye, $S("$cyv"))))->*
-                $ cy::Syntax::Throw(cye)
-            ), NULL);
+            declare->*
+            $ cy::Syntax::Try(statements, rescue, NULL);

     }
 }
 
 CYIdentifier *CYContext::Unique() {
     }
 }
 
 CYIdentifier *CYContext::Unique() {

-    CYContext &context(*this);
-    return $ CYIdentifier(apr_psprintf(pool_, "$cy%u", unique_++));
+    return $ CYIdentifier(apr_psprintf($pool, "$cy%u", unique_++));

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


@@ -204,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)


@@ -333,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_
         ))
     );


@@ -352,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)
         ))
     )));


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

-    CYScope scope;
-    scope.parent_ = context.scope_;
-    context.scope_ = &scope;
+    CYScope scope(CYScopeFunction, context, code_.statements_);
+
+    CYNonLocal *nonlocal(context.nonlocal_);
+    CYNonLocal *nextlocal(context.nextlocal_);

 
     bool localize;
 
     bool localize;

-    if (nonlocal_ != NULL)
+    if (nonlocal_ != NULL) {

         localize = false;
         localize = false;

-    else {
+        context.nonlocal_ = nonlocal_;
+    } else {

         localize = true;
         nonlocal_ = $ CYNonLocal();
         localize = true;
         nonlocal_ = $ CYNonLocal();

+        context.nextlocal_ = nonlocal_;

     }
 
     }
 

-    CYNonLocal *nonlocal(context.nonlocal_);
-    context.nonlocal_ = nonlocal_;
-

     if (!outer && name_ != NULL)
         Inject(context);
 
     if (parameters_ != NULL)
         parameters_ = parameters_->Replace(context, code_);
     if (!outer && name_ != NULL)
         Inject(context);
 
     if (parameters_ != NULL)
         parameters_ = parameters_->Replace(context, code_);

+

     code_.Replace(context);
 
     if (localize)
         context.NonLocal(code_.statements_);
     code_.Replace(context);
 
     if (localize)
         context.NonLocal(code_.statements_);

+
+    context.nextlocal_ = nextlocal;

     context.nonlocal_ = nonlocal;
 
     context.nonlocal_ = nonlocal;
 

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

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


@@ -408,7 +423,7 @@ CYExpression *CYFunctionExpression::Replace(CYContext &context) {
 }
 
 CYFunctionParameter *CYFunctionParameter::Replace(CYContext &context, CYBlock &code) {
 }
 
 CYFunctionParameter *CYFunctionParameter::Replace(CYContext &context, CYBlock &code) {

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

     context.scope_->Declare(context, name_, CYIdentifierArgument);
     if (next_ != NULL)
         next_ = next_->Replace(context, code);
     context.scope_->Declare(context, name_, CYIdentifierArgument);
     if (next_ != NULL)
         next_ = next_->Replace(context, code);


@@ -472,7 +487,10 @@ void CYMember::Replace_(CYContext &context) {
     context.Replace(property_);
 }
 
     context.Replace(property_);
 }
 

-CYExpression *CYNew::AddArgument(CYContext &context, CYExpression *value) {
+namespace cy {
+namespace Syntax {
+
+CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {

     CYArgument **argument(&arguments_);
     while (*argument != NULL)
         argument = &(*argument)->next_;
     CYArgument **argument(&arguments_);
     while (*argument != NULL)
         argument = &(*argument)->next_;


@@ -480,12 +498,14 @@ CYExpression *CYNew::AddArgument(CYContext &context, CYExpression *value) {
     return this;
 }
 
     return this;
 }
 

-CYExpression *CYNew::Replace(CYContext &context) {
+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);
 }


@@ -500,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) {


@@ -511,8 +531,9 @@ CYExpression *CYObject::Replace(CYContext &context) {
 CYFunctionParameter *CYOptionalFunctionParameter::Replace(CYContext &context, CYBlock &code) {
     CYFunctionParameter *parameter($ CYFunctionParameter(name_, next_));
     parameter = parameter->Replace(context, code);
 CYFunctionParameter *CYOptionalFunctionParameter::Replace(CYContext &context, CYBlock &code) {
     CYFunctionParameter *parameter($ CYFunctionParameter(name_, next_));
     parameter = parameter->Replace(context, code);

+    context.Replace(initializer_);

 
 

-    CYVariable *name($ CYVariable(name_));
+    CYVariable *name($V(name_));

     code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(name), $S("undefined")), $$->*
         $E($ CYAssign(name, initializer_))
     ));
     code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(name), $S("undefined")), $$->*
         $E($ CYAssign(name, initializer_))
     ));


@@ -549,16 +570,13 @@ namespace {
 }
 
 void CYProgram::Replace(CYContext &context) {
 }
 
 void CYProgram::Replace(CYContext &context) {

-    CYScope scope;
-    scope.parent_ = context.scope_;
-    context.scope_ = &scope;
+    CYScope scope(CYScopeProgram, context, statements_);

 
 

-    context.nonlocal_ = $ CYNonLocal();
+    context.nextlocal_ = $ CYNonLocal();

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

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

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


@@ -579,7 +597,7 @@ void CYProgram::Replace(CYContext &context) {
         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';


@@ -598,7 +616,7 @@ 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
         }
 


@@ -616,7 +634,7 @@ CYStatement *CYReturn::Replace(CYContext &context) {
     if (context.nonlocal_ != NULL) {
         CYProperty *value(value_ == NULL ? NULL : $ CYProperty($S("$cyv"), value_));
         return $ cy::Syntax::Throw($ CYObject(
     if (context.nonlocal_ != NULL) {
         CYProperty *value(value_ == NULL ? NULL : $ CYProperty($S("$cyv"), value_));
         return $ cy::Syntax::Throw($ CYObject(

-            $ CYProperty($S("$cyk"), $ CYVariable(context.nonlocal_->Target(context)), value)
+            $ CYProperty($S("$cyk"), $V(context.nonlocal_->Target(context)), value)

         ));
     }
 
         ));
     }
 


@@ -631,12 +649,29 @@ CYExpression *CYRubyBlock::Replace(CYContext &context) {
 
 CYExpression *CYRubyProc::Replace(CYContext &context) {
     CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
 
 CYExpression *CYRubyProc::Replace(CYContext &context) {
     CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));

-    function->nonlocal_ = context.nonlocal_;
+    function->nonlocal_ = context.nextlocal_;

     return function;
 }
 
     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) {


@@ -750,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';


@@ -815,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;
 }