X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/d5618df7c804163dceb3eb48e5406aeb9de79c96..f6fa3c2112ee8b0aa26ab0765674601a9800db77:/Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index 9040f1a..b658cf7 100644
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
@@ -32,19 +32,16 @@ CYFunctionExpression *CYNonLocalize(CYContext &context, CYFunctionExpression *fu
 CYExpression *CYAdd::Replace(CYContext &context) {
     CYInfix::Replace(context);
 
-    CYExpression *lhp(lhs_->Primitive(context));
-    CYExpression *rhp(rhs_->Primitive(context));
-
-    CYString *lhs(dynamic_cast<CYString *>(lhp));
-    CYString *rhs(dynamic_cast<CYString *>(rhp));
+    CYString *lhs(dynamic_cast<CYString *>(lhs_));
+    CYString *rhs(dynamic_cast<CYString *>(rhs_));
 
     if (lhs != NULL || rhs != NULL) {
         if (lhs == NULL) {
-            lhs = lhp->String(context);
+            lhs = lhs_->String(context);
             if (lhs == NULL)
                 return this;
         } else if (rhs == NULL) {
-            rhs = rhp->String(context);
+            rhs = rhs_->String(context);
             if (rhs == NULL)
                 return this;
         }
@@ -52,8 +49,8 @@ CYExpression *CYAdd::Replace(CYContext &context) {
         return lhs->Concat(context, rhs);
     }
 
-    if (CYNumber *lhn = lhp->Number(context))
-        if (CYNumber *rhn = rhp->Number(context))
+    if (CYNumber *lhn = lhs_->Number(context))
+        if (CYNumber *rhn = rhs_->Number(context))
             return $D(lhn->Value() + rhn->Value());
 
     return this;
@@ -149,12 +146,29 @@ CYStatement *CYComment::Replace(CYContext &context) {
 }
 
 CYExpression *CYCompound::Replace(CYContext &context) {
-    context.ReplaceAll(expressions_);
-    if (expressions_ == NULL)
-        return NULL;
+    if (next_ == NULL)
+        return expression_;
+
+    context.Replace(expression_);
+    context.Replace(next_);
+
+    if (CYCompound *compound = dynamic_cast<CYCompound *>(expression_)) {
+        expression_ = compound->expression_;
+        compound->expression_ = compound->next_;
+        compound->next_ = next_;
+        next_ = compound;
+    }
+
     return this;
 }
 
+CYExpression *CYCompound::Primitive(CYContext &context) {
+    CYExpression *expression(expression_);
+    if (expression == NULL || next_ != NULL)
+        return NULL;
+    return expression->Primitive(context);
+}
+
 CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
     CYFunctionParameter *next(next_->Parameters(context));
     if (CYFunctionParameter *parameter = Parameter(context)) {
@@ -201,7 +215,7 @@ void CYContext::NonLocal(CYStatement *&statements) {
 }
 
 CYIdentifier *CYContext::Unique() {
-    return $ CYIdentifier(apr_psprintf($pool, "$cy%u", unique_++));
+    return $ CYIdentifier($pool.strcat("$cy", $pool.itoa(unique_++), NULL));
 }
 
 CYStatement *CYContinue::Replace(CYContext &context) {
@@ -253,9 +267,9 @@ CYArgument *CYDeclarations::Argument(CYContext &context) { $T(NULL)
 }
 
 CYCompound *CYDeclarations::Compound(CYContext &context) { $T(NULL)
-    CYCompound *compound(next_->Compound(context) ?: $ CYCompound());
+    CYCompound *compound(next_->Compound(context));
     if (CYAssignment *assignment = declaration_->Assignment(context))
-        compound->AddPrev(assignment);
+        compound = $ CYCompound(assignment, compound);
     return compound;
 }
 
@@ -280,13 +294,13 @@ CYStatement *CYEmpty::Replace(CYContext &context) {
     return NULL;
 }
 
+CYExpression *CYEncodedType::Replace(CYContext &context) {
+    return typed_->Replace(context);
+}
+
 CYStatement *CYExpress::Replace(CYContext &context) {
     while (CYExpress *express = dynamic_cast<CYExpress *>(next_)) {
-        CYCompound *compound(dynamic_cast<CYCompound *>(express->expression_));
-        if (compound == NULL)
-            compound = $ CYCompound(express->expression_);
-        compound->AddPrev(expression_);
-        expression_ = compound;
+        expression_ = $ CYCompound(expression_, express->expression_);
         SetNext(express->next_);
     }
 
@@ -321,6 +335,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);
 }
@@ -402,6 +422,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_);
 
@@ -423,12 +446,19 @@ void CYFunction::Replace_(CYContext &context, bool outer) {
     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();
 }
 
@@ -496,15 +526,29 @@ CYStatement *CYLabel::Replace(CYContext &context) {
     return this;
 }
 
+CYExpression *CYLambda::Replace(CYContext &context) {
+    return $N2($V("Functor"), $ CYFunctionExpression(NULL, parameters_->Parameters(context), statements_), parameters_->TypeSignature(context, typed_->Replace(context)));
+}
+
 CYStatement *CYLetStatement::Replace(CYContext &context) {
     return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
 }
 
+CYExpression *CYMultiply::Replace(CYContext &context) {
+    CYInfix::Replace(context);
+
+    if (CYNumber *lhn = lhs_->Number(context))
+        if (CYNumber *rhn = rhs_->Number(context))
+            return $D(lhn->Value() * rhn->Value());
+
+    return this;
+}
+
 namespace cy {
 namespace Syntax {
 
 CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
-    CYSetLast(arguments_, $ CYArgument(value));
+    CYSetLast(arguments_) = $ CYArgument(value);
     return this;
 }
 
@@ -530,7 +574,7 @@ CYNumber *CYNumber::Number(CYContext &context) {
 
 CYString *CYNumber::String(CYContext &context) {
     // XXX: there is a precise algorithm for this
-    return $S(apr_psprintf($pool, "%.17g", Value()));
+    return $S($pool.sprintf(24, "%.17g", Value()));
 }
 
 CYExpression *CYObject::Replace(CYContext &context) {
@@ -594,7 +638,7 @@ void CYProgram::Replace(CYContext &context) {
         const char *name;
 
         if (context.options_.verbose_)
-            name = apr_psprintf($pool, "$%"APR_SIZE_T_FMT"", offset);
+            name = $pool.strcat("$", $pool.itoa(offset), NULL);
         else {
             char id[8];
             id[7] = '\0';
@@ -613,7 +657,7 @@ void CYProgram::Replace(CYContext &context) {
                 goto id;
             }
 
-            name = apr_pstrmemdup($pool, id + position, 7 - position);
+            name = $pool.strmemdup(id + position, 7 - position);
             // XXX: at some point, this could become a keyword
         }
 
@@ -797,6 +841,8 @@ CYStatement *CYSwitch::Replace(CYContext &context) {
 }
 
 CYExpression *CYThis::Replace(CYContext &context) {
+    if (context.this_ != NULL)
+        return $V(context.this_->Identifier(context));
     return this;
 }
 
@@ -834,9 +880,88 @@ CYStatement *Try::Replace(CYContext &context) {
 
 } }
 
+CYExpression *CYTypeArrayOf::Replace_(CYContext &context, CYExpression *type) {
+    return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("arrayOf")), $ CYArgument(size_)));
+}
+
+CYExpression *CYTypeBlockWith::Replace_(CYContext &context, CYExpression *type) {
+    return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("blockWith")), parameters_->Argument(context)));
+}
+
+CYExpression *CYTypeConstant::Replace_(CYContext &context, CYExpression *type) {
+    return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("constant"))));
+}
+
+CYStatement *CYTypeDefinition::Replace(CYContext &context) {
+    return $E($ CYAssign($V(typed_->identifier_), typed_->Replace(context)));
+}
+
+CYExpression *CYTypeError::Replace(CYContext &context) {
+    _assert(false);
+    return NULL;
+}
+
+CYExpression *CYTypeModifier::Replace(CYContext &context, CYExpression *type) { $T(type)
+    return Replace_(context, type);
+}
+
+CYExpression *CYTypeFunctionWith::Replace_(CYContext &context, CYExpression *type) {
+    return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("functionWith")), parameters_->Argument(context)));
+}
+
+CYExpression *CYTypeLong::Replace(CYContext &context) {
+    return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("long")));
+}
+
+CYExpression *CYTypePointerTo::Replace_(CYContext &context, CYExpression *type) {
+    return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("pointerTo"))));
+}
+
+CYExpression *CYTypeShort::Replace(CYContext &context) {
+    return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("short")));
+}
+
+CYExpression *CYTypeSigned::Replace(CYContext &context) {
+    return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("signed")));
+}
+
+CYExpression *CYTypeUnsigned::Replace(CYContext &context) {
+    return $ CYCall($ CYDirectMember(specifier_->Replace(context), $ CYString("unsigned")));
+}
+
+CYExpression *CYTypeVariable::Replace(CYContext &context) {
+    return $V(name_);
+}
+
+CYExpression *CYTypeVoid::Replace(CYContext &context) {
+    return $N1($V("Type"), $ CYString("v"));
+}
+
+CYExpression *CYTypeVolatile::Replace_(CYContext &context, CYExpression *type) {
+    return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("volatile"))));
+}
+
+CYExpression *CYTypedIdentifier::Replace(CYContext &context) {
+    return modifier_->Replace(context, specifier_->Replace(context));
+}
+
+CYArgument *CYTypedParameter::Argument(CYContext &context) { $T(NULL)
+    return $ CYArgument(typed_->Replace(context), next_->Argument(context));
+}
+
+CYFunctionParameter *CYTypedParameter::Parameters(CYContext &context) { $T(NULL)
+    return $ CYFunctionParameter($ CYDeclaration(typed_->identifier_ ?: context.Unique()), next_->Parameters(context));
+}
+
+CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *prefix) { $T(prefix)
+    return next_->TypeSignature(context, $ CYAdd(prefix, typed_->Replace(context)));
+}
+
 CYStatement *CYVar::Replace(CYContext &context) {
     declarations_->Replace(context);
-    return $E(declarations_->Compound(context));
+    if (CYCompound *compound = declarations_->Compound(context))
+        return $E(compound);
+    return $ CYEmpty();
 }
 
 CYExpression *CYVariable::Replace(CYContext &context) {