diff options
Diffstat (limited to 'modules/regex')
| -rw-r--r-- | modules/regex/regex.cpp | 36 | ||||
| -rw-r--r-- | modules/regex/register_types.cpp | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp index e67040b5a3..3d1dd048a8 100644 --- a/modules/regex/regex.cpp +++ b/modules/regex/regex.cpp @@ -321,7 +321,7 @@ struct RegExNodeClass : public RegExNode { case Type_lower: return ('a' <= c && c <= 'z'); case Type_print: - return (0x1F < c && c < 0x1F); + return (0x20 < c && c < 0x7f); case Type_punct: return (REGEX_NODE_PUNCT.find(c) >= 0); case Type_space: @@ -1481,27 +1481,27 @@ RegEx::~RegEx() { void RegExMatch::_bind_methods() { - ClassDB::bind_method(_MD("expand","template"),&RegExMatch::expand); - ClassDB::bind_method(_MD("get_group_count"),&RegExMatch::get_group_count); - ClassDB::bind_method(_MD("get_group_array"),&RegExMatch::get_group_array); - ClassDB::bind_method(_MD("get_names"),&RegExMatch::get_names); - ClassDB::bind_method(_MD("get_name_dict"),&RegExMatch::get_name_dict); - ClassDB::bind_method(_MD("get_string","name"),&RegExMatch::get_string, DEFVAL(0)); - ClassDB::bind_method(_MD("get_start","name"),&RegExMatch::get_start, DEFVAL(0)); - ClassDB::bind_method(_MD("get_end","name"),&RegExMatch::get_end, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("expand","template"),&RegExMatch::expand); + ClassDB::bind_method(D_METHOD("get_group_count"),&RegExMatch::get_group_count); + ClassDB::bind_method(D_METHOD("get_group_array"),&RegExMatch::get_group_array); + ClassDB::bind_method(D_METHOD("get_names"),&RegExMatch::get_names); + ClassDB::bind_method(D_METHOD("get_name_dict"),&RegExMatch::get_name_dict); + ClassDB::bind_method(D_METHOD("get_string","name"),&RegExMatch::get_string, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_start","name"),&RegExMatch::get_start, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_end","name"),&RegExMatch::get_end, DEFVAL(0)); } void RegEx::_bind_methods() { - ClassDB::bind_method(_MD("clear"),&RegEx::clear); - ClassDB::bind_method(_MD("compile","pattern"),&RegEx::compile); - ClassDB::bind_method(_MD("search","text","start","end"),&RegEx::search, DEFVAL(0), DEFVAL(-1)); - ClassDB::bind_method(_MD("sub","text","replacement","all","start","end"),&RegEx::sub, DEFVAL(false), DEFVAL(0), DEFVAL(-1)); - ClassDB::bind_method(_MD("is_valid"),&RegEx::is_valid); - ClassDB::bind_method(_MD("get_pattern"),&RegEx::get_pattern); - ClassDB::bind_method(_MD("get_group_count"),&RegEx::get_group_count); - ClassDB::bind_method(_MD("get_names"),&RegEx::get_names); + ClassDB::bind_method(D_METHOD("clear"),&RegEx::clear); + ClassDB::bind_method(D_METHOD("compile","pattern"),&RegEx::compile); + ClassDB::bind_method(D_METHOD("search","text","start","end"),&RegEx::search, DEFVAL(0), DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("sub","text","replacement","all","start","end"),&RegEx::sub, DEFVAL(false), DEFVAL(0), DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("is_valid"),&RegEx::is_valid); + ClassDB::bind_method(D_METHOD("get_pattern"),&RegEx::get_pattern); + ClassDB::bind_method(D_METHOD("get_group_count"),&RegEx::get_group_count); + ClassDB::bind_method(D_METHOD("get_names"),&RegEx::get_names); - ADD_PROPERTY(PropertyInfo(Variant::STRING, "pattern"), _SCS("compile"), _SCS("get_pattern")); + ADD_PROPERTY(PropertyInfo(Variant::STRING, "pattern"), "compile", "get_pattern"); } diff --git a/modules/regex/register_types.cpp b/modules/regex/register_types.cpp index d44c7e563c..c62a04d80f 100644 --- a/modules/regex/register_types.cpp +++ b/modules/regex/register_types.cpp @@ -28,7 +28,7 @@ /*************************************************************************/ #include "register_types.h" -#include "object_type_db.h" +#include "class_db.h" #include "regex.h" void register_regex_types() { |