nygard · Feb 24, 2015 · Feb 24, 2015 · Feb 24, 2015 · Sep 27, 2015 · Nov 24, 2018
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,155 @@
+#########################
+# .gitignore file for Xcode4 and Xcode5 Source projects
+#
+# Based on http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects
+#
+#########################
+
+#####
+# OS X temporary files that should never be committed
+#
+# c.f. http://www.westwind.com/reference/os-x/invisibles.html
+
+.DS_Store
+
+# c.f. http://www.westwind.com/reference/os-x/invisibles.html
+
+.Trashes
+
+# c.f. http://www.westwind.com/reference/os-x/invisibles.html
+
+*.swp
+
+#
+# *.lock - this is used and abused by many editors for many different things.
+#    For the main ones I use (e.g. Eclipse), it should be excluded 
+#    from source-control, but YMMV.
+#   (lock files are usually local-only file-synchronization on the local FS that should NOT go in git)
+# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations!
+#
+# In particular, if you're using CocoaPods, you'll want to comment-out this line:
+*.lock
+
+
+
+####
+# Xcode temporary files that should never be committed
+# 
+# NB: NIB/XIB files still exist even on Storyboard projects, so we want this...
+
+*~.nib
+
+
+####
+# Xcode build files -
+#
+# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData"
+
+DerivedData/
+
+# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build"
+
+build/
+
+
+#####
+# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
+#
+# This is complicated:
+#
+# SOMETIMES you need to put this file in version control.
+# Apple designed it poorly - if you use "custom executables", they are
+#  saved in this file.
+# 99% of projects do NOT use those, so they do NOT want to version control this file.
+#  ..but if you're in the 1%, comment out the line "*.pbxuser"
+
+# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html
+
+*.pbxuser
+
+# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html
+
+*.mode1v3
+
+# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html
+
+*.mode2v3
+
+# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file
+
+*.perspectivev3
+
+#    NB: also, whitelist the default ones, some projects need to use these
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+
+####
+# Xcode 4 - semi-personal settings
+#
+# Apple Shared data that Apple put in the wrong folder
+# c.f. http://stackoverflow.com/a/19260712/153422
+#     FROM ANSWER: Apple says "don't ignore it"
+#     FROM COMMENTS: Apple is wrong; Apple code is too buggy to trust; there are no known negative side-effects to ignoring Apple's unofficial advice and instead doing the thing that actively fixes bugs in Xcode
+# Up to you, but ... current advice: ignore it.
+*.xccheckout
+
+#
+#
+# OPTION 1: ---------------------------------
+#     throw away ALL personal settings (including custom schemes!
+#     - unless they are "shared")
+# As per build/ and DerivedData/, this ought to have a trailing slash
+#
+# NB: this is exclusive with OPTION 2 below
+xcuserdata/
+
+# OPTION 2: ---------------------------------
+#     get rid of ALL personal settings, but KEEP SOME OF THEM
+#     - NB: you must manually uncomment the bits you want to keep
+#
+# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X,
+#    or manually install git over the top of the OS X version
+# NB: this is exclusive with OPTION 1 above
+#
+#xcuserdata/**/*
+
+#     (requires option 2 above): Personal Schemes
+#
+#!xcuserdata/**/xcschemes/*
+
+####
+# XCode 4 workspaces - more detailed
+#
+# Workspaces are important! They are a core feature of Xcode - don't exclude them :)
+#
+# Workspace layout is quite spammy. For reference:
+#
+# /(root)/
+#   /(project-name).xcodeproj/
+#     project.pbxproj
+#     /project.xcworkspace/
+#       contents.xcworkspacedata
+#       /xcuserdata/
+#         /(your name)/xcuserdatad/
+#           UserInterfaceState.xcuserstate
+#     /xcshareddata/
+#       /xcschemes/
+#         (shared scheme name).xcscheme
+#     /xcuserdata/
+#       /(your name)/xcuserdatad/
+#         (private scheme).xcscheme
+#         xcschememanagement.plist
+#
+#
+
+####
+# Xcode 4 - Deprecated classes
+#
+# Allegedly, if you manually "deprecate" your classes, they get moved here.
+#
+# We're using source-control, so this is a "feature" that we do not want!
+
+*.moved-aside
diff --git a/Source/CDClassDump.h b/Source/CDClassDump.h
@@ -5,7 +5,7 @@
 
 #import "CDFile.h" // For CDArch
 
-#define CLASS_DUMP_BASE_VERSION "3.5 (64 bit)"
+#define CLASS_DUMP_BASE_VERSION "4.0 (mas fork)"
 
 #ifdef DEBUG
 #define CLASS_DUMP_VERSION CLASS_DUMP_BASE_VERSION " (Debug version compiled " __DATE__ " " __TIME__ ")"

