瀏覽代碼

Exposed RegEx expanded option to scripts

Zher Huei Lee 10 年之前
父節點
當前提交
f0d246a7bc
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      drivers/nrex/regex.cpp
  2. 1 1
      drivers/nrex/regex.h

+ 3 - 3
drivers/nrex/regex.cpp

@@ -15,7 +15,7 @@
 
 
 void RegEx::_bind_methods() {
 void RegEx::_bind_methods() {
 
 
-	ObjectTypeDB::bind_method(_MD("compile","pattern"),&RegEx::compile);
+	ObjectTypeDB::bind_method(_MD("compile","pattern", "expanded"),&RegEx::compile, DEFVAL(true));
 	ObjectTypeDB::bind_method(_MD("find","text","start","end"),&RegEx::find, 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("clear"),&RegEx::clear);
 	ObjectTypeDB::bind_method(_MD("is_valid"),&RegEx::is_valid);
 	ObjectTypeDB::bind_method(_MD("is_valid"),&RegEx::is_valid);
@@ -68,11 +68,11 @@ String RegEx::get_capture(int capture) const {
 
 
 }
 }
 
 
-Error RegEx::compile(const String& p_pattern) {
+Error RegEx::compile(const String& p_pattern, bool expanded) {
 
 
 	clear();
 	clear();
 
 
-	exp.compile(p_pattern.c_str());
+	exp.compile(p_pattern.c_str(), expanded);
 
 
 	ERR_FAIL_COND_V( !exp.valid(), FAILED );
 	ERR_FAIL_COND_V( !exp.valid(), FAILED );
 
 

+ 1 - 1
drivers/nrex/regex.h

@@ -36,7 +36,7 @@ public:
 	bool is_valid() const;
 	bool is_valid() const;
 	int get_capture_count() const;
 	int get_capture_count() const;
 	String get_capture(int capture) const;
 	String get_capture(int capture) const;
-	Error compile(const String& p_pattern);
+	Error compile(const String& p_pattern, bool expanded = false);
 	int find(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();