Added support for unsigned integers by setting an integer property's …

…minimum value to '0' in the Xcode modeler.
rentzsch · Jun 26, 2014 · e70cab5 · e70cab5
1 parent 67f9860
commit e70cab5
Showing 1 changed file with 41 additions and 3 deletions.
diff --git a/mogenerator.m b/mogenerator.m
@@ -342,6 +342,17 @@ - (NSArray*)prettyFetchRequests {
 @end
 
 @implementation NSAttributeDescription (typing)
+- (BOOL)isUnsigned
+{
+    BOOL hasMin = NO;
+    for (NSPredicate *pred in [self validationPredicates]) {
+        if ([pred.predicateFormat containsString:@">= 0"]) {
+            hasMin = YES;
+        }
+    }
+    return hasMin;
+}
+
 - (BOOL)hasScalarAttributeType {
     switch ([self attributeType]) {
         case NSInteger16AttributeType:
@@ -357,20 +368,23 @@ - (BOOL)hasScalarAttributeType {
     }
 }
 - (NSString*)scalarAttributeType {
+
+    BOOL isUnsigned = [self isUnsigned];
+
     NSString *attributeValueScalarType = [[self userInfo] objectForKey:kAttributeValueScalarTypeKey];
 
     if (attributeValueScalarType) {
         return attributeValueScalarType;
     } else {
         switch ([self attributeType]) {
             case NSInteger16AttributeType:
-                return gSwift ? @"Int16" : @"int16_t";
+                return gSwift ? isUnsigned ? @"UInt16" : @"Int16" : isUnsigned ? @"uint16_t" : @"int16_t";
                 break;
             case NSInteger32AttributeType:
-                return gSwift ? @"Int32" : @"int32_t";
+                return gSwift ? isUnsigned ? @"UInt32" : @"Int32" : isUnsigned ? @"uint32_t" : @"int32_t";
                 break;
             case NSInteger64AttributeType:
-                return gSwift ? @"Int64" : @"int64_t";
+                return gSwift ? isUnsigned ? @"UInt64" : @"Int64" : isUnsigned ? @"uint64_t" : @"int64_t";
                 break;
             case NSDoubleAttributeType:
                 return gSwift ? @"Double" : @"double";
@@ -387,14 +401,26 @@ - (NSString*)scalarAttributeType {
     }
 }
 - (NSString*)scalarAccessorMethodName {
+
+    BOOL isUnsigned = [self isUnsigned];
+
     switch ([self attributeType]) {
         case NSInteger16AttributeType:
+            if (isUnsigned) {
+                return @"unsignedShortValue";
+            }
             return @"shortValue";
             break;
         case NSInteger32AttributeType:
+            if (isUnsigned) {
+                return @"unsignedIntValue";
+            }
             return @"intValue";
             break;
         case NSInteger64AttributeType:
+            if (isUnsigned) {
+                return @"unsignedLongLongValue";
+            }
             return @"longLongValue";
             break;
         case NSDoubleAttributeType:
@@ -411,14 +437,26 @@ - (NSString*)scalarAccessorMethodName {
     }
 }
 - (NSString*)scalarFactoryMethodName {
+
+    BOOL isUnsigned = [self isUnsigned];
+
     switch ([self attributeType]) {
         case NSInteger16AttributeType:
+            if (isUnsigned) {
+                return @"numberWithUnsignedShort:";
+            }
             return @"numberWithShort:";
             break;
         case NSInteger32AttributeType:
+            if (isUnsigned) {
+                return @"numberWithUnsignedInt:";
+            }
             return @"numberWithInt:";
             break;
         case NSInteger64AttributeType:
+            if (isUnsigned) {
+                return @"numberWithUnsignedLongLong:";
+            }
             return @"numberWithLongLong:";
             break;
         case NSDoubleAttributeType: