Skip to content

Commit aeb9c21

Browse files
authored
Merge pull request #205 from theludovyc/fix#203_sg_custom_regex
Fix #203 rename unhandled_regex to custom_regex
2 parents 5ce66f4 + a85034d commit aeb9c21

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
extends "res://Test/RakugoTest.gd"
2+
3+
const file_path = "res://Test/TestExecuter/TestCustomRegex/TestCustomRegex.rk"
4+
5+
var file_base_name = get_file_base_name(file_path)
6+
7+
func test_custom_regex():
8+
Rakugo.add_custom_regex("HW", "^hello_world$")
9+
10+
watch_rakugo_signals()
11+
12+
await wait_parse_and_execute_script(file_path)
13+
14+
await wait_for_signal(Rakugo.sg_custom_regex, 0.2)
15+
16+
var params = get_signal_parameters(Rakugo, Rakugo.sg_custom_regex.get_name())
17+
18+
assert_eq(params[0], "HW")
19+
20+
await wait_execute_script_finished(file_base_name)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[gd_scene load_steps=2 format=3 uid="uid://ds2f3ywueejdo"]
2+
3+
[ext_resource type="Script" path="res://Test/TestExecuter/TestCustomRegex/TestCustomRegex.gd" id="1_u0hr0"]
4+
5+
[node name="TestCustomRegex" type="Node"]
6+
script = ExtResource("1_u0hr0")

Test/TestExecuter/TestUnhandledRegex/TestUnhandledRegex.gd

Lines changed: 0 additions & 20 deletions
This file was deleted.

Test/TestExecuter/TestUnhandledRegex/TestUnhandledRegex.tscn

Lines changed: 0 additions & 6 deletions
This file was deleted.

addons/Rakugo/Rakugo.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ signal sg_say(character, text)
4848
signal sg_notify(text)
4949
signal sg_ask(character, question, default_answer)
5050
signal sg_menu(choices)
51-
signal sg_parser_unhandled_regex(key, result)
51+
signal sg_custom_regex(key, result)
5252
signal sg_execute_script_start(file_name)
5353
signal sg_execute_script_finished(file_name, error_str)
5454
signal sg_variable_changed(var_name, value)
@@ -220,7 +220,7 @@ func _exit_tree() -> void:
220220

221221

222222
# Todo Handle Error
223-
func parser_add_regex_at_runtime(key: String, regex: String):
223+
func add_custom_regex(key: String, regex: String):
224224
parser.add_regex_at_runtime(key, regex)
225225

226226

addons/Rakugo/lib/systems/Executer.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ func do_execute_script(parameters:Dictionary):
270270

271271
Rakugo.set_variable(result.get_string("lvar_name"), value)
272272
_:
273-
Rakugo.sg_parser_unhandled_regex.emit(line[0], result)
273+
Rakugo.sg_custom_regex.emit(line[0], result)
274274

275275
index += 1
276276

0 commit comments

Comments
 (0)