diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-03 22:21:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 22:21:24 +0100 |
| commit | f8f19b313d62b707467c54d245b9c3e0ad53f34f (patch) | |
| tree | 975f9c64fe51c3809c7c3b2eb0cd46d3563d2bd2 /core/variant | |
| parent | 025e778020dde6dcee89f5ae1e2a63ccddc24340 (diff) | |
| parent | adbe948bda202209b55249198e1837324e703ddb (diff) | |
Merge pull request #57562 from AnilBK/string-add-contains
String: Add contains().
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/variant_call.cpp | 1 | ||||
| -rw-r--r-- | core/variant/variant_parser.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index aecc6e9a26..750f23902d 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1421,6 +1421,7 @@ static void _register_variant_builtin_methods() { bind_method(String, sha1_buffer, sarray(), varray()); bind_method(String, sha256_buffer, sarray(), varray()); bind_method(String, is_empty, sarray(), varray()); + bind_methodv(String, contains, static_cast<bool (String::*)(const String &) const>(&String::contains), sarray("what"), varray()); bind_method(String, is_absolute_path, sarray(), varray()); bind_method(String, is_relative_path, sarray(), varray()); diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp index 96cdc0678e..55fc9212b7 100644 --- a/core/variant/variant_parser.cpp +++ b/core/variant/variant_parser.cpp @@ -1495,7 +1495,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str case Variant::FLOAT: { String s = rtos_fix(p_variant.operator double()); if (s != "inf" && s != "inf_neg" && s != "nan") { - if (s.find(".") == -1 && s.find("e") == -1) { + if (!s.contains(".") && !s.contains("e")) { s += ".0"; } } |