dnrops
/
SwiftyExpat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed func callbacks to closures. Compiles, but I think we need to copy the blocks.

This commit is contained in:
Helge Hess 2014-07-15 13:33:00 +02:00
parent 69d22d93aa
commit beeb198d64
2 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SwiftyExpat.xcodeproj/project.pbxproj
View File

@ -19,10 +19,10 @@
E8FB777A1971667F00E0557D /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB77671971667F00E0557D /* internal.h */; };
E8FB777C1971667F00E0557D /* nametab.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB77691971667F00E0557D /* nametab.h */; };
E8FB777D1971667F00E0557D /* utf8tab.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB776A1971667F00E0557D /* utf8tab.h */; };
E8FB777E1971667F00E0557D /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = E8FB776B1971667F00E0557D /* xmlparse.c */; settings = {COMPILER_FLAGS = "-DHAVE_EXPAT_CONFIG_H=1"; }; };
E8FB777F1971667F00E0557D /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = E8FB776C1971667F00E0557D /* xmlrole.c */; settings = {COMPILER_FLAGS = "-DHAVE_EXPAT_CONFIG_H=1"; }; };
E8FB777E1971667F00E0557D /* xmlparse.c in Sources */ = {isa = PBXBuildFile; fileRef = E8FB776B1971667F00E0557D /* xmlparse.c */; settings = {COMPILER_FLAGS = "-DHAVE_EXPAT_CONFIG_H=1 -fno-objc-arc"; }; };
E8FB777F1971667F00E0557D /* xmlrole.c in Sources */ = {isa = PBXBuildFile; fileRef = E8FB776C1971667F00E0557D /* xmlrole.c */; settings = {COMPILER_FLAGS = "-DHAVE_EXPAT_CONFIG_H=1 -fno-objc-arc"; }; };
E8FB77801971667F00E0557D /* xmlrole.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB776D1971667F00E0557D /* xmlrole.h */; };
E8FB77811971667F00E0557D /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = E8FB776E1971667F00E0557D /* xmltok.c */; settings = {COMPILER_FLAGS = "-DHAVE_EXPAT_CONFIG_H=1"; }; };
E8FB77811971667F00E0557D /* xmltok.c in Sources */ = {isa = PBXBuildFile; fileRef = E8FB776E1971667F00E0557D /* xmltok.c */; settings = {COMPILER_FLAGS = "-DHAVE_EXPAT_CONFIG_H=1 -fno-objc-arc"; }; };
E8FB77821971667F00E0557D /* xmltok.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB776F1971667F00E0557D /* xmltok.h */; };
E8FB77841971667F00E0557D /* xmltok_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB77711971667F00E0557D /* xmltok_impl.h */; };
E8FB7786197166D800E0557D /* latin1tab.h in Headers */ = {isa = PBXBuildFile; fileRef = E8FB7785197166D800E0557D /* latin1tab.h */; };
@ -40,6 +40,20 @@
remoteGlobalIDString = E8FB773D1971609A00E0557D;
remoteInfo = SwiftyExpat;
};
E8D56622197422600019A103 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E8FB77351971609A00E0557D /* Project object */;
proxyType = 1;
remoteGlobalIDString = E8FB773D1971609A00E0557D;
remoteInfo = SwiftyExpat;
};
E8D56624197422660019A103 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E8FB77351971609A00E0557D /* Project object */;
proxyType = 1;
remoteGlobalIDString = E8FB773D1971609A00E0557D;
remoteInfo = SwiftyExpat;
};
E8FB77961971767500E0557D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E8FB77351971609A00E0557D /* Project object */;
@ -256,6 +270,8 @@
dependencies = (
E8FB77971971767500E0557D /* PBXTargetDependency */,
E8D566211974225F0019A103 /* PBXTargetDependency */,
E8D56623197422600019A103 /* PBXTargetDependency */,
E8D56625197422660019A103 /* PBXTargetDependency */,
);
name = SwiftyExpatTests;
productName = SwiftyExpatTests;
@ -345,6 +361,16 @@
target = E8FB773D1971609A00E0557D /* SwiftyExpat */;
targetProxy = E8D566201974225F0019A103 /* PBXContainerItemProxy */;
};
E8D56623197422600019A103 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E8FB773D1971609A00E0557D /* SwiftyExpat */;
targetProxy = E8D56622197422600019A103 /* PBXContainerItemProxy */;
};
E8D56625197422660019A103 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E8FB773D1971609A00E0557D /* SwiftyExpat */;
targetProxy = E8D56624197422660019A103 /* PBXContainerItemProxy */;
};
E8FB77971971767500E0557D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E8FB773D1971609A00E0557D /* SwiftyExpat */;

38
SwiftyExpat/expat/expat.h
View File

