chore: sync with ecsact_common (#216)

seaubot · zaucy · web-flow · commit b97c4524c94a · 2024-05-24T00:01:09.000Z
Co-authored-by: seaubot &lt;seaubot@users.noreply.github.com&gt;
Co-authored-by: Ezekiel Warren &lt;ezekiel@seaube.com&gt;
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.1.1
+7.1.2
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,23 +4,31 @@
 name: main
 
 on:
-  push:
-    branches:
-      - "**"
+  pull_request:
+  merge_group:
 
 jobs:
+  typos-check:
+    name: Typos Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: crate-ci/typos@v1.19.0
+
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: jidicula/clang-format-action@v4.9.0
-        with: { clang-format-version: "16" }
+      - uses: greut/eclint-action@v0
+      - uses: jidicula/clang-format-action@v4.11.0
+        with: { clang-format-version: "18" }
 
   test-windows:
+    if: github.event_name == 'merge_group'
     runs-on: windows-latest
     steps:
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             /Users/runneradmin/AppData/Local/bazelisk
@@ -33,9 +41,10 @@ jobs:
         working-directory: test
 
   test-linux:
+    if: github.event_name == 'merge_group'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/bazelisk
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -100,4 +100,4 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
-Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
+Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).
diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc
@@ -10,9 +10,6 @@ build --enable_runfiles
 build --noincompatible_remove_rule_name_parameter
 query --noincompatible_remove_rule_name_parameter
 
-# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
-build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux
-
 common:ci --announce_rc
 common:ci --verbose_failures
 common:ci --keep_going
