Add missing enum values, add skeleton implementations for metods, add simple tests

Headers/Foundation/NSExpression.h

@@ -45,7 +45,14 @@ enum
   NSVariableExpressionType,
   NSKeyPathExpressionType,
   NSFunctionExpressionType,
-  NSKeyPathCompositionExpressionType
+  NSKeyPathCompositionExpressionType,
+  NSUnionSetExpressionType,
+  NSIntersectSetExpressionType,
+  NSSubqueryExpressionType = 13,
+  NSAggregateExpressionType = 14,
+  NSAnyKeyExpressionType = 15,
+  NSBlockExpressionType = 19,
+  NSConditionalExpressionType = 20
 };
 typedef NSUInteger NSExpressionType;
 

MISSING

@@ -4,10 +4,6 @@ Missing macros:
 	NS_ENUM_AVAILABLE_IOS
 	NS_AVAILABLE_IOS
 
-Missing headers:
-==
-NONE
-
 -------------------------------------------------------------
 FoundationErrors:
     NSXPCConnectionInterrupted
@@ -159,16 +155,6 @@ NSException:
 NSExpression:
 	@class NSPredicate
 
-	NSUnionSetExpressionType
-    NSIntersectSetExpressionType
-    NSMinusSetExpressionType
-    NSSubqueryExpressionType
-    NSAggregateExpressionType
-
-	+ expressionForAggregate:
-	+ expressionForUnionSet:with:
-	+ expressionForIntersectSet:with
-	+ expressionForMinusSet:with:
 	+ expressionForSubquery:usingIteratorVariable:predicate:
 	+ expressionForFunction:selectorName:arguments:
 	+ expressionForBlock:arguments:	

Source/NSPredicate.m

@@ -1281,8 +1281,8 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
     }
 
   va_start(ap, format);
-  obj = [[self alloc] expressionWithFormat: format
-				 arguments: ap];
+  obj = [self expressionWithFormat: format
+			 arguments: ap];
   va_end(ap);
 
   return obj;

Tests/base/NSPredicate/basic.m

@@ -181,9 +181,6 @@ void testExpressions(void)
   exp = [NSExpression expressionWithFormat: @"key = %@", @"test"];
   PASS(exp != nil, "expressionWithFormat: returns non nil");
 
-  exp = [NSExpression expressionWithFormat: @"key = %@" arguments: @"test"];
-  PASS(exp != nil, "expressionWithFormat:arguments: returns non nil");
-
   exp = [NSExpression expressionWithFormat: @"key = %@" argumentArray: [NSArray arrayWithObject: @"test"]];
   PASS(exp != nil, "expressionWithFormat:argumentArray: returns non nil");
 }
@@ -295,7 +292,8 @@ int main()
     "predicate created with format can filter an array")
 
   testArray();
-
+  testExpressions();
+  
   END_SET("basic")
 
   return 0;