nano-store 0.6.0 → 0.6.1

data/vendor/Pods/Headers/NanoStore/NSFNanoGlobals.h

@@ -144,7 +144,9 @@ typedef enum {
     /** * Greater Ththanan */
     NSFGreaterThan,
     /** * Less than */
-    NSFLessThan
+    NSFLessThan,
+    /** * Not Equal to from */
+    NSFNotEqualTo
 } NSFMatchType;
 
 /** * Column types for the Attributes table.

data/vendor/Pods/Headers/NanoStore/NSFNanoPredicate.h

@@ -77,7 +77,7 @@
 /** * The comparison operator to be used. */
 @property (nonatomic, assign, readonly) NSFMatchType match;
 /** * The value to be used for comparison.  */
-@property (nonatomic, copy, readonly) NSString *value;
+@property (nonatomic, readonly) id value;
 
 /** @name Creating and Initializing a Predicate
  */
@@ -87,22 +87,22 @@
 /** * Creates and returns a predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link initWithColumn:matching:value: - (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
 
-+ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 
 /** * Initializes a newly allocated predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link predicateWithColumn:matching:value: + (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
 
-- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
+- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 
 //@}
 

data/vendor/Pods/Headers/NanoStore/NSFNanoSearch.h

@@ -180,6 +180,8 @@
 @property (nonatomic, assign, readwrite) NSUInteger offset;
 /** * The limit clause is used to place an upper bound on the number of rows returned by a Search operation. */
 @property (nonatomic, assign, readwrite) NSUInteger limit;
+/** * limit a Search to a particular bag. */
+@property (nonatomic, assign, readwrite) NSFNanoBag *bag;
 
 /** @name Creating and Initializing a Search
  */
@@ -213,7 +215,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return An array is returned if: 1) the sort has been specified or 2) the return type is \link Globals::NSFReturnKeys NSFReturnKeys \endlink. Otherwise, a dictionary is returned.
- * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 
@@ -225,7 +227,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return If theReturnType is \link Globals::NSFReturnObjects NSFReturnObjects \endlink, a dictionary is returned. Otherwise, an array is returned.
- * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsWithReturnType:error: - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.h

@@ -144,7 +144,9 @@ typedef enum {
     /** * Greater Ththanan */
     NSFGreaterThan,
     /** * Less than */
-    NSFLessThan
+    NSFLessThan,
+    /** * Not Equal to from */
+    NSFNotEqualTo
 } NSFMatchType;
 
 /** * Column types for the Attributes table.

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m

@@ -85,6 +85,7 @@ NSString * NSFStringFromMatchType (NSFMatchType aMatchType)
         case NSFInsensitiveEndsWith: value = @"Ends with (case insensitive)"; break;
         case NSFGreaterThan: value = @"Greater than"; break;
         case NSFLessThan: value = @"Less than"; break;
+        case NSFNotEqualTo: value = @"Not equal to"; break;
     }
     
     return value;

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.h

@@ -77,7 +77,7 @@
 /** * The comparison operator to be used. */
 @property (nonatomic, assign, readonly) NSFMatchType match;
 /** * The value to be used for comparison.  */
-@property (nonatomic, copy, readonly) NSString *value;
+@property (nonatomic, readonly) id value;
 
 /** @name Creating and Initializing a Predicate
  */
@@ -87,22 +87,22 @@
 /** * Creates and returns a predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link initWithColumn:matching:value: - (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
 
-+ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 
 /** * Initializes a newly allocated predicate.
  * @param theType is the column type. Can be \link Globals::NSFKeyColumn NSFKeyColumn \endlink, \link Globals::NSFAttributeColumn NSFAttributeColumn \endlink or \link Globals::NSFValueColumn NSFValueColumn \endlink.
  * @param theMatch is the match operator.
- * @param theValue is the value.
+ * @param theValue can be an NSString or [NSNull null]
  * @return A predicate which can be used in an NSFNanoExpression.
  * @see \link predicateWithColumn:matching:value: + (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue \endlink
  */
 
-- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue;
+- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue;
 
 //@}
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m

@@ -33,7 +33,7 @@
     /** \cond */
     @property (nonatomic, assign, readwrite) NSFTableColumnType column;
     @property (nonatomic, assign, readwrite) NSFMatchType match;
-    @property (nonatomic, copy, readwrite) NSString *value;
+    @property (nonatomic, readwrite) id value;
     /** \endcond */
 
 @end
@@ -44,23 +44,16 @@
 // Initialization / Cleanup
 // ----------------------------------------------
 
-+ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(NSString *)aValue
++ (NSFNanoPredicate*)predicateWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(id)aValue
 {
-    if (nil == aValue)
-        [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd)]
-                               userInfo:nil]raise];
-    
     return [[self alloc]initWithColumn:type matching:matching value:aValue];
 }
 
-- (id)initWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(NSString *)aValue
+- (id)initWithColumn:(NSFTableColumnType)type matching:(NSFMatchType)matching value:(id)aValue
 {
-    if (nil == aValue)
-        [[NSException exceptionWithName:NSFUnexpectedParameterException
-                                 reason:[NSString stringWithFormat:@"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd)]
-                               userInfo:nil]raise];
-    
+    NSAssert(nil != aValue, @"*** -[%@ %@]: value is nil.", [self class], NSStringFromSelector(_cmd));
+    NSAssert([aValue isKindOfClass:[NSString class]] || [aValue isKindOfClass:[NSNull class]], @"*** -[%@ %@]: value must be of type NSString or NSNull.", [self class], NSStringFromSelector(_cmd));
+
     if ((self = [super init])) {
         _column = type;
         _match = matching;
@@ -96,7 +89,12 @@
     }
     
     // Make sure we escape quotes if present and the value is a string
-    _value = [_value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    if (YES == [_value isKindOfClass:[NSString class]]) {
+        _value = [_value stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
+    } else {
+        _value = NSFStringFromNanoDataType(NSFNanoTypeNULL);
+        columnValue = NSFDatatype;
+    }
     
     switch (_match) {
         case NSFEqualTo:
@@ -135,6 +133,9 @@
         case NSFLessThan:
             [values addObject:[NSString stringWithFormat:@"%@ < '%@'", columnValue, _value]];
             break;
+        case NSFNotEqualTo:
+            [values addObject:[NSString stringWithFormat:@"%@ <> '%@'", columnValue, _value]];
+            break;
     }
     
     return values;

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h

@@ -180,6 +180,8 @@
 @property (nonatomic, assign, readwrite) NSUInteger offset;
 /** * The limit clause is used to place an upper bound on the number of rows returned by a Search operation. */
 @property (nonatomic, assign, readwrite) NSUInteger limit;
+/** * limit a Search to a particular bag. */
+@property (nonatomic, assign, readwrite) NSFNanoBag *bag;
 
 /** @name Creating and Initializing a Search
  */
@@ -213,7 +215,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return An array is returned if: 1) the sort has been specified or 2) the return type is \link Globals::NSFReturnKeys NSFReturnKeys \endlink. Otherwise, a dictionary is returned.
- * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsAdded:date:returnType:error: - (id)searchObjectsAdded:(NSFDateMatchType)theDateMatch date:(NSDate *)theDate returnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 
@@ -225,7 +227,7 @@
  * @param theReturnType the type of object to be returned. Can be \link Globals::NSFReturnObjects NSFReturnObjects \endlink or \link Globals::NSFReturnKeys NSFReturnKeys \endlink.
  * @param outError is used if an error occurs. May be NULL.
  * @return If theReturnType is \link Globals::NSFReturnObjects NSFReturnObjects \endlink, a dictionary is returned. Otherwise, an array is returned.
- * @note The sort descriptor will be ignored when returning requesting NSFReturnKeys.
+ * @note The sort descriptor will be ignored when the return type is NSFReturnKeys.
  * @see \link searchObjectsWithReturnType:error: - (id)searchObjectsWithReturnType:(NSFReturnType)theReturnType error:(out NSError **)outError \endlink
  */
 

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m

@@ -569,11 +569,15 @@
                 segment = [NSFNanoSearch _querySegmentForColumn:NSFAttribute value:anAttribute matching:NSFEqualTo];
                 [theSQLStatement appendString:segment];
                 [theSQLStatement appendString:@" AND "];
-                segment = [NSFNanoSearch _querySegmentForColumn:NSFValue value:aValue matching:NSFEqualTo];
+                segment = [NSFNanoSearch _querySegmentForColumn:NSFValue value:aValue matching:aMatch];
             }
         }
         
         [theSQLStatement appendString:segment];
+        if (self.bag != nil) {
+            NSString *selectInABag = [NSString stringWithFormat:@" AND NSFKey IN (SELECT NSFValue FROM NSFVALUES WHERE NSFKey == '%@' AND NSFAttribute == '%@')",self.bag.key,NSF_Private_NSFNanoBag_NSFObjectKeys];
+            [theSQLStatement appendString:selectInABag];
+        }
     } else {
         if (nil != aValue) {
             if (YES == querySegmentWasAdded)
@@ -732,6 +736,10 @@
                 value = [[NSMutableString alloc]initWithFormat:@"%@ < '%@'", aColumn, aValue];
                 [segment appendString:value];
                 break;
+            case NSFNotEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"%@ <> '%@'", aColumn, aValue];
+                [segment appendString:value];
+                break;
         }
     } else if (YES == [aValue isKindOfClass:[NSArray class]]) {
         // Quote the parameters
@@ -749,6 +757,19 @@
         [segment appendString:value];
         
         // Free allocated resources
+    } else if (YES == [aValue isKindOfClass:[NSNull class]]){
+        switch (match) {
+            case NSFEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"%@ IS NULL", aColumn];
+                [segment appendString:value];
+                break;
+            case NSFNotEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"%@ IS NOT NULL", aColumn];
+                [segment appendString:value];
+                break;
+            default:
+                break;
+        }
     }
     
     return segment;
