Formatting

JBenda · Dec 15, 2023 · b3cf913 · b3cf913
1 parent 69765f1
commit b3cf913
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 119 deletions.
diff --git a/.clang-format b/.clang-format
@@ -77,7 +77,7 @@ SpaceAfterTemplateKeyword: false
 SpaceAfterLogicalNot: true
 SpaceAfterCStyleCast: true
 SortUsingDeclarations: Lexicographic
-SortIncludes: CaseInsensitive
+SortIncludes: Never
 ShortNamespaceLines: 0
 SeparateDefinitionBlocks: Always
 RequiresExpressionIndentation: OuterScope

diff --git a/inkcpp/array.h b/inkcpp/array.h
@@ -18,15 +18,16 @@ namespace ink::runtime::internal {
 			{
 				_dynamic_data = new T[initialCapacity];
 			}
-		}
+                }
 
-		~managed_array() {
-			if constexpr (dynamic) {
-				delete[] _dynamic_data;
-			}
-		}
+                ~managed_array()
+                {
+                        if constexpr (dynamic) {
+                                delete[] _dynamic_data;
+                        }
+                }
 
-		const T& operator[]( size_t i ) const { return data()[i]; }
+                const T& operator[]( size_t i ) const { return data()[i]; }
 		T&       operator[]( size_t i ) { return data()[i]; }
 		const T* data() const
 		{

diff --git a/inkcpp/output.cpp b/inkcpp/output.cpp
@@ -140,13 +140,13 @@ namespace ink::runtime::internal
 		std::string result = str.str();
 		if ( !result.empty() ) {
 			auto end = clean_string<true, false>( result.begin(), result.end() );
-			if (result.begin() == end) {
-				result.resize(0);
-			} else {
-				_last_char = *( end - 1 );
-				result.resize( end - result.begin() - ( _last_char == ' ' ? 1 : 0 ) );
-			}
-		}
+                        if (result.begin() == end) {
+                                result.resize(0);
+                        } else {
+                                _last_char = *(end - 1);
+                                result.resize(end - result.begin() - (_last_char == ' ' ? 1 : 0));
+                        }
+                }
 		return result;
 	}
 #endif

diff --git a/inkcpp/runner_impl.cpp b/inkcpp/runner_impl.cpp
@@ -177,16 +177,15 @@ namespace ink::runtime::internal
 		//  without entering any other containers
 		// OR IF if target is same position do nothing
 		// could happend if jumping to and of an unnamed container
-		if (dest ==_ptr)
-		{
-			_ptr = dest;
+                if (dest == _ptr) {
+                        _ptr = dest;
 			return;
-		}
+                }
 
-		const uint32_t* iter = nullptr;
+                const uint32_t* iter = nullptr;
 		container_t id;
-		ip_t offset = nullptr;
-		size_t comm_end;
+                ip_t            offset = nullptr;
+                size_t comm_end;
 		bool reversed = _ptr > dest;
 
 		if (reversed) {
@@ -1172,14 +1171,16 @@ namespace ink::runtime::internal
 			} break;
 			case Command::END_CONTAINER_MARKER:
 			{
-				container_t index = read<container_t>();
+	                        container_t index = read<container_t>();
 
-					inkAssert(_container.top().id == index, "Leaving container we are not in!");
+	                        inkAssert(
+	                            _container.top().id == index, "Leaving container we are not in!"
+	                        );
 
-					// Move up out of the current container
-					_container.pop();
+	                        // Move up out of the current container
+	                        _container.pop();
 
-				// SPECIAL: If we've popped all containers, then there's an implied 'done' command or return
+	                        // SPECIAL: If we've popped all containers, then there's an implied 'done' command or return
 				if (_container.empty())
 				{
 					_is_falling = false;

diff --git a/inkcpp/story_ptr.cpp b/inkcpp/story_ptr.cpp
@@ -66,4 +66,4 @@ namespace ink::runtime::internal
 		_instance_block = _story_block = nullptr;
 		return is_destroyed;
 	}
-}
+        } // namespace ink::runtime::internal
diff --git a/inkcpp_cl/inkcpp_cl.cpp b/inkcpp_cl/inkcpp_cl.cpp
@@ -155,9 +155,9 @@ int main(int argc, const char** argv)
 		using namespace ink::runtime;
 
 		// Load story
-		std::unique_ptr<story> myInk{story::from_file(outputFilename.c_str())};
+                std::unique_ptr<story> myInk{story::from_file(outputFilename.c_str())};
 
-		// Start runner
+                // Start runner
 		runner thread;
 		if (snapshotFile.size()) {
 			auto snap_ptr = snapshot::from_file( snapshotFile.c_str() );
@@ -212,12 +212,12 @@ int main(int argc, const char** argv)
 
 			// out of content
 			break;
-		}
-	}
+                }
+        }
 	catch (const std::exception& e)
 	{
 		std::cerr << "Unhandled ink runtime exception: " << e.what() << std::endl;
 		return 1;
 	}
-	return 0;
+        return 0;
 }
