Skip to content

Commit 59a5a8b

Browse files
committed
Switch to 64-bit ints.
1 parent dd62b96 commit 59a5a8b

File tree

7 files changed

+253
-170
lines changed

7 files changed

+253
-170
lines changed

binding_generator.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -588,17 +588,17 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
588588

589589
# Special cases.
590590
if class_name == "String":
591-
result.append("\tstatic String utf8(const char *from, int len = -1);")
592-
result.append("\tvoid parse_utf8(const char *from, int len = -1);")
593-
result.append("\tstatic String utf16(const char16_t *from, int len = -1);")
594-
result.append("\tvoid parse_utf16(const char16_t *from, int len = -1);")
591+
result.append("\tstatic String utf8(const char *from, int64_t len = -1);")
592+
result.append("\tvoid parse_utf8(const char *from, int64_t len = -1);")
593+
result.append("\tstatic String utf16(const char16_t *from, int64_t len = -1);")
594+
result.append("\tvoid parse_utf16(const char16_t *from, int64_t len = -1);")
595595
result.append("\tCharString utf8() const;")
596596
result.append("\tCharString ascii() const;")
597597
result.append("\tChar16String utf16() const;")
598598
result.append("\tChar32String utf32() const;")
599599
result.append("\tCharWideString wide_string() const;")
600600
result.append("\tstatic String num_real(double p_num, bool p_trailing = true);")
601-
result.append("\tError resize(int p_size);")
601+
result.append("\tError resize(int64_t p_size);")
602602

603603
if "members" in builtin_api:
604604
for member in builtin_api["members"]:
@@ -651,8 +651,8 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
651651
result.append("\tString &operator+=(const wchar_t *p_str);")
652652
result.append("\tString &operator+=(const char32_t *p_str);")
653653

654-
result.append("\tconst char32_t &operator[](int p_index) const;")
655-
result.append("\tchar32_t &operator[](int p_index);")
654+
result.append("\tconst char32_t &operator[](int64_t p_index) const;")
655+
result.append("\tchar32_t &operator[](int64_t p_index);")
656656
result.append("\tconst char32_t *ptr() const;")
657657
result.append("\tchar32_t *ptrw();")
658658

@@ -670,8 +670,8 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
670670
return_type = "int32_t"
671671
elif class_name == "PackedFloat32Array":
672672
return_type = "float"
673-
result.append(f"\tconst {return_type} &operator[](int p_index) const;")
674-
result.append(f"\t{return_type} &operator[](int p_index);")
673+
result.append(f"\tconst {return_type} &operator[](int64_t p_index) const;")
674+
result.append(f"\t{return_type} &operator[](int64_t p_index);")
675675
result.append(f"\tconst {return_type} *ptr() const;")
676676
result.append(f"\t{return_type} *ptrw();")
677677
iterators = """
@@ -742,8 +742,8 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
742742
result.append(iterators.replace("$TYPE", return_type))
743743

744744
if class_name == "Array":
745-
result.append("\tconst Variant &operator[](int p_index) const;")
746-
result.append("\tVariant &operator[](int p_index);")
745+
result.append("\tconst Variant &operator[](int64_t p_index) const;")
746+
result.append("\tVariant &operator[](int64_t p_index);")
747747
result.append("\tvoid set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script);")
748748
result.append("\tvoid _ref(const Array &p_from) const;")
749749

@@ -1696,7 +1696,7 @@ def generate_global_constants(api, output_dir):
16961696
header.append("")
16971697

16981698
for constant in api["global_constants"]:
1699-
header.append(f'\tconst int {escape_identifier(constant["name"])} = {constant["value"]};')
1699+
header.append(f'\tconst int64_t {escape_identifier(constant["name"])} = {constant["value"]};')
17001700

17011701
header.append("")
17021702

0 commit comments

Comments
 (0)