[reformat] Run clang-format over repository

Signed-off-by: Kimball Thurston <[email protected]>

Author: kdt3rd

.clang-format

@@ -1,29 +1,30 @@
 ---
 Language:        Cpp
-BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: false
+AlignConsecutiveDeclarations: true
 AlignEscapedNewlines: Right
 AlignOperands:   true
 AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: false
-AllowAllConstructorInitializersOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
+# AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+# AllowAllConstructorInitializersOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: InlineOnly
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
+# AllowShortLambdasOnASingleLine: true
+# ArrayInitializerAlignmentStyle: Left
 AlwaysBreakAfterDefinitionReturnType: TopLevel
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: MultiLine
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:   
-  AfterCaseLabel:  true
   AfterClass:      true
   AfterControlStatement: true
   AfterEnum:       true
@@ -44,16 +45,17 @@ BreakBeforeBraces: Custom
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeColon
+BreakConstructorInitializersBeforeComma: true
+BreakConstructorInitializers: BeforeComma
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
-ColumnLimit:     100
+ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
+Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 FixNamespaceComments: true
@@ -70,7 +72,7 @@ IncludeCategories:
   - Regex:           '.*'
     Priority:        1
 IncludeIsMainRegex: '(Test|_test)?$'
-IndentCaseLabels: false
+IndentCaseLabels: true
 IndentPPDirectives: AfterHash
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -85,7 +87,7 @@ ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 4
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 8
+PenaltyBreakAssignment: 4
 PenaltyBreakBeforeFirstCallParameter: 8
 PenaltyBreakComment: 1000
 PenaltyBreakFirstLessLess: 120
@@ -100,21 +102,20 @@ SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
+SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: NonEmptyParentheses
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
+SpaceBeforeParens: Always
+SpaceBeforeRangeBasedForLoopColon: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-SpacesInConditionalStatement: false
 Standard:        Cpp11
-TabWidth:        4
+TabWidth:        8
+#UseTab:          ForIndentation
 UseTab:          Never
 ...

config/ImathConfig.h.in

@@ -12,6 +12,9 @@
 // Options / configuration based on O.S. / compiler
 //
 
+// automated formatting does not handle the cmake tags well
+// clang-format off
+
 //
 // Define whether the half-to-float conversion should use the lookup
 // table method. Note that this is overriden by F16C compiler
@@ -51,13 +54,16 @@
 #define IMATH_VERSION_PATCH @Imath_VERSION_PATCH@
 #define IMATH_VERSION_RELEASE_TYPE "@IMATH_VERSION_RELEASE_TYPE@"
 
-#define IMATH_VERSION_HEX ((uint32_t(IMATH_VERSION_MAJOR) << 24) | \
-                             (uint32_t(IMATH_VERSION_MINOR) << 16) | \
-                             (uint32_t(IMATH_VERSION_PATCH) <<  8))
+#define IMATH_VERSION_HEX                                                      \
+    ((uint32_t (IMATH_VERSION_MAJOR) << 24) |                                  \
+     (uint32_t (IMATH_VERSION_MINOR) << 16) |                                  \
+     (uint32_t (IMATH_VERSION_PATCH) << 8))
 
 // IMATH_LIB_VERSION is the library API version: SOCURRENT.SOAGE.SOREVISION
 #define IMATH_LIB_VERSION_STRING "@IMATH_LIB_VERSION@"
 
+// clang-format on
+
 //
 // Code that depends on the v2 ExcMath mechanism of signal handlers
 // that throw exceptions is incompatible with noexcept, since
@@ -69,9 +75,9 @@
 
 #cmakedefine01 IMATH_USE_NOEXCEPT
 #if IMATH_USE_NOEXCEPT
-#define IMATH_NOEXCEPT noexcept
+#    define IMATH_NOEXCEPT noexcept
 #else
-#define IMATH_NOEXCEPT
+#    define IMATH_NOEXCEPT
 #endif
 
 //
@@ -84,25 +90,23 @@
 // templates from compiling correctly.
 //
 #ifndef IMATH_FOREIGN_VECTOR_INTEROP
-#  if defined(__GNUC__) && __GNUC__ == 4 && !defined(__clang__)
-#    define IMATH_FOREIGN_VECTOR_INTEROP 0
-#  else
-#    define IMATH_FOREIGN_VECTOR_INTEROP 1
-#  endif
+#    if defined(__GNUC__) && __GNUC__ == 4 && !defined(__clang__)
+#        define IMATH_FOREIGN_VECTOR_INTEROP 0
+#    else
+#        define IMATH_FOREIGN_VECTOR_INTEROP 1
+#    endif
 #endif
 
