Modified enum paradigm

Author: kevklam

Templates/ObjC/Models/EnumType.h.tt

@@ -3,11 +3,13 @@
 <#@ include file="SharedObjC.template.tt"#>
 <#
 var entity = host.CurrentType.AsOdcmEnum();
+var typeName = GetObjCTypeIdentifier(entity);
+var valueTypeName = typeName + "Value";
 #>
 
 #include <Foundation/Foundation.h>
 
-typedef NS_ENUM(NSInteger, <#=GetObjCTypeIdentifier(entity)#>){
+typedef NS_ENUM(NSInteger, <#=valueTypeName#>){
 
 <#
 foreach(var member in entity.Members.OrderBy(x => x.Value))
@@ -17,12 +19,30 @@ foreach(var member in entity.Members.OrderBy(x => x.Value))
 <#
 }
 #>
-    <#=GetObjCTypeIdentifier(entity)#>EndOfEnum
+    <#=typeName#>EndOfEnum
 };
 
-@interface NSString (<#=GetObjCTypeIdentifier(entity)#>)
+@interface <#=typeName#> : NSObject
 
-+ (instancetype) stringWith<#=GetObjCTypeIdentifier(entity)#>:(<#=GetObjCTypeIdentifier(entity)#>)val;
-- (<#=GetObjCTypeIdentifier(entity)#>) to<#=GetObjCTypeIdentifier(entity)#>;
+<#
+foreach (var member in entity.Members.OrderBy(x => x.Value))
+{
+#>
++(<#=typeName#>*) <#=member.Name.ToUpperFirst()#>;
+<#
+}
+#>
+
++(<#=typeName#>*) <#=typeName.ToLowerFirst()#>WithEnumValue:(<#=valueTypeName#>)val;
+
+@property (nonatomic, readonly) <#=typeName#>Value enumValue;
+
+@end
+
+
+@interface NSString (<#=typeName#>)
+
++ (instancetype) stringWith<#=typeName#>:(<#=typeName#>*)val;
+- (<#=typeName#>*) to<#=typeName#>;
 
 @end

Templates/ObjC/Models/EnumType.m.tt

@@ -3,46 +3,88 @@
 <#@ include file="SharedObjC.template.tt"#>
 <#
 var entity = host.CurrentType.AsOdcmEnum();
+var typeName = GetObjCTypeIdentifier(entity);
+var valueTypeName = typeName + "Value";
 #>
 
-#include <<#=GetObjCTypeIdentifier(entity)#>.h>
+#include <<#=typeName#>.h>
 
-@implementation NSString (<#=GetObjCTypeIdentifier(entity)#>)
+@interface <#=typeName#> () {
+    <#=valueTypeName#> _enumValue;
+}
+
+@implementation <#=typeName#>
+
+<#
+/////////////////////////////////////////////////////////////////
+// Generate the static methods that look like [DayOfWeek Monday]
+/////////////////////////////////////////////////////////////////
+foreach (var member in entity.Members.OrderBy(x => x.Value))
+{
+#>
++(<#=typeName#>*) <#=member.Name.ToUpperFirst()#> {
+    static <#=typeName#> *_<#=member.Name.ToLowerFirst()#>
+    static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+	    _<#=member.Name.ToLowerFirst()#> = [[<#=typeName#> alloc] init];
+		_<#=member.Name.ToLowerFirst()#>._enumValue = <#=GetObjCEnumMember(entity, member)#>;
+	});
+	return _<#=member.Name.ToLowerFirst()#>;
+}
+<#
+}
+#>
+<#
+///////////////////////////////////////////////////////////////
+// Generate conversion from enum to boxed type and vice versa
+// e.g. [DayOfWeek dayOfWeekWithEnumValue:DayOfWeekMonday]
+///////////////////////////////////////////////////////////////
+#>
++(<#=GetObjCTypeIdentifier(entity)#>*) <#=GetObjCTypeIdentifier(entity).ToLowerFirst()#>WithEnumValue:(<#=valueType#>)val {
+    
+}
+
+- (<#=valueTypeName#>) enumValue {
+    return _enumValue;
+}
+
+@end
+
+@implementation NSString (<#=typeName#>)
 
-+ (instancetype) stringWith<#=GetObjCTypeIdentifier(entity)#>:(<#=GetObjCTypeIdentifier(entity)#>)val {
++ (instancetype) stringWith<#=typeName#>:(<#=typeName#>)val {
 
-    switch(val)
+    switch(val.enumValue)
     {
-    <#
+<#
     foreach(var member in entity.Members)
     {
-    #>
-    case <#=GetObjCEnumMember(entity,member)#>:
+#>
+        case <#=GetObjCEnumMember(entity,member)#>:
             return @"<#=member.Name#>";
-    <#
+<#
     }
-    #>
-    case <#=GetObjCTypeIdentifier(entity)#>EndOfEnum:
+#>
+        case <#=typeName#>EndOfEnum:
         default:
             return nil;
     }
 
     return nil;
 }
 
-- (<#=GetObjCTypeIdentifier(entity)#>) to<#=GetObjCTypeIdentifier(entity)#>{
+- (<#=typeName#>*) to<#=typeName#>{
 
     <#
     foreach(var member in entity.Members)
     {
     #>if([self isEqualToString:@"<#=member.Name#>"])
-      {
-            return <#=GetObjCEnumMember(entity,member)#>;
-      }
-      else <#
-    }
-    #>
     {
+          return [<#=typeName#> <#=GetObjCEnumMember(entity,member)#>];
+    }
+    else <#
+    }
+    #>{
         return <#=GetObjCTypeIdentifier(entity)#>EndOfEnum;
     }
 }