Merge pull request #135 from ole/keypath-reverse-condition

Make @keypath macro more resilient when combined with other expressions
jspahrsummers · Jun 29, 2018 · 3acbd6a · 3acbd6a
2 parents 6c5b3c0 + 8d3d597
commit 3acbd6a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/extobjc/EXTKeyPathCoding.h b/extobjc/EXTKeyPathCoding.h
@@ -38,7 +38,7 @@ NSString *lowercaseStringPath = @keypath(NSString.new, lowercaseString);
 #define keypath(...) \
     _Pragma("clang diagnostic push") \
     _Pragma("clang diagnostic ignored \"-Warc-repeated-use-of-weak\"") \
-    (YES).boolValue ? (NSString * _Nonnull)@(cStringKeypath(__VA_ARGS__)) : (NSString * _Nonnull)nil \
+    (NO).boolValue ? ((NSString * _Nonnull)nil) : ((NSString * _Nonnull)@(cStringKeypath(__VA_ARGS__))) \
     _Pragma("clang diagnostic pop") \
 
 #define cStringKeypath(...) \