@ -249,31 +249,31 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
/* atts is array of name/value pairs, terminated by 0;
names and values are 0 terminated.
*/
typedef void (XMLCALL *XML_StartElementHandler) (void *userData,
typedef void (XMLCALL ^XML_StartElementHandler) (void *userData,
const XML_Char *name,
const XML_Char **atts);
typedef void (XMLCALL *XML_EndElementHandler) (void *userData,
typedef void (XMLCALL ^XML_EndElementHandler) (void *userData,
const XML_Char *name);
/* s is not 0 terminated. */
typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData,
typedef void (XMLCALL ^XML_CharacterDataHandler) (void *userData,
const XML_Char *s,
int len);
/* target and data are 0 terminated */
typedef void (XMLCALL *XML_ProcessingInstructionHandler) (
typedef void (XMLCALL ^XML_ProcessingInstructionHandler) (
void *userData,
const XML_Char *target,
const XML_Char *data);
/* data is 0 terminated */
typedef void (XMLCALL *XML_CommentHandler) (void *userData,
typedef void (XMLCALL ^XML_CommentHandler) (void *userData,
const XML_Char *data);
typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData);
typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
typedef void (XMLCALL ^XML_StartCdataSectionHandler) (void *userData);
typedef void (XMLCALL ^XML_EndCdataSectionHandler) (void *userData);
/* This is called for any characters in the XML document for which
there is no applicable handler. This includes both characters that
@ -288,14 +288,14 @@ typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
default handler: for example, a comment might be split between
multiple calls.
*/
typedef void (XMLCALL *XML_DefaultHandler) (void *userData,
typedef void (XMLCALL ^XML_DefaultHandler) (void *userData,
const XML_Char *s,
int len);
/* This is called for the start of the DOCTYPE declaration, before
any DTD or internal subset is parsed.
*/
typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
typedef void (XMLCALL ^XML_StartDoctypeDeclHandler) (
void *userData,
const XML_Char *doctypeName,
const XML_Char *sysid,
@ -306,7 +306,7 @@ typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
closing > is encountered, but after processing any external
subset.
*/
typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
typedef void (XMLCALL ^XML_EndDoctypeDeclHandler)(void *userData);
/* This is called for entity declarations. The is_parameter_entity
argument will be non-zero if the entity is a parameter entity, zero
@ -326,7 +326,7 @@ typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
Note that is_parameter_entity can't be changed to XML_Bool, since
that would break binary compatibility.
*/
typedef void (XMLCALL *XML_EntityDeclHandler) (
typedef void (XMLCALL ^XML_EntityDeclHandler) (
void *userData,
const XML_Char *entityName,
int is_parameter_entity,
@ -350,7 +350,7 @@ XML_SetEntityDeclHandler(XML_Parser parser,
entityName, systemId and notationName arguments will never be
NULL. The other arguments may be.
*/
typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) (
typedef void (XMLCALL ^XML_UnparsedEntityDeclHandler) (
void *userData,
const XML_Char *entityName,
const XML_Char *base,
@ -362,7 +362,7 @@ typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) (
whatever was set by XML_SetBase. The notationName will never be
NULL. The other arguments can be.
*/
typedef void (XMLCALL *XML_NotationDeclHandler) (
typedef void (XMLCALL ^XML_NotationDeclHandler) (
void *userData,
const XML_Char *notationName,
const XML_Char *base,
@ -375,12 +375,12 @@ typedef void (XMLCALL *XML_NotationDeclHandler) (
declaration handlers. For an xmlns attribute, prefix will be
NULL. For an xmlns="" attribute, uri will be NULL.
*/
typedef void (XMLCALL *XML_StartNamespaceDeclHandler) (
typedef void (XMLCALL ^XML_StartNamespaceDeclHandler) (
void *userData,
const XML_Char *prefix,
const XML_Char *uri);
typedef void (XMLCALL *XML_EndNamespaceDeclHandler) (
typedef void (XMLCALL ^XML_EndNamespaceDeclHandler) (
void *userData,
const XML_Char *prefix);
@ -393,7 +393,7 @@ typedef void (XMLCALL *XML_EndNamespaceDeclHandler) (
conditions above this handler will only be called if the referenced
entity was actually read.
*/
typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData);
typedef int (XMLCALL ^XML_NotStandaloneHandler) (void *userData);
/* This is called for a reference to an external parsed general
entity. The referenced entity is not automatically parsed. The
@ -429,7 +429,7 @@ typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData);
Note that unlike other handlers the first argument is the parser,
not userData.
*/
typedef int (XMLCALL *XML_ExternalEntityRefHandler) (
typedef int (XMLCALL ^XML_ExternalEntityRefHandler) (
XML_Parser parser,
const XML_Char *context,
const XML_Char *base,
@ -446,7 +446,7 @@ typedef int (XMLCALL *XML_ExternalEntityRefHandler) (
the event would be out of sync with the reporting of the
declarations or attribute values
*/
typedef void (XMLCALL *XML_SkippedEntityHandler) (
typedef void (XMLCALL ^XML_SkippedEntityHandler) (
void *userData,
const XML_Char *entityName,
int is_parameter_entity);
@ -525,7 +525,7 @@ typedef struct {
If info does not describe a suitable encoding, then the parser will
return an XML_UNKNOWN_ENCODING error.
*/
typedef int (XMLCALL *XML_UnknownEncodingHandler) (
typedef int (XMLCALL ^XML_UnknownEncodingHandler) (
void *encodingHandlerData,
const XML_Char *name,
XML_Encoding *info);