Use correct variable to verify thread state access.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index d508db0e252b2dd15aea7a9f6c13ce781968cdfd..acf4d51527d63eb5910656c228e46b20cdfcd899 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */
@@ -85,7 +85,7 @@ CYExpression *CYArray::Replace(CYContext &context) {
 CYExpression *CYArrayComprehension::Replace(CYContext &context) {
     CYVariable *cyv($V("$cyv"));
 
-    return $C0($F(NULL, $P1("$cyv", comprehensions_->Parameters(context)), $$->*
+    return $C0($F(NULL, $P1($L("$cyv"), comprehensions_->Parameters(context)), $$->*
         $E($ CYAssign(cyv, $ CYArray()))->*
         comprehensions_->Replace(context, $E($C1($M(cyv, $S("push")), expression_)))->*
         $ CYReturn(cyv)
@@ -155,6 +155,15 @@ CYExpression *CYCompound::Replace(CYContext &context) {
     return this;
 }
 
+CYExpression *CYCompound::Primitive(CYContext &context) {
+    CYExpression *expression(expressions_);
+    if (expression == NULL)
+        return NULL;
+    while (expression->next_ != NULL)
+        expression = expression->next_;
+    return expression->Primitive(context);
+}
+
 CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
     CYFunctionParameter *next(next_->Parameters(context));
     if (CYFunctionParameter *parameter = Parameter(context)) {
@@ -183,7 +192,7 @@ void CYContext::NonLocal(CYStatement *&statements) {
         CYIdentifier *unique(nextlocal_->identifier_->Replace(context));
 
         CYStatement *declare(
-            $ CYVar($L1($L(unique, $ CYObject()))));
+            $ CYVar($L1($ CYDeclaration(unique, $ CYObject()))));
 
         cy::Syntax::Catch *rescue(
             $ cy::Syntax::Catch(cye, $$->*
@@ -208,6 +217,10 @@ CYStatement *CYContinue::Replace(CYContext &context) {
     return this;
 }
 
+CYStatement *CYDebugger::Replace(CYContext &context) {
+    return this;
+}
+
 CYAssignment *CYDeclaration::Assignment(CYContext &context) {
     if (initialiser_ == NULL)
         return NULL;
@@ -222,7 +235,7 @@ CYVariable *CYDeclaration::Variable(CYContext &context) {
 }
 
 CYStatement *CYDeclaration::ForEachIn(CYContext &context, CYExpression *value) {
-    return $ CYVar($L1($L(identifier_, value)));
+    return $ CYVar($L1($ CYDeclaration(identifier_, value)));
 }
 
 CYExpression *CYDeclaration::Replace(CYContext &context) {
@@ -241,7 +254,7 @@ CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
 }
 
 CYFunctionParameter *CYDeclarations::Parameter(CYContext &context) { $T(NULL)
-    return $ CYFunctionParameter(declaration_->identifier_, next_->Parameter(context));
+    return $ CYFunctionParameter($ CYDeclaration(declaration_->identifier_), next_->Parameter(context));
 }
 
 CYArgument *CYDeclarations::Argument(CYContext &context) { $T(NULL)
@@ -317,6 +330,12 @@ CYString *CYFalse::String(CYContext &context) {
     return $S("false");
 }
 
+CYExpression *CYFatArrow::Replace(CYContext &context) {
+    CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
+    function->this_.SetNext(context.this_);
+    return function;
+}
+
 void CYFinally::Replace(CYContext &context) { $T()
     code_.Replace(context);
 }
@@ -349,17 +368,23 @@ CYStatement *CYForIn::Replace(CYContext &context) {
 }
 
 CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
-    return $ CYFunctionParameter(name_);
+    return $ CYFunctionParameter($ CYDeclaration(name_));
 }
 
 CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *statement) const {
     return $ CYForIn($V(name_), set_, CYComprehension::Replace(context, statement));
 }
 
-CYStatement *CYForEachIn::Replace(CYContext &context) {
+CYStatement *CYForOf::Replace(CYContext &context) {
+    if (CYAssignment *assignment = initialiser_->Assignment(context))
+        return $ CYBlock($$->*
+            $E(assignment)->*
+            this
+        );
+
     CYIdentifier *cys($I("$cys")), *cyt($I("$cyt"));
 
-    return $ CYLet($L2($L(cys, set_), $L(cyt)), $$->*
+    return $ CYLetStatement($L2($ CYDeclaration(cys, set_), $ CYDeclaration(cyt)), $$->*
         $ CYForIn($V(cyt), $V(cys), $ CYBlock($$->*
             initialiser_->ForEachIn(context, $M($V(cys), $V(cyt)))->*
             code_
@@ -367,14 +392,14 @@ CYStatement *CYForEachIn::Replace(CYContext &context) {
     );
 }
 
-CYFunctionParameter *CYForEachInComprehension::Parameter(CYContext &context) const {
-    return $ CYFunctionParameter(name_);
+CYFunctionParameter *CYForOfComprehension::Parameter(CYContext &context) const {
+    return $ CYFunctionParameter($ CYDeclaration(name_));
 }
 
-CYStatement *CYForEachInComprehension::Replace(CYContext &context, CYStatement *statement) const {
+CYStatement *CYForOfComprehension::Replace(CYContext &context, CYStatement *statement) const {
     CYIdentifier *cys($I("cys"));
 
-    return $E($C0($F(NULL, $P1("$cys"), $$->*
+    return $E($C0($F(NULL, $P1($L("$cys")), $$->*
         $E($ CYAssign($V(cys), set_))->*
         $ CYForIn($V(name_), $V(cys), $ CYBlock($$->*
             $E($ CYAssign($V(name_), $M($V(cys), $V(name_))))->*
@@ -392,6 +417,9 @@ void CYFunction::Replace_(CYContext &context, bool outer) {
     if (outer)
         Inject(context);
 
+    CYThisScope *_this(context.this_);
+    context.this_ = CYGetLast(&this_);
+
     CYNonLocal *nonlocal(context.nonlocal_);
     CYNonLocal *nextlocal(context.nextlocal_);
 
@@ -410,17 +438,22 @@ void CYFunction::Replace_(CYContext &context, bool outer) {
     if (!outer && name_ != NULL)
         Inject(context);
 
-    if (parameters_ != NULL)
-        parameters_ = parameters_->Replace(context, code_);
-
+    parameters_->Replace(context, code_);
     code_.Replace(context);
 
+    if (CYIdentifier *identifier = this_.identifier_)
+        code_.statements_ = $$->*
+            $ CYVar($L1($ CYDeclaration(identifier, $ CYThis())))->*
+            code_.statements_;
+
     if (localize)
         context.NonLocal(code_.statements_);
 
     context.nextlocal_ = nextlocal;
     context.nonlocal_ = nonlocal;
 
+    context.this_ = _this;
+
     scope.Close();
 }
 
@@ -429,12 +462,17 @@ CYExpression *CYFunctionExpression::Replace(CYContext &context) {
     return this;
 }
 
-CYFunctionParameter *CYFunctionParameter::Replace(CYContext &context, CYBlock &code) {
-    context.Replace(name_);
-    context.scope_->Declare(context, name_, CYIdentifierArgument);
-    if (next_ != NULL)
-        next_ = next_->Replace(context, code);
-    return this;
+void CYFunctionParameter::Replace(CYContext &context, CYBlock &code) { $T()
+    CYAssignment *assignment(initialiser_->Assignment(context));
+    context.Replace(initialiser_);
+
+    next_->Replace(context, code);
+
+    if (assignment != NULL)
+        // XXX: this cast is quite incorrect
+        code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(dynamic_cast<CYExpression *>(initialiser_)), $S("undefined")), $$->*
+            $E(assignment)
+        ));
 }
 
 CYStatement *CYFunctionStatement::Replace(CYContext &context) {
@@ -483,7 +521,7 @@ CYStatement *CYLabel::Replace(CYContext &context) {
     return this;
 }
 
-CYStatement *CYLet::Replace(CYContext &context) {
+CYStatement *CYLetStatement::Replace(CYContext &context) {
     return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
 }
 
@@ -491,7 +529,7 @@ namespace cy {
 namespace Syntax {
 
 CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
-    CYSetLast(arguments_, $ CYArgument(value));
+    CYSetLast(arguments_) = $ CYArgument(value);
     return this;
 }
 
@@ -525,19 +563,6 @@ CYExpression *CYObject::Replace(CYContext &context) {
     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;
@@ -797,6 +822,8 @@ CYStatement *CYSwitch::Replace(CYContext &context) {
 }
 
 CYExpression *CYThis::Replace(CYContext &context) {
+    if (context.this_ != NULL)
+        return $V(context.this_->Identifier(context));
     return this;
 }