Skip to content

Commit f356140

Browse files
committed
[General] Migrate to new options API for string generation
1 parent 2d51a5b commit f356140

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Sources/classdumpctl/main.m

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,14 @@ int main(int argc, char *argv[]) {
259259
return 1;
260260
}
261261

262+
CDGenerationOptions *const generationOptions = [CDGenerationOptions new];
263+
generationOptions.stripSynthesized = YES;
264+
262265
IMP const blankIMP = imp_implementationWithBlock(^{ }); // returns void, takes no parameters
263266

264267
// just doing this once before we potentially delete some class initializers
265-
[[CDClassModel modelWithClass:NSClassFromString(@"NSObject")] linesWithComments:YES synthesizeStrip:YES];
266-
[[CDProtocolModel modelWithProtocol:NSProtocolFromString(@"NSObject")] linesWithComments:YES synthesizeStrip:YES];
268+
[[CDClassModel modelWithClass:NSClassFromString(@"NSObject")] semanticLinesWithOptions:generationOptions];
269+
[[CDProtocolModel modelWithProtocol:NSProtocolFromString(@"NSObject")] semanticLinesWithOptions:generationOptions];
267270

268271
if (hasImageRequests && (outputDir == nil)) {
269272
fprintf(stderr, "-o/--output required to dump all classes in an image\n");
@@ -307,7 +310,7 @@ int main(int argc, char *argv[]) {
307310
}
308311
Class const cls = objc_getClass(classNames[classIndex]);
309312
CDClassModel *model = safelyGenerateModelForClass(cls, blankIMP);
310-
CDSemanticString *semanticString = [model semanticLinesWithComments:NO synthesizeStrip:YES];
313+
CDSemanticString *semanticString = [model semanticLinesWithOptions:generationOptions];
311314
NSString *lines = linesForSemanticStringColorMode(semanticString, outputColorMode, NO);
312315
NSString *headerName = [NSStringFromClass(cls) stringByAppendingPathExtension:@"h"];
313316

@@ -335,7 +338,7 @@ int main(int argc, char *argv[]) {
335338
fprintf(stderr, "Unable to message class named %s\n", requestClassName.UTF8String);
336339
continue;
337340
}
338-
CDSemanticString *string = [model semanticLinesWithComments:NO synthesizeStrip:YES];
341+
CDSemanticString *string = [model semanticLinesWithOptions:generationOptions];
339342
NSString *lines = linesForSemanticStringColorMode(string, outputColorMode, isOutputTTY);
340343
NSData *encodedLines = [lines dataUsingEncoding:NSUTF8StringEncoding];
341344

@@ -356,7 +359,7 @@ int main(int argc, char *argv[]) {
356359
continue;
357360
}
358361
CDProtocolModel *model = [CDProtocolModel modelWithProtocol:prcl];
359-
CDSemanticString *string = [model semanticLinesWithComments:NO synthesizeStrip:YES];
362+
CDSemanticString *string = [model semanticLinesWithOptions:generationOptions];
360363
NSString *lines = linesForSemanticStringColorMode(string, outputColorMode, isOutputTTY);
361364
NSData *encodedLines = [lines dataUsingEncoding:NSUTF8StringEncoding];
362365

@@ -481,7 +484,7 @@ int main(int argc, char *argv[]) {
481484
if (model == nil) {
482485
continue;
483486
}
484-
CDSemanticString *semanticString = [model semanticLinesWithComments:NO synthesizeStrip:YES];
487+
CDSemanticString *semanticString = [model semanticLinesWithOptions:generationOptions];
485488

486489
NSString *lines = linesForSemanticStringColorMode(semanticString, outputColorMode, NO);
487490
NSString *headerName = [NSStringFromClass(cls) stringByAppendingPathExtension:@"h"];

0 commit comments

Comments
 (0)