From 28b0624e9857b5cd7578ba8913cdbf2733eb2d55 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 3 Aug 2024 17:11:40 +0000 Subject: [PATCH] Improve clang-format file FossilOrigin-Name: 2bc02cf4700f34b37d510b7b9bedf34ff005dd333cb898dbf964a24f6eefa8cb --- src/.clang-format | 11 +++++++++++ src/command.mm | 39 ++++++++++++++++++++------------------- src/cube.h | 16 +++++++++------- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/.clang-format b/src/.clang-format index bcccb62..dcb3031 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -4,3 +4,14 @@ UseTab: ForIndentation BreakBeforeBraces: Linux AlwaysBreakAfterReturnType: AllDefinitions AlignAfterOpenBracket: DontAlign +ObjCBlockIndentWidth: 8 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true +ObjCPropertyAttributeOrder: [ + class, direct, + readonly, readwrite, + nullable, nonnull, null_resettable, null_unspecified, + assign, retain, strong, copy, weak, unsafe_unretained, + atomic, nonatomic, + getter, setter +] diff --git a/src/command.mm b/src/command.mm index 75701a8..e088b01 100644 --- a/src/command.mm +++ b/src/command.mm @@ -6,14 +6,14 @@ enum { ID_VAR, ID_COMMAND, ID_ALIAS }; @interface Ident : OFObject -@property(nonatomic) int type; // one of ID_* above -@property(nonatomic) char *name; -@property(nonatomic) int min, max; // ID_VAR -@property(nonatomic) int *storage; // ID_VAR -@property(nonatomic) void (*fun)(); // ID_VAR, ID_COMMAND -@property(nonatomic) int narg; // ID_VAR, ID_COMMAND -@property(nonatomic) char *action; // ID_ALIAS -@property(nonatomic) bool persist; +@property (nonatomic) int type; // one of ID_* above +@property (nonatomic) char *name; +@property (nonatomic) int min, max; // ID_VAR +@property (nonatomic) int *storage; // ID_VAR +@property (nonatomic) void (*fun)(); // ID_VAR, ID_COMMAND +@property (nonatomic) int narg; // ID_VAR, ID_COMMAND +@property (nonatomic) char *action; // ID_ALIAS +@property (nonatomic) bool persist; @end @implementation Ident @@ -519,11 +519,11 @@ complete(char *s) __block int idx = 0; [idents enumerateKeysAndObjectsUsingBlock:^( OFString *name, Ident *ident, bool *stop) { - if (strncmp(ident.name, s + 1, completesize) == 0 && - idx++ == completeidx) { - strcpy_s(s, "/"); - strcat_s(s, ident.name); - } + if (strncmp(ident.name, s + 1, completesize) == 0 && + idx++ == completeidx) { + strcpy_s(s, "/"); + strcat_s(s, ident.name); + } }]; completeidx++; if (completeidx >= idx) @@ -564,18 +564,19 @@ writecfg() fprintf(f, "\n"); [idents enumerateKeysAndObjectsUsingBlock:^( OFString *name, Ident *ident, bool *stop) { - if (ident.type == ID_VAR && ident.persist) { - fprintf(f, "%s %d\n", ident.name, *ident.storage); - } + if (ident.type == ID_VAR && ident.persist) { + fprintf(f, "%s %d\n", ident.name, *ident.storage); + } }]; fprintf(f, "\n"); writebinds(f); fprintf(f, "\n"); [idents enumerateKeysAndObjectsUsingBlock:^( OFString *name, Ident *ident, bool *stop) { - if (ident.type == ID_ALIAS && !strstr(ident.name, "nextmap_")) { - fprintf(f, "alias \"%s\" [%s]\n", ident.name, ident.action); - } + if (ident.type == ID_ALIAS && !strstr(ident.name, "nextmap_")) { + fprintf( + f, "alias \"%s\" [%s]\n", ident.name, ident.action); + } }]; fclose(f); } diff --git a/src/cube.h b/src/cube.h index 48c4db8..c4c899e 100644 --- a/src/cube.h +++ b/src/cube.h @@ -395,7 +395,7 @@ enum // function signatures for script functions, see command.cpp OF_CONSTRUCTOR() \ { \ enqueueInit(#name, ^{ \ - addcommand(#name, (void (*)())fun, nargs); \ + addcommand(#name, (void (*)())fun, nargs); \ }); \ } #define COMMAND(name, nargs) COMMANDN(name, name, nargs) @@ -404,7 +404,8 @@ enum // function signatures for script functions, see command.cpp OF_CONSTRUCTOR() \ { \ enqueueInit(#name, ^{ \ - name = variable(#name, min, cur, max, &name, NULL, true); \ + name = \ + variable(#name, min, cur, max, &name, NULL, true); \ }); \ } #define VAR(name, min, cur, max) \ @@ -412,7 +413,8 @@ enum // function signatures for script functions, see command.cpp OF_CONSTRUCTOR() \ { \ enqueueInit(#name, ^{ \ - name = variable(#name, min, cur, max, &name, NULL, false); \ + name = variable( \ + #name, min, cur, max, &name, NULL, false); \ }); \ } #define VARF(name, min, cur, max, body) \ @@ -421,8 +423,8 @@ enum // function signatures for script functions, see command.cpp OF_CONSTRUCTOR() \ { \ enqueueInit(#name, ^{ \ - name = variable( \ - #name, min, cur, max, &name, var_##name, false); \ + name = variable( \ + #name, min, cur, max, &name, var_##name, false); \ }); \ } \ void var_##name() { body; } @@ -432,8 +434,8 @@ enum // function signatures for script functions, see command.cpp OF_CONSTRUCTOR() \ { \ enqueueInit(#name, ^{ \ - name = \ - variable(#name, min, cur, max, &name, var_##name, true); \ + name = variable( \ + #name, min, cur, max, &name, var_##name, true); \ }); \ } \ void var_##name() { body; }