diff --git a/inkcpp_test/SpaceAfterBracketChoice.cpp b/inkcpp_test/SpaceAfterBracketChoice.cpp
@@ -1,48 +1,48 @@
-#include "catch.hpp"
-#include "../inkcpp_cl/test.h"
-
-#include <story.h>
-#include <globals.h>
-#include <runner.h>
-#include <compiler.h>
-
-using namespace ink::runtime;
-
-SCENARIO("a story with bracketed choices and spaces can choose correctly", "[choices]")
-{
-	GIVEN("a story with line breaks")
-	{
-		inklecate("ink/ChoiceBracketStory.ink", "ChoiceBracketStory.tmp");
-		ink::compiler::run("ChoiceBracketStory.tmp", "ChoiceBracketStory.bin");
-		auto ink = story::from_file("ChoiceBracketStory.bin");
-		runner thread = ink->new_runner();
-		thread->getall();
-		WHEN("start thread")
-		{
-			THEN("thread has choices")
-			{
-				thread->getall();
-				REQUIRE(thread->has_choices());
-			}
-			WHEN("choose choice 1")
-			{
-				thread->choose(0);
-				thread->getall();
-				THEN("still has choices")
-				{
-					thread->getall();
-					REQUIRE(thread->has_choices());
-				}
-			}
-			WHEN("choose choice 2")
-			{
-				thread->choose(1);
-				thread->getall();
-				THEN("still has choices")
-				{
-					REQUIRE(thread->has_choices());
-				}
-			}
-		}
-	}
-}
+#include "catch.hpp"
+#include "../inkcpp_cl/test.h"
+
+#include <story.h>
+#include <globals.h>
+#include <runner.h>
+#include <compiler.h>
+
+using namespace ink::runtime;
+
+SCENARIO("a story with bracketed choices and spaces can choose correctly", "[choices]")
+{
+  GIVEN("a story with line breaks")
+  {
+    inklecate("ink/ChoiceBracketStory.ink", "ChoiceBracketStory.tmp");
+    ink::compiler::run("ChoiceBracketStory.tmp", "ChoiceBracketStory.bin");
+    auto   ink    = story::from_file("ChoiceBracketStory.bin");
+    runner thread = ink->new_runner();
+    thread->getall();
+    WHEN("start thread")
+    {
+      THEN("thread has choices")
+      {
+	thread->getall();
+	REQUIRE(thread->has_choices());
+      }
+      WHEN("choose choice 1")
+      {
+	thread->choose(0);
+	thread->getall();
+	THEN("still has choices")
+	{
+	  thread->getall();
+	  REQUIRE(thread->has_choices());
+	}
+      }
+      WHEN("choose choice 2")
+      {
+	thread->choose(1);
+	thread->getall();
+	THEN("still has choices")
+	{
+	  REQUIRE(thread->has_choices());
+	}
+      }
+    }
+  }
+}
diff --git a/inkcpp_test/ThirdTierChoiceAfterBrackets.cpp b/inkcpp_test/ThirdTierChoiceAfterBrackets.cpp
@@ -1,38 +1,43 @@
-#include "catch.hpp"
-#include "../inkcpp_cl/test.h"
-
-#include <story.h>
-#include <globals.h>
-#include <runner.h>
-#include <compiler.h>
-
-using namespace ink::runtime;
-
-SCENARIO("a story with a bracketed choice as a second choice, and then a third choice, chooses properly", "[choices]")
-{
-	GIVEN("a story with brackets and nested choices")
-	{
-		inklecate("ink/ThirdTierChoiceAfterBracketsStory.ink", "ThirdTierChoiceAfterBracketsStory.tmp");
-		ink::compiler::run("ThirdTierChoiceAfterBracketsStory.tmp", "ThirdTierChoiceAfterBracketsStory.bin");
-		auto ink = story::from_file("ThirdTierChoiceAfterBracketsStory.bin");
-		runner thread = ink->new_runner();
-
-		WHEN("start thread")
-		{
-			THEN("thread doesn't error")
-			{
-				thread->getall();
-				thread->has_choices();
-				thread->choose(0);
-				thread->getall();
-				thread->has_choices();
-				thread->choose(0);
-				thread->getall();
-				thread->has_choices();
-				thread->choose(0);
-				thread->getall();
-				thread->has_choices();
-			}
-		}
-	}
-}
+#include "catch.hpp"
+#include "../inkcpp_cl/test.h"
+
+#include <story.h>
+#include <globals.h>
+#include <runner.h>
+#include <compiler.h>
+
+using namespace ink::runtime;
+
+SCENARIO(
+    "a story with a bracketed choice as a second choice, and then a third choice, chooses properly",
+    "[choices]"
+)
+{
+  GIVEN("a story with brackets and nested choices")
+  {
+    inklecate("ink/ThirdTierChoiceAfterBracketsStory.ink", "ThirdTierChoiceAfterBracketsStory.tmp");
+    ink::compiler::run(
+        "ThirdTierChoiceAfterBracketsStory.tmp", "ThirdTierChoiceAfterBracketsStory.bin"
+    );
+    auto   ink    = story::from_file("ThirdTierChoiceAfterBracketsStory.bin");
+    runner thread = ink->new_runner();
+
+    WHEN("start thread")
+    {
+      THEN("thread doesn't error")
+      {
+	thread->getall();
+	thread->has_choices();
+	thread->choose(0);
+	thread->getall();
+	thread->has_choices();
+	thread->choose(0);
+	thread->getall();
+	thread->has_choices();
+	thread->choose(0);
+	thread->getall();
+	thread->has_choices();
+      }
+    }
+  }
+}