Merge pull request godotengine#102419 from Ivorforce/std-size

Use `std::size` instead of `sizeof(a) / sizeof(a[0])` pattern throughout the codebase.

Author: Repiteo

core/error/error_list.cpp

@@ -30,6 +30,8 @@
 
 #include "error_list.h"
 
+#include <iterator>
+
 const char *error_names[] = {
 	"OK", // OK
 	"Failed", // FAILED
@@ -82,4 +84,4 @@ const char *error_names[] = {
 	"Printer on fire", // ERR_PRINTER_ON_FIRE
 };
 
-static_assert(sizeof(error_names) / sizeof(*error_names) == ERR_MAX);
+static_assert(std::size(error_names) == ERR_MAX);

core/input/input_map.cpp

@@ -407,7 +407,7 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
 };
 
 String InputMap::get_builtin_display_name(const String &p_name) const {
-	int len = sizeof(_builtin_action_display_names) / sizeof(_BuiltinActionDisplayName);
+	constexpr int len = std::size(_builtin_action_display_names);
 
 	for (int i = 0; i < len; i++) {
 		if (_builtin_action_display_names[i].name == p_name) {

core/io/file_access.cpp

@@ -429,7 +429,7 @@ class CharBuffer {
 public:
 	_FORCE_INLINE_ CharBuffer() :
 			buffer(stack_buffer),
-			capacity(sizeof(stack_buffer) / sizeof(char)) {
+			capacity(std::size(stack_buffer)) {
 	}
 
 	_FORCE_INLINE_ void push_back(char c) {

core/io/resource_uid.cpp

@@ -46,7 +46,7 @@ String ResourceUID::get_cache_file() {
 }
 
 static constexpr uint8_t uuid_characters[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', '0', '1', '2', '3', '4', '5', '6', '7', '8' };
-static constexpr uint32_t uuid_characters_element_count = (sizeof(uuid_characters) / sizeof(*uuid_characters));
+static constexpr uint32_t uuid_characters_element_count = std::size(uuid_characters);
 static constexpr uint8_t max_uuid_number_length = 13; // Max 0x7FFFFFFFFFFFFFFF (uid://d4n4ub6itg400) size is 13 characters.
 
 String ResourceUID::id_to_text(ID p_id) const {

core/math/color.cpp

@@ -439,7 +439,7 @@ int Color::find_named_color(const String &p_name) {
 }
 
 int Color::get_named_color_count() {
-	return sizeof(named_colors) / sizeof(NamedColor);
+	return std::size(named_colors);
 }
 
 String Color::get_named_color_name(int p_idx) {

core/string/char_utils.h

@@ -35,23 +35,25 @@
 
 #include "char_range.inc"
 
-#define BSEARCH_CHAR_RANGE(m_array)                      \
-	int low = 0;                                         \
-	int high = sizeof(m_array) / sizeof(m_array[0]) - 1; \
-	int middle = (low + high) / 2;                       \
-                                                         \
-	while (low <= high) {                                \
-		if (p_char < m_array[middle].start) {            \
-			high = middle - 1;                           \
-		} else if (p_char > m_array[middle].end) {       \
-			low = middle + 1;                            \
-		} else {                                         \
-			return true;                                 \
-		}                                                \
-                                                         \
-		middle = (low + high) / 2;                       \
-	}                                                    \
-                                                         \
+#include <iterator>
+
+#define BSEARCH_CHAR_RANGE(m_array)                \
+	int low = 0;                                   \
+	int high = std::size(m_array) - 1;             \
+	int middle = (low + high) / 2;                 \
+                                                   \
+	while (low <= high) {                          \
+		if (p_char < m_array[middle].start) {      \
+			high = middle - 1;                     \
+		} else if (p_char > m_array[middle].end) { \
+			low = middle + 1;                      \
+		} else {                                   \
+			return true;                           \
+		}                                          \
+                                                   \
+		middle = (low + high) / 2;                 \
+	}                                              \
+                                                   \
 	return false
 
 constexpr bool is_unicode_identifier_start(char32_t p_char) {

core/string/translation_domain.cpp

@@ -182,7 +182,7 @@ const char32_t *TranslationDomain::_get_accented_version(char32_t p_character) c
 		return nullptr;
 	}
 
-	for (unsigned int i = 0; i < sizeof(_character_to_accented) / sizeof(_character_to_accented[0]); i++) {
+	for (unsigned int i = 0; i < std::size(_character_to_accented); i++) {
 		if (_character_to_accented[i].character == p_character) {
 			return _character_to_accented[i].accented_character;
 		}

drivers/d3d12/rendering_context_driver_d3d12.h

@@ -86,7 +86,7 @@
 
 using Microsoft::WRL::ComPtr;
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#define ARRAY_SIZE(a) std::size(a)
 
 class RenderingContextDriverD3D12 : public RenderingContextDriver {
 	ComPtr<ID3D12DeviceFactory> device_factory;

drivers/vulkan/rendering_device_driver_vulkan.cpp

@@ -45,7 +45,7 @@
 #include "thirdparty/swappy-frame-pacing/swappyVk.h"
 #endif
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#define ARRAY_SIZE(a) std::size(a)
 
 #define PRINT_NATIVE_COMMANDS 0
 

editor/code_editor.cpp

@@ -1908,7 +1908,7 @@ CodeTextEditor::CodeTextEditor() {
 	zoom_button->set_text("100 %");
 
 	PopupMenu *zoom_menu = zoom_button->get_popup();
-	int preset_count = sizeof(ZOOM_FACTOR_PRESETS) / sizeof(float);
+	constexpr int preset_count = std::size(ZOOM_FACTOR_PRESETS);
 
 	for (int i = 0; i < preset_count; i++) {
 		float z = ZOOM_FACTOR_PRESETS[i];