Merge branch 'ChrisChares-NSHTTPCookie'

Author: tptee

.gitignore

@@ -15,4 +15,5 @@ project.xcworkspace
 
 Build
 .build
+.configuration
 

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing
+
+Contributions to Foundation are welcome! This project follows the [contribution guidelines for the Swift project](https://swift.org/contributing/#contributing-code). A few additional details are outlined below.
+
+## Licensing
+
+By submitting a pull request, you represent that you have the right to license your contribution to Apple and the community, and agree by submitting the patch that your contributions are licensed under the [Swift license](https://swift.org/LICENSE.txt).
+
+
+## Bug Reports
+
+You can use the `Foundation` component in the [bug reporter](https://bugs.swift.org) if you know your bug is specifically about Swift Foundation.
+
+Please remember to include platform information with your report. If the bug is about the Foundation framework on Darwin, then please use the [Apple bug reporting system](https://bugreport.apple.com).
+
+## Pull Requests
+
+Before embarking on a large amount of work to implement missing functionality, please double-check with the community on the [swift-corelibs-dev](https://lists.swift.org/mailman/listinfo/swift-corelibs-dev) mailing list. Someone may already be working in this area, and we want to avoid duplication of work.
+
+If your request includes functionality changes, please be sure to test your code on Linux as well as OS X. Differences in the compiler and runtime on each platform means that code that compiles and runs correctly on Darwin (where the Objective-C runtime is present) may not compile at all on Linux.
+
+##### Review
+
+Each pull request will be reviewed by a code owner before merging.
+
+* Pull requests should contain small, incremental change.
+* Focus on one task. If a pull request contains several unrelated commits, we will ask for the pull request to be split up.
+* Please squash work-in-progress commits. Each commit should stand on its own (including the addition of tests if possible). This allows us to bisect issues more effectively.
+* After addressing review feedback, please rebase your commit so that we create a clean history in the `master` branch.
+
+##### Tests
+
+All pull requests which contain code changes should come with a new set of automated tests, and every current test must pass on all supported platforms.
+
+##### Documentation
+
+Most of the methods in Foundation are lacking documentation. We appreciate your help in filling out documentation when you implement a method. Use the markdown syntax in the [Swift Naming Guidelines](https://swift.org/documentation/api-design-guidelines.html#write-doc-comment).
+
+## API Changes
+
+The interface of Foundation is intended to be both stable and cross-platform. This means that when API is added to Foundation, it is effectively permanent.
+
+It is therefore critical that any code change that affects the public-facing API go through a full  `swift-evolution` review process. This gives us the chance to ensure several important requirements are satisfied:
+
+* The proposal aligns with our current goals for the upcoming release.
+* We are comfortable supporting the proposed API for the long term.
+* We believe we can make the same change to the API of Darwin Foundation. This could be done via changes in the overlay, changes in the compiler, or changes in Darwin Foundation itself. This must be addressed in every proposal.

CoreFoundation/Base.subproj/CFBase.h

@@ -231,6 +231,15 @@ CF_EXTERN_C_BEGIN
 #define CF_AUTOMATED_REFCOUNT_UNAVAILABLE
 #endif
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+#ifndef CF_ASSUME_NONNULL_BEGIN
+#define CF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
+#endif
+#ifndef CF_ASSUME_NONNULL_BEGIN
+#define CF_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
+#endif
+#endif
+
 #ifndef CF_IMPLICIT_BRIDGING_ENABLED
 #if __has_feature(arc_cf_code_audited)
 #define CF_IMPLICIT_BRIDGING_ENABLED _Pragma("clang arc_cf_code_audited begin")

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -11,17 +11,14 @@
 #ifndef __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__
 #define __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ 1
 
-#define NS_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
-#define NS_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
-
 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFNumber.h>
 #include <CoreFoundation/CFLocaleInternal.h>
 #include <CoreFoundation/CFCalendar.h>
+#include <CoreFoundation/CFXMLInterface.h>
+#include <fts.h>
 
-#import <fts.h>
-
-NS_ASSUME_NONNULL_BEGIN
+CF_ASSUME_NONNULL_BEGIN
 
 struct __CFSwiftObject {
     uintptr_t isa;
@@ -115,6 +112,68 @@ struct _NSMutableStringBridge {
     void (*_cfAppendCString)(CFTypeRef str, const char *chars, CFIndex appendLength);
 };
 
+struct _NSXMLParserBridge {
+    _CFXMLInterface _Nullable (*_Nonnull currentParser)();
+    _CFXMLInterfaceParserInput _Nonnull (*_Nonnull _xmlExternalEntityWithURL)(_CFXMLInterface interface, const char *url, const char * identifier, _CFXMLInterfaceParserContext context, _CFXMLInterfaceExternalEntityLoader originalLoaderFunction);
+    
+    _CFXMLInterfaceParserContext _Nonnull (*_Nonnull getContext)(_CFXMLInterface ctx);
+    
+    void (*internalSubset)(_CFXMLInterface ctx, const unsigned char *name, const unsigned char *ExternalID, const unsigned char *SystemID);
+    int (*isStandalone)(_CFXMLInterface ctx);
+    int (*hasInternalSubset)(_CFXMLInterface ctx);
+    int (*hasExternalSubset)(_CFXMLInterface ctx);
+    _CFXMLInterfaceEntity _Nonnull (*_Nonnull getEntity)(_CFXMLInterface ctx, const unsigned char *name);
+    void (*notationDecl)(_CFXMLInterface ctx,
+                         const unsigned char *name,
+                         const unsigned char *publicId,
+                         const unsigned char *systemId);
+    void (*attributeDecl)(_CFXMLInterface ctx,
+                          const unsigned char *elem,
+                          const unsigned char *fullname,
+                          int type,
+                          int def,
+                          const unsigned char *defaultValue,
+                          _CFXMLInterfaceEnumeration tree);
+    void (*elementDecl)(_CFXMLInterface ctx,
+                        const unsigned char *name,
+                        int type,
+                        _CFXMLInterfaceElementContent content);
+    void (*unparsedEntityDecl)(_CFXMLInterface ctx,
+                               const unsigned char *name,
+                               const unsigned char *publicId,
+                               const unsigned char *systemId,
+                               const unsigned char *notationName);
+    void (*startDocument)(_CFXMLInterface ctx);
+    void (*endDocument)(_CFXMLInterface ctx);
+    void (*startElementNs)(_CFXMLInterface ctx,
+                           const unsigned char *localname,
+                           const unsigned char *prefix,
+                           const unsigned char *URI,
+                           int nb_namespaces,
+                           const unsigned char *_Nonnull *_Nonnull namespaces,
+                           int nb_attributes,
+                           int nb_defaulted,
+                           const unsigned char *_Nonnull *_Nonnull attributes);
+    void (*endElementNs)(_CFXMLInterface ctx,
+                         const unsigned char *localname,
+                         const unsigned char *prefix,
+                         const unsigned char *URI);
+    void (*characters)(_CFXMLInterface ctx,
+                       const unsigned char *ch,
+                       int len);
+    void (*processingInstruction)(_CFXMLInterface ctx,
+                                  const unsigned char *target,
+                                  const unsigned char *data);
+    void (*cdataBlock)(_CFXMLInterface ctx,
+                       const unsigned char *value,
+                       int len);
+    void (*comment)(_CFXMLInterface ctx, const unsigned char *value);
+    void (*externalSubset)(_CFXMLInterface ctx,
+                           const unsigned char *name,
+                           const unsigned char *ExternalID,
+                           const unsigned char *SystemID);
+};
+
 struct _CFSwiftBridge {
     struct _NSObjectBridge NSObject;
     struct _NSArrayBridge NSArray;
@@ -125,6 +184,7 @@ struct _CFSwiftBridge {
     struct _NSMutableSetBridge NSMutableSet;
     struct _NSStringBridge NSString;
     struct _NSMutableStringBridge NSMutableString;
+    struct _NSXMLParserBridge NSXMLParser;
 };
 
 __attribute__((__visibility__("hidden"))) extern struct _CFSwiftBridge __CFSwiftBridge;
@@ -211,6 +271,6 @@ extern void _cf_uuid_unparse(const _cf_uuid_t uu, _cf_uuid_string_t out);
 extern void _cf_uuid_unparse_lower(const _cf_uuid_t uu, _cf_uuid_string_t out);
 extern void _cf_uuid_unparse_upper(const _cf_uuid_t uu, _cf_uuid_string_t out);
 
-NS_ASSUME_NONNULL_END
+CF_ASSUME_NONNULL_END
 
 #endif /* __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ */

CoreFoundation/NumberDate.subproj/CFNumber.c

@@ -1099,6 +1099,7 @@ static inline void _CFNumberInit(CFNumberRef result, CFNumberType type, const vo
         case kCFNumberFloat32Type: memmove((void *)&result->_pad, valuePtr, 4); break;
         case kCFNumberFloat64Type: memmove((void *)&result->_pad, valuePtr, 8); break;
     }
+    __CFBitfieldSetValue(((struct __CFNumber *)result)->_base._cfinfo[CF_INFO_BITS], 4, 0, (uint8_t)__CFNumberTypeTable[type].canonicalType);
 }
 
 CF_EXPORT void _CFNumberInitBool(CFNumberRef result, Boolean value) {