@@ -1,7 +1,7 @@ /* - * Copyright (c) 2008-2022 Jonathan Schleifer + * Copyright (c) 2008-2024 Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -29,56 +29,78 @@ extern void newClass(OFString *, OFString *, OFMutableArray *); OF_APPLICATION_DELEGATE(ObjFWNew) static void -showUsage(void) +help(OFStream *stream, bool full, int status) { - [OFStdErr writeFormat: @"Usage: %@ --app|--class name\n", - [OFApplication programName]]; + [stream writeFormat: + @"Usage: %@ --app|--class [--superclass=] [--property=] name\n", + [OFApplication programName]]; + + if (full) { + [stream writeString: @"\n"]; + [stream writeLine: + @"Options:\n" + @" -a --app Create a new app\n" + @" -c --class Create a new class\n" + @" -h --help Show this help\n" + @" -s --superclass= Specify the superclass for the " + @"class\n" + @" -p --property= Add a property to the class.\n" + @" E.g.: --property='(readonly, " + @"nonatomic) id foo'"]; + } - [OFApplication terminateWithStatus: 1]; + [OFApplication terminateWithStatus: status]; } @implementation ObjFWNew -- (void)applicationDidFinishLaunching +- (void)applicationDidFinishLaunching: (OFNotification *)notification { bool app, class; OFString *superclass = nil, *name; OFMutableArray OF_GENERIC(OFString *) *properties = nil; const OFOptionsParserOption options[] = { { 'a', @"app", 0, &app, NULL }, { 'c', @"class", 0, &class, NULL }, + { 'h', @"help", 0, NULL, NULL }, { 's', @"superclass", 1, NULL, &superclass }, { 'p', @"property", 1, NULL, NULL }, { '\0', nil, 0, NULL, NULL } }; OFOptionsParser *optionsParser; OFUnichar option; + + if ([OFApplication arguments].count == 0) + help(OFStdErr, true, 1); optionsParser = [OFOptionsParser parserWithOptions: options]; while ((option = [optionsParser nextOption]) != '\0') { switch (option) { + case 'h': + help(OFStdOut, true, 0); + break; case 'p': if (properties == nil) properties = [OFMutableArray array]; [properties addObject: optionsParser.argument]; break; case '?': case ':': case '=': - showUsage(); + help(OFStdErr, false, 1); break; } } if ((app ^ class) != 1 || optionsParser.remainingArguments.count != 1) - showUsage(); + help(OFStdErr, false, 1); if ((superclass && !class) || (properties != nil && !class)) - showUsage(); + help(OFStdErr, false, 1); name = optionsParser.remainingArguments.firstObject; if ([name rangeOfString: @"."].location != OFNotFound) { [OFStdErr writeLine: @"Name must not contain dots!"]; [OFApplication terminate]; @@ -87,10 +109,10 @@ if (app) newApp(name); else if (class) newClass(name, superclass, properties); else - showUsage(); + help(OFStdErr, false, 1); [OFApplication terminate]; } @end