IMPLEMENT support of custom scalar types (/!\ swift not supported)

mogenerator.h

@@ -22,8 +22,10 @@
 - (BOOL)hasCustomClass;
 - (BOOL)hasSuperentity;
 - (BOOL)hasCustomSuperentity;
+- (BOOL)hasAdditionalHeaderFile;
 - (NSString*)customSuperentity;
 - (NSString*)forcedCustomBaseClass;
+- (NSString*)additionalHeaderFileName;
 - (void)_processPredicate:(NSPredicate*)predicate_ bindings:(NSMutableArray*)bindings_;
 - (NSArray*)prettyFetchRequests;
 @end

mogenerator.m

@@ -12,6 +12,9 @@
 NSString  *gCustomBaseClassForced;
 BOOL       gSwift;
 
+static NSString *const kAttributeValueScalarTypeKey = @"attributeValueScalarType";
+static NSString *const kAdditionalHeaderFileNameKey = @"additionalHeaderFileName";
+
 @interface NSEntityDescription (fetchedPropertiesAdditions)
 - (NSDictionary*)fetchedPropertiesByName;
 @end
@@ -130,6 +133,10 @@ - (BOOL)hasCustomSuperentity {
     }
 }
 
+- (BOOL)hasAdditionalHeaderFile {
+    return [[[self userInfo] allKeys] containsObject:kAdditionalHeaderFileNameKey];
+}
+
 - (NSString*)customSuperentity {
     NSString *forcedBaseClass = [self forcedCustomBaseClass];
     if (!forcedBaseClass) {
@@ -159,6 +166,11 @@ - (NSArray*)noninheritedAttributes {
         return [[[self attributesByName] allValues] sortedArrayUsingDescriptors:sortDescriptors];
     }
 }
+
+- (NSString*)additionalHeaderFileName {
+    return [[self userInfo] objectForKey:kAdditionalHeaderFileNameKey];
+}
+
 /** @TypeInfo NSAttributeDescription */
 - (NSArray*)noninheritedAttributesSansType {
     NSArray *attributeDescriptions = [self noninheritedAttributes];
@@ -345,27 +357,33 @@ - (BOOL)hasScalarAttributeType {
     }
 }
 - (NSString*)scalarAttributeType {
-    switch ([self attributeType]) {
-        case NSInteger16AttributeType:
-            return gSwift ? @"Int16" : @"int16_t";
-            break;
-        case NSInteger32AttributeType:
-            return gSwift ? @"Int32" : @"int32_t";
-            break;
-        case NSInteger64AttributeType:
-            return gSwift ? @"Int64" : @"int64_t";
-            break;
-        case NSDoubleAttributeType:
-            return gSwift ? @"Double" : @"double";
-            break;
-        case NSFloatAttributeType:
-            return gSwift ? @"Float" : @"float";
-            break;
-        case NSBooleanAttributeType:
-            return gSwift ? @"Bool" : @"BOOL";
-            break;
-        default:
-            return nil;
+    NSString *attributeValueScalarType = [[self userInfo] objectForKey:kAttributeValueScalarTypeKey];
+
+    if (attributeValueScalarType) {
+        return attributeValueScalarType;
+    } else {
+        switch ([self attributeType]) {
+            case NSInteger16AttributeType:
+                return gSwift ? @"Int16" : @"int16_t";
+                break;
+            case NSInteger32AttributeType:
+                return gSwift ? @"Int32" : @"int32_t";
+                break;
+            case NSInteger64AttributeType:
+                return gSwift ? @"Int64" : @"int64_t";
+                break;
+            case NSDoubleAttributeType:
+                return gSwift ? @"Double" : @"double";
+                break;
+            case NSFloatAttributeType:
+                return gSwift ? @"Float" : @"float";
+                break;
+            case NSBooleanAttributeType:
+                return gSwift ? @"Bool" : @"BOOL";
+                break;
+            default:
+                return nil;
+        }
     }
 }
 - (NSString*)scalarAccessorMethodName {

templates/machine.h.motemplate

@@ -5,6 +5,10 @@
 <$if hasCustomSuperentity$><$if hasSuperentity$>#import "<$customSuperentity$>.h"
 <$else$><$if hasCustomBaseCaseImport$>#import <$baseClassImport$><$else$>#import "<$customSuperentity$>.h"<$endif$><$endif$><$endif$>
 
+<$if hasAdditionalHeaderFile$>
+#import "<$additionalHeaderFileName$>"
+<$endif$>
+
 <$if noninheritedAttributes.@count > 0$>
 extern const struct <$managedObjectClassName$>Attributes {<$foreach Attribute noninheritedAttributes do$>
 	<$if TemplateVar.arc$>__unsafe_unretained<$endif$> NSString *<$Attribute.name$>;<$endforeach do$>