refactor: fixes clang compiler warnings

Author: JBenda

.clang-format-ignore

@@ -0,0 +1 @@
+inkcpp_compiler/json.hpp

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ repos:
     hooks:
     - id: clang-format
       types_or: [c++, c, cuda]
+      exclude: inkcpp_compiler/json.hpp
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0

inkcpp/avl_array.h

@@ -112,6 +112,12 @@ class avl_array
 			return *this;
 		}
 
+		tag_avl_array_iterator(const tag_avl_array_iterator& other)
+		    : instance_{other.instance_}
+		    , idx_{other.idx_}
+		{
+		}
+
 		inline bool operator==(const tag_avl_array_iterator& rhs) const { return idx_ == rhs.idx_; }
 
 		inline bool operator!=(const tag_avl_array_iterator& rhs) const { return ! (*this == rhs); }

inkcpp/collections/restorable.cpp

@@ -16,10 +16,10 @@ unsigned char*
 	ptr = snapshot_interface::snap_write(ptr, jump, write);
 	ptr = snapshot_interface::snap_write(ptr, save, write);
 	max = pos;
-	if (jump != ~0 && jump > max) {
+	if (jump != ~0U && jump > max) {
 		max = jump;
 	}
-	if (save != ~0 && save > max) {
+	if (save != ~0U && save > max) {
 		max = save;
 	}
 	return ptr;
@@ -32,10 +32,10 @@ const unsigned char*
 	ptr = snapshot_interface::snap_read(ptr, jump);
 	ptr = snapshot_interface::snap_read(ptr, save);
 	max = pos;
-	if (jump != ~0 && jump > max) {
+	if (jump != ~0U && jump > max) {
 		max = jump;
 	}
-	if (save != ~0 && save > max) {
+	if (save != ~0U && save > max) {
 		max = save;
 	}
 	return ptr;

inkcpp/collections/restorable.h

@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include "../snapshot_impl.h"
+#include "../snapshot_interface.h"
 
 #include <system.h>
 #include <traits.h>
@@ -102,15 +102,15 @@ class restorable : public snapshot_interface
 	}
 
 	// Checks if we have a save state
-	bool is_saved() const { return _save != ~0; }
+	bool is_saved() const { return _save != ~0U; }
 
 	// Creates a save point which can later be restored to or forgotten
 	void save()
 	{
 		inkAssert(
-		    _save == ~0, "Collection is already saved. You should never call save twice. Ignoring."
+		    _save == ~0U, "Collection is already saved. You should never call save twice. Ignoring."
 		);
-		if (_save != ~0) {
+		if (_save != ~0U) {
 			return;
 		}
 
@@ -121,8 +121,8 @@ class restorable : public snapshot_interface
 	// Restore to the last save point
 	void restore()
 	{
-		inkAssert(_save != ~0, "Collection can't be restored because it's not saved. Ignoring.");
-		if (_save == ~0) {
+		inkAssert(_save != ~0U, "Collection can't be restored because it's not saved. Ignoring.");
+		if (_save == ~0U) {
 			return;
 		}
 
@@ -137,8 +137,8 @@ class restorable : public snapshot_interface
 	template<typename NullifyMethod>
 	void forget(NullifyMethod nullify)
 	{
-		inkAssert(_save != ~0, "Can't forget save point because there is none. Ignoring.");
-		if (_save == ~0) {
+		inkAssert(_save != ~0U, "Can't forget save point because there is none. Ignoring.");
+		if (_save == ~0U) {
 			return;
 		}
 
@@ -170,7 +170,7 @@ class restorable : public snapshot_interface
 	ElementType& push(const ElementType& elem)
 	{
 		// Don't destroy saved data. Jump over it
-		if (_pos < _save && _save != ~0) {
+		if (_pos < _save && _save != ~0U) {
 			_jump = _pos;
 			_pos  = _save;
 		}
@@ -279,7 +279,7 @@ class restorable : public snapshot_interface
 	void for_each_all(CallbackMethod callback) const
 	{
 		// no matter if we're saved or not, we iterate everything
-		int len = (_save == ~0 || _pos > _save) ? _pos : _save;
+		int len = (_save == ~0U || _pos > _save) ? _pos : _save;
 
 		// Iterate
 		for (int i = 0; i < len; i++)
@@ -358,10 +358,7 @@ class restorable : public snapshot_interface
 
 protected:
 	// Called when we run out of space in buffer.
-	virtual void overflow(ElementType*&, size_t&)
-	{
-		inkFail("Restorable run out of memory!");
-	}
+	virtual void overflow(ElementType*&, size_t&) { inkFail("Restorable run out of memory!"); }
 
 private:
 	template<typename Predicate>

inkcpp/include/choice.h

@@ -80,10 +80,7 @@ namespace runtime
 		uint32_t                  _path       = ~0U;     ///< @private
 		thread_t                  _thread     = ~0U;     ///< @private
 		int                       _index      = -1;      ///< @private
-#pragma warning(push)
-#pragma warning(disable : 4820, justification : "4 byte aligment free on 64-bit systems")
 	};
 
-#pragma warning(pop)
 } // namespace runtime
 } // namespace ink

inkcpp/include/list.h

@@ -49,6 +49,7 @@ class list_interface
 	}
 
 	virtual list_interface& operator=(const list_interface&) = default;
+
 	virtual ~list_interface() {}
 
 	/** iterater for flags in a list
@@ -61,8 +62,6 @@ class list_interface
 		const list_interface& _list;
 		int                   _i;
 		bool                  _one_list_iterator; ///< iterates only though values of one list
-#pragma warning(push)
-#pragma warning(disable : 4820, justification : "3 byte aligment free on 64-bit systems")
 		friend list_interface;
 #ifdef INK_BUILD_CLIB
 		friend int ::ink_list_flags(const HInkList*, InkListIter*);
@@ -123,10 +122,15 @@ class list_interface
 	};
 
 
-#pragma warning(push)
-#pragma warning(                                                                          \
-    disable : 4100, justification : "non functional prototypes do not need the argument." \
-)
+#ifdef __GNUC__
+#	pragma GCC diagnostic push
+#	pragma GCC diagnostic ignored "-Wunused-parameter"
+#else
+#	pragma warning(push)
+#	pragma warning(                                                                          \
+	    disable : 4100, justification : "non functional prototypes do not need the argument." \
+	)
+#endif
 
 	/** checks if a flag is contained in the list */
 	virtual bool contains(const char* flag) const
@@ -177,7 +181,11 @@ class list_interface
 		inkAssert(false, "Not implemented funciton from interface is called!");
 	};
 
-#pragma warning(pop)
+#ifdef __GNUC__
+#	pragma GCC diagnostic pop
+#else
+#	pragma warning(pop)
+#endif
 
 protected:
 	/** @private */
@@ -199,5 +207,3 @@ class list_interface
 };
 
 } // namespace ink::runtime
-
-#pragma warning(pop)

inkcpp/include/story_ptr.h

@@ -19,16 +19,13 @@ namespace internal
 		    , valid(true)
 		{
 		}
+
 		static void remove_reference(ref_block*&);
 
 		size_t references;
 		bool   valid;
-#pragma warning(push)
-#pragma warning(disable : 4820, justification : "3 byte aligment free on 64-bit systems")
 	};
 
-#pragma warning(pop)
-
 	/** @private */
 	class story_ptr_base
 	{

inkcpp/include/types.h

@@ -54,8 +54,6 @@ struct value {
 		Float,  ///< containing a float
 		List    ///< containing a @ref list_interface
 	} type;   ///< Label of type currently contained in @ref value
-#pragma warning(push)
-#pragma warning(disable : 4820, justification : "4 byte aligment free on 64-bit systems")
 
 	value()
 	    : v_int32{0}
@@ -128,8 +126,6 @@ struct value {
 	}
 };
 
-#pragma warning(pop)
-
 /** access #value::Type::Bool value */
 template<>
 inline const auto& value::get<value::Type::Bool>() const

inkcpp/runner_impl.cpp

@@ -42,7 +42,7 @@ namespace ink::runtime::internal
 
 hash_t runner_impl::get_current_knot() const
 {
-	return _current_knot_id == ~0 ? 0 : _story->container_hash(_current_knot_id);
+	return _current_knot_id == ~0U ? 0 : _story->container_hash(_current_knot_id);
 }
 
 template<>
@@ -599,7 +599,7 @@ void runner_impl::choose(size_t index)
 
 	// Figure out where our previous pointer was for that thread
 	ip_t prev = nullptr;
-	if (choiceThread == ~0) {
+	if (choiceThread == ~0U) {
 		prev = _done;
 	} else {
 		prev = _threads.get(choiceThread);
@@ -1543,7 +1543,7 @@ void runner_impl::on_done(bool setDone)
 void runner_impl::set_done_ptr(ip_t ptr)
 {
 	thread_t curr = current_thread();
-	if (curr == ~0) {
+	if (curr == ~0U) {
 		_done = ptr;
 	} else {
 		_threads.set(curr, ptr);