Merge pull request #553 from red031000/clang-format

apply clang-format

.clang-format

@@ -1,25 +1,103 @@
-BasedOnStyle: LLVM
-AllowShortFunctionsOnASingleLine: None
-BreakBeforeBraces: Allman
-ColumnLimit: 100
-UseTab: Never
-IndentWidth: 4
-TabWidth: 4
+---
+BasedOnStyle: WebKit
+Language: Cpp
+LineEnding: LF
+ColumnLimit: 0
+
 AlignAfterOpenBracket: DontAlign
-Cpp11BracedListStyle: false
-BreakStringLiterals: false
-IndentCaseLabels: true
+AlignConsecutiveAssignments:
+  Enabled: true
+AlignConsecutiveBitFields:
+  Enabled: true
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: Consecutive
+AlignTrailingComments: true
+AlignArrayOfStructures: Left
+
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+
 BinPackArguments: false
 BinPackParameters: false
-AlignTrailingComments: false
+BitFieldColonSpacing: Both
+
+InsertBraces: true
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeElse: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: false
+
+AlwaysBreakAfterReturnType: None
+BreakBeforeBinaryOperators: All
+BreakBeforeTernaryOperators: true
+BreakStringLiterals: true
+
+DerivePointerAlignment: false
+PointerAlignment: Right
+ReferenceAlignment: Right
+
+ContinuationIndentWidth: 4
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+
+SortIncludes: CaseSensitive
+IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex:           '^"nitro/types\.h"$'
-    Priority:        -4
-  - Regex:           '^"global\.h"$'
-    Priority:        -3
-  - Regex:           '^"nitro/nitro\.h"$'
-    Priority:        -2
-  - Regex:           '^"nitro/'
-    Priority:        -1
-  - Regex:           '.\*'
-    Priority:        1
+  - Regex: '((<.+>)|("nitro/.*\.h"))'
+    Priority: 1
+  - Regex: '"global\.h"'
+    Priority: 2
+  - Regex: '"(consts|constants)/.*\.h"'
+    Priority: 3
+  - Regex: '"(struct_(decls|defs))/.*\.h"'
+    Priority: 4
+  - Regex: '"(constdata|res)/.*\.(h|naix)"'
+    Priority: 7
+  - Regex: '"[[:alnum:]_]+/.*\.(h|naix)"'
+    Priority: 5
+  - Regex: '"[[:alnum:]_]+\.(h|naix)"'
+    Priority: 6
+  - Regex: '.*'
+    Priority: 8
+
+InsertTrailingCommas: Wrapped
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtEOF: false
+MaxEmptyLinesToKeep: 1
+RemoveParentheses: ReturnStatement
+RemoveSemicolon: true
+
+# QualifierAlignment: Custom
+# QualifierOrder: [static, inline, const, volatile, type]
+
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeParens: ControlStatements
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParens: Never

.clang-format-ignore

@@ -0,0 +1,6 @@
+**/*.s
+**/*.inc
+**/*.json
+arm9/lib/
+arm7/lib/
+include/nitro/

.gitattributes

@@ -1,13 +1,17 @@
 *.sha1 text eol=lf
 charmap.txt text eol=crlf
 m2ctx.sh text eol=lf
+format.sh text eol=lf
 
 *.png binary
 
-*.c text eol=crlf
-*.h text eol=crlf
-*.cpp text eol=crlf
-*.hpp text eol=crlf
-*.s text eol=crlf
-.gitattributes text eol=crlf
-.gitignore text eol=crlf
+*.c text eol=lf
+*.h text eol=lf
+*.cpp text eol=lf
+*.hpp text eol=lf
+*.s text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+Makefile text eol=lf
+.clang-format-ignore eol=lf
+.clang-format eol=lf

.githooks/pre-commit

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Redirect output to stderr.
+exec 1>&2
+
+# Run clang-format on staged files; abort the commit if any files are changed
+if ! git clang-format --extensions c,cpp,h,hpp ; then
+    echo "linting made changes to source files; aborting commit"
+    exit 1
+fi

arm9/lib/NitroSDK/include/PAD_pad.h

@@ -2,6 +2,7 @@
 #define NITRO_PAD_PAD_H_
 
 #include "registers.h"
+#include "mmap.h"
 
 //================================================================================
 //    BUTTONS

arm9/lib/NitroSDK/include/RTC_api.h

@@ -1,6 +1,8 @@
 #ifndef NITRO_RTC_API_H_
 #define NITRO_RTC_API_H_
 
+#include "nitro/types.h"
+
 typedef enum RTCAlarmChan
 {
     RTC_ALARM_CHAN_1 = 0,

arm9/overlays/01/src/overlay_01.c

@@ -1,4 +1,5 @@
 #include "global.h"
+
 #include "sinit.h"
 
 static void NitroStaticInit(void) {

arm9/overlays/05/include/ov05_021E72FC.h

@@ -2,11 +2,11 @@
 #define POKEDIAMOND_ov05_021E72FC_H
 
 #include "nitro/types.h"
+
 #include "field_system.h"
 #include "task.h"
 
-typedef struct UnkStruct021E7358
-{
+typedef struct UnkStruct021E7358 {
     u32 Unk00;
     u32 Unk04;
     u32 Unk08;
@@ -22,4 +22,4 @@ BOOL ov05_021E73B4(TaskManager *taskManager);
 UnkStruct021E7358 *ov05_021E74D4(u32 param0);
 void ov05_021E74F8(UnkStruct021E7358 *param0);
 
-#endif //POKEDIAMOND_ov05_021E72FC_H
+#endif // POKEDIAMOND_ov05_021E72FC_H

arm9/overlays/05/include/overlay_05.h

@@ -1,10 +1,10 @@
 #ifndef POKEDIAMOND_OVERLAY_05_H
 #define POKEDIAMOND_OVERLAY_05_H
 
-//todo: remove this file
+// todo: remove this file
 
 #include "pokemon.h"
 
-void ov05_SetEggStats(struct Pokemon * mon, u16 species, int a1, PlayerProfile * data, int a2, int metLoc);
+void ov05_SetEggStats(struct Pokemon *mon, u16 species, int a1, PlayerProfile *data, int a2, int metLoc);
 
-#endif //POKEDIAMOND_OVERLAY_05_H
+#endif // POKEDIAMOND_OVERLAY_05_H