@@ -761,51 +782,56 @@
 
     if ((YES == [aValue isKindOfClass:[NSString class]]) || (nil == aValue)) {
         if (nil == aValue) {
-            value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@') OR (%@ GLOB '%@.*') OR (%@ GLOB '*.%@.*') OR (%@ GLOB '*.%@')", NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue];
+            value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@') OR (%@ GLOB '%@.*') OR (%@ GLOB '*.%@.*') OR (%@ GLOB '*.%@'))", NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue, NSFAttribute, anAttributeValue];
             [segment appendString:value];
         } else {
             switch (match) {
                 case NSFEqualTo:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ = '%@') OR (%@ GLOB '%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@' AND %@ = '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ = '%@') OR (%@ GLOB '%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@' AND %@ = '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFBeginsWith:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@*') OR (%@ GLOB '%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@' AND %@ GLOB '%@*')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ GLOB '%@*') OR (%@ GLOB '%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@' AND %@ GLOB '%@*'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFContains:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@') OR (%@ GLOB '%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@' AND %@ GLOB '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ GLOB '%@') OR (%@ GLOB '%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@' AND %@ GLOB '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFEndsWith:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '*%@') OR (%@ GLOB '%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@' AND %@ GLOB '*%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ GLOB '*%@') OR (%@ GLOB '%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@' AND %@ GLOB '*%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveEqualTo:
                     aValue = [aValue uppercaseString];
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) = '%@') OR (%@ GLOB '%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@' AND upper(%@) = '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND upper(%@) = '%@') OR (%@ GLOB '%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@' AND upper(%@) = '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveBeginsWith:
                     aValue = [aValue uppercaseString];
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) GLOB '%@*') OR (%@ GLOB '%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@' AND upper(%@) GLOB '%@*')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND upper(%@) GLOB '%@*') OR (%@ GLOB '%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@' AND upper(%@) GLOB '%@*'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveContains:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ LIKE '%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFInsensitiveEndsWith:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%%%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%%%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ LIKE '%%%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%%%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFGreaterThan:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ > '%@') OR (%@ GLOB '%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@' AND %@ > '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ > '%@') OR (%@ GLOB '%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@' AND %@ > '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
                     break;
                 case NSFLessThan:
-                    value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ < '%@') OR (%@ GLOB '%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@' AND %@ < '%@')", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ = '%@' AND %@ < '%@') OR (%@ GLOB '%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@' AND %@ < '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
                     [segment appendString:value];
+                    break;
+                case NSFNotEqualTo:
+                    value = [[NSMutableString alloc]initWithFormat:@"((%@ <> '%@' AND %@ <> '%@') OR (%@ GLOB '%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@' AND %@ <> '%@'))", NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue, NSFAttribute, anAttributeValue, NSFValue, aValue];
+                    [segment appendString:value];
+
                     break;
             }
         }
@@ -825,6 +851,56 @@
         [segment appendString:value];
         
         // Free allocated resources
+    } else if (YES == [aValue isKindOfClass:[NSNull class]]) {
+        NSString *NULLStringValue = NSFStringFromNanoDataType (NSFNanoTypeNULL);
+        switch (match) {
+            case NSFEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ = '%@') OR (%@ GLOB '%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@.*' AND %@ = '%@') OR (%@ GLOB '*.%@' AND %@ = '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFNotEqualTo:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ <> '%@') OR (%@ GLOB '%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@.*' AND %@ <> '%@') OR (%@ GLOB '*.%@' AND %@ <> '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFBeginsWith:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@*') OR (%@ GLOB '%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@*') OR (%@ GLOB '*.%@' AND %@ GLOB '%@*')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFContains:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '%@') OR (%@ GLOB '%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '%@') OR (%@ GLOB '*.%@' AND %@ GLOB '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFEndsWith:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ GLOB '*%@') OR (%@ GLOB '%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@.*' AND %@ GLOB '*%@') OR (%@ GLOB '*.%@' AND %@ GLOB '*%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveEqualTo:
+                aValue = [aValue uppercaseString];
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) = '%@') OR (%@ GLOB '%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@.*' AND upper(%@) = '%@') OR (%@ GLOB '*.%@' AND upper(%@) = '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveBeginsWith:
+                aValue = [aValue uppercaseString];
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND upper(%@) GLOB '%@*') OR (%@ GLOB '%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@.*' AND upper(%@) GLOB '%@*') OR (%@ GLOB '*.%@' AND upper(%@) GLOB '%@*')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveContains:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFInsensitiveEndsWith:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ LIKE '%%%@') OR (%@ GLOB '%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@.*' AND %@ LIKE '%%%@') OR (%@ GLOB '*.%@' AND %@ LIKE '%%%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFGreaterThan:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ > '%@') OR (%@ GLOB '%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@.*' AND %@ > '%@') OR (%@ GLOB '*.%@' AND %@ > '%@')", NSFAttribute, NSFDatatype, NULLStringValue, aValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+            case NSFLessThan:
+                value = [[NSMutableString alloc]initWithFormat:@"(%@ = '%@' AND %@ < '%@') OR (%@ GLOB '%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@.*' AND %@ < '%@') OR (%@ GLOB '*.%@' AND %@ < '%@')", NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue, NSFAttribute, anAttributeValue, NSFDatatype, NULLStringValue];
+                [segment appendString:value];
+                break;
+        }
     }
     
     return segment;
