Merge pull request swiftlang#1755 from millenomi/cfcalendar

Mojave merge addendum: CF… & NSCalendar Fixes

Author: millenomi

CMakeLists.txt

@@ -324,6 +324,7 @@ if(ENABLE_TESTING)
                          TestFoundation/TestNSArray.swift
                          TestFoundation/TestNSAttributedString.swift
                          TestFoundation/TestNSCache.swift
+                         TestFoundation/TestNSCalendar.swift
                          TestFoundation/TestNSCompoundPredicate.swift
                          TestFoundation/TestNSData.swift
                          TestFoundation/TestNSDictionary.swift

CoreFoundation/Base.subproj/CFInternal.h

@@ -1005,6 +1005,12 @@ enum {
     __kCFZombieMessagedEvent = 21,
 };
 
+#define _CFReleaseDeferred __attribute__((__cleanup__(_CFReleaseOnCleanup)))
+static inline void _CFReleaseOnCleanup(void * CF_RELEASES_ARGUMENT ptr) {
+    CFTypeRef cf = *(CFTypeRef *)ptr;
+    if (cf) CFRelease(cf);
+}
+
 #pragma mark - CF Private Globals
 
 CF_PRIVATE void *__CFAppleLanguages;

CoreFoundation/Base.subproj/ForFoundationOnly.h

@@ -602,16 +602,6 @@ CF_EXPORT Boolean _CFCalendarComposeAbsoluteTimeV(CFCalendarRef calendar, /* out
 CF_EXPORT Boolean _CFCalendarDecomposeAbsoluteTimeV(CFCalendarRef calendar, CFAbsoluteTime at, const char *componentDesc, int32_t *_Nonnull * _Nonnull vector, int32_t count);
 CF_EXPORT Boolean _CFCalendarAddComponentsV(CFCalendarRef calendar, /* inout */ CFAbsoluteTime *atp, CFOptionFlags options, const char *componentDesc, int32_t *vector, int32_t count);
 CF_EXPORT Boolean _CFCalendarGetComponentDifferenceV(CFCalendarRef calendar, CFAbsoluteTime startingAT, CFAbsoluteTime resultAT, CFOptionFlags options, const char *componentDesc, int32_t *_Nonnull * _Nonnull vector, int32_t count);
-CF_CROSS_PLATFORM_EXPORT Boolean _CFCalendarIsWeekend(CFCalendarRef calendar, CFAbsoluteTime at);
-
-typedef struct {
-    CFTimeInterval onsetTime;
-    CFTimeInterval ceaseTime;
-    CFIndex start;
-    CFIndex end;
-} _CFCalendarWeekendRange;
-
-CF_CROSS_PLATFORM_EXPORT Boolean _CFCalendarGetNextWeekend(CFCalendarRef calendar, _CFCalendarWeekendRange *range);
 
 CF_CROSS_PLATFORM_EXPORT Boolean _CFLocaleInit(CFLocaleRef locale, CFStringRef identifier);
 

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -29,6 +29,8 @@
 #include <pthread.h>
 #include <dirent.h>
 
+#include <CoreFoundation/CFCalendar_Internal.h>
+
 #if __has_include(<execinfo.h>)
 #include <execinfo.h>
 #endif
@@ -39,6 +41,11 @@
 
 _CF_EXPORT_SCOPE_BEGIN
 
+CF_CROSS_PLATFORM_EXPORT Boolean _CFCalendarGetNextWeekend(CFCalendarRef calendar, _CFCalendarWeekendRange *range);
+CF_CROSS_PLATFORM_EXPORT void _CFCalendarEnumerateDates(CFCalendarRef calendar, CFDateRef start, CFDateComponentsRef matchingComponents, CFOptionFlags opts, void (^block)(CFDateRef, Boolean, Boolean*));
+CF_EXPORT void CFCalendarSetGregorianStartDate(CFCalendarRef calendar, CFDateRef _Nullable date);
+CF_EXPORT _Nullable CFDateRef CFCalendarCopyGregorianStartDate(CFCalendarRef calendar);
+
 struct __CFSwiftObject {
     uintptr_t isa;
 };
@@ -51,7 +58,7 @@ typedef struct __CFSwiftObject *CFSwiftRef;
     if (CF_IS_SWIFT(type, obj)) { \
         return (ret)__CFSwiftBridge.fn((CFSwiftRef)obj, ##__VA_ARGS__); \
     } \
-} while (0)
+} while (0) 
 
 CF_EXPORT bool _CFIsSwift(CFTypeID type, CFSwiftRef obj);
 CF_EXPORT void _CFDeinit(CFTypeRef cf);
