From 4ca0399ff6a16c7e5e760d57a7675df61f1f8ef0 Mon Sep 17 00:00:00 2001
From: Zher Huei Lee
Date: Fri, 24 Jul 2015 13:55:18 +0100
Subject: Added a live-edit RegEx tester to the demos

---
 demos/misc/regex/regex.gd | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 demos/misc/regex/regex.gd

(limited to 'demos/misc/regex/regex.gd')

diff --git a/demos/misc/regex/regex.gd b/demos/misc/regex/regex.gd
new file mode 100644
index 000000000..a2dc62bf8
--- /dev/null
+++ b/demos/misc/regex/regex.gd
@@ -0,0 +1,22 @@
+extends VBoxContainer
+
+var regex = RegEx.new()
+
+func update_expression():
+	regex.compile(get_node("Expression").get_text())
+	update_text()
+
+func update_text():
+	var text = get_node("Text").get_text()
+	regex.match(text)
+	var list = get_node("List")
+	for child in list.get_children():
+		child.queue_free()
+	for res in regex.get_capture_list():
+		var label = Label.new()
+		label.set_text(res)
+		list.add_child(label)
+
+func _ready():
+	get_node("Text").set_text("They asked me \"What's going on \\\"in the manor\\\"?\"")
+	update_expression()
-- 
cgit v1.2.3-70-g09d2


From 87c1e16834a21ac1e42321811cb0efcda4b91b9a Mon Sep 17 00:00:00 2001
From: Zher Huei Lee
Date: Fri, 24 Jul 2015 14:09:39 +0100
Subject: Made RegEx API similar to old version

---
 bin/tests/test_string.cpp  |   4 ++--
 demos/misc/regex/regex.gd  |   4 ++--
 demos/misc/regex/regex.scn | Bin 1770 -> 1772 bytes
 drivers/nrex/regex.cpp     |  20 +++++++++++---------
 drivers/nrex/regex.h       |   4 ++--
 5 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'demos/misc/regex/regex.gd')

diff --git a/bin/tests/test_string.cpp b/bin/tests/test_string.cpp
index 7b512a5d9..93b1835b7 100644
--- a/bin/tests/test_string.cpp
+++ b/bin/tests/test_string.cpp
@@ -464,8 +464,8 @@ bool test_26() {
 	OS::get_singleton()->print("\n\nTest 26: RegEx\n");
 	RegEx regexp("(.*):(.*)");
 
-	bool res = regexp.match("name:password");
-	printf("\tmatch: %s\n", res?"true":"false");
+	int res = regexp.find("name:password");
+	printf("\tmatch: %s\n", (res>=0)?"true":"false");
 
 	printf("\t%i captures:\n", regexp.get_capture_count());
 	for (int i = 0; i<regexp.get_capture_count(); i++)
diff --git a/demos/misc/regex/regex.gd b/demos/misc/regex/regex.gd
index a2dc62bf8..e648c1809 100644
--- a/demos/misc/regex/regex.gd
+++ b/demos/misc/regex/regex.gd
@@ -8,11 +8,11 @@ func update_expression():
 
 func update_text():
 	var text = get_node("Text").get_text()
-	regex.match(text)
+	regex.find(text)
 	var list = get_node("List")
 	for child in list.get_children():
 		child.queue_free()
-	for res in regex.get_capture_list():
+	for res in regex.get_captures():
 		var label = Label.new()
 		label.set_text(res)
 		list.add_child(label)
diff --git a/demos/misc/regex/regex.scn b/demos/misc/regex/regex.scn
index 591b60974..2b62d6b82 100644
Binary files a/demos/misc/regex/regex.scn and b/demos/misc/regex/regex.scn differ
diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp
index d7c12bd54..708e68cc2 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;
 
 };
 
diff --git a/drivers/nrex/regex.h b/drivers/nrex/regex.h
index 3ef9ca342..062602970 100644
--- a/drivers/nrex/regex.h
+++ b/drivers/nrex/regex.h
@@ -28,7 +28,7 @@ class RegEx : public Reference {
 protected:
 
 	static void _bind_methods();
-	StringArray _bind_get_capture_list() const;
+	StringArray _bind_get_captures() const;
 
 public:
 
@@ -37,7 +37,7 @@ public:
 	int get_capture_count() const;
 	String get_capture(int capture) const;
 	Error compile(const String& p_pattern);
-	bool match(const String& p_text, int p_start = 0, int p_end = -1) const;
+	int find(const String& p_text, int p_start = 0, int p_end = -1) const;
 
 	RegEx();
 	RegEx(const String& p_pattern);
-- 
cgit v1.2.3-70-g09d2