From ef005d4f64d2ee2b35185d4fbdf2aea684cd4966 Mon Sep 17 00:00:00 2001 From: Lee Zher Huei Date: Fri, 24 Jul 2015 01:18:46 +0100 Subject: Regex library Nrex initial port --- drivers/nrex/regex.cpp | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 drivers/nrex/regex.cpp (limited to 'drivers/nrex/regex.cpp') diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp new file mode 100644 index 0000000000..d7c12bd544 --- /dev/null +++ b/drivers/nrex/regex.cpp @@ -0,0 +1,112 @@ +/*************************************************/ +/* regex.cpp */ +/*************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/*************************************************/ +/* Source code within this file is: */ +/* (c) 2007-2010 Juan Linietsky, Ariel Manzur */ +/* All Rights Reserved. */ +/*************************************************/ + +#include "regex.h" +#include "nrex.hpp" +#include "core/os/memory.h" + +void RegEx::_bind_methods() { + + ObjectTypeDB::bind_method(_MD("compile","pattern"),&RegEx::compile); + ObjectTypeDB::bind_method(_MD("match","text","start","end"),&RegEx::match, DEFVAL(0), DEFVAL(-1)); + ObjectTypeDB::bind_method(_MD("get_capture","capture"),&RegEx::get_capture); + ObjectTypeDB::bind_method(_MD("get_capture_list"),&RegEx::_bind_get_capture_list); + +}; + +StringArray RegEx::_bind_get_capture_list() const { + + StringArray ret; + int count = get_capture_count(); + for (int i=0; i Date: Fri, 24 Jul 2015 14:09:39 +0100 Subject: Made RegEx API similar to old version --- drivers/nrex/regex.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'drivers/nrex/regex.cpp') diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp index d7c12bd544..708e68cc26 100644 --- a/drivers/nrex/regex.cpp +++ b/drivers/nrex/regex.cpp @@ -16,13 +16,16 @@ void RegEx::_bind_methods() { ObjectTypeDB::bind_method(_MD("compile","pattern"),&RegEx::compile); - ObjectTypeDB::bind_method(_MD("match","text","start","end"),&RegEx::match, DEFVAL(0), DEFVAL(-1)); + ObjectTypeDB::bind_method(_MD("find","text","start","end"),&RegEx::find, DEFVAL(0), DEFVAL(-1)); + ObjectTypeDB::bind_method(_MD("clear"),&RegEx::clear); + ObjectTypeDB::bind_method(_MD("is_valid"),&RegEx::is_valid); + ObjectTypeDB::bind_method(_MD("get_capture_count"),&RegEx::get_capture_count); ObjectTypeDB::bind_method(_MD("get_capture","capture"),&RegEx::get_capture); - ObjectTypeDB::bind_method(_MD("get_capture_list"),&RegEx::_bind_get_capture_list); + ObjectTypeDB::bind_method(_MD("get_captures"),&RegEx::_bind_get_captures); }; -StringArray RegEx::_bind_get_capture_list() const { +StringArray RegEx::_bind_get_captures() const { StringArray ret; int count = get_capture_count(); @@ -64,22 +67,21 @@ String RegEx::get_capture(int capture) const { } Error RegEx::compile(const String& p_pattern) { - + clear(); exp.compile(p_pattern.c_str()); ERR_FAIL_COND_V( !exp.valid(), FAILED ); - + captures.resize(exp.capture_size()); return OK; }; -bool RegEx::match(const String& p_text, int p_start, int p_end) const { +int RegEx::find(const String& p_text, int p_start, int p_end) const { - ERR_FAIL_COND_V( !exp.valid(), false ); ERR_FAIL_COND_V( p_text.length() < p_start, false ); ERR_FAIL_COND_V( p_text.length() < p_end, false ); @@ -88,10 +90,10 @@ bool RegEx::match(const String& p_text, int p_start, int p_end) const { if (res) { text = p_text; - return true; + return captures[0].start; } text.clear(); - return false; + return -1; }; -- cgit v1.2.3 From 69eff35cd5758aa4a6d299989342ae0e08894a8f Mon Sep 17 00:00:00 2001 From: Zher Huei Lee Date: Fri, 24 Jul 2015 16:15:04 +0100 Subject: Fixed incorrect failsafe return values --- drivers/nrex/regex.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/nrex/regex.cpp') diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp index 708e68cc26..0a813c3490 100644 --- a/drivers/nrex/regex.cpp +++ b/drivers/nrex/regex.cpp @@ -82,9 +82,9 @@ Error RegEx::compile(const String& p_pattern) { int RegEx::find(const String& p_text, int p_start, int p_end) const { - ERR_FAIL_COND_V( !exp.valid(), false ); - ERR_FAIL_COND_V( p_text.length() < p_start, false ); - ERR_FAIL_COND_V( p_text.length() < p_end, false ); + ERR_FAIL_COND_V( !exp.valid(), -1 ); + ERR_FAIL_COND_V( p_text.length() < p_start, -1 ); + ERR_FAIL_COND_V( p_text.length() < p_end, -1 ); bool res = exp.match(p_text.c_str(), &captures[0], p_start, p_end); -- cgit v1.2.3