Merge remote-tracking branch 'upstream/master'

3 files changed, 26 insertions, 0 deletions

diff --git a/demos/misc/regex/engine.cfg b/demos/misc/regex/engine.cfg
new file mode 100644
index 0000000000..0a6f4f869c
--- /dev/null
+++ b/demos/misc/regex/engine.cfg
@@ -0,0 +1,4 @@
+[application]
+
+name="RegEx"
+main_scene="res://regex.scn"
diff --git a/demos/misc/regex/regex.gd b/demos/misc/regex/regex.gd
new file mode 100644
index 0000000000..e648c18093
--- /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.find(text)
+	var list = get_node("List")
+	for child in list.get_children():
+		child.queue_free()
+	for res in regex.get_captures():
+		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()
diff --git a/demos/misc/regex/regex.scn b/demos/misc/regex/regex.scn
new file mode 100644
index 0000000000..2b62d6b82a
--- /dev/null
+++ b/demos/misc/regex/regex.scn