Update OCMock to 3e193f3c2d4ea4ada63df54c8ce98e7ea4cf768f

third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m

Index: third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
diff --git a/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m b/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
old mode 100644
new mode 100755
index a69bb143b695281f2069f8d69a1423241168fed8..9d217aca312523d003ac6279140c871c43319361
--- a/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
+++ b/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
@@ -1,19 +1,153 @@
-//---------------------------------------------------------------------------------------
-//  $Id$
-//  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
+/*
+ *  Copyright (c) 2009-2015 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
 
 #import "NSMethodSignature+OCMAdditions.h"
+#import "OCMFunctionsPrivate.h"
+#import <objc/runtime.h>
 
 
 @implementation NSMethodSignature(OCMAdditions)
 
-- (const char *)methodReturnTypeWithoutQualifiers
++ (NSMethodSignature *)signatureOfGetterForDynamicProperty:(NSString *)propertyName inClass:(Class)aClass
 {
-	const char *returnType = [self methodReturnType];
-	while(strchr("rnNoORV", returnType[0]) != NULL)
-		returnType += 1;
-	return returnType;
+    objc_property_t property = class_getProperty(aClass, [propertyName cStringUsingEncoding:NSASCIIStringEncoding]);
+    if(property == NULL)
+        return nil;
+
+    const char *propertyAttributesString = property_getAttributes(property);
+    if(propertyAttributesString == NULL)
+        return nil;
+
+    NSArray *propertyAttributes = [[NSString stringWithCString:propertyAttributesString
+                                                      encoding:NSASCIIStringEncoding] componentsSeparatedByString:@","];
+    BOOL isDynamic = NO;
+    NSString *typeStr = nil;
+    for(NSString *attribute in propertyAttributes)
+    {
+        if([attribute isEqualToString:@"D"])
+        {
+            //property is @dynamic, but we can synthesize the signature
+            isDynamic = YES;
+        }
+        else if([attribute hasPrefix:@"T"])
+        {
+            typeStr = [attribute substringFromIndex:1];
+        }
+    }
+
+    if(!isDynamic)
+        return nil;
+
+    NSRange r = [typeStr rangeOfString:@"\""];
+    if(r.location != NSNotFound)
+    {
+        typeStr = [typeStr substringToIndex:r.location];
+    }
+    const char *str = [[NSString stringWithFormat:@"%@@:", typeStr] cStringUsingEncoding:NSASCIIStringEncoding];
+    return [NSMethodSignature signatureWithObjCTypes:str];
+}
+
+
+struct OCMBlockDef
+{
+    void *isa; // initialized to &_NSConcreteStackBlock or &_NSConcreteGlobalBlock
+    int flags;
+    int reserved;
+    void (*invoke)(void *, ...);
+    struct block_descriptor {
+        unsigned long int reserved;                 // NULL
+        unsigned long int size;                     // sizeof(struct Block_literal_1)
+        // optional helper functions
+        void (*copy_helper)(void *dst, void *src);  // IFF (1<<25)
+        void (*dispose_helper)(void *src);          // IFF (1<<25)
+        // required ABI.2010.3.16
+        const char *signature;                      // IFF (1<<30)
+    } *descriptor;
+};
+
+enum
+{
+    OCMBlockDescriptionFlagsHasCopyDispose = (1 << 25),
+    OCMBlockDescriptionFlagsHasSignature   = (1 << 30)
+};
+
+
++ (NSMethodSignature *)signatureForBlock:(id)block
+{
+    /* For a more complete implementation of parsing the block data structure see:
+     *
+     * https://github.com/ebf/CTObjectiveCRuntimeAdditions/tree/master/CTObjectiveCRuntimeAdditions/CTObjectiveCRuntimeAdditions
+     */
+
+    struct OCMBlockDef *blockRef = (__bridge struct OCMBlockDef *)block;
+
+    if(!(blockRef->flags & OCMBlockDescriptionFlagsHasSignature))
+        return nil;
+
+    void *signatureLocation = blockRef->descriptor;
+    signatureLocation += sizeof(unsigned long int);
+    signatureLocation += sizeof(unsigned long int);
+    if(blockRef->flags & OCMBlockDescriptionFlagsHasCopyDispose)
+    {
+        signatureLocation += sizeof(void(*)(void *dst, void *src));
+        signatureLocation += sizeof(void (*)(void *src));
+    }
+
+    const char *signature = (*(const char **)signatureLocation);
+    return [NSMethodSignature signatureWithObjCTypes:signature];
+}
+
+
+- (BOOL)usesSpecialStructureReturn
+{
+    const char *types = OCMTypeWithoutQualifiers([self methodReturnType]);
+
+    if((types == NULL) || (types[0] != '{'))
+        return NO;
+
+    /* In some cases structures are returned by ref. The rules are complex and depend on the
+       architecture, see:
+
+       http://sealiesoftware.com/blog/archive/2008/10/30/objc_explain_objc_msgSend_stret.html
+       http://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/LowLevelABI/000-Introduction/introduction.html
+       https://github.com/atgreen/libffi/blob/master/src/x86/ffi64.c
+       http://www.uclibc.org/docs/psABI-x86_64.pdf
+       http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042e/IHI0042E_aapcs.pdf
+
+       NSMethodSignature knows the details but has no API to return it, though it is in
+       the debugDescription. Horribly kludgy.
+    */
+    NSRange range = [[self debugDescription] rangeOfString:@"is special struct return? YES"];
+    return range.length > 0;
+}
+
+
+- (NSString *)fullTypeString
+{
+    NSMutableString *typeString = [NSMutableString string];
+    [typeString appendFormat:@"%s", [self methodReturnType]];
+    for (NSUInteger i=0; i<[self numberOfArguments]; i++)
+        [typeString appendFormat:@"%s", [self getArgumentTypeAtIndex:i]];
+    return typeString;
+}
+
+
+- (const char *)fullObjCTypes
+{
+    return [[self fullTypeString] UTF8String];
 }
 
 @end