Improve isolation of ObjectiveC syntax filter code.

[cycript.git] / Bridge.def

diff --git a/Bridge.def b/Bridge.def
index b3792aa6a87e7b803677756e79585fe42efce8e5..17b017ae2ce668624a8991bddc8460079f492322 100644 (file)
--- a/Bridge.def
+++ b/Bridge.def
@@ -1,6 +1,5 @@
 C YES true
 C NO false
-C nil null
 C NULL null
 
 : applicationDidFinishLaunching: v12@0:4@8
@@ -10,11 +9,13 @@ T id @
 T short s
 T int i
 T long l
+T longlong q
 
 T byte C
+T ushort S
 T uint I
 T ulong L
-T ushort S
+T ulonglong Q
 
 T char c
 T boolean B
@@ -22,13 +23,26 @@ T float f
 T double d
 
 T Boolean B
-
-T SInt8 {char}
-T UInt8 {byte}
-T SInt16 {short}
-T UInt16 {ushort}
-T SInt32 {int}
-T UInt32 {uint}
+T BOOL B
+T bool B
+
+T int8_t {char}
+T uint8_t {byte}
+T int16_t {short}
+T uint16_t {ushort}
+T int32_t {int}
+T uint32_t {uint}
+T int64_t {longlong}
+T uint64_t {ulonglong}
+
+T SInt8 {int8_t}
+T UInt8 {uint8_t}
+T SInt16 {int16_t}
+T UInt16 {uint16_t}
+T SInt32 {int32_t}
+T UInt32 {uint32_t}
+T SInt64 {int64_t}
+T UInt64 {uint64_t}
 
 S CGPoint "x"f"y"f
 S CGRect "origin"{CGPoint}"size"{CGSize}
@@ -118,7 +132,7 @@ F property_getName *^{objc_property=}
 
 F protocol_conformsToProtocol B@@
 F protocol_copyMethodDescriptionList ^{objc_method_description=:*}@BB^I
-F protocol_copyPropertyList ^{objc_property=}@^I
+F protocol_copyPropertyList ^^{objc_property=}@^I
 F protocol_copyProtocolList ^@@^I
 F protocol_getMethodDescription {objc_method_description=:*}@:BB
 F protocol_getName *@
@@ -623,6 +637,7 @@ F CalFilterCreateWithDatabase ^{CalFilter}^{CalDatabase}
 
 F CalEventOccurrenceGetEvent @@
 F CalEventCopySummary @@
+F CalEventIsAllDay B@
 F CalEventOccurrenceGetDate I@
 
 f CoreAnimation
@@ -1436,6 +1451,7 @@ T NSMapTable {_NSMapTable}
 T NSMapTableOptions {NSUInteger}
 # NSMapTableValueCallBacks
 
+S _NSPoint "x"{CGFloat}"y"{CGFloat}
 T NSPoint {_NSPoint}
 T NSPointArray ^{NSPoint}
 T NSPointPointer ^{NSPoint}
@@ -1600,7 +1616,7 @@ C RTLD_NEXT -1
 C RTLD_DEFAULT -2
 C RTLD_SELF -3
 
-S dl_info "dli_fname"*"dli_fbase"v^"dli_sname"*"dli_saddr"^v
+S dl_info "dli_fname"*"dli_fbase"^v"dli_sname"*"dli_saddr"^v
 T Dl_info {dl_info}
 
 F dladdr i^rv^{dl_info}