From 006b53e3c07f9377f426d48c8bad99d4126a0fb0 Mon Sep 17 00:00:00 2001
From: mzuenni <michi.zuendorf@gmail.com>
Date: Tue, 14 May 2024 16:24:50 +0200
Subject: [PATCH] update regex

---
 support/schemas/generators.cue              | 6 ++++--
 support/schemas/generators_yaml_schema.json | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/support/schemas/generators.cue b/support/schemas/generators.cue
index 50af5902a..c67ce3502 100644
--- a/support/schemas/generators.cue
+++ b/support/schemas/generators.cue
@@ -8,8 +8,10 @@ import "struct"
 
 // A command invokes a generator, like "tree --n 5".
 // The regex restricts occurrences of curly-bracketed expressions
-// to things like "tree --random --seed {seed:5}"
-command: !="" & (=~"^[^{}]*(\\{seed(:[0-9]+)?\\}[^{}]*)*$")
+// to things like "tree --random --seed {seed:5} {name} {count}"
+// - {seed} can occure at most once
+// - {name} and {count} can occure any number of times
+command: !="" & (=~"^([^{}]|\\{name\\}|\\{count\\})*(\\{seed(:[0-9]+)?\\})?([^{}]|\\{name\\}|\\{count\\})*$")
 
 #config: {
 	"testdata.yaml"?: #testdata_settings
diff --git a/support/schemas/generators_yaml_schema.json b/support/schemas/generators_yaml_schema.json
index 1bd7b3dca..ff06679ef 100644
--- a/support/schemas/generators_yaml_schema.json
+++ b/support/schemas/generators_yaml_schema.json
@@ -171,7 +171,7 @@
         "/visualizers/vis --large"
       ],
       "type": "string",
-      "pattern": "^/[^{}]*(\\{seed(:[0-9]+)?\\}[^{}]*)*$"
+      "pattern": "^([^{}]|\\{name\\})*$"
     },
     "random_salt": {
       "title": "Random Salt",
@@ -190,7 +190,7 @@
       "description": "Invocation of a generator to create this testcase",
       "examples": ["forest --n 40 --connected", "path.cpp 20", "random {seed}"],
       "type": "string",
-      "pattern": "^[^{}]*(\\{seed(:[0-9]+)?\\}[^{}]*)*$"
+      "pattern": "^([^{}]|\\{name\\}|\\{count\\})*(\\{seed(:[0-9]+)?\\})?([^{}]|\\{name\\}|\\{count\\})*$"
     },
     "slashedfilepath": {
       "type": "string",