Add .clang-format and format codebase

.clang-format

@@ -0,0 +1,133 @@
+---
+# Reverse-engineered clang-format configuration for plasma
+# Based on analysis of existing code style
+
+Language: Cpp
+BasedOnStyle: GNU
+
+# Core indentation
+IndentWidth: 2
+UseTab: Never
+TabWidth: 2
+ContinuationIndentWidth: 2
+
+# Custom brace wrapping based on observed style
+# GNU-like for control statements (braces indented), but K&R for namespaces
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: false
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: false
+  BeforeWhile: true
+  IndentBraces: true
+  SplitEmptyFunction: true
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+
+# Column limit - appears to be around 80
+ColumnLimit: 80
+
+# DISTINCTIVE: Space before ALL parentheses including function calls
+# e.g., malloc (sizeof (slabu)), fprintf (stderr, ...)
+SpaceBeforeParens: Always
+
+# Pointer/reference alignment - space before pointer, attached to variable name
+# e.g., char *buf, not char* buf
+PointerAlignment: Right
+ReferenceAlignment: Right
+
+# Access modifiers (public:, private:) indented 1 space from class
+AccessModifierOffset: -1
+
+# Namespace handling - no indentation inside namespaces
+NamespaceIndentation: None
+
+# Switch/case - case labels indented inside switch braces
+IndentCaseLabels: true
+IndentCaseBlocks: false
+
+# Constructor initializer lists
+ConstructorInitializerIndentWidth: 4
+BreakConstructorInitializers: BeforeColon
+PackConstructorInitializers: NextLine
+
+# Allow short forms
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortLambdasOnASingleLine: Inline
+
+# Breaking and wrapping - keep return type on same line as function name
+AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeTernaryOperators: true
+
+# Alignment
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: Right
+AlignOperands: Align
+AlignTrailingComments: true
+
+# Spacing
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# Include sorting
+SortIncludes: false
+IncludeBlocks: Preserve
+
+# Macros
+# OB_PRIVATE is an alias for private/public access specifiers
+StatementMacros:
+  - OB_PRIVATE
+  - OB_PROTECTED
+
+# Other
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+FixNamespaceComments: false
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 3
+ReflowComments: false
+SortUsingDeclarations: false
+UseCRLF: false
+---

.gitignore

@@ -104,9 +104,6 @@ obj-*-linux-*/
 #ccls
 .ccls-cache/
 
-#clang-format
-.clang-format
-
 # Common cmake dirs
 build
 

bld/delta/main.c

@@ -3,13 +3,13 @@ static int reap_children (void)
   int i;
   int status;
   for (i = 0; i < total_children; i++)
-      wait (&status);
+    wait (&status);
 }
 int main (int argc, char *argv[])
 {
   get_args (argc, argv);
 
-  gettimeofday (&start_time, ((void *)0));
+  gettimeofday (&start_time, ((void *) 0));
   goal_end_time = start_time;
   goal_end_time.tv_sec += test_secs;
 

libLoam/c++/ArgParse.cpp

@@ -381,9 +381,10 @@ ArgParse::ArgInfo ArgParse::Query (apstring name) const
   OptionHandler *oh = d->findOption (name, &no);
 
   if (isAlias && !oh)
-    OB_FATAL_BUG_CODE (0x12000006, "Invariant violated (alias '%s' without a "
-                                   "real option '%s' "
-                                   "behind it)\n",
+    OB_FATAL_BUG_CODE (0x12000006,
+                       "Invariant violated (alias '%s' without a "
+                       "real option '%s' "
+                       "behind it)\n",
                        name.utf8 (), ai.aliasFor.utf8 ());
 
   if (oh)
@@ -712,9 +713,7 @@ OptionHandler::OptionHandler (ArgParse::apstring usage_in, int separator_in)
 {
 }
 
-OptionHandler::~OptionHandler ()
-{
-}
+OptionHandler::~OptionHandler () {}
 
 bool OptionHandler::takesarg () const
 {
@@ -726,9 +725,7 @@ bool OptionHandler::allownegation () const
   return false;
 }
 
-void OptionHandler::reset ()
-{
-}
+void OptionHandler::reset () {}
 
 ArgParse::apstring OptionHandler::handleargsplit (ArgParse::apstring arg,
                                                   ArgParse::apstring prefix)

libLoam/c++/Line.cpp

@@ -10,9 +10,7 @@ using namespace oblong::loam;
 static const Vect zaxis (0.0, 0.0, 1.0);
 
 
-Line::Line () : dir (zaxis)
-{
-}
+Line::Line () : dir (zaxis) {}
 
 Line::Line (const Vect &pointOnLine, const Vect &direction)
     : point (pointOnLine), dir (direction)

libLoam/c++/Mutex.cpp

@@ -14,9 +14,8 @@ Mutex::Mutex (bool recursive)
   pthread_mutexattr_t attr;
   OB_CHECK_PTHREAD_CODE (0x110b0000, pthread_mutexattr_init (&attr));
   if (recursive)
-    OB_CHECK_PTHREAD_CODE (0x110b0001,
-                           pthread_mutexattr_settype (&attr,
-                                                      PTHREAD_MUTEX_RECURSIVE));
+    OB_CHECK_PTHREAD_CODE (
+      0x110b0001, pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE));
   OB_CHECK_PTHREAD_CODE (0x110b0002, pthread_mutex_init (&mutex_, &attr));
   OB_CHECK_PTHREAD_CODE (0x110b0003, pthread_mutexattr_destroy (&attr));
 }