@@ -243,6 +250,20 @@ struct _NSDataBridge {
     _Nonnull CFTypeRef (*_Nonnull copy)(CFTypeRef obj);
 };
 
+struct _NSCalendarBridge {
+    _Nonnull CFTypeRef (*_Nonnull calendarIdentifier)(CFTypeRef obj);
+    _Nullable CFTypeRef (*_Nonnull copyLocale)(CFTypeRef obj);
+    void (*_Nonnull setLocale)(CFTypeRef obj, CFTypeRef _Nullable locale);
+    _Nonnull CFTypeRef (*_Nonnull copyTimeZone)(CFTypeRef obj);
+    void (*_Nonnull setTimeZone)(CFTypeRef obj, CFTypeRef _Nonnull timeZone);
+    CFIndex (*_Nonnull firstWeekday)(CFTypeRef obj);
+    void (*_Nonnull setFirstWeekday)(CFTypeRef obj, CFIndex firstWeekday);
+    CFIndex (*_Nonnull minimumDaysInFirstWeek)(CFTypeRef obj);
+    void (*_Nonnull setMinimumDaysInFirstWeek)(CFTypeRef obj, CFIndex minimumDays);
+    _Nullable CFTypeRef (*_Nonnull copyGregorianStartDate)(CFTypeRef obj);
+    void (*_Nonnull setGregorianStartDate)(CFTypeRef obj, CFTypeRef _Nullable date);
+};
+
 struct _CFSwiftBridge {
     struct _NSObjectBridge NSObject;
     struct _NSArrayBridge NSArray;
@@ -259,6 +280,7 @@ struct _CFSwiftBridge {
     struct _NSMutableCharacterSetBridge NSMutableCharacterSet;
     struct _NSNumberBridge NSNumber;
     struct _NSDataBridge NSData;
+    struct _NSCalendarBridge NSCalendar;
 };
 
 CF_EXPORT struct _CFSwiftBridge __CFSwiftBridge;
@@ -306,9 +328,6 @@ extern CFIndex __CFBinaryPlistWriteToStream(CFPropertyListRef plist, CFTypeRef s
 extern CFDataRef _CFPropertyListCreateXMLDataWithExtras(CFAllocatorRef allocator, CFPropertyListRef propertyList);
 extern CFWriteStreamRef _CFWriteStreamCreateFromFileDescriptor(CFAllocatorRef alloc, int fd);
 
-extern _Nullable CFDateRef CFCalendarCopyGregorianStartDate(CFCalendarRef calendar);
-extern void CFCalendarSetGregorianStartDate(CFCalendarRef calendar, CFDateRef date);
-
 CF_EXPORT char *_Nullable *_Nonnull _CFEnviron(void);
 
 CF_EXPORT void CFLog1(CFLogLevel lev, CFStringRef message);

CoreFoundation/CMakeLists.txt

@@ -66,7 +66,10 @@ add_framework(CoreFoundation
                 # Error
                 Error.subproj/CFError_Private.h
                 # Locale
+                Locale.subproj/CFCalendar_Internal.h
+                Locale.subproj/CFDateComponents.h
                 Locale.subproj/CFDateFormatter_Private.h
+                Locale.subproj/CFDateInterval.h
                 Locale.subproj/CFICULogging.h
                 Locale.subproj/CFLocaleInternal.h
                 Locale.subproj/CFLocale_Private.h
@@ -119,6 +122,9 @@ add_framework(CoreFoundation
                 Base.subproj/CFRuntime.h
                 Base.subproj/ForFoundationOnly.h
                 Base.subproj/ForSwiftFoundationOnly.h
+                Locale.subproj/CFCalendar_Internal.h
+                Locale.subproj/CFDateComponents.h
+                Locale.subproj/CFDateInterval.h
                 Locale.subproj/CFLocaleInternal.h
                 Parsing.subproj/CFXMLInterface.h
                 PlugIn.subproj/CFBundlePriv.h
@@ -214,7 +220,10 @@ add_framework(CoreFoundation
                 Error.subproj/CFError.c
                 # Locale
                 Locale.subproj/CFCalendar.c
+                Locale.subproj/CFCalendar_Enumerate.c
+                Locale.subproj/CFDateComponents.c
                 Locale.subproj/CFDateFormatter.c
+                Locale.subproj/CFDateInterval.c
                 Locale.subproj/CFLocale.c
                 Locale.subproj/CFLocaleIdentifier.c
                 Locale.subproj/CFLocaleKeys.c