Syntax modernizations

This commit is contained in:
Andrew Hyatt 2018-01-16 21:24:15 -08:00
parent 5352e472c9
commit 7942379f04
6 changed files with 32 additions and 33 deletions

View File

@ -17,8 +17,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
+ (NSXMLDTDNode *)predefinedEntityDeclarationForName:(NSString *)name;
- initWithData:(NSData *)data options:(NSUInteger)options error:(NSError **)error;
- initWithContentsOfURL:(NSURL *)url options:(NSUInteger)options error:(NSError **)error;
- (instancetype)initWithData:(NSData *)data options:(NSUInteger)options error:(NSError **)error;
- (instancetype)initWithContentsOfURL:(NSURL *)url options:(NSUInteger)options error:(NSError **)error;
- (NSString *)publicID;
- (NSString *)systemID;

View File

@ -17,7 +17,7 @@ typedef int NSXMLDTDNodeKind;
NSString *_systemID;
}
- initWithXMLString:(NSString *)string;
- (instancetype)initWithXMLString:(NSString *)string;
- (NSXMLDTDNodeKind)DTDKind;
- (BOOL)isExternal;

View File

@ -37,10 +37,10 @@ typedef NSUInteger NSXMLDocumentContentKind;
+ (Class)replacementClassForClass:(Class)aClass;
- initWithRootElement:(NSXMLElement *)element;
- initWithXMLString:(NSString *)string options:(NSUInteger)options error:(NSError **)error;
- initWithData:(NSData *)data options:(NSUInteger)options error:(NSError **)error;
- initWithContentsOfURL:(NSURL *)url options:(NSUInteger)options error:(NSError **)error;
- (instancetype)initWithRootElement:(NSXMLElement *)element;
- (instancetype)initWithXMLString:(NSString *)string options:(NSUInteger)options error:(NSError **)error;
- (instancetype)initWithData:(NSData *)data options:(NSUInteger)options error:(NSError **)error;
- (instancetype)initWithContentsOfURL:(NSURL *)url options:(NSUInteger)options error:(NSError **)error;
- (NSXMLDocumentContentKind)documentContentKind;
- (NSString *)version;
@ -72,8 +72,8 @@ typedef NSUInteger NSXMLDocumentContentKind;
- (NSData *)XMLData;
- (NSData *)XMLDataWithOptions:(NSUInteger)options;
- objectByApplyingXSLT:(NSData *)xslt arguments:(NSDictionary *)arguments error:(NSError *)error;
- objectByApplyingXSLTAtURL:(NSURL *)url arguments:(NSDictionary *)arguments error:(NSError *)error;
- objectByApplyingXSLTString:(NSString *)string arguments:(NSDictionary *)arguments error:(NSError *)error;
- (id)objectByApplyingXSLT:(NSData *)xslt arguments:(NSDictionary *)arguments error:(NSError *)error;
- (id)objectByApplyingXSLTAtURL:(NSURL *)url arguments:(NSDictionary *)arguments error:(NSError *)error;
- (id)objectByApplyingXSLTString:(NSString *)string arguments:(NSDictionary *)arguments error:(NSError *)error;
@end

View File

@ -15,10 +15,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
NSMutableDictionary *_namespaces;
}
- initWithName:(NSString *)name;
- initWithName:(NSString *)name stringValue:(NSString *)string;
- initWithName:(NSString *)name URI:(NSString *)uri;
- initWithXMLString:(NSString *)xml error:(NSError **)error;
- (instancetype)initWithName:(NSString *)name;
- (instancetype)initWithName:(NSString *)name stringValue:(NSString *)string;
- (instancetype)initWithName:(NSString *)name URI:(NSString *)uri;
- (instancetype)initWithXMLString:(NSString *)xml error:(NSError **)error;
- (NSArray *)attributes;
- (NSXMLNode *)attributeForLocalName:(NSString *)name URI:(NSString *)uri;

View File

@ -1,5 +1,4 @@
/* Copyright (c) 2007 Christopher J. W. Lloyd
/*
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
@ -58,28 +57,28 @@ enum {
id _value;
}
+ document;
+ documentWithRootElement:(NSXMLElement *)element;
+ (id)document;
+ (id)documentWithRootElement:(NSXMLElement *)element;
+ elementWithName:(NSString *)name;
+ elementWithName:(NSString *)name children:(NSArray *)children attributes:(NSArray *)attributes;
+ elementWithName:(NSString *)name stringValue:(NSString *)string;
+ (id)elementWithName:(NSString *)name;
+ (id)elementWithName:(NSString *)name children:(NSArray *)children attributes:(NSArray *)attributes;
+ (id)elementWithName:(NSString *)name stringValue:(NSString *)string;
+ attributeWithName:(NSString *)name stringValue:(NSString *)string;
+ (id)attributeWithName:(NSString *)name stringValue:(NSString *)string;
+ commentWithStringValue:(NSString *)string;
+ textWithStringValue:(NSString *)string;
+ processingInstructionWithName:(NSString *)name stringValue:(NSString *)string;
+ (id)commentWithStringValue:(NSString *)string;
+ (id)textWithStringValue:(NSString *)string;
+ (id)processingInstructionWithName:(NSString *)name stringValue:(NSString *)string;
+ DTDNodeWithXMLString:(NSString *)string;
+ namespaceWithName:(NSString *)name stringValue:(NSString *)string;
+ (id)DTDNodeWithXMLString:(NSString *)string;
+ (id)namespaceWithName:(NSString *)name stringValue:(NSString *)string;
+ (NSXMLNode *)predefinedNamespaceForPrefix:(NSString *)prefix;
+ (NSString *)prefixForName:(NSString *)name;
+ (NSString *)localNameForName:(NSString *)name;
- initWithKind:(NSXMLNodeKind)kind;
- initWithKind:(NSXMLNodeKind)kind options:(NSUInteger)options;
- (instancetype)initWithKind:(NSXMLNodeKind)kind;
- (instancetype)initWithKind:(NSXMLNodeKind)kind options:(NSUInteger)options;
- (NSUInteger)index;
- (NSXMLNodeKind)kind;
@ -90,7 +89,7 @@ enum {
- (NSXMLNode *)nextSibling;
- (NSString *)stringValue;
- (NSString *)URI;
- objectValue;
- (id)objectValue;
- (NSXMLNode *)parent;
- (NSString *)prefix;
- (NSXMLNode *)previousNode;

View File

@ -68,10 +68,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
NSMutableDictionary *_currentAttributes;
}
- initWithData:(NSData *)data;
- initWithContentsofURL:(NSURL *)url;
- (instancetype)initWithData:(NSData *)data;
- (instancetype)initWithContentsofURL:(NSURL *)url;
- delegate;
- (id)delegate;
- (BOOL)shouldProcessNamespaces;
- (BOOL)shouldReportNamespacePrefixes;
- (BOOL)shouldResolveExternalEntities;