libLoam/c++/ObPseudopod.cpp

@@ -7,11 +7,7 @@
 using namespace oblong::loam;
 
 
-ObPseudopod::ObPseudopod () : AnkleObject ()
-{
-}
+ObPseudopod::ObPseudopod () : AnkleObject () {}
 
 
-ObPseudopod::~ObPseudopod ()
-{
-}
+ObPseudopod::~ObPseudopod () {}

libLoam/c++/ObRetortPod.cpp

@@ -7,23 +7,17 @@
 using namespace oblong::loam;
 
 
-ObRetortPod::ObRetortPod () : ObPseudopod (), c_ret (0)
-{
-}
+ObRetortPod::ObRetortPod () : ObPseudopod (), c_ret (0) {}
 
-ObRetortPod::ObRetortPod (ob_retort obr) : ObPseudopod (), c_ret (obr)
-{
-}
+ObRetortPod::ObRetortPod (ob_retort obr) : ObPseudopod (), c_ret (obr) {}
 
 ObRetortPod::ObRetortPod (ob_retort obr, ObRetortPod *ant)
     : ObPseudopod (), c_ret (obr), antecedent (ant)
 {
 }
 
 
-ObRetortPod::~ObRetortPod ()
-{
-}
+ObRetortPod::~ObRetortPod () {}
 
 
 ob_retort ObRetortPod::NumericRetort () const

libLoam/c++/Plane.cpp

@@ -11,9 +11,7 @@ using namespace oblong::loam;
 static const Vect zaxs (0.0, 0.0, 1.0);
 
 
-Plane::Plane () : norm (zaxs)
-{
-}
+Plane::Plane () : norm (zaxs) {}
 
 Plane::Plane (const Vect &p, const Vect &normal) : point (p), norm (normal)
 {

libLoam/c++/Rectangle.cpp

@@ -11,8 +11,8 @@ Rectangle::Rectangle (Vect corner_, Vect leg1_, Vect leg2_)
 
 Str Rectangle::AsStr () const
 {
-  return "Rectangle[c=" + corner.AsStr () + ", l1=" + leg1.AsStr () + ", l2="
-         + leg2.AsStr () + "]";
+  return "Rectangle[c=" + corner.AsStr () + ", l1=" + leg1.AsStr ()
+         + ", l2=" + leg2.AsStr () + "]";
 }
 
 bool Rectangle::IsValid () const

libLoam/c++/Str.cpp

@@ -106,9 +106,7 @@ Str::Str () noexcept
   _Init ();
 }
 
-Str::Str (std::nullptr_t) noexcept : Str ()
-{
-}
+Str::Str (std::nullptr_t) noexcept : Str () {}
 
 Str::Str (const char *text)
 {
@@ -813,7 +811,7 @@ bool Str::Matches (const Str &pattern) const
                          pattern.utf8 (), mattie.ErrorStr ().utf8 ());
   else
     mattie.Match ();
-  return bool(mattie);
+  return bool (mattie);
 }
 
 bool Str::Match (const Str &pattern)