@@ -872,15 +948,14 @@
     id theResults = results;
     
     if ([_sort count] > 0) {
-        NSMutableArray *cocoaSortDescriptors = [NSMutableArray new];
-        
-        for (NSFNanoSortDescriptor *descriptor in _sort) {
-            NSString *targetKeyPath = [[NSString alloc]initWithFormat:@"rootObject.%@", descriptor.attribute];
-            NSSortDescriptor *cocoaSort = [[NSSortDescriptor alloc]initWithKey:targetKeyPath ascending:descriptor.isAscending];
-            [cocoaSortDescriptors addObject:cocoaSort];
-        }
-        
         if (NSFReturnObjects == theReturnType) {
+            NSMutableArray *cocoaSortDescriptors = [NSMutableArray new];
+            
+            for (NSFNanoSortDescriptor *descriptor in _sort) {
+                NSString *targetKeyPath = [[NSString alloc]initWithFormat:@"rootObject.%@", descriptor.attribute];
+                NSSortDescriptor *cocoaSort = [[NSSortDescriptor alloc]initWithKey:targetKeyPath ascending:descriptor.isAscending];
+                [cocoaSortDescriptors addObject:cocoaSort];
+            }
             theResults = [[results allValues]sortedArrayUsingDescriptors:cocoaSortDescriptors];
         } else {
             theResults = [results allKeys];

data/vendor/Pods/Pods.bridgesupport

@@ -1,1349 +1,1357 @@
 <?xml version='1.0'?>
 <signatures version='1.0'>
-<constant type='@' declared_type='NSString*' name='NSFAttribute' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFCalendarDate' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFDatatype' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFDomainKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFKeyedArchive' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFKeys' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFMemoryDatabase' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFNanoObjectBehaviorException' const='true'/>
-<constant type='i' declared_type='NSInteger' name='NSFNanoStoreErrorKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFNanoStoreUnableToManipulateStoreException' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFNonConformingNanoObjectProtocolException' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFObjectClass' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFP_ColumnIdentifier' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFP_DatatypeIdentifier' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFP_FullDatatypeIdentifier' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFP_SchemaTable' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFP_TableIdentifier' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFRowIDColumnName' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFTemporaryDatabase' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFUnexpectedParameterException' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFValue' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFValues' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSFVersionKey' const='true'/>
-<constant type='i' declared_type='NSInteger' name='NSF_Private_InvalidParameterDataCodeKey' const='true'/>
-<constant type='i' declared_type='NSInteger' name='NSF_Private_MacOSXErrorCodeKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFKeys_NSFKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFKeys_NSFKeyedArchive' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFNanoBag_NSFKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFNanoBag_NSFObjectKeys' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFNanoBag_Name' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFValues_NSFAttribute' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFValues_NSFKey' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_NSFValues_NSFValue' const='true'/>
-<constant type='@' declared_type='NSString*' name='NSF_Private_ToDeleteTableKey' const='true'/>
-<enum name='CacheAllData' value='1'/>
-<enum name='CacheDataOnDemand' value='2'/>
-<enum name='DoNotCacheData' value='3'/>
-<enum name='JournalModeDelete' value='0'/>
-<enum name='JournalModeMemory' value='3'/>
-<enum name='JournalModeOFF' value='5'/>
-<enum name='JournalModePersist' value='2'/>
-<enum name='JournalModeTruncate' value='1'/>
-<enum name='JournalModeWAL' value='4'/>
-<enum name='NSFAfterDate' value='3'/>
-<enum name='NSFAnd' value='1'/>
-<enum name='NSFAttributeColumn' value='2'/>
-<enum name='NSFAverage' value='1'/>
-<enum name='NSFBeforeDate' value='1'/>
-<enum name='NSFBeginsWith' value='1'/>
-<enum name='NSFContains' value='2'/>
-<enum name='NSFCount' value='2'/>
-<enum name='NSFEncodingUTF16' value='2'/>
-<enum name='NSFEncodingUTF8' value='1'/>
-<enum name='NSFEncodingUnknown' value='3'/>
-<enum name='NSFEndsWith' value='3'/>
-<enum name='NSFEngineProcessingDefaultMode' value='1'/>
-<enum name='NSFEngineProcessingFastMode' value='2'/>
-<enum name='NSFEqualTo' value='0'/>
-<enum name='NSFGreaterThan' value='8'/>
-<enum name='NSFInsensitiveBeginsWith' value='5'/>
-<enum name='NSFInsensitiveContains' value='6'/>
-<enum name='NSFInsensitiveEndsWith' value='7'/>
-<enum name='NSFInsensitiveEqualTo' value='4'/>
-<enum name='NSFKeyColumn' value='1'/>
-<enum name='NSFLessThan' value='9'/>
-<enum name='NSFMax' value='3'/>
-<enum name='NSFMemoryStoreType' value='1'/>
-<enum name='NSFMin' value='4'/>
-<enum name='NSFNanoTypeData' value='1'/>
-<enum name='NSFNanoTypeDate' value='3'/>
-<enum name='NSFNanoTypeNULL' value='5'/>
-<enum name='NSFNanoTypeNumber' value='4'/>
-<enum name='NSFNanoTypeRowUID' value='0'/>
-<enum name='NSFNanoTypeString' value='2'/>
-<enum name='NSFNanoTypeURL' value='6'/>
-<enum name='NSFNanoTypeUnknown' value='-1'/>
-<enum name='NSFOnDate' value='2'/>
-<enum name='NSFOr' value='2'/>
-<enum name='NSFPersistentStoreType' value='3'/>
-<enum name='NSFReturnKeys' value='2'/>
-<enum name='NSFReturnObjects' value='1'/>
-<enum name='NSFTemporaryStoreType' value='2'/>
-<enum name='NSFTotal' value='5'/>
-<enum name='NSFValueColumn' value='3'/>
-<enum name='SynchronousModeFull' value='2'/>
-<enum name='SynchronousModeNormal' value='1'/>
-<enum name='SynchronousModeOff' value='0'/>
-<enum name='TempStoreModeDefault' value='0'/>
-<enum name='TempStoreModeFile' value='1'/>
-<enum name='TempStoreModeMemory' value='2'/>
+<constant const='true' name='NSFAttribute' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFCalendarDate' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFDatatype' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFDomainKey' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFKey' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFKeyedArchive' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFKeys' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFMemoryDatabase' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFNanoObjectBehaviorException' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFNanoStoreErrorKey' declared_type='NSInteger' type='i'/>
+<constant const='true' name='NSFNanoStoreUnableToManipulateStoreException' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFNonConformingNanoObjectProtocolException' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFObjectClass' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFP_ColumnIdentifier' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFP_DatatypeIdentifier' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFP_FullDatatypeIdentifier' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFP_SchemaTable' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFP_TableIdentifier' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFRowIDColumnName' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFTemporaryDatabase' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFUnexpectedParameterException' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFValue' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFValues' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSFVersionKey' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_InvalidParameterDataCodeKey' declared_type='NSInteger' type='i'/>
+<constant const='true' name='NSF_Private_MacOSXErrorCodeKey' declared_type='NSInteger' type='i'/>
+<constant const='true' name='NSF_Private_NSFKeys_NSFKey' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFKeys_NSFKeyedArchive' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFNanoBag_NSFKey' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFNanoBag_NSFObjectKeys' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFNanoBag_Name' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFValues_NSFAttribute' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFValues_NSFKey' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_NSFValues_NSFValue' declared_type='NSString*' type='@'/>
+<constant const='true' name='NSF_Private_ToDeleteTableKey' declared_type='NSString*' type='@'/>
+<enum value='1' name='CacheAllData'/>
+<enum value='2' name='CacheDataOnDemand'/>
+<enum value='3' name='DoNotCacheData'/>
+<enum value='0' name='JournalModeDelete'/>
+<enum value='3' name='JournalModeMemory'/>
+<enum value='5' name='JournalModeOFF'/>
+<enum value='2' name='JournalModePersist'/>
+<enum value='1' name='JournalModeTruncate'/>
+<enum value='4' name='JournalModeWAL'/>
+<enum value='3' name='NSFAfterDate'/>
+<enum value='1' name='NSFAnd'/>
+<enum value='2' name='NSFAttributeColumn'/>
+<enum value='1' name='NSFAverage'/>
+<enum value='1' name='NSFBeforeDate'/>
+<enum value='1' name='NSFBeginsWith'/>
+<enum value='2' name='NSFContains'/>
+<enum value='2' name='NSFCount'/>
+<enum value='2' name='NSFEncodingUTF16'/>
+<enum value='1' name='NSFEncodingUTF8'/>
+<enum value='3' name='NSFEncodingUnknown'/>
+<enum value='3' name='NSFEndsWith'/>
+<enum value='1' name='NSFEngineProcessingDefaultMode'/>
+<enum value='2' name='NSFEngineProcessingFastMode'/>
+<enum value='0' name='NSFEqualTo'/>
+<enum value='8' name='NSFGreaterThan'/>
+<enum value='5' name='NSFInsensitiveBeginsWith'/>
+<enum value='6' name='NSFInsensitiveContains'/>
+<enum value='7' name='NSFInsensitiveEndsWith'/>
+<enum value='4' name='NSFInsensitiveEqualTo'/>
+<enum value='1' name='NSFKeyColumn'/>
+<enum value='9' name='NSFLessThan'/>
+<enum value='3' name='NSFMax'/>
+<enum value='1' name='NSFMemoryStoreType'/>
+<enum value='4' name='NSFMin'/>
+<enum value='1' name='NSFNanoTypeData'/>
+<enum value='3' name='NSFNanoTypeDate'/>
+<enum value='5' name='NSFNanoTypeNULL'/>
+<enum value='4' name='NSFNanoTypeNumber'/>
+<enum value='0' name='NSFNanoTypeRowUID'/>
+<enum value='2' name='NSFNanoTypeString'/>
+<enum value='6' name='NSFNanoTypeURL'/>
+<enum value='-1' name='NSFNanoTypeUnknown'/>
+<enum value='10' name='NSFNotEqualTo'/>
+<enum value='2' name='NSFOnDate'/>
+<enum value='2' name='NSFOr'/>
+<enum value='3' name='NSFPersistentStoreType'/>
+<enum value='2' name='NSFReturnKeys'/>
+<enum value='1' name='NSFReturnObjects'/>
+<enum value='2' name='NSFTemporaryStoreType'/>
+<enum value='5' name='NSFTotal'/>
+<enum value='3' name='NSFValueColumn'/>
+<enum value='2' name='SynchronousModeFull'/>
+<enum value='1' name='SynchronousModeNormal'/>
+<enum value='0' name='SynchronousModeOff'/>
+<enum value='0' name='TempStoreModeDefault'/>
+<enum value='1' name='TempStoreModeFile'/>
+<enum value='2' name='TempStoreModeMemory'/>
 <function name='NSFIsDebugOn'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </function>
 <function name='NSFNanoDatatypeFromString'>
-<arg type='@' declared_type='NSString*' name='aNanoDatatype'/>
-<retval type='i' declared_type='NSFNanoDatatype'/>
+<arg name='aNanoDatatype' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoDatatype' type='i'/>
 </function>
 <function name='NSFSetIsDebugOn'>
-<arg type='B' declared_type='BOOL' name='flag'/>
-<retval type='v' declared_type='void'/>
+<arg name='flag' declared_type='BOOL' type='B'/>
+<retval declared_type='void' type='v'/>
 </function>
 <function name='NSFStringFromMatchType'>
-<arg type='i' declared_type='NSFMatchType' name='aMatchType'/>
-<retval type='@' declared_type='NSString*'/>
+<arg name='aMatchType' declared_type='NSFMatchType' type='i'/>
+<retval declared_type='NSString*' type='@'/>
 </function>
 <function name='NSFStringFromNanoDataType'>
-<arg type='i' declared_type='NSFNanoDatatype' name='aNanoDatatype'/>
-<retval type='@' declared_type='NSString*'/>
+<arg name='aNanoDatatype' declared_type='NSFNanoDatatype' type='i'/>
+<retval declared_type='NSString*' type='@'/>
 </function>
 <function name='safeJSONArrayFromArray'>
-<arg type='@' declared_type='NSArray*' name='array'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg name='array' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </function>
 <function name='safeJSONDictionaryFromDictionary'>
-<arg type='@' declared_type='NSDictionary*' name='dictionary'/>
-<retval type='@' declared_type='NSDictionary*'/>
+<arg name='dictionary' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </function>
 <function name='safeJSONObjectFromObject'>
-<arg type='@' declared_type='id' name='object'/>
-<retval type='@' declared_type='id'/>
+<arg name='object' declared_type='id' type='@'/>
+<retval declared_type='id' type='@'/>
 </function>
 <class name='NSFNanoBag'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_inflateObjectsWithKeys:'>
-<arg type='@' index='0' declared_type='NSArray*' name='someKeys'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='someKeys' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_saveInStore:error:'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='someStore'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='someStore' declared_type='NSFNanoStore*' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_setStore:'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='aStore'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='aStore' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='addObject:error:'>
-<arg type='@' index='0' declared_type='id' name='theObject'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theObject' declared_type='id' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='addObjectsFromArray:error:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theObjects'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='bag' class_method='true'>
-<retval type='@' declared_type='NSFNanoBag*'/>
+<retval declared_type='NSFNanoBag*' type='@'/>
 </method>
 <method selector='bagWithName:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='theName'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='bagWithName:andObjects:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='theName'/>
-<arg type='@' index='1' declared_type='NSArray*' name='theObjects'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<arg index='1' name='theObjects' declared_type='NSArray*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='bagWithObjects:' class_method='true'>
-<arg type='@' index='0' declared_type='NSArray*' name='theObjects'/>
-<retval type='@' declared_type='NSFNanoBag*'/>
+<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSFNanoBag*' type='@'/>
 </method>
 <method selector='count'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='deflateBag'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='dictionaryRepresentation'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='hasUnsavedChanges'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='inflateBag'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='initBagWithName:andObjects:'>
-<arg type='@' index='0' declared_type='NSString*' name='theName'/>
-<arg type='@' index='1' declared_type='NSArray*' name='someObjects'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<arg index='1' name='someObjects' declared_type='NSArray*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='isEqualToNanoBag:'>
-<arg type='@' index='0' declared_type='NSFNanoBag*' name='otherNanoBag'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='otherNanoBag' declared_type='NSFNanoBag*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='key'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='name'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='reloadBagWithError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeAllObjects'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObject:'>
-<arg type='@' index='0' declared_type='id' name='theObject'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theObject' declared_type='id' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectWithKey:'>
-<arg type='@' index='0' declared_type='NSString*' name='theObjectKey'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theObjectKey' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectsInArray:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theObjects'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectsWithKeysInArray:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theKeys'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removedObjects'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='saveAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='savedObjects'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='setName:'>
-<arg type='@' index='0' declared_type='NSString*' name='name'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='name' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setStore:'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='store'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='store' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='store'>
-<retval type='@' declared_type='NSFNanoStore*'/>
+<retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='undoChangesWithError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='unsavedObjects'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 </class>
 <class name='NSFNanoEngine'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFEncodingTypeToNSString:' class_method='true'>
-<arg type='i' index='0' declared_type='NSFEncodingType' name='value'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='value' declared_type='NSFEncodingType' type='i'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_ROWIDPresenceLocation:datatypes:'>
-<arg type='@' index='0' declared_type='NSArray*' name='tableColumns'/>
-<arg type='@' index='1' declared_type='NSArray*' name='datatypes'/>
-<retval type='i' declared_type='NSInteger'/>
+<arg index='0' name='tableColumns' declared_type='NSArray*' type='@'/>
+<arg index='1' name='datatypes' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSInteger' type='i'/>
 </method>
 <method selector='NSFP_beginTransactionMode:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_cacheMethodToString'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_createTable:withColumns:datatypes:isTemporary:'>
-<arg type='@' index='0' declared_type='NSString*' name='table'/>
-<arg type='@' index='1' declared_type='NSArray*' name='tableColumns'/>
-<arg type='@' index='2' declared_type='NSArray*' name='tableDatatypes'/>
-<arg type='B' index='3' declared_type='BOOL' name='isTemporaryFlag'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='table' declared_type='NSString*' type='@'/>
+<arg index='1' name='tableColumns' declared_type='NSArray*' type='@'/>
+<arg index='2' name='tableDatatypes' declared_type='NSArray*' type='@'/>
+<arg index='3' name='isTemporaryFlag' declared_type='BOOL' type='B'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_datatypeForColumn:'>
-<arg type='@' index='0' declared_type='NSString*' name='tableAndColumn'/>
-<retval type='i' declared_type='NSFNanoDatatype'/>
+<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoDatatype' type='i'/>
 </method>
 <method selector='NSFP_datatypeForTable:column:'>
-<arg type='@' index='0' declared_type='NSString*' name='table'/>
-<arg type='@' index='1' declared_type='NSString*' name='column'/>
-<retval type='i' declared_type='NSFNanoDatatype'/>
+<arg index='0' name='table' declared_type='NSString*' type='@'/>
+<arg index='1' name='column' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoDatatype' type='i'/>
 </method>
 <method selector='NSFP_decodeQuantum:andSource:' class_method='true'>
-<arg type='*' index='0' declared_type='unsigned char*' name='dest'/>
-<arg type='*' index='1' declared_type='char*' name='src' const='true'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='dest' declared_type='unsigned char*' type='*'/>
+<arg const='true' index='1' name='src' declared_type='char*' type='*'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_flattenAllTables'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='NSFP_insertStringValues:forColumns:table:'>
-<arg type='@' index='0' declared_type='NSArray*' name='values'/>
-<arg type='@' index='1' declared_type='NSArray*' name='columns'/>
-<arg type='@' index='2' declared_type='NSString*' name='table'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='values' declared_type='NSArray*' type='@'/>
+<arg index='1' name='columns' declared_type='NSArray*' type='@'/>
+<arg index='2' name='table' declared_type='NSString*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_installCommitCallback'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_isColumnROWIDAlias:forTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='column'/>
-<arg type='@' index='1' declared_type='NSString*' name='table'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='column' declared_type='NSString*' type='@'/>
+<arg index='1' name='table' declared_type='NSString*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_nestedDescriptionWithPrefixedSpace:'>
-<arg type='@' index='0' declared_type='NSString*' name='prefixedSpace'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='prefixedSpace' declared_type='NSString*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_prefixWithDotDelimiter:'>
-<arg type='@' index='0' declared_type='NSString*' name='tableAndColumn'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_prepareSQLite3Statement:theSQLStatement:'>
-<arg type='^^{sqlite3_stmt}' index='0' declared_type='sqlite3_stmt**' name='aStatement'/>
-<arg type='@' index='1' declared_type='NSString*' name='aSQLQuery'/>
-<retval type='i' declared_type='NSInteger'/>
+<arg index='0' name='aStatement' declared_type='sqlite3_stmt**' type='^^{sqlite3_stmt}'/>
+<arg index='1' name='aSQLQuery' declared_type='NSString*' type='@'/>
+<retval declared_type='NSInteger' type='i'/>
 </method>
 <method selector='NSFP_rebuildDatatypeCache'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_removeColumn:fromTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='column'/>
-<arg type='@' index='1' declared_type='NSString*' name='table'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='column' declared_type='NSString*' type='@'/>
+<arg index='1' name='table' declared_type='NSString*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_setFullColumnNamesEnabled'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_sharedROWIDKeywords' class_method='true'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='NSFP_sqlString:appendingTags:'>
-<arg type='@' index='0' declared_type='NSMutableString*' name='theSQLStatement'/>
-<arg type='@' index='1' declared_type='NSArray*' name='columns'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
+<arg index='1' name='columns' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_sqlString:appendingTags:quoteTags:'>
-<arg type='@' index='0' declared_type='NSMutableString*' name='theSQLStatement'/>
-<arg type='@' index='1' declared_type='NSArray*' name='tags'/>
-<arg type='B' index='2' declared_type='BOOL' name='flag'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
+<arg index='1' name='tags' declared_type='NSArray*' type='@'/>
+<arg index='2' name='flag' declared_type='BOOL' type='B'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSFP_sqlString:forTable:withColumns:datatypes:'>
-<arg type='@' index='0' declared_type='NSMutableString*' name='theSQLStatement'/>
-<arg type='@' index='1' declared_type='NSString*' name='table'/>
-<arg type='@' index='2' declared_type='NSArray*' name='columns'/>
-<arg type='@' index='3' declared_type='NSArray*' name='datatypes'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theSQLStatement' declared_type='NSMutableString*' type='@'/>
+<arg index='1' name='table' declared_type='NSString*' type='@'/>
+<arg index='2' name='columns' declared_type='NSArray*' type='@'/>
+<arg index='3' name='datatypes' declared_type='NSArray*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='NSFP_stripBitsFromExtendedResultCode:' class_method='true'>
-<arg type='i' index='0' declared_type='int' name='extendedResult'/>
-<retval type='i' declared_type='int'/>
+<arg index='0' name='extendedResult' declared_type='int' type='i'/>
+<retval declared_type='int' type='i'/>
 </method>
 <method selector='NSFP_suffixWithDotDelimiter:'>
-<arg type='@' index='0' declared_type='NSString*' name='tableAndColumn'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='tableAndColumn' declared_type='NSString*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='NSFP_uninstallCommitCallback'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='NSStringToNSFEncodingType:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='value'/>
-<retval type='i' declared_type='NSFEncodingType'/>
+<arg index='0' name='value' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFEncodingType' type='i'/>
 </method>
 <method selector='_plistToDictionary:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='aPlist'/>
-<retval type='@' declared_type='NSDictionary*'/>
+<arg index='0' name='aPlist' declared_type='NSString*' type='@'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='allTables'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='beginDeferredTransaction'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='beginTransaction'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='busyTimeout'>
-<retval type='I' declared_type='unsigned int'/>
+<retval declared_type='unsigned int' type='I'/>
 </method>
 <method selector='cacheMethod'>
-<retval type='i' declared_type='NSFCacheMethod'/>
+<retval declared_type='NSFCacheMethod' type='i'/>
 </method>
 <method selector='cacheSize'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='close'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='columnsForTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='theTable'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='commitTransaction'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='compact'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='createIndexForColumn:table:isUnique:'>
-<arg type='@' index='0' declared_type='NSString*' name='theColumn'/>
-<arg type='@' index='1' declared_type='NSString*' name='theTable'/>
-<arg type='B' index='2' declared_type='BOOL' name='isUnique'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theColumn' declared_type='NSString*' type='@'/>
+<arg index='1' name='theTable' declared_type='NSString*' type='@'/>
+<arg index='2' name='isUnique' declared_type='BOOL' type='B'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='createTable:withColumns:datatypes:'>
-<arg type='@' index='0' declared_type='NSString*' name='theTable'/>
-<arg type='@' index='1' declared_type='NSArray*' name='theColumns'/>
-<arg type='@' index='2' declared_type='NSArray*' name='theDatatypes'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<arg index='1' name='theColumns' declared_type='NSArray*' type='@'/>
+<arg index='2' name='theDatatypes' declared_type='NSArray*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='databaseWithPath:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='thePath'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='datatypesForTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='theTable'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='decodeDataFromBase64:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='theEncodedData'/>
-<retval type='@' declared_type='NSData*'/>
+<arg index='0' name='theEncodedData' declared_type='NSString*' type='@'/>
+<retval declared_type='NSData*' type='@'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='dictionaryDescription'>
-<retval type='@' declared_type='NSFOrderedDictionary*'/>
+<retval declared_type='NSFOrderedDictionary*' type='@'/>
 </method>
 <method selector='dropIndex:'>
-<arg type='@' index='0' declared_type='NSString*' name='theIndex'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theIndex' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='dropTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='theTable'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='encodeDataToBase64:' class_method='true'>
-<arg type='@' index='0' declared_type='NSData*' name='theData'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='theData' declared_type='NSData*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='encoding'>
-<retval type='i' declared_type='NSFEncodingType'/>
+<retval declared_type='NSFEncodingType' type='i'/>
 </method>
 <method selector='executeSQL:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<retval type='@' declared_type='NSFNanoResult*'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='indexedColumnsForTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='theTable'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='indexes'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='initWithPath:'>
-<arg type='@' index='0' declared_type='NSString*' name='thePath'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='integrityCheck'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='isDatabaseOpen'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='isTransactionActive'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='journalModeAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='i' declared_type='NSFJournalModeMode'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='NSFJournalModeMode' type='i'/>
 </method>
 <method selector='maxRowUIDForTable:'>
-<arg type='@' index='0' declared_type='NSString*' name='theTable'/>
-<retval type='q' declared_type='long long'/>
+<arg index='0' name='theTable' declared_type='NSString*' type='@'/>
+<retval declared_type='long long' type='q'/>
 </method>
 <method selector='nanoStoreEngineVersion' class_method='true'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='openWithCacheMethod:useFastMode:'>
-<arg type='i' index='0' declared_type='NSFCacheMethod' name='theCacheMethod'/>
-<arg type='B' index='1' declared_type='BOOL' name='useFastMode'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theCacheMethod' declared_type='NSFCacheMethod' type='i'/>
+<arg index='1' name='useFastMode' declared_type='BOOL' type='B'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='pageSize'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='path'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='recommendedCacheSize' class_method='true'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='rollbackTransaction'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setBusyTimeout:'>
-<arg type='I' index='0' declared_type='unsigned int' name='theTimeout'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theTimeout' declared_type='unsigned int' type='I'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setCacheMethod:'>
-<arg type='i' index='0' declared_type='NSFCacheMethod' name='cacheMethod'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='cacheMethod' declared_type='NSFCacheMethod' type='i'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setCacheSize:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='numberOfPages'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='numberOfPages' declared_type='NSUInteger' type='I'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setEncodingType:'>
-<arg type='i' index='0' declared_type='NSFEncodingType' name='theEncodingType'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theEncodingType' declared_type='NSFEncodingType' type='i'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setJournalMode:'>
-<arg type='i' index='0' declared_type='NSFJournalModeMode' name='theMode'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theMode' declared_type='NSFJournalModeMode' type='i'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setPageSize:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='numberOfBytes'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='numberOfBytes' declared_type='NSUInteger' type='I'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setSynchronousMode:'>
-<arg type='i' index='0' declared_type='NSFSynchronousMode' name='theSynchronousMode'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theSynchronousMode' declared_type='NSFSynchronousMode' type='i'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setTempStoreMode:'>
-<arg type='i' index='0' declared_type='NSFTempStoreMode' name='theTempStoreMode'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theTempStoreMode' declared_type='NSFTempStoreMode' type='i'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='sharedNanoStoreEngineDatatypes' class_method='true'>
-<retval type='@' declared_type='NSSet*'/>
+<retval declared_type='NSSet*' type='@'/>
 </method>
 <method selector='sqlite'>
-<retval type='^{sqlite3=}' declared_type='sqlite3*'/>
+<retval declared_type='sqlite3*' type='^{sqlite3=}'/>
 </method>
 <method selector='sqliteVersion' class_method='true'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='stringWithUUID' class_method='true'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='synchronousMode'>
-<retval type='i' declared_type='NSFSynchronousMode'/>
+<retval declared_type='NSFSynchronousMode' type='i'/>
 </method>
 <method selector='systemPageSize' class_method='true'>
-<retval type='i' declared_type='NSInteger'/>
+<retval declared_type='NSInteger' type='i'/>
 </method>
 <method selector='tables'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='tempStoreMode'>
-<retval type='i' declared_type='NSFTempStoreMode'/>
+<retval declared_type='NSFTempStoreMode' type='i'/>
 </method>
 <method selector='temporaryTables'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 </class>
 <class name='NSFNanoExpression'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='addPredicate:withOperator:'>
-<arg type='@' index='0' declared_type='NSFNanoPredicate*' name='thePredicate'/>
-<arg type='i' index='1' declared_type='NSFOperator' name='theOperator'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
+<arg index='1' name='theOperator' declared_type='NSFOperator' type='i'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='arrayDescription'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='expressionWithPredicate:' class_method='true'>
-<arg type='@' index='0' declared_type='NSFNanoPredicate*' name='thePredicate'/>
-<retval type='@' declared_type='NSFNanoExpression*'/>
+<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
+<retval declared_type='NSFNanoExpression*' type='@'/>
 </method>
 <method selector='initWithPredicate:'>
-<arg type='@' index='0' declared_type='NSFNanoPredicate*' name='thePredicate'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='thePredicate' declared_type='NSFNanoPredicate*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='operators'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='predicates'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 </class>
 <class name='NSFNanoObject'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_NSObjectToJSONString:error:' class_method='true'>
-<arg type='@' index='0' declared_type='id' name='object'/>
-<arg type='^@' index='1' declared_type='NSError**' name='error'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='object' declared_type='id' type='@'/>
+<arg index='1' name='error' declared_type='NSError**' type='^@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_safeArrayFromArray:' class_method='true'>
-<arg type='@' index='0' declared_type='NSArray*' name='array'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='array' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='_safeDictionaryFromDictionary:' class_method='true'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='dictionary'/>
-<retval type='@' declared_type='NSDictionary*'/>
+<arg index='0' name='dictionary' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_safeObjectFromObject:' class_method='true'>
-<arg type='@' index='0' declared_type='id' name='object'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='object' declared_type='id' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='_setOriginalClassString:'>
-<arg type='@' index='0' declared_type='NSString*' name='theClassString'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='theClassString' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='addEntriesFromDictionary:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='otherDictionary'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='otherDictionary' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='dictionaryRepresentation'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='info'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='initFromDictionaryRepresentation:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='theDictionary'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='initFromDictionaryRepresentation:key:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='theDictionary'/>
-<arg type='@' index='1' declared_type='NSString*' name='theKey'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='theKey' declared_type='NSString*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='isEqualToNanoObject:'>
-<arg type='@' index='0' declared_type='NSFNanoObject*' name='otherNanoObject'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='otherNanoObject' declared_type='NSFNanoObject*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='key'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='nanoObject' class_method='true'>
-<retval type='@' declared_type='NSFNanoObject*'/>
+<retval declared_type='NSFNanoObject*' type='@'/>
 </method>
 <method selector='nanoObjectWithDictionary:' class_method='true'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='theDictionary'/>
-<retval type='@' declared_type='NSFNanoObject*'/>
+<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='NSFNanoObject*' type='@'/>
 </method>
 <method selector='nanoObjectWithDictionary:key:' class_method='true'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='theDictionary'/>
-<arg type='@' index='1' declared_type='NSString*' name='theKey'/>
-<retval type='@' declared_type='NSFNanoObject*'/>
+<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='theKey' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoObject*' type='@'/>
 </method>
 <method selector='objectForKey:'>
-<arg type='@' index='0' declared_type='NSString*' name='aKey'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='originalClassString'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='removeAllObjects'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectForKey:'>
-<arg type='@' index='0' declared_type='NSString*' name='aKey'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='removeObjectsForKeys:'>
-<arg type='@' index='0' declared_type='NSArray*' name='keyArray'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='keyArray' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='saveStoreAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setObject:forKey:'>
-<arg type='@' index='0' declared_type='id' name='anObject'/>
-<arg type='@' index='1' declared_type='NSString*' name='aKey'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='anObject' declared_type='id' type='@'/>
+<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setStore:'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='store'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='store' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='store'>
-<retval type='@' declared_type='NSFNanoStore*'/>
+<retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 </class>
 <class name='NSFNanoPredicate'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='column'>
-<retval type='i' declared_type='NSFTableColumnType'/>
+<retval declared_type='NSFTableColumnType' type='i'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='initWithColumn:matching:value:'>
-<arg type='i' index='0' declared_type='NSFTableColumnType' name='theType'/>
-<arg type='i' index='1' declared_type='NSFMatchType' name='theMatch'/>
-<arg type='@' index='2' declared_type='NSString*' name='theValue'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theType' declared_type='NSFTableColumnType' type='i'/>
+<arg index='1' name='theMatch' declared_type='NSFMatchType' type='i'/>
+<arg index='2' name='theValue' declared_type='id' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='match'>
-<retval type='i' declared_type='NSFMatchType'/>
+<retval declared_type='NSFMatchType' type='i'/>
 </method>
 <method selector='predicateWithColumn:matching:value:' class_method='true'>
-<arg type='i' index='0' declared_type='NSFTableColumnType' name='theType'/>
-<arg type='i' index='1' declared_type='NSFMatchType' name='theMatch'/>
-<arg type='@' index='2' declared_type='NSString*' name='theValue'/>
-<retval type='@' declared_type='NSFNanoPredicate*'/>
+<arg index='0' name='theType' declared_type='NSFTableColumnType' type='i'/>
+<arg index='1' name='theMatch' declared_type='NSFMatchType' type='i'/>
+<arg index='2' name='theValue' declared_type='id' type='@'/>
+<retval declared_type='NSFNanoPredicate*' type='@'/>
 </method>
 <method selector='value'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='id' type='@'/>
 </method>
 </class>
 <class name='NSFNanoResult'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_calculateNumberOfRows'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_initWithDictionary:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='results'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='_initWithError:'>
-<arg type='@' index='0' declared_type='NSError*' name='error'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='_reset'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_resultWithDictionary:' class_method='true'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='results'/>
-<retval type='@' declared_type='NSFNanoResult*'/>
+<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
+<retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='_resultWithError:' class_method='true'>
-<arg type='@' index='0' declared_type='NSError*' name='error'/>
-<retval type='@' declared_type='NSFNanoResult*'/>
+<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='_setError:'>
-<arg type='@' index='0' declared_type='NSError*' name='error'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='columns'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='error'>
-<retval type='@' declared_type='NSError*'/>
+<retval declared_type='NSError*' type='@'/>
 </method>
 <method selector='firstValue'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='numberOfRows'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='setError:'>
-<arg type='@' index='0' declared_type='NSError*' name='error'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='error' declared_type='NSError*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='valueAtIndex:forColumn:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='theIndex'/>
-<arg type='@' index='1' declared_type='NSString*' name='theColumn'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='theIndex' declared_type='NSUInteger' type='I'/>
+<arg index='1' name='theColumn' declared_type='NSString*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='valuesForColumn:'>
-<arg type='@' index='0' declared_type='NSString*' name='theColumn'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theColumn' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='writeToFile:'>
-<arg type='@' index='0' declared_type='NSString*' name='thePath'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 </class>
 <class name='NSFNanoSearch'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_dataWithKey:attribute:value:matching:'>
-<arg type='@' index='0' declared_type='NSString*' name='aKey'/>
-<arg type='@' index='1' declared_type='NSString*' name='anAttribute'/>
-<arg type='@' index='2' declared_type='NSString*' name='aValue'/>
-<arg type='i' index='3' declared_type='NSFMatchType' name='match'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
+<arg index='2' name='aValue' declared_type='NSString*' type='@'/>
+<arg index='3' name='match' declared_type='NSFMatchType' type='i'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='_dataWithKey:attribute:value:matching:returning:'>
-<arg type='@' index='0' declared_type='NSString*' name='aKey'/>
-<arg type='@' index='1' declared_type='NSString*' name='anAttribute'/>
-<arg type='@' index='2' declared_type='NSString*' name='aValue'/>
-<arg type='i' index='3' declared_type='NSFMatchType' name='match'/>
-<arg type='i' index='4' declared_type='NSFReturnType' name='returnedObjectType'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
+<arg index='2' name='aValue' declared_type='NSString*' type='@'/>
+<arg index='3' name='match' declared_type='NSFMatchType' type='i'/>
+<arg index='4' name='returnedObjectType' declared_type='NSFReturnType' type='i'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='_dictionaryForKeyPath:value:'>
-<arg type='@' index='0' declared_type='NSString*' name='keyPath'/>
-<arg type='@' index='1' declared_type='id' name='value'/>
-<retval type='@' declared_type='NSDictionary*'/>
+<arg index='0' name='keyPath' declared_type='NSString*' type='@'/>
+<arg index='1' name='value' declared_type='id' type='@'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_prepareSQLQueryStringWithExpressions:'>
-<arg type='@' index='0' declared_type='NSArray*' name='someExpressions'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='someExpressions' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_prepareSQLQueryStringWithKey:attribute:value:matching:'>
-<arg type='@' index='0' declared_type='NSString*' name='aKey'/>
-<arg type='@' index='1' declared_type='NSString*' name='anAttribute'/>
-<arg type='@' index='2' declared_type='id' name='aValue'/>
-<arg type='i' index='3' declared_type='NSFMatchType' name='match'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='aKey' declared_type='NSString*' type='@'/>
+<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
+<arg index='2' name='aValue' declared_type='id' type='@'/>
+<arg index='3' name='match' declared_type='NSFMatchType' type='i'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_prepareSQLQueryStringWithKeys:' class_method='true'>
-<arg type='@' index='0' declared_type='NSArray*' name='someKeys'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='someKeys' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_preparedSQL'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_querySegmentForAttributeColumnWithValue:matching:valueColumnWithValue:' class_method='true'>
-<arg type='@' index='0' declared_type='id' name='anAttributeValue'/>
-<arg type='i' index='1' declared_type='NSFMatchType' name='match'/>
-<arg type='@' index='2' declared_type='id' name='aValue'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='anAttributeValue' declared_type='id' type='@'/>
+<arg index='1' name='match' declared_type='NSFMatchType' type='i'/>
+<arg index='2' name='aValue' declared_type='id' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_querySegmentForColumn:value:matching:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='aColumn'/>
-<arg type='@' index='1' declared_type='id' name='aValue'/>
-<arg type='i' index='2' declared_type='NSFMatchType' name='match'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='aColumn' declared_type='NSString*' type='@'/>
+<arg index='1' name='aValue' declared_type='id' type='@'/>
+<arg index='2' name='match' declared_type='NSFMatchType' type='i'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_quoteStrings:joiningWithDelimiter:' class_method='true'>
-<arg type='@' index='0' declared_type='NSArray*' name='strings'/>
-<arg type='@' index='1' declared_type='NSString*' name='delimiter'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='strings' declared_type='NSArray*' type='@'/>
+<arg index='1' name='delimiter' declared_type='NSString*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_resultsFromSQLQuery:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='_retrieveDataAdded:calendarDate:error:'>
-<arg type='i' index='0' declared_type='NSFDateMatchType' name='aDateMatch'/>
-<arg type='@' index='1' declared_type='NSDate*' name='aDate'/>
-<arg type='^@' index='2' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='@' declared_type='NSDictionary*'/>
+<arg index='0' name='aDateMatch' declared_type='NSFDateMatchType' type='i'/>
+<arg index='1' name='aDate' declared_type='NSDate*' type='@'/>
+<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_retrieveDataWithError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='@' declared_type='NSDictionary*'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_sortResultsIfApplicable:returnType:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='results'/>
-<arg type='i' index='1' declared_type='NSFReturnType' name='theReturnType'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='results' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='theReturnType' declared_type='NSFReturnType' type='i'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='aggregateOperation:onAttribute:'>
-<arg type='i' index='0' declared_type='NSFAggregateFunctionType' name='theFunctionType'/>
-<arg type='@' index='1' declared_type='NSString*' name='theAttribute'/>
-<retval type='@' declared_type='NSNumber*'/>
+<arg index='0' name='theFunctionType' declared_type='NSFAggregateFunctionType' type='i'/>
+<arg index='1' name='theAttribute' declared_type='NSString*' type='@'/>
+<retval declared_type='NSNumber*' type='@'/>
 </method>
 <method selector='attribute'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='attributesToBeReturned'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
+</method>
+<method selector='bag'>
+<retval declared_type='NSFNanoBag*' type='@'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='executeSQL:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<retval type='@' declared_type='NSFNanoResult*'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='executeSQL:returnType:error:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<arg type='i' index='1' declared_type='NSFReturnType' name='theReturnType'/>
-<arg type='^@' index='2' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<arg index='1' name='theReturnType' declared_type='NSFReturnType' type='i'/>
+<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='explainSQL:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<retval type='@' declared_type='NSFNanoResult*'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='expressions'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='filterClass'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='groupValues'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='initWithStore:'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='theNanoStore'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theNanoStore' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='key'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='limit'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='match'>
-<retval type='i' declared_type='NSFMatchType'/>
+<retval declared_type='NSFMatchType' type='i'/>
 </method>
 <method selector='nanoStore'>
-<retval type='@' declared_type='NSFNanoStore*'/>
+<retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='offset'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='reset'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='searchObjectsAdded:date:returnType:error:'>
-<arg type='i' index='0' declared_type='NSFDateMatchType' name='theDateMatch'/>
-<arg type='@' index='1' declared_type='NSDate*' name='theDate'/>
-<arg type='i' index='2' declared_type='NSFReturnType' name='theReturnType'/>
-<arg type='^@' index='3' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theDateMatch' declared_type='NSFDateMatchType' type='i'/>
+<arg index='1' name='theDate' declared_type='NSDate*' type='@'/>
+<arg index='2' name='theReturnType' declared_type='NSFReturnType' type='i'/>
+<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='searchObjectsWithReturnType:error:'>
-<arg type='i' index='0' declared_type='NSFReturnType' name='theReturnType'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theReturnType' declared_type='NSFReturnType' type='i'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='searchWithStore:' class_method='true'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='theNanoStore'/>
-<retval type='@' declared_type='NSFNanoSearch*'/>
+<arg index='0' name='theNanoStore' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='NSFNanoSearch*' type='@'/>
 </method>
 <method selector='setAttribute:'>
-<arg type='@' index='0' declared_type='NSString*' name='attribute'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='attribute' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setAttributesToBeReturned:'>
-<arg type='@' index='0' declared_type='NSArray*' name='attributesToBeReturned'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='attributesToBeReturned' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
+</method>
+<method selector='setBag:'>
+<arg index='0' name='bag' declared_type='NSFNanoBag*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setExpressions:'>
-<arg type='@' index='0' declared_type='NSArray*' name='expressions'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='expressions' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setFilterClass:'>
-<arg type='@' index='0' declared_type='NSString*' name='filterClass'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='filterClass' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setGroupValues:'>
-<arg type='B' index='0' declared_type='BOOL' name='groupValues'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='groupValues' declared_type='BOOL' type='B'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setKey:'>
-<arg type='@' index='0' declared_type='NSString*' name='key'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='key' declared_type='NSString*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setLimit:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='limit'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='limit' declared_type='NSUInteger' type='I'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setMatch:'>
-<arg type='i' index='0' declared_type='NSFMatchType' name='match'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='match' declared_type='NSFMatchType' type='i'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setNanoStore:'>
-<arg type='@' index='0' declared_type='NSFNanoStore*' name='nanoStore'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='nanoStore' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setOffset:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='offset'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='offset' declared_type='NSUInteger' type='I'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setSort:'>
-<arg type='@' index='0' declared_type='NSArray*' name='sort'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='sort' declared_type='NSArray*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setValue:'>
-<arg type='@' index='0' declared_type='id' name='value'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='value' declared_type='id' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='sort'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='sql'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='value'>
-<retval type='@' declared_type='id'/>
+<retval declared_type='id' type='@'/>
 </method>
 </class>
 <class name='NSFNanoSortDescriptor'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='attribute'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='initWithAttribute:ascending:'>
-<arg type='@' index='0' declared_type='NSString*' name='theAttribute'/>
-<arg type='B' index='1' declared_type='BOOL' name='ascending'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theAttribute' declared_type='NSString*' type='@'/>
+<arg index='1' name='ascending' declared_type='BOOL' type='B'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='isAscending'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='sortDescriptorWithAttribute:ascending:' class_method='true'>
-<arg type='@' index='0' declared_type='NSString*' name='theAttribute'/>
-<arg type='B' index='1' declared_type='BOOL' name='ascending'/>
-<retval type='@' declared_type='NSFNanoSortDescriptor*'/>
+<arg index='0' name='theAttribute' declared_type='NSString*' type='@'/>
+<arg index='1' name='ascending' declared_type='BOOL' type='B'/>
+<retval declared_type='NSFNanoSortDescriptor*' type='@'/>
 </method>
 </class>
 <class name='NSFNanoStore'>
 <method selector='JSONDescription'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_NSFDatatypeOfObject:'>
-<arg type='@' index='0' declared_type='id' name='value'/>
-<retval type='i' declared_type='NSFNanoDatatype'/>
+<arg index='0' name='value' declared_type='id' type='@'/>
+<retval declared_type='NSFNanoDatatype' type='i'/>
 </method>
 <method selector='__storeDictionaries:forKeys:error:'>
-<arg type='@' index='0' declared_type='NSArray*' name='someObjects'/>
-<arg type='@' index='1' declared_type='NSArray*' name='someKeys'/>
-<arg type='^@' index='2' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='someObjects' declared_type='NSArray*' type='@'/>
+<arg index='1' name='someKeys' declared_type='NSArray*' type='@'/>
+<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_addObjectsFromArray:forceSave:error:'>
-<arg type='@' index='0' declared_type='NSArray*' name='someObjects'/>
-<arg type='B' index='1' declared_type='BOOL' name='forceSave'/>
-<arg type='^@' index='2' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='someObjects' declared_type='NSArray*' type='@'/>
+<arg index='1' name='forceSave' declared_type='BOOL' type='B'/>
+<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_backupFileStoreToDirectoryAtPath:extension:compact:error:'>
-<arg type='@' index='0' declared_type='NSString*' name='aPath'/>
-<arg type='@' index='1' declared_type='NSString*' name='anExtension'/>
-<arg type='B' index='2' declared_type='BOOL' name='flag'/>
-<arg type='^@' index='3' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='aPath' declared_type='NSString*' type='@'/>
+<arg index='1' name='anExtension' declared_type='NSString*' type='@'/>
+<arg index='2' name='flag' declared_type='BOOL' type='B'/>
+<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_backupMemoryStoreToDirectoryAtPath:extension:compact:error:'>
-<arg type='@' index='0' declared_type='NSString*' name='aPath'/>
-<arg type='@' index='1' declared_type='NSString*' name='anExtension'/>
-<arg type='B' index='2' declared_type='BOOL' name='flag'/>
-<arg type='^@' index='3' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='aPath' declared_type='NSString*' type='@'/>
+<arg index='1' name='anExtension' declared_type='NSString*' type='@'/>
+<arg index='2' name='flag' declared_type='BOOL' type='B'/>
+<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_bindValue:forAttribute:parameterNumber:usingSQLite3Statement:'>
-<arg type='@' index='0' declared_type='id' name='aValue'/>
-<arg type='@' index='1' declared_type='NSString*' name='anAttribute'/>
-<arg type='i' index='2' declared_type='NSInteger' name='aParamNumber'/>
-<arg type='^{sqlite3_stmt=}' index='3' declared_type='sqlite3_stmt*' name='aStatement'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='aValue' declared_type='id' type='@'/>
+<arg index='1' name='anAttribute' declared_type='NSString*' type='@'/>
+<arg index='2' name='aParamNumber' declared_type='NSInteger' type='i'/>
+<arg index='3' name='aStatement' declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_calendarDateToString:' class_method='true'>
-<arg type='@' index='0' declared_type='NSDate*' name='aDate'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='aDate' declared_type='NSDate*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_checkNanoStoreIsReadyAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_createAndOpenDebugDatabase' class_method='true'>
-<retval type='@' declared_type='NSFNanoStore*'/>
+<retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='_defaultTestData' class_method='true'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='_executeSQL:'>
-<arg type='@' index='0' declared_type='NSString*' name='theSQLStatement'/>
-<retval type='@' declared_type='NSFNanoResult*'/>
+<arg index='0' name='theSQLStatement' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoResult*' type='@'/>
 </method>
 <method selector='_executeSQLite3StepUsingSQLite3Statement:'>
-<arg type='^{sqlite3_stmt=}' index='0' declared_type='sqlite3_stmt*' name='aStatement'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='aStatement' declared_type='sqlite3_stmt*' type='^{sqlite3_stmt=}'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_flattenCollection:keyPath:keys:values:'>
-<arg type='@' index='0' declared_type='id' name='someObject'/>
-<arg type='^@' index='1' declared_type='NSMutableArray**' name='aKeyPath'/>
-<arg type='^@' index='2' declared_type='NSMutableArray**' name='someKeys'/>
-<arg type='^@' index='3' declared_type='NSMutableArray**' name='someValues'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='someObject' declared_type='id' type='@'/>
+<arg index='1' name='aKeyPath' declared_type='NSMutableArray**' type='^@'/>
+<arg index='2' name='someKeys' declared_type='NSMutableArray**' type='^@'/>
+<arg index='3' name='someValues' declared_type='NSMutableArray**' type='^@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_flattenCollection:keys:values:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='info'/>
-<arg type='^@' index='1' declared_type='NSMutableArray**' name='flattenedKeys'/>
-<arg type='^@' index='2' declared_type='NSMutableArray**' name='flattenedValues'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='info' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='flattenedKeys' declared_type='NSMutableArray**' type='^@'/>
+<arg index='2' name='flattenedValues' declared_type='NSMutableArray**' type='^@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_initializePreparedStatementsWithError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_isOurTransaction'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_nestedDescriptionWithPrefixedSpace:'>
-<arg type='@' index='0' declared_type='NSString*' name='prefixedSpace'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='prefixedSpace' declared_type='NSString*' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='_prepareSQLite3Statement:theSQLStatement:'>
-<arg type='^^{sqlite3_stmt}' index='0' declared_type='sqlite3_stmt**' name='aStatement'/>
-<arg type='@' index='1' declared_type='NSString*' name='aSQLQuery'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='aStatement' declared_type='sqlite3_stmt**' type='^^{sqlite3_stmt}'/>
+<arg index='1' name='aSQLQuery' declared_type='NSString*' type='@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_releasePreparedStatements'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_setIsOurTransaction:'>
-<arg type='B' index='0' declared_type='BOOL' name='value'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='value' declared_type='BOOL' type='B'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='_setupCachingSchema'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_storeDictionary:forKey:forClassNamed:error:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='someInfo'/>
-<arg type='@' index='1' declared_type='NSString*' name='aKey'/>
-<arg type='@' index='2' declared_type='NSString*' name='classType'/>
-<arg type='^@' index='3' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='someInfo' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
+<arg index='2' name='classType' declared_type='NSString*' type='@'/>
+<arg index='3' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='_stringFromValue:'>
-<arg type='@' index='0' declared_type='id' name='aValue'/>
-<retval type='@' declared_type='NSString*'/>
+<arg index='0' name='aValue' declared_type='id' type='@'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='addObject:error:'>
-<arg type='@' index='0' declared_type='id' name='theObject'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theObject' declared_type='id' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='addObjectsFromArray:error:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theObjects'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='allObjectClasses'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagWithName:'>
-<arg type='@' index='0' declared_type='NSString*' name='theName'/>
-<retval type='@' declared_type='NSFNanoBag*'/>
+<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoBag*' type='@'/>
 </method>
 <method selector='bags'>
-<retval type='@' declared_type='NSArray*'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagsContainingObjectWithKey:'>
-<arg type='@' index='0' declared_type='NSString*' name='theKey'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theKey' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagsWithKeysInArray:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theKeys'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='bagsWithName:'>
-<arg type='@' index='0' declared_type='NSString*' name='theName'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theName' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='beginTransactionAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='clearIndexesAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='closeWithError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='commitTransactionAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='compactStoreAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='countOfObjectsOfClassNamed:'>
-<arg type='@' index='0' declared_type='NSString*' name='theClassName'/>
-<retval type='q' declared_type='long long'/>
+<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
+<retval declared_type='long long' type='q'/>
 </method>
 <method selector='createAndOpenStoreWithType:path:error:' class_method='true'>
-<arg type='i' index='0' declared_type='NSFNanoStoreType' name='theType'/>
-<arg type='@' index='1' declared_type='NSString*' name='thePath'/>
-<arg type='^@' index='2' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='@' declared_type='NSFNanoStore*'/>
+<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
+<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
+<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='createStoreWithType:path:' class_method='true'>
-<arg type='i' index='0' declared_type='NSFNanoStoreType' name='theType'/>
-<arg type='@' index='1' declared_type='NSString*' name='thePath'/>
-<retval type='@' declared_type='NSFNanoStore*'/>
+<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
+<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
+<retval declared_type='NSFNanoStore*' type='@'/>
 </method>
 <method selector='description'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='dictionaryDescription'>
-<retval type='@' declared_type='NSFOrderedDictionary*'/>
+<retval declared_type='NSFOrderedDictionary*' type='@'/>
 </method>
 <method selector='discardUnsavedChanges'>
-<retval type='v' declared_type='void'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='filePath'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='hasUnsavedChanges'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='initStoreWithType:path:'>
-<arg type='i' index='0' declared_type='NSFNanoStoreType' name='theType'/>
-<arg type='@' index='1' declared_type='NSString*' name='thePath'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theType' declared_type='NSFNanoStoreType' type='i'/>
+<arg index='1' name='thePath' declared_type='NSString*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='isClosed'>
-<retval type='B' declared_type='BOOL'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='nanoEngineProcessingMode'>
-<retval type='i' declared_type='NSFEngineProcessingMode'/>
+<retval declared_type='NSFEngineProcessingMode' type='i'/>
 </method>
 <method selector='nanoStoreEngine'>
-<retval type='@' declared_type='NSFNanoEngine*'/>
+<retval declared_type='NSFNanoEngine*' type='@'/>
 </method>
 <method selector='objectsOfClassNamed:'>
-<arg type='@' index='0' declared_type='NSString*' name='theClassName'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='objectsOfClassNamed:usingSortDescriptors:'>
-<arg type='@' index='0' declared_type='NSString*' name='theClassName'/>
-<arg type='@' index='1' declared_type='NSArray*' name='theSortDescriptors'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theClassName' declared_type='NSString*' type='@'/>
+<arg index='1' name='theSortDescriptors' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='objectsWithKeysInArray:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theKeys'/>
-<retval type='@' declared_type='NSArray*'/>
+<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<retval declared_type='NSArray*' type='@'/>
 </method>
 <method selector='openWithError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='rebuildIndexesAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeAllObjectsFromStoreAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeObject:error:'>
-<arg type='@' index='0' declared_type='id' name='theObject'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theObject' declared_type='id' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeObjectsInArray:error:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theObjects'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theObjects' declared_type='NSArray*' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='removeObjectsWithKeysInArray:error:'>
-<arg type='@' index='0' declared_type='NSArray*' name='theKeys'/>
-<arg type='^@' index='1' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='theKeys' declared_type='NSArray*' type='@'/>
+<arg index='1' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='rollbackTransactionAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='saveInterval'>
-<retval type='I' declared_type='NSUInteger'/>
+<retval declared_type='NSUInteger' type='I'/>
 </method>
 <method selector='saveStoreAndReturnError:'>
-<arg type='^@' index='0' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='saveStoreToDirectoryAtPath:compactDatabase:error:'>
-<arg type='@' index='0' declared_type='NSString*' name='thePath'/>
-<arg type='B' index='1' declared_type='BOOL' name='shouldCompact'/>
-<arg type='^@' index='2' type_modifier='o' declared_type='NSError**' name='outError'/>
-<retval type='B' declared_type='BOOL'/>
+<arg index='0' name='thePath' declared_type='NSString*' type='@'/>
+<arg index='1' name='shouldCompact' declared_type='BOOL' type='B'/>
+<arg index='2' type_modifier='o' name='outError' declared_type='NSError**' type='^@'/>
+<retval declared_type='BOOL' type='B'/>
 </method>
 <method selector='setNanoEngineProcessingMode:'>
-<arg type='i' index='0' declared_type='NSFEngineProcessingMode' name='nanoEngineProcessingMode'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='nanoEngineProcessingMode' declared_type='NSFEngineProcessingMode' type='i'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setNanoStoreEngine:'>
-<arg type='@' index='0' declared_type='NSFNanoEngine*' name='nanoStoreEngine'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='nanoStoreEngine' declared_type='NSFNanoEngine*' type='@'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='setSaveInterval:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='saveInterval'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='saveInterval' declared_type='NSUInteger' type='I'/>
+<retval declared_type='void' type='v'/>
 </method>
 </class>
 <class name='NSFOrderedDictionary'>
 <method selector='insertObject:forKey:atIndex:'>
-<arg type='@' index='0' declared_type='id' name='anObject'/>
-<arg type='@' index='1' declared_type='id' name='aKey'/>
-<arg type='I' index='2' declared_type='NSUInteger' name='anIndex'/>
-<retval type='v' declared_type='void'/>
+<arg index='0' name='anObject' declared_type='id' type='@'/>
+<arg index='1' name='aKey' declared_type='id' type='@'/>
+<arg index='2' name='anIndex' declared_type='NSUInteger' type='I'/>
+<retval declared_type='void' type='v'/>
 </method>
 <method selector='keyAtIndex:'>
-<arg type='I' index='0' declared_type='NSUInteger' name='anIndex'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='anIndex' declared_type='NSUInteger' type='I'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='reverseKeyEnumerator'>
-<retval type='@' declared_type='NSEnumerator*'/>
+<retval declared_type='NSEnumerator*' type='@'/>
 </method>
 </class>
 <class name='NSObject'>
 <method selector='initNanoObjectFromDictionaryRepresentation:forKey:store:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='theDictionary'/>
-<arg type='@' index='1' declared_type='NSString*' name='aKey'/>
-<arg type='@' index='2' declared_type='NSFNanoStore*' name='theStore'/>
-<retval type='@' declared_type='id'/>
+<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
+<arg index='2' name='theStore' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
 <method selector='nanoObjectDictionaryRepresentation'>
-<retval type='@' declared_type='NSDictionary*'/>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
 <method selector='nanoObjectKey'>
-<retval type='@' declared_type='NSString*'/>
+<retval declared_type='NSString*' type='@'/>
 </method>
 <method selector='rootObject'>
-<retval type='@' declared_type='id'/>
+<retval declared_type='id' type='@'/>
 </method>
 </class>
 <informal_protocol name='NSFNanoObjectProtocol'>
-<method type='@20@0:4@8@12@16' selector='initNanoObjectFromDictionaryRepresentation:forKey:store:'>
-<arg type='@' index='0' declared_type='NSDictionary*' name='theDictionary'/>
-<arg type='@' index='1' declared_type='NSString*' name='aKey'/>
-<arg type='@' index='2' declared_type='NSFNanoStore*' name='theStore'/>
-<retval type='@' declared_type='id'/>
+<method selector='initNanoObjectFromDictionaryRepresentation:forKey:store:' type='@20@0:4@8@12@16'>
+<arg index='0' name='theDictionary' declared_type='NSDictionary*' type='@'/>
+<arg index='1' name='aKey' declared_type='NSString*' type='@'/>
+<arg index='2' name='theStore' declared_type='NSFNanoStore*' type='@'/>
+<retval declared_type='id' type='@'/>
 </method>
-<method type='@8@0:4' selector='nanoObjectDictionaryRepresentation'>
-<retval type='@' declared_type='NSDictionary*'/>
+<method selector='nanoObjectDictionaryRepresentation' type='@8@0:4'>
+<retval declared_type='NSDictionary*' type='@'/>
 </method>
-<method type='@8@0:4' selector='nanoObjectKey'>
-<retval type='@' declared_type='NSString*'/>
+<method selector='nanoObjectKey' type='@8@0:4'>
+<retval declared_type='NSString*' type='@'/>
 </method>
-<method type='@8@0:4' selector='rootObject'>
-<retval type='@' declared_type='id'/>
+<method selector='rootObject' type='@8@0:4'>
+<retval declared_type='id' type='@'/>
 </method>
 </informal_protocol>
 </signatures>