Fix Ruby Block arguments and make them lexicalish.

[cycript.git] / Replace.cpp

diff --git a/Replace.cpp b/Replace.cpp
index 65d8236459baebc6b08340752f01f2c87cba03e2..46dd8bbc7d166afeade80830d96d0d81578f2bed 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -390,11 +390,11 @@ CYTarget *CYExtend::Replace(CYContext &context) {
 }
 
 CYStatement *CYExternalDefinition::Replace(CYContext &context) {
-    return $E($ CYAssign($V(typed_->identifier_), $ CYExternalExpression(abi_, typed_)));
+    return $E($ CYAssign($V(name_), $ CYExternalExpression(abi_, type_, name_)));
 }
 
 CYTarget *CYExternalExpression::Replace(CYContext &context) {
-    return $C1(typed_->Replace(context), $C2($V("dlsym"), $V("RTLD_DEFAULT"), $S(typed_->identifier_->Word())));
+    return $C1(type_->Replace(context), $C2($V("dlsym"), $V("RTLD_DEFAULT"), name_->PropertyName(context)));
 }
 
 CYNumber *CYFalse::Number(CYContext &context) {
@@ -967,7 +967,10 @@ CYIdentifierFlags *CYScope::Declare(CYContext &context, CYIdentifier *identifier
     else if (existing->kind_ == CYIdentifierGlobal || existing->kind_ == CYIdentifierMagic)
         existing->kind_ = kind;
     else if (existing->kind_ == CYIdentifierLexical || kind == CYIdentifierLexical)
-        _assert(false); // XXX: throw new SyntaxError()
+        _assert(false);
+    else if (transparent_ && existing->kind_ == CYIdentifierArgument && kind == CYIdentifierVariable)
+        _assert(false);
+    // XXX: throw new SyntaxError() instead of these asserts
 
     return existing;
 }
@@ -1005,10 +1008,6 @@ void CYScope::Close(CYContext &context) {
     CYForEach (i, internal_) {
         _assert(i->identifier_->next_ == i->identifier_);
     switch (i->kind_) {
-        case CYIdentifierArgument: {
-            _assert(!transparent_);
-        } break;
-
         case CYIdentifierLexical: {
             if (!damaged_) {
                 CYIdentifier *replace(context.Unique());
@@ -1099,6 +1098,12 @@ CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
     return $S(value, size);
 }
 
+CYIdentifier *CYString::Identifier() const {
+    if (const char *word = Word())
+        return $ CYIdentifier(word);
+    return NULL;
+}
+
 CYNumber *CYString::Number(CYContext &context) {
     // XXX: there is a precise algorithm for this
     return NULL;
@@ -1124,14 +1129,13 @@ CYTarget *CYStructTail::Replace(CYContext &context) {
     CYList<CYElementValue> names;
 
     CYForEach (field, fields_) {
-        CYTypedIdentifier *typed(field->typed_);
-        types->*$ CYElementValue(typed->Replace(context));
+        types->*$ CYElementValue(field->type_->Replace(context));
 
         CYExpression *name;
-        if (typed->identifier_ == NULL)
+        if (field->name_ == NULL)
             name = NULL;
         else
-            name = $S(typed->identifier_->Word());
+            name = field->name_->PropertyName(context);
         names->*$ CYElementValue(name);
     }
 
@@ -1231,9 +1235,7 @@ CYTarget *CYTypeConstant::Replace_(CYContext &context, CYTarget *type) {
 }
 
 CYStatement *CYTypeDefinition::Replace(CYContext &context) {
-    CYIdentifier *identifier(typed_->identifier_);
-    typed_->identifier_ = NULL;
-    return $ CYLexical(false, $B1($B(identifier, $ CYTypeExpression(typed_))));
+    return $ CYLexical(false, $B1($B(name_, $ CYTypeExpression(type_))));
 }
 
 CYTarget *CYTypeEnum::Replace(CYContext &context) {
@@ -1288,14 +1290,14 @@ CYTarget *CYTypePointerTo::Replace_(CYContext &context, CYTarget *type) {
 }
 
 CYTarget *CYTypeReference::Replace(CYContext &context) {
-    const char *suffix;
+    const char *prefix;
     switch (kind_) {
-        case CYTypeReferenceStruct: suffix = "$cys"; break;
-        case CYTypeReferenceEnum: suffix = "$cye"; break;
+        case CYTypeReferenceStruct: prefix = "$cys"; break;
+        case CYTypeReferenceEnum: prefix = "$cye"; break;
         default: _assert(false);
     }
 
-    return $V($pool.strcat(name_->Word(), suffix, NULL));
+    return $V($pool.strcat(prefix, name_->Word(), NULL));
 }
 
 CYTarget *CYTypeStruct::Replace(CYContext &context) {
@@ -1317,11 +1319,11 @@ CYTarget *CYTypeVolatile::Replace_(CYContext &context, CYTarget *type) {
     return next_->Replace(context, $ CYCall($ CYDirectMember(type, $ CYString("volatile"))));
 }
 
-CYTarget *CYTypedIdentifier::Replace(CYContext &context) {
+CYTarget *CYType::Replace(CYContext &context) {
     return modifier_->Replace(context, specifier_->Replace(context));
 }
 
-CYTypeFunctionWith *CYTypedIdentifier::Function() {
+CYTypeFunctionWith *CYType::Function() {
     CYTypeModifier *&modifier(CYGetLast(modifier_));
     if (modifier == NULL)
         return NULL;
@@ -1335,15 +1337,15 @@ CYTypeFunctionWith *CYTypedIdentifier::Function() {
 }
 
 CYArgument *CYTypedParameter::Argument(CYContext &context) { $T(NULL)
-    return $ CYArgument(typed_->Replace(context), next_->Argument(context));
+    return $ CYArgument(type_->Replace(context), next_->Argument(context));
 }
 
 CYFunctionParameter *CYTypedParameter::Parameters(CYContext &context) { $T(NULL)
-    return $ CYFunctionParameter($ CYBinding(typed_->identifier_ ?: context.Unique()), next_->Parameters(context));
+    return $ CYFunctionParameter($ CYBinding(name_ ?: context.Unique()), next_->Parameters(context));
 }
 
 CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *prefix) { $T(prefix)
-    return next_->TypeSignature(context, $ CYAdd(prefix, typed_->Replace(context)));
+    return next_->TypeSignature(context, $ CYAdd(prefix, type_->Replace(context)));
 }
 
 CYForInitializer *CYVar::Replace(CYContext &context) {