-
 //
 // Decorator that makes a function available for both CPU and GPU, when
 // compiling for Cuda.
 //
 #ifdef __CUDACC__
-  #define IMATH_HOSTDEVICE __host__ __device__
+#    define IMATH_HOSTDEVICE __host__ __device__
 #else
-  #define IMATH_HOSTDEVICE
+#    define IMATH_HOSTDEVICE
 #endif
 
-
 //
 // Some compilers define a special intrinsic to use in conditionals that can
 // speed up extremely performance-critical spots if the conditional is
@@ -118,38 +122,37 @@
 //
 #if defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)
 #    ifdef __cplusplus
-#        define IMATH_LIKELY(x) (__builtin_expect(static_cast<bool>(x), true))
-#        define IMATH_UNLIKELY(x) (__builtin_expect(static_cast<bool>(x), false))
+#        define IMATH_LIKELY(x) (__builtin_expect (static_cast<bool> (x), true))
+#        define IMATH_UNLIKELY(x)                                              \
+            (__builtin_expect (static_cast<bool> (x), false))
 #    else
-#        define IMATH_LIKELY(x) (__builtin_expect((x), 1))
-#        define IMATH_UNLIKELY(x) (__builtin_expect((x), 0))
+#        define IMATH_LIKELY(x) (__builtin_expect ((x), 1))
+#        define IMATH_UNLIKELY(x) (__builtin_expect ((x), 0))
 #    endif
 #else
 #    define IMATH_LIKELY(x) (x)
 #    define IMATH_UNLIKELY(x) (x)
 #endif
 
-
 // On modern versions of gcc & clang, __has_attribute can test support for
 // __attribute__((attr)).  Make sure it's safe for other compilers.
 #ifndef __has_attribute
 #    define __has_attribute(x) 0
 #endif
 
-
 //
 // Simple way to mark things as deprecated.
 // When we are sure that C++14 is our true minimum, then we can just
 // directly use [[deprecated(msg)]].
 //
 #if defined(_MSC_VER)
-# define IMATH_DEPRECATED(msg) __declspec(deprecated(msg))
+#    define IMATH_DEPRECATED(msg) __declspec(deprecated (msg))
 #elif defined(__cplusplus) && __cplusplus >= 201402L
-# define IMATH_DEPRECATED(msg) [[deprecated(msg)]]
+#    define IMATH_DEPRECATED(msg) [[deprecated (msg)]]
 #elif defined(__GNUC__) || defined(__clang__)
-# define IMATH_DEPRECATED(msg) __attribute__((deprecated(msg)))
+#    define IMATH_DEPRECATED(msg) __attribute__ ((deprecated (msg)))
 #else
-# define IMATH_DEPRECATED(msg) /* unsupported on this platform */
+#    define IMATH_DEPRECATED(msg) /* unsupported on this platform */
 #endif
 
 // Whether the user configured the library to have symbol visibility
@@ -159,13 +162,16 @@
 // MSVC does not do the same visibility attributes, and when we are
 // compiling a static library we won't be in DLL mode, but just don't
 // define these and the export headers will work out
-#if ! defined(_MSC_VER) && defined(IMATH_ENABLE_API_VISIBILITY)
-#  define IMATH_PUBLIC_SYMBOL_ATTRIBUTE __attribute__ ((__visibility__ ("default")))
-#  define IMATH_PRIVATE_SYMBOL_ATTRIBUTE __attribute__ ((__visibility__ ("hidden")))
+#if !defined(_MSC_VER) && defined(IMATH_ENABLE_API_VISIBILITY)
+#    define IMATH_PUBLIC_SYMBOL_ATTRIBUTE                                      \
+        __attribute__ ((__visibility__ ("default")))
+#    define IMATH_PRIVATE_SYMBOL_ATTRIBUTE                                     \
+        __attribute__ ((__visibility__ ("hidden")))
 // clang differs from gcc and has type visibility which is needed for enums and templates
-#  if __has_attribute(__type_visibility__)
-#    define IMATH_PUBLIC_TYPE_VISIBILITY_ATTRIBUTE __attribute__ ((__type_visibility__ ("default")))
-#  endif
+#    if __has_attribute(__type_visibility__)
+#        define IMATH_PUBLIC_TYPE_VISIBILITY_ATTRIBUTE                         \
+            __attribute__ ((__type_visibility__ ("default")))
+#    endif
 #endif
 
 #endif // INCLUDED_IMATH_CONFIG_H

