Use osx as the short tag for OS X instead of mac.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index 83a5c47328840c8238115c6908ac47563dafa51b..b658cf733e994a20b909eb5c75a48cf83483dede 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -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,18 +146,26 @@ 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(expressions_);
-    if (expression == NULL)
+    CYExpression *expression(expression_);
+    if (expression == NULL || next_ != NULL)
         return NULL;
-    while (expression->next_ != NULL)
-        expression = expression->next_;
     return expression->Primitive(context);
 }
 
@@ -262,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;
 }
 
@@ -295,11 +300,7 @@ CYExpression *CYEncodedType::Replace(CYContext &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_);
     }
 
@@ -533,6 +534,16 @@ 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 {
 
@@ -885,6 +896,11 @@ 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);
 }
@@ -893,16 +909,40 @@ CYExpression *CYTypeFunctionWith::Replace_(CYContext &context, CYExpression *typ
     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, type_);
+    return modifier_->Replace(context, specifier_->Replace(context));
 }
 
 CYArgument *CYTypedParameter::Argument(CYContext &context) { $T(NULL)
@@ -914,12 +954,14 @@ CYFunctionParameter *CYTypedParameter::Parameters(CYContext &context) { $T(NULL)
 }
 
 CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *prefix) { $T(prefix)
-    return next_->TypeSignature(context, $ CYAdd(prefix, typed_->type_->Replace(context)));
+    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) {