@@ -59,41 +59,46 @@ open class XMLDocument : XMLNode {
5959 private var _xmlDoc : _CFXMLDocPtr {
6060 return _CFXMLDocPtr ( _xmlNode)
6161 }
62+
63+ public init ( ) {
64+ NSUnimplemented ( )
65+ }
66+
6267 /*!
6368 @method initWithXMLString:options:error:
6469 @abstract Returns a document created from either XML or HTML, if the HTMLTidy option is set. Parse errors are returned in <tt>error</tt>.
6570 */
66- public convenience init ( xmlString string: String , options mask : Int ) throws {
71+ public convenience init ( xmlString string: String , options: Options ) throws {
6772 guard let data = string. data ( using: . utf8) else {
6873 // TODO: Throw an error
6974 fatalError ( " String: ' \( string) ' could not be converted to NSData using UTF-8 encoding " )
7075 }
7176
72- try self . init ( data: data, options: mask )
77+ try self . init ( data: data, options: options )
7378 }
7479
7580 /*!
7681 @method initWithContentsOfURL:options:error:
7782 @abstract Returns a document created from the contents of an XML or HTML URL. Connection problems such as 404, parse errors are returned in <tt>error</tt>.
7883 */
79- public convenience init ( contentsOf url: URL , options mask : Int ) throws {
84+ public convenience init ( contentsOf url: URL , options: Options ) throws {
8085 let data = try Data ( contentsOf: url, options: . dataReadingMappedIfSafe)
8186
82- try self . init ( data: data, options: mask )
87+ try self . init ( data: data, options: options )
8388 }
8489
8590 /*!
8691 @method initWithData:options:error:
8792 @abstract Returns a document created from data. Parse errors are returned in <tt>error</tt>.
8893 */
89- public init ( data: Data , options mask : Int ) throws {
90- let docPtr = _CFXMLDocPtrFromDataWithOptions ( data. _cfObject, Int32 ( mask ) )
94+ public init ( data: Data , options: Options ) throws {
95+ let docPtr = _CFXMLDocPtrFromDataWithOptions ( data. _cfObject, Int32 ( options . rawValue ) )
9196 super. init ( ptr: _CFXMLNodePtr ( docPtr) )
9297
93- if mask & NSXMLDocumentValidate != 0 {
98+ if options . contains ( . documentValidate ) {
9499 try validate ( )
95100 }
96- } //primitive
101+ }
97102
98103 /*!
99104 @method initWithRootElement:
@@ -102,14 +107,16 @@ open class XMLDocument : XMLNode {
102107 public init ( rootElement element: XMLElement ? ) {
103108 precondition ( element? . parent == nil )
104109
105- super. init ( kind: . document, options: NSXMLNodeOptionsNone )
110+ super. init ( kind: . document, options: [ ] )
106111 if let element = element {
107112 _CFXMLDocSetRootElement ( _xmlDoc, element. _xmlNode)
108113 _childNodes. insert ( element)
109114 }
110115 }
111116
112- open class func replacementClassForClass( _ cls: AnyClass ) -> AnyClass { NSUnimplemented ( ) }
117+ open class func replacementClass( for cls: AnyClass ) -> AnyClass {
118+ NSUnimplemented ( )
119+ }
113120
114121 /*!
115122 @method characterEncoding
@@ -126,7 +133,7 @@ open class XMLDocument : XMLNode {
126133 _CFXMLDocSetCharacterEncoding ( _xmlDoc, nil )
127134 }
128135 }
129- } //primitive
136+ }
130137
131138 /*!
132139 @method version
@@ -144,13 +151,13 @@ open class XMLDocument : XMLNode {
144151 _CFXMLDocSetVersion ( _xmlDoc, nil )
145152 }
146153 }
147- } //primitive
154+ }
148155
149156 /*!
150157 @method standalone
151158 @abstract Set whether this document depends on an external DTD. If this option is set the standalone declaration will appear on output.
152159 */
153- open var standalone : Bool {
160+ open var isStandalone : Bool {
154161 get {
155162 return _CFXMLDocStandalone ( _xmlDoc)
156163 }
@@ -192,7 +199,7 @@ open class XMLDocument : XMLNode {
192199 @method MIMEType
193200 @abstract Set the MIME type, eg text/xml.
194201 */
195- open var mimeType : String ? //primitive
202+ open var mimeType : String ?
196203
197204 /*!
198205 @method DTD
@@ -250,15 +257,15 @@ open class XMLDocument : XMLNode {
250257 }
251258
252259 return XMLNode . _objectNodeForNode ( rootPtr) as? XMLElement
253- } //primitive
260+ }
254261
255262 /*!
256263 @method insertChild:atIndex:
257264 @abstract Inserts a child at a particular index.
258265 */
259266 open func insertChild( _ child: XMLNode , at index: Int ) {
260267 _insertChild ( child, atIndex: index)
261- } //primitive
268+ }
262269
263270 /*!
264271 @method insertChildren:atIndex:
@@ -274,15 +281,15 @@ open class XMLDocument : XMLNode {
274281 */
275282 open func removeChild( at index: Int ) {
276283 _removeChildAtIndex ( index)
277- } //primitive
284+ }
278285
279286 /*!
280287 @method setChildren:
281288 @abstract Removes all existing children and replaces them with the new children. Set children to nil to simply remove all children.
282289 */
283290 open func setChildren( _ children: [ XMLNode ] ? ) {
284291 _setChildren ( children)
285- } //primitive
292+ }
286293
287294 /*!
288295 @method addChild:
@@ -304,13 +311,13 @@ open class XMLDocument : XMLNode {
304311 @method XMLData
305312 @abstract Invokes XMLDataWithOptions with NSXMLNodeOptionsNone.
306313 */
307- /*@NSCopying*/ open var xmlData : Data { return xmlData ( withOptions: NSXMLNodeOptionsNone ) }
314+ /*@NSCopying*/ open var xmlData : Data { return xmlData ( withOptions: [ ] ) }
308315
309316 /*!
310317 @method XMLDataWithOptions:
311318 @abstract The representation of this node as it would appear in an XML document, encoded based on characterEncoding.
312319 */
313- open func xmlData( withOptions options: Int ) -> Data {
320+ open func xmlData( withOptions options: Options ) -> Data {
314321 let string = xmlString ( withOptions: options)
315322 // TODO: support encodings other than UTF-8
316323
@@ -321,19 +328,25 @@ open class XMLDocument : XMLNode {
321328 @method objectByApplyingXSLT:arguments:error:
322329 @abstract Applies XSLT with arguments (NSString key/value pairs) to this document, returning a new document.
323330 */
324- open func object( byApplyingXSLT xslt: NSData , arguments: [ String : String ] ? ) throws -> AnyObject { NSUnimplemented ( ) }
331+ open func object( byApplyingXSLT xslt: Data , arguments: [ String : String ] ? ) throws -> Any {
332+ NSUnimplemented ( )
333+ }
325334
326335 /*!
327336 @method objectByApplyingXSLTString:arguments:error:
328337 @abstract Applies XSLT as expressed by a string with arguments (NSString key/value pairs) to this document, returning a new document.
329338 */
330- open func object( byApplyingXSLTString xslt: String , arguments: [ String : String ] ? ) throws -> AnyObject { NSUnimplemented ( ) }
339+ open func object( byApplyingXSLTString xslt: String , arguments: [ String : String ] ? ) throws -> Any {
340+ NSUnimplemented ( )
341+ }
331342
332343 /*!
333344 @method objectByApplyingXSLTAtURL:arguments:error:
334345 @abstract Applies the XSLT at a URL with arguments (NSString key/value pairs) to this document, returning a new document. Error may contain a connection error from the URL.
335346 */
336- open func objectByApplyingXSLT( at xsltURL: URL , arguments argument: [ String : String ] ? ) throws -> AnyObject { NSUnimplemented ( ) }
347+ open func objectByApplyingXSLT( at xsltURL: URL , arguments argument: [ String : String ] ? ) throws -> Any {
348+ NSUnimplemented ( )
349+ }
337350
338351 open func validate( ) throws {
339352 var unmanagedError : Unmanaged < CFError > ? = nil
0 commit comments