docs/examples/Box.cpp

@@ -1,25 +1,25 @@
 #include <Imath/ImathBox.h>
-        
+
 void
-box_example()
+box_example ()
 {
-    Imath::V3f   a (0, 0, 0);
-    Imath::V3f   b (1, 1, 1);
-    Imath::V3f   c (2, 9, 2);
+    Imath::V3f a (0, 0, 0);
+    Imath::V3f b (1, 1, 1);
+    Imath::V3f c (2, 9, 2);
 
     Imath::Box3f box (a);
 
-    assert (box.isEmpty());
-    assert (!box.isInfinite());
-    assert (!box.hasVolume());
-    
+    assert (box.isEmpty ());
+    assert (!box.isInfinite ());
+    assert (!box.hasVolume ());
+
     box.extendBy (c);
 
-    assert (box.size() == (c-a));
+    assert (box.size () == (c - a));
     assert (box.intersects (b));
     assert (box.max[0] > box.min[0]);
     assert (box.max[1] > box.min[1]);
     assert (box.max[2] > box.min[2]);
-    assert (box.hasVolume());
-    assert (box.majorAxis() == 1);
+    assert (box.hasVolume ());
+    assert (box.majorAxis () == 1);
 }

docs/examples/Color3.cpp

@@ -1,13 +1,13 @@
 #include <Imath/ImathColor.h>
 
 void
-color3_example()
+color3_example ()
 {
-    Imath::C3c   r (255, 0, 0);
-    Imath::C3c   g (0, 255, 0);
-    Imath::C3c   b (0, 0, 255);
-    
-    Imath::C3c   c = r + g + b;
+    Imath::C3c r (255, 0, 0);
+    Imath::C3c g (0, 255, 0);
+    Imath::C3c b (0, 0, 255);
+
+    Imath::C3c c = r + g + b;
 
     assert (c.x == 255);
     assert (c.x == 255);

docs/examples/Color4.cpp

@@ -1,13 +1,13 @@
 #include <Imath/ImathColor.h>
 
 void
-color4_example()
+color4_example ()
 {
-    Imath::C4f   r (1.0f, 0.0f, 0.0f, 1.0f);
-    Imath::C4f   g (0.0f, 1.0f, 0.0f, 1.0f);
-    Imath::C4f   b (0.0f, 0.0f, 1.0f, 1.0f);
-    
-    Imath::C4f   w = r + g + b;
+    Imath::C4f r (1.0f, 0.0f, 0.0f, 1.0f);
+    Imath::C4f g (0.0f, 1.0f, 0.0f, 1.0f);
+    Imath::C4f b (0.0f, 0.0f, 1.0f, 1.0f);
+
+    Imath::C4f w = r + g + b;
 
     assert (w.r == 1.0f);
     assert (w.g == 1.0f);

docs/examples/Euler.cpp

@@ -2,10 +2,10 @@
 #include <ImathMatrixAlgo.h>
 
 void
-euler_example()
+euler_example ()
 {
     int i, j, k;
-    
+
     Imath::Eulerf xyz (Imath::Eulerf::XYZ);
     xyz.angleOrder (i, j, k);
     assert (i == 0 && j == 1 && k == 2);
@@ -18,7 +18,6 @@ euler_example()
     Imath::Eulerf e2 (0.0f, 0.0f, 0.1f);
 
     e1.makeNear (e2);
-    Imath::V3f v = e2.toXYZVector();
+    Imath::V3f v = e2.toXYZVector ();
     assert (v.equalWithAbsError (Imath::V3f (0.0f, 0.0f, 0.1f), 0.00001f));
 }
-  

docs/examples/Frustum.cpp

@@ -1,18 +1,18 @@
 #include <Imath/ImathFrustum.h>
 
 void
-frustum_example()
+frustum_example ()
 {
-    float near = 1.7f;
-    float far = 567.0f;
-    float left = -3.5f;
-    float right = 2.0f;
-    float top = 0.9f;
+    float near   = 1.7f;
+    float far    = 567.0f;
+    float left   = -3.5f;
+    float right  = 2.0f;
+    float top    = 0.9f;
     float bottom = -1.3f;
 
     Imath::Frustumf frustum (near, far, left, right, top, bottom, false);
 
-    Imath::M44f m = frustum.projectionMatrix();
+    Imath::M44f m = frustum.projectionMatrix ();
 
     Imath::V3f p (1.0f, 1.0f, 1.0f);
     Imath::V2f s = frustum.projectPointToScreen (p);