Skip to content

Commit 59a914d

Browse files
bors[bot]Bromeon
andauthored
Merge #100
100: Enumerators in `PascalCase`, update GDExtension header r=Bromeon a=Bromeon Close #98. Co-authored-by: Jan Haller <[email protected]>
2 parents acb0696 + 28e1bf2 commit 59a914d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

godot-codegen/input/gdextension_interface.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@ typedef struct {
551551

552552
GDExtensionVariantPtr (*array_operator_index)(GDExtensionTypePtr p_self, GDExtensionInt p_index); // p_self should be an Array ptr
553553
GDExtensionVariantPtr (*array_operator_index_const)(GDExtensionConstTypePtr p_self, GDExtensionInt p_index); // p_self should be an Array ptr
554+
void (*array_ref)(GDExtensionTypePtr p_self, GDExtensionConstTypePtr p_from); // p_self should be an Array ptr
555+
void (*array_set_typed)(GDExtensionTypePtr p_self, uint32_t p_type, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstVariantPtr p_script); // p_self should be an Array ptr
554556

555557
/* Dictionary functions */
556558

godot-codegen/src/central_generator.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,14 +441,12 @@ fn make_enumerator(
441441
value: i32,
442442
ctx: &mut Context,
443443
) -> (Ident, TokenStream, Literal) {
444-
//let shout_name = format_ident!("{}", type_names.shout_case);
445-
let (first, rest) = type_names.json_builtin_name.split_at(1);
446-
447-
let pascal_name = format_ident!("{}{}", first.to_ascii_uppercase(), rest);
448-
let rust_ty = to_rust_type(&type_names.json_builtin_name, ctx);
444+
let enumerator_name = &type_names.json_builtin_name;
445+
let pascal_name = to_pascal_case(enumerator_name);
446+
let rust_ty = to_rust_type(enumerator_name, ctx);
449447
let ord = Literal::i32_unsuffixed(value);
450448

451-
(pascal_name, rust_ty.to_token_stream(), ord)
449+
(ident(&pascal_name), rust_ty.to_token_stream(), ord)
452450
}
453451

454452
fn make_opaque_type(name: &str, size: usize) -> TokenStream {

0 commit comments

Comments
 (0)