Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a nondestructive -attributeTypeName property to attributes #86

Merged
merged 4 commits into from
Jan 7, 2012
Merged

Adds a nondestructive -attributeTypeName property to attributes #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01e5043
Adds -attributeTypeName to attributes.
robrix Jan 7, 2012
fd2b556
Adds scalar int*_t support.
robrix Jan 7, 2012
161fba5
The default template uses the new attr methods.
robrix Jan 7, 2012
3f8512b
Uses the correct keys for the NSNumber messages.
robrix Jan 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mogenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@
@interface NSAttributeDescription (scalarAttributeType)
- (BOOL)hasScalarAttributeType;
- (NSString*)scalarAttributeType;
- (NSString*)scalarAttributeTypeName;
- (NSString*)scalarAccessorMethodName;
- (NSString*)scalarFactoryMethodName;
- (BOOL)hasDefinedAttributeType;
- (NSString*)objectAttributeType;
- (NSString*)attributeTypeName;
- (BOOL)hasTransformableAttributeType;
@end

Expand Down
78 changes: 78 additions & 0 deletions mogenerator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,78 @@ - (NSString*)scalarAttributeType {
return nil;
}
}
- (NSString*)scalarAttributeTypeName {
switch ([self attributeType]) {
case NSInteger16AttributeType:
return @"int16_t";
break;
case NSInteger32AttributeType:
return @"int32_t";
break;
case NSInteger64AttributeType:
return @"int64_t";
break;
case NSDoubleAttributeType:
return @"double";
break;
case NSFloatAttributeType:
return @"float";
break;
case NSBooleanAttributeType:
return @"BOOL";
break;
default:
return nil;
}
}
- (NSString*)scalarAccessorMethodName {
switch ([self attributeType]) {
case NSInteger16AttributeType:
return @"shortValue";
break;
case NSInteger32AttributeType:
return @"intValue";
break;
case NSInteger64AttributeType:
return @"longLongValue";
break;
case NSDoubleAttributeType:
return @"doubleValue";
break;
case NSFloatAttributeType:
return @"floatValue";
break;
case NSBooleanAttributeType:
return @"boolValue";
break;
default:
return nil;
}
}
- (NSString*)scalarFactoryMethodName {
switch ([self attributeType]) {
case NSInteger16AttributeType:
return @"numberWithShortValue:";
break;
case NSInteger32AttributeType:
return @"numberWithIntValue:";
break;
case NSInteger64AttributeType:
return @"numberWithLongLongValue:";
break;
case NSDoubleAttributeType:
return @"numberWithDoubleValue:";
break;
case NSFloatAttributeType:
return @"numberWithFloatValue:";
break;
case NSBooleanAttributeType:
return @"numberWithBoolValue:";
break;
default:
return nil;
}
}
- (BOOL)hasDefinedAttributeType {
return [self attributeType] != NSUndefinedAttributeType;
}
Expand All @@ -259,6 +331,12 @@ - (NSString*)objectAttributeType {
return [self attributeValueClassName];
}
}
- (NSString*)attributeTypeName {
return
[[self userInfo] objectForKey:@"attributeValueTypeName"]
?: [self scalarAttributeTypeName]
?: [[self objectAttributeType] stringByAppendingString:@"*"];
}

- (BOOL)hasTransformableAttributeType {
return ([self attributeType] == NSTransformableAttributeType);
Expand Down
18 changes: 9 additions & 9 deletions templates/machine.h.motemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ extern const struct <$managedObjectClassName$>FetchedProperties {<$foreach Fetch
<$foreach Attribute noninheritedAttributes do$>
<$if Attribute.hasDefinedAttributeType$>
<$if TemplateVar.arc$>
@property (nonatomic, strong) <$Attribute.objectAttributeType$> *<$Attribute.name$>;
@property (nonatomic, strong) <$Attribute.attributeTypeName$> <$Attribute.name$>;
<$else$>
@property (nonatomic, retain) <$Attribute.objectAttributeType$> *<$Attribute.name$>;
@property (nonatomic, retain) <$Attribute.attributeTypeName$> <$Attribute.name$>;
<$endif$>
<$if Attribute.hasScalarAttributeType$>
@property <$Attribute.scalarAttributeType$> <$Attribute.name$>Value;
- (<$Attribute.scalarAttributeType$>)<$Attribute.name$>Value;
- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_;
@property <$Attribute.attributeTypeName$> <$Attribute.name$>Value;
- (<$Attribute.attributeTypeName$>)<$Attribute.name$>Value;
- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_;
<$endif$>
//- (BOOL)validate<$Attribute.name.initialCapitalString$>:(id*)value_ error:(NSError**)error_;
<$endif$>
Expand Down Expand Up @@ -87,11 +87,11 @@ extern const struct <$managedObjectClassName$>FetchedProperties {<$foreach Fetch
@interface _<$managedObjectClassName$> (CoreDataGeneratedPrimitiveAccessors)
<$foreach Attribute noninheritedAttributes do$>
<$if Attribute.hasDefinedAttributeType$>
- (<$Attribute.objectAttributeType$>*)primitive<$Attribute.name.initialCapitalString$>;
- (void)setPrimitive<$Attribute.name.initialCapitalString$>:(<$Attribute.objectAttributeType$>*)value;
- (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>;
- (void)setPrimitive<$Attribute.name.initialCapitalString$>:(<$Attribute.attributeTypeName$>)value;
<$if Attribute.hasScalarAttributeType$>
- (<$Attribute.scalarAttributeType$>)primitive<$Attribute.name.initialCapitalString$>Value;
- (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_;
- (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>Value;
- (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_;
<$endif$>
<$endif$>
<$endforeach do$>
Expand Down
14 changes: 7 additions & 7 deletions templates/machine.m.motemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@ const struct <$managedObjectClassName$>FetchedProperties <$managedObjectClassNam

<$if Attribute.hasScalarAttributeType$>

- (<$Attribute.scalarAttributeType$>)<$Attribute.name$>Value {
- (<$Attribute.attributeTypeName$>)<$Attribute.name$>Value {
NSNumber *result = [self <$Attribute.name$>];
return [result <$Attribute.scalarAttributeType.camelCaseString$>Value];
return [result <$Attribute.scalarAccessorMethodName$>];
}

- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_ {
[self set<$Attribute.name.initialCapitalString$>:[NSNumber numberWith<$Attribute.scalarAttributeType.camelCaseString.initialCapitalString$>:value_]];
- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_ {
[self set<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarFactoryMethodName$>value_]];
}

- (<$Attribute.scalarAttributeType$>)primitive<$Attribute.name.initialCapitalString$>Value {
- (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>Value {
NSNumber *result = [self primitive<$Attribute.name.initialCapitalString$>];
return [result <$Attribute.scalarAttributeType.camelCaseString$>Value];
return [result <$Attribute.scalarAccessorMethodName$>];
}

- (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_ {
[self setPrimitive<$Attribute.name.initialCapitalString$>:[NSNumber numberWith<$Attribute.scalarAttributeType.camelCaseString.initialCapitalString$>:value_]];
[self setPrimitive<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarFactoryMethodName$>value_]];
}
<$endif$>
<$endif$>
Expand Down