asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #28648 from KoBeWi/substr-1

Browse source 
Make second parameter of substr optional
This commit is contained in:
Rémi Verschelde 2019-06-19 12:43:46 +02:00 committed by GitHub
commit 2b52cd3e5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/ustring.cpp
View file

@ -2331,6 +2331,9 @@ String String::insert(int p_at_pos, const String &p_string) const {
} }
String String::substr(int p_from, int p_chars) const { String String::substr(int p_from, int p_chars) const {
if (p_chars == -1)
p_chars = length() - p_from;
if (empty() || p_from < 0 || p_from >= length() || p_chars <= 0) if (empty() || p_from < 0 || p_from >= length() || p_chars <= 0)
return ""; return "";

2
core/ustring.h
View file

@ -201,7 +201,7 @@ public:
} }
/* complex helpers */ /* complex helpers */
String substr(int p_from, int p_chars) const; String substr(int p_from, int p_chars = -1) const;
int find(const String &p_str, int p_from = 0) const; ///< return <0 if failed int find(const String &p_str, int p_from = 0) const; ///< return <0 if failed
int find(const char *p_str, int p_from = 0) const; ///< return <0 if failed int find(const char *p_str, int p_from = 0) const; ///< return <0 if failed
int find_char(const CharType &p_char, int p_from = 0) const; ///< return <0 if failed int find_char(const CharType &p_char, int p_from = 0) const; ///< return <0 if failed

2
core/variant_call.cpp
View file

@ -1499,7 +1499,7 @@ void register_variant_methods() {
ADDFUNC1R(STRING, INT, String, casecmp_to, STRING, "to", varray()); ADDFUNC1R(STRING, INT, String, casecmp_to, STRING, "to", varray());
ADDFUNC1R(STRING, INT, String, nocasecmp_to, STRING, "to", varray()); ADDFUNC1R(STRING, INT, String, nocasecmp_to, STRING, "to", varray());
ADDFUNC0R(STRING, INT, String, length, varray()); ADDFUNC0R(STRING, INT, String, length, varray());
ADDFUNC2R(STRING, STRING, String, substr, INT, "from", INT, "len", varray()); ADDFUNC2R(STRING, STRING, String, substr, INT, "from", INT, "len", varray(-1));
ADDFUNC2R(STRING, INT, String, find, STRING, "what", INT, "from", varray(0)); ADDFUNC2R(STRING, INT, String, find, STRING, "what", INT, "from", varray(0));

4
doc/classes/String.xml
View file

@ -757,10 +757,10 @@
</return> </return>
<argument index="0" name="from" type="int"> <argument index="0" name="from" type="int">
</argument> </argument>
<argument index="1" name="len" type="int"> <argument index="1" name="len" type="int" default="-1">
</argument> </argument>
<description> <description>
Returns part of the string from the position [code]from[/code] with length [code]len[/code]. Returns part of the string from the position [code]from[/code] with length [code]len[/code]. Argument [code]len[/code] is optional and using -1 will return remaining characters from given position.
</description> </description>
</method> </method>
<method name="to_ascii"> <method name="to_ascii">