From b2c67c9f984fee13945b5e75c05ec1f1b342842b Mon Sep 17 00:00:00 2001 From: MomoPewpew <50401575+MomoPewpew@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:50:40 +0200 Subject: [PATCH 1/2] Allow colons in selection identifier This will restore functionality to the group selector --- .../antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 b/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 index d62074bd..54d16997 100644 --- a/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 +++ b/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 @@ -45,7 +45,7 @@ COND_DELIMIT: ','; COND_EQUALS: '='; QUOTE : '"' ( ESC_SEQ | ~('\\'|'"') )* '"' ; -IDENTIFIER: [a-zA-Z][a-zA-Z0-9_-]*; +IDENTIFIER: [a-zA-Z0-9_:]+; STRING: (~[,=])+?; fragment From 6448aa4c6fde26f1e20c34416e5fea8bbe86117b Mon Sep 17 00:00:00 2001 From: MomoPewpew <50401575+MomoPewpew@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:58:34 +0200 Subject: [PATCH 2/2] Bug fix with prior change --- .../antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 b/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 index 54d16997..e00d58a2 100644 --- a/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 +++ b/pathfinder-core/src/main/antlr/de/cubbossa/pathfinder/antlr/SelectionLanguage.g4 @@ -45,7 +45,7 @@ COND_DELIMIT: ','; COND_EQUALS: '='; QUOTE : '"' ( ESC_SEQ | ~('\\'|'"') )* '"' ; -IDENTIFIER: [a-zA-Z0-9_:]+; +IDENTIFIER: [a-zA-Z][a-zA-Z0-9_:-]*; STRING: (~[,=])+?; fragment