diff --git a/Source/CDLCBuildVersion.m b/Source/CDLCBuildVersion.m
@@ -15,10 +15,11 @@
         case PLATFORM_TVOS:             return @"tvOS";
         case PLATFORM_WATCHOS:          return @"watchOS";
         case PLATFORM_BRIDGEOS:         return @"bridgeOS";
-        case PLATFORM_IOSMAC:           return @"iOS Mac";
+        case PLATFORM_MACCATALYST:      return @"Mac Catalyst";
         case PLATFORM_IOSSIMULATOR:     return @"iOS Simulator";
         case PLATFORM_TVOSSIMULATOR:    return @"tvOS Simulator";
         case PLATFORM_WATCHOSSIMULATOR: return @"watchOS Simulator";
+        case PLATFORM_DRIVERKIT:        return @"DriverKit";
         default:               return [NSString stringWithFormat:@"Unknown platform %x", platform];
     }
 }

diff --git a/Source/CDMultiFileVisitor.m b/Source/CDMultiFileVisitor.m
@@ -36,6 +36,8 @@ @interface CDMultiFileVisitor ()
 
 @property (nonatomic, readonly) NSString *referenceString;
 
+@property (nonatomic) NSString *currentFramework;
+
 @end
 
 #pragma mark -
@@ -85,6 +87,8 @@ - (void)willVisitClass:(CDOCClass *)aClass;
     [self.resultString setString:@""];
     [self.classDump appendHeaderToString:self.resultString];
 
