Skip to content

Commit

Permalink
Merge pull request godotengine#86704 from AThousandShips/len_fix
Browse files Browse the repository at this point in the history
[GDScript] Add `StringName` support to `@GDScript.len`
  • Loading branch information
akien-mga committed Jan 2, 2024
2 parents f3df5f7 + 045d921 commit 06bb9f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion modules/gdscript/doc_classes/@GDScript.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<return type="int" />
<param index="0" name="var" type="Variant" />
<description>
Returns the length of the given Variant [param var]. The length can be the character count of a [String], the element count of any array type or the size of a [Dictionary]. For every other Variant type, a run-time error is generated and execution is stopped.
Returns the length of the given Variant [param var]. The length can be the character count of a [String] or [StringName], the element count of any array type, or the size of a [Dictionary]. For every other Variant type, a run-time error is generated and execution is stopped.
[codeblock]
a = [1, 2, 3, 4]
len(a) # Returns 4
Expand Down
3 changes: 2 additions & 1 deletion modules/gdscript/gdscript_utility_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,8 @@ struct GDScriptUtilityFunctionsDefinitions {
static inline void len(Variant *r_ret, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
VALIDATE_ARG_COUNT(1);
switch (p_args[0]->get_type()) {
case Variant::STRING: {
case Variant::STRING:
case Variant::STRING_NAME: {
String d = *p_args[0];
*r_ret = d.length();
} break;
Expand Down

0 comments on commit 06bb9f2

Please sign in to comment.