From 9a5ce099f1c3559cc46b923d4e192a7be781163c Mon Sep 17 00:00:00 2001
From: Zher Huei Lee
Date: Wed, 26 Oct 2016 13:05:00 +0100
Subject: Changed RegEx to inherit Resource

---
 modules/regex/regex.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/regex/regex.cpp')

diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp
index 388e6dfde..a0f4b4934 100644
--- a/modules/regex/regex.cpp
+++ b/modules/regex/regex.cpp
@@ -985,7 +985,9 @@ static bool RegEx_is_shorthand(CharType ch) {
 
 Error RegEx::compile(const String& p_pattern) {
 
-	if (pattern == p_pattern)
+	ERR_FAIL_COND_V(p_pattern.length() == 0, FAILED);
+
+	if (pattern == p_pattern && root)
 		return OK;
 
 	clear();
@@ -1421,7 +1423,7 @@ void RegEx::clear() {
 	if (root)
 		memdelete(root);
 
-	pattern.clear();
+	root = NULL;
 	group_names.clear();
 	lookahead_depth = 0;
 }
@@ -1494,5 +1496,7 @@ void RegEx::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_pattern"),&RegEx::get_pattern);
 	ObjectTypeDB::bind_method(_MD("get_group_count"),&RegEx::get_group_count);
 	ObjectTypeDB::bind_method(_MD("get_names"),&RegEx::get_names);
+
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "pattern"), _SCS("compile"), _SCS("get_pattern"));
 }
 
-- 
cgit v1.2.3-70-g09d2