+    self.currentFramework = [self frameworkForClassName:aClass.name];
+
     [self removeAllClassNameProtocolNameReferences];
     NSString *str = [self importStringForClassName:aClass.superClassName];
     if (str != nil) {
@@ -94,6 +98,7 @@ - (void)willVisitClass:(CDOCClass *)aClass;
 
     self.referenceLocation = [self.resultString length];
 
+    [self.resultString setString:@"#import <Foundation/NSObjCRuntime.h>\n\nNS_ASSUME_NONNULL_BEGIN\n\n"];
     // And then generate the regular output
     [super willVisitClass:aClass];
 
@@ -102,8 +107,11 @@ - (void)willVisitClass:(CDOCClass *)aClass;
 
 - (void)didVisitClass:(CDOCClass *)aClass;
 {
+    self.currentFramework = nil;
+
     // Generate the regular output
     [super didVisitClass:aClass];
+    [self.resultString appendString:@"NS_ASSUME_NONNULL_END\n\n"];
 
     // Then insert the imports and write the file.
     [self removeReferenceToClassName:aClass.name];
@@ -125,6 +133,8 @@ - (void)willVisitCategory:(CDOCCategory *)category;
     [self.resultString setString:@""];
     [self.classDump appendHeaderToString:self.resultString];
 
+    self.currentFramework = [self frameworkForClassName:category.name];
+
     [self removeAllClassNameProtocolNameReferences];
     NSString *str = [self importStringForClassName:category.className];
     if (str != nil) {
@@ -133,6 +143,7 @@ - (void)willVisitCategory:(CDOCCategory *)category;
     }
     self.referenceLocation = [self.resultString length];
 
+    [self.resultString appendString:@"#import <Foundation/NSObjCRuntime.h>\n\nNS_ASSUME_NONNULL_BEGIN\n\n"];
     // And then generate the regular output
     [super willVisitCategory:category];
 
@@ -141,8 +152,11 @@ - (void)willVisitCategory:(CDOCCategory *)category;
 
 - (void)didVisitCategory:(CDOCCategory *)category;
 {
+    self.currentFramework = nil;
+
     // Generate the regular output
     [super didVisitCategory:category];
+    [self.resultString appendString:@"NS_ASSUME_NONNULL_END\n\n"];
 
     // Then insert the imports and write the file.
     [self removeReferenceToClassName:category.className];
@@ -162,9 +176,12 @@ - (void)willVisitProtocol:(CDOCProtocol *)protocol;
     [self.resultString setString:@""];
     [self.classDump appendHeaderToString:self.resultString];
 
+    self.currentFramework = [self frameworkForClassName:protocol.name];
+
     [self removeAllClassNameProtocolNameReferences];
     self.referenceLocation = [self.resultString length];
 
+    [self.resultString appendString:@"#import <Foundation/NSObjCRuntime.h>\n\nNS_ASSUME_NONNULL_BEGIN\n\n"];
     // And then generate the regular output
     [super willVisitProtocol:protocol];
 
@@ -173,8 +190,11 @@ - (void)willVisitProtocol:(CDOCProtocol *)protocol;
 
 - (void)didVisitProtocol:(CDOCProtocol *)protocol;
 {
+    self.currentFramework = nil;
+
     // Generate the regular output
     [super didVisitProtocol:protocol];
+    [self.resultString appendString:@"NS_ASSUME_NONNULL_END\n\n"];
 
     // Then insert the imports and write the file.
     NSString *referenceString = self.referenceString;
@@ -223,7 +243,7 @@ - (NSString *)importStringForClassName:(NSString *)name;
 {
     if (name != nil) {
         NSString *framework = [self frameworkForClassName:name];
-        if (framework == nil)
+        if (framework == nil || [framework isEqualToString:self.currentFramework])
             return [NSString stringWithFormat:@"#import \"%@.h\"\n", name];
         else
             return [NSString stringWithFormat:@"#import <%@/%@.h>\n", framework, name];
@@ -237,7 +257,7 @@ - (NSString *)importStringForProtocolName:(NSString *)name;
     if (name != nil) {
         NSString *framework = [self frameworkForProtocolName:name];
         NSString *headerName = [name stringByAppendingString:@"-Protocol.h"];
-        if (framework == nil)
+        if (framework == nil || [framework isEqualToString:self.currentFramework])
             return [NSString stringWithFormat:@"#import \"%@\"\n", headerName];
         else
             return [NSString stringWithFormat:@"#import <%@/%@>\n", framework, headerName];

diff --git a/Source/CDTextClassDumpVisitor.m b/Source/CDTextClassDumpVisitor.m
@@ -6,6 +6,7 @@
 #import "CDTextClassDumpVisitor.h"
 
 #import "CDClassDump.h"
+#import "CDType.h"
 #import "CDOCClass.h"
 #import "CDOCCategory.h"
 #import "CDOCMethod.h"
@@ -122,8 +123,16 @@ - (void)visitClassMethod:(CDOCMethod *)method;
 - (void)visitInstanceMethod:(CDOCMethod *)method propertyState:(CDVisitorPropertyState *)propertyState;
 {
     CDOCProperty *property = [propertyState propertyForAccessor:method.name];
-    if (property == nil) {
+    if (property.isReadOnly && [property.setter isEqualToString:method.name]) {
+        [self.resultString appendFormat:@"- (void)%@(%@)arg1;\n", method.name, [property.type formattedString:nil formatter:self.classDump.typeController.propertyTypeFormatter level:0]];
+    } else if (property == nil) {
         //NSLog(@"No property for method: %@", method.name);
+        // C++ destructors can't be called and this header can't be compiled with one declared. So let's comment it out.
+        // Leave it there so the user knows that the class has a C++ implementation though.
+        if ([method.name isEqualToString:@".cxx_destruct"]) {
+            [self.resultString appendString:@"// "];
+        }
+
         [self.resultString appendString:@"- "];
         [method appendToString:self.resultString typeController:self.classDump.typeController];
         [self.resultString appendString:@"\n"];

diff --git a/Source/CDType.m b/Source/CDType.m
@@ -433,20 +433,21 @@ - (NSString *)formattedString:(NSString *)previousName formatter:(CDTypeFormatte
             break;
 
         case T_FUNCTION_POINTER_TYPE:
-            if (currentName == nil)
-                result = @"CDUnknownFunctionPointerType";
-            else
-                result = [NSString stringWithFormat:@"CDUnknownFunctionPointerType %@", currentName];
+            result = @"void * /* CDUnknownFunctionPointerType */";
+            if (currentName != nil) {
+                result = [result stringByAppendingFormat:@" %@", currentName];
+            }
+
             break;
 
         case T_BLOCK_TYPE:
             if (self.types) {
                 result = [self blockSignatureString];
             } else {
-                if (currentName == nil)
-                    result = @"CDUnknownBlockType";
-                else
-                    result = [NSString stringWithFormat:@"CDUnknownBlockType %@", currentName];
+                result = @"id /* CDUnknownBlockType */";
+                if (currentName != nil) {
+                    result = [result stringByAppendingFormat:@" %@", currentName];
+                }
             }
             break;
 

diff --git a/Source/CDVisitorPropertyState.m b/Source/CDVisitorPropertyState.m
@@ -28,7 +28,7 @@ - (id)initWithProperties:(NSArray *)properties;
             //NSLog(@"property: %@, getter: %@, setter: %@", [property name], [property getter], [property setter]);
             _propertiesByName[property.name] = property;
             _propertiesByAccessor[property.getter] = property;
-            if (property.isReadOnly == NO)
+            if (property.isReadOnly == NO || property.setter)
                 _propertiesByAccessor[property.setter] = property;
         }
     }