Skip to content

Relax restrictions on command identifiers #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
recatek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Relax restrictions on command identifiers #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions limbo_console.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,11 @@ func print_line(p_line: String, p_stdout: bool = _options.print_to_stdout) -> vo


## Registers a callable as a command, with optional name and description.
## Name can have up to 4 space-separated identifiers (e.g., "command sub1 sub2 sub3"),
## using letters, digits, or underscores, starting with a non-digit.
## Name can have up to 4 space-separated identifiers (e.g., "command sub1 sub2 sub3").
## A valid command identifier may contain only letters, digits, periods, and underscores (_).
func register_command(p_func: Callable, p_name: String = "", p_desc: String = "") -> void:
if p_name and not Util.is_valid_command_sequence(p_name):
push_error("LimboConsole: Failed to register command: %s. Name can have up to 4 space-separated identifiers, using letters, digits, or underscores, starting with non-digit." % [p_name])
push_error("LimboConsole: Failed to register command: %s. Name can have up to 4 space-separated identifiers each containing only letters, digits, periods, and underscores (_)." % [p_name])
return

if not _validate_callable(p_func):
Expand Down
11 changes: 7 additions & 4 deletions util.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,14 @@ static func _calculate_osa_distance(s1: String, s2: String) -> int:


## Returns true, if a string is constructed of one or more space-separated valid
## command identifiers ("command" or "command sub1 sub2").
## A valid command identifier may contain only letters, digits, and underscores (_),
## and the first character may not be a digit.
## command identifiers ("command" or "command sub1 sub2").
## A valid command identifier may contain only letters, digits, periods, and
## underscores (_).
static func is_valid_command_sequence(p_string: String) -> bool:
var regex = RegEx.new()
regex.compile("^[A-Za-z0-9_\\.]+$")

for part in p_string.split(' '):
if not part.is_valid_ascii_identifier():
if not regex.search(part):
return false
return true