@@ -827,7 +825,7 @@ bool Str::Match (const Str &pattern)
                          pattern.utf8 (), match->ErrorStr ().utf8 ());
   else
     match->Match ();
-  return bool(*match);
+  return bool (*match);
 }
 
 bool Str::Match ()
@@ -841,13 +839,13 @@ bool Str::MatchAgain ()
   if (!match)
     return false;
   match->Match ();
-  return bool(*match);
+  return bool (*match);
 }
 
 bool Str::MatchHasMatched () const
 {
   if (match)
-    return bool(*match);
+    return bool (*match);
   return false;
 }
 
@@ -1282,8 +1280,9 @@ void Str::_EnsureU8Capacity (int64 capacity)
 void Str::_SetU8Length (int64 length)
 {
   if (!u8 || u8ByteCapacity < length)
-    OB_FATAL_BUG_CODE (0x11000003, "u8 = %p, u8ByteCapacity = %" OB_FMT_64 "d, "
-                                   "length = %" OB_FMT_64 "d\n",
+    OB_FATAL_BUG_CODE (0x11000003,
+                       "u8 = %p, u8ByteCapacity = %" OB_FMT_64 "d, "
+                       "length = %" OB_FMT_64 "d\n",
                        u8, u8ByteCapacity, length);
   u8[length] = 0;
   u8ByteLength = length;

libLoam/c++/tests/AxisAlignedBoxTests.cpp

@@ -31,7 +31,9 @@ TEST (AxisAlignedBoxTests, AABB_Constructors)
   const std::array<Vect, 8> op_corners = box.Corners ();
 
   // Test construction from an iterator pair.
-  auto bad_hash = [](const Vect &x) -> size_t { return 0; };
+  auto bad_hash = [] (const Vect &x) -> size_t {
+    return 0;
+  };
   std::unordered_set<Vect, decltype (bad_hash)> spoints (0, bad_hash);
   spoints.emplace (1, 2, 3);
   spoints.emplace (2, 3, 4);

libLoam/c++/tests/BasicStrTest.cpp

@@ -566,9 +566,9 @@ TEST_F (BasicStrTest, Format)
  * to keep C++11 from complaining?  That blows! */
 
 const char eins[] = {0x24, 0x00};
-const char zwei[] = {char(0xC2), char(0xA2), 0x00};
-const char drei[] = {char(0xE2), char(0x82), char(0xAC), 0x00};
-const char vier[] = {char(0xF0), char(0xA4), char(0xAD), char(0xA2), 0x00};
+const char zwei[] = {char (0xC2), char (0xA2), 0x00};
+const char drei[] = {char (0xE2), char (0x82), char (0xAC), 0x00};
+const char vier[] = {char (0xF0), char (0xA4), char (0xAD), char (0xA2), 0x00};
 
 TEST_F (BasicStrTest, FromUTF8)
 {
@@ -960,8 +960,8 @@ TEST_F (BasicStrTest, InvalidUTF8)  // bug 2865
 {
   ob_suppress_message (OBLV_WARN, 0x11000004);
 
-  static const char notutf8[] = {82, 101, 121,       107, 106,
-                                 97, 118, char(237), 107, 0};
+  static const char notutf8[] = {82, 101, 121,        107, 106,
+                                 97, 118, char (237), 107, 0};
   Str unfortunate (notutf8);
   EXPECT_EQ (9, unfortunate.Length ());
   EXPECT_EQ ('j', unfortunate.At (4));
@@ -1082,7 +1082,6 @@ TEST_F (BasicStrTest, Char16)
 
 TEST_F (BasicStrTest, DubyaChar)
 {
-
   const wchar_t *text = L"beeeep";
   const size_t text_length = wcslen (text);
 

libLoam/c++/tests/FatherTimeTest.cpp

@@ -55,7 +55,7 @@ static void waste_time ()
     vals[i] = i;
 
 #ifdef HAVE_STD_SHUFFLE
-  std::shuffle(vals + 0, vals + enuf, std::mt19937{std::random_device{}()});
+  std::shuffle (vals + 0, vals + enuf, std::mt19937{std::random_device{}()});
 #else
   std::random_shuffle (vals + 0, vals + enuf);
 #endif