diff --git a/cog.toml b/cog.toml
@@ -1,6 +1,7 @@
 pre_bump_hooks = [
 	# Ecsact pre 1.0.0 the 0.X.0 is our 'major' version
 	"buildozer 'set version {{version}}' 'set compatibility_level {{version.minor}}' //MODULE.bazel:%module",
+	"bazel mod tidy",
 ]
 
 post_bump_hooks = [
diff --git a/ecsact/interpret/detail/file_eval_error.hh b/ecsact/interpret/detail/file_eval_error.hh
@@ -8,7 +8,7 @@
 namespace ecsact::detail {
 
 void check_file_eval_error(
-	ecsact_eval_error&      inout_error,
+	ecsact_eval_error&      in_out_error,
 	ecsact_package_id       package_id,
 	ecsact_parse_status     status,
 	const ecsact_statement& statement,
diff --git a/ecsact/interpret/eval.cc b/ecsact/interpret/eval.cc
@@ -89,11 +89,13 @@ static auto statement_param( //
 template<>
 auto statement_param<int32_t>( //
 	const ecsact_statement& statement,
-	std::string_view        param_name
+	std::string_view        in_param_name
 ) -> std::optional<int32_t> {
 	auto result = std::optional<int32_t>{};
 	for(auto& param : view_statement_params(statement)) {
-		if(std::string_view{param.name.data, static_cast<size_t>(param.name.length)} != param_name) {
+		auto param_name =
+			std::string_view{param.name.data, static_cast<size_t>(param.name.length)};
+		if(param_name != in_param_name) {
 			continue;
 		}
 
@@ -114,7 +116,10 @@ auto statement_param<bool>( //
 ) -> std::optional<bool> {
 	auto result = std::optional<bool>{};
 	for(auto& param : view_statement_params(statement)) {
-		if(std::string_view{param.name.data, static_cast<size_t>(param.name.length)} != param_name) {
+		if(std::string_view{
+				 param.name.data,
+				 static_cast<size_t>(param.name.length)
+			 } != param_name) {
 			continue;
 		}
 
@@ -727,7 +732,11 @@ static ecsact_eval_error eval_system_statement(
 		return err;
 	}
 
-	if(auto err = allow_statement_params(statement, context, std::array{"lazy"sv, "parallel"sv})) {
+	if(auto err = allow_statement_params(
+			 statement,
+			 context,
+			 std::array{"lazy"sv, "parallel"sv}
+		 )) {
 		return *err;
 	}
 
@@ -802,7 +811,8 @@ static ecsact_eval_error eval_action_statement(
 		return err;
 	}
 
-	if(auto err = allow_statement_params(statement, context, std::array{"parallel"sv})) {
+	if(auto err =
+			 allow_statement_params(statement, context, std::array{"parallel"sv})) {
 		return *err;
 	}
 
@@ -1757,13 +1767,13 @@ void ecsact_eval_reset() {
 }
 
 void ecsact::detail::check_file_eval_error(
-	ecsact_eval_error&      inout_error,
+	ecsact_eval_error&      in_out_error,
 	ecsact_package_id       package_id,
 	ecsact_parse_status     status,
 	const ecsact_statement& statement,
 	const std::string&      source
 ) {
-	assert(inout_error.code == ECSACT_EVAL_OK);
+	assert(in_out_error.code == ECSACT_EVAL_OK);
 
 	if(status.code == ECSACT_PARSE_STATUS_BLOCK_END) {
 		if(statement.type == ECSACT_STATEMENT_ACTION) {
@@ -1776,8 +1786,8 @@ void ecsact::detail::check_file_eval_error(
 
 			auto caps = ecsact::meta::system_capabilities(*act_id);
 			if(caps.empty()) {
-				inout_error.code = ECSACT_EVAL_ERR_NO_CAPABILITIES;
-				inout_error.relevant_content = {
+				in_out_error.code = ECSACT_EVAL_ERR_NO_CAPABILITIES;
+				in_out_error.relevant_content = {
 					.data = source.c_str(),
 					.length = static_cast<int32_t>(source.size()),
 				};
diff --git a/renovate.json b/renovate.json
@@ -3,4 +3,4 @@
 	"extends": [
 		"github>ecsact-dev/renovate-config"
 	]
-}
+}
diff --git a/test/comment_before_package.cc b/test/comment_before_package.cc
@@ -1,11 +1,11 @@
-
-#include "gtest/gtest.h"
-#include "ecsact/interpret/eval.h"
-
-#include "test_lib.hh"
-
-TEST(NoPackageStatementFirst, NoPackageStatementFirst) {
-	auto errs = ecsact_interpret_test_files({"comment_before_package.ecsact"});
-	ASSERT_EQ(errs.size(), 0) //
-		<< "Expected no errors. Instead got: " << errs[0].error_message << "\n";
-}
+
+#include "gtest/gtest.h"
+#include "ecsact/interpret/eval.h"
+
+#include "test_lib.hh"
+
+TEST(NoPackageStatementFirst, NoPackageStatementFirst) {
+	auto errs = ecsact_interpret_test_files({"comment_before_package.ecsact"});
+	ASSERT_EQ(errs.size(), 0) //
+		<< "Expected no errors. Instead got: " << errs[0].error_message << "\n";
+}
diff --git a/test/comment_before_package.ecsact b/test/comment_before_package.ecsact
@@ -1,4 +1,4 @@
-// Comments are allowed before the package statement
-
-package test.comment_before_package;
-
+// Comments are allowed before the package statement
+
+package test.comment_before_package;
+
diff --git a/test/errors/no_package_statement_first.cc b/test/errors/no_package_statement_first.cc
@@ -1,11 +1,11 @@
-#include "gtest/gtest.h"
-#include "ecsact/interpret/eval.h"
-
-#include "test_lib.hh"
-
-TEST(NoPackageStatementFirst, NoPackageStatementFirst) {
-	auto errs =
-		ecsact_interpret_test_files({"errors/no_package_statement_first.ecsact"});
-	ASSERT_EQ(errs.size(), 1);
-	ASSERT_EQ(errs[0].eval_error, ECSACT_EVAL_ERR_EXPECTED_PACKAGE_STATEMENT);
-}
+#include "gtest/gtest.h"
+#include "ecsact/interpret/eval.h"
+
+#include "test_lib.hh"
+
+TEST(NoPackageStatementFirst, NoPackageStatementFirst) {
+	auto errs =
+		ecsact_interpret_test_files({"errors/no_package_statement_first.ecsact"});
+	ASSERT_EQ(errs.size(), 1);
+	ASSERT_EQ(errs[0].eval_error, ECSACT_EVAL_ERR_EXPECTED_PACKAGE_STATEMENT);
+}
diff --git a/test/errors/no_package_statement_first.ecsact b/test/errors/no_package_statement_first.ecsact
@@ -1,7 +1,7 @@
-component ExampleComponent {
-	f32 num;
-}
-
-// Package statement must be first
-package errors.no_pkg_statement_first;
-
+component ExampleComponent {
+	f32 num;
+}
+
+// Package statement must be first
+package errors.no_pkg_statement_first;
+
diff --git a/test/errors/unknown_association_field.cc b/test/errors/unknown_association_field.cc
@@ -1,11 +1,11 @@
-#include "gtest/gtest.h"
-#include "ecsact/interpret/eval.h"
-
-#include "test_lib.hh"
-
-TEST(InterpretError, UnknownAssociationField) {
-	auto errs =
-		ecsact_interpret_test_files({"errors/unknown_association_field.ecsact"});
-	ASSERT_EQ(errs.size(), 1);
-	ASSERT_EQ(errs[0].eval_error, ECSACT_EVAL_ERR_FIELD_NAME_ALREADY_EXISTS);
-}
+#include "gtest/gtest.h"
+#include "ecsact/interpret/eval.h"
+
+#include "test_lib.hh"
+
+TEST(InterpretError, UnknownAssociationField) {
+	auto errs =
+		ecsact_interpret_test_files({"errors/unknown_association_field.ecsact"});
+	ASSERT_EQ(errs.size(), 1);
+	ASSERT_EQ(errs[0].eval_error, ECSACT_EVAL_ERR_FIELD_NAME_ALREADY_EXISTS);
+}
diff --git a/test/errors/unknown_association_field.ecsact b/test/errors/unknown_association_field.ecsact
@@ -1,12 +1,12 @@
-package unknown_association_field;
-
-component ComponentWithAssoc {
-	entity foo;
-}
-
-system MySystem {
-	readwrite ComponentWithAssoc with bar {
-		readwrite ComponentWithAssoc;
-	}
-}
-
+package unknown_association_field;
+
+component ComponentWithAssoc {
+	entity foo;
+}
+
+system MySystem {
+	readwrite ComponentWithAssoc with bar {
+		readwrite ComponentWithAssoc;
+	}
+}
+
diff --git a/test/extra/extra.cc b/test/extra/extra.cc
@@ -1,29 +1,29 @@
-#include "gtest/gtest.h"
-#include "ecsact/interpret/eval.h"
-#include "ecsact/runtime/meta.hh"
-
-#include "test_lib.hh"
-
-TEST(MultiPkgTest, NoErrors) {
-	auto errs = ecsact_interpret_test_files({
-		"extra/imported_pkg.ecsact",
-		"extra/runtime_test.ecsact",
-	});
-	EXPECT_EQ(errs.size(), 0) //
-		<< "Expected no errors. Instead got: " << errs[0].error_message << "\n";
-
-	EXPECT_EQ(ecsact_meta_count_packages(), 2);
-
-	auto pkg_ids = ecsact::meta::get_package_ids();
-	for(auto pkg_id : pkg_ids) {
-		auto pkg_name = ecsact::meta::package_name(pkg_id);
-
-		if(pkg_name == "runtime_test") {
-			EXPECT_EQ(ecsact_meta_count_dependencies(pkg_id), 1) //
-				<< "Expected main package to have 3 dependencies. One for each import";
-		} else if(pkg_name == "imported.test_pkg") {
-		} else {
-			EXPECT_TRUE(false) << "No tests for package: " << pkg_name;
-		}
-	}
-}
+#include "gtest/gtest.h"
+#include "ecsact/interpret/eval.h"
+#include "ecsact/runtime/meta.hh"
+
+#include "test_lib.hh"
+
+TEST(MultiPkgTest, NoErrors) {
+	auto errs = ecsact_interpret_test_files({
+		"extra/imported_pkg.ecsact",
+		"extra/runtime_test.ecsact",
+	});
+	EXPECT_EQ(errs.size(), 0) //
+		<< "Expected no errors. Instead got: " << errs[0].error_message << "\n";
+
+	EXPECT_EQ(ecsact_meta_count_packages(), 2);
+
+	auto pkg_ids = ecsact::meta::get_package_ids();
+	for(auto pkg_id : pkg_ids) {
+		auto pkg_name = ecsact::meta::package_name(pkg_id);
+
+		if(pkg_name == "runtime_test") {
+			EXPECT_EQ(ecsact_meta_count_dependencies(pkg_id), 1) //
+				<< "Expected main package to have 3 dependencies. One for each import";
+		} else if(pkg_name == "imported.test_pkg") {
+		} else {
+			EXPECT_TRUE(false) << "No tests for package: " << pkg_name;
+		}
+	}
+}
diff --git a/test/extra/imported_pkg.ecsact b/test/extra/imported_pkg.ecsact
@@ -1,6 +1,6 @@
-package imported.test_pkg;
-
-component ImportedComponent {
-	i32 num;
-}
-
+package imported.test_pkg;
+
+component ImportedComponent {
+	i32 num;
+}
+
diff --git a/test/multi_pkg.cc b/test/multi_pkg.cc
diff --git a/test/multi_pkg_a.ecsact b/test/multi_pkg_a.ecsact
diff --git a/test/multi_pkg_b.ecsact b/test/multi_pkg_b.ecsact
diff --git a/test/multi_pkg_c.ecsact b/test/multi_pkg_c.ecsact
diff --git a/test/multi_pkg_main.ecsact b/test/multi_pkg_main.ecsact
diff --git a/typos.toml b/typos.toml

Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,4 @@ All notable changes to this project will be documented in this file. See [conven`
`100`	`100`
`101`	`101`	`- - -`
`102`	`102`
`103`		`-Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).`
	`103`	`+Changelog generated by [cocogitto](https://github.com/cocogitto/cocogitto).`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`pre_bump_hooks = [`
`2`	`2`	`# Ecsact pre 1.0.0 the 0.X.0 is our 'major' version`
`3`	`3`	`"buildozer 'set version {{version}}' 'set compatibility_level {{version.minor}}' //MODULE.bazel:%module",`
	`4`	`+ "bazel mod tidy",`
`4`	`5`	`]`
`5`	`6`
`6`	`7`	`post_bump_hooks = [`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`"extends": [`
`4`	`4`	`"github>ecsact-dev/renovate-config"`
`5`	`5`	`]`
`6`		`-}`
	`6`	`+}`