more tests

Author: bbonev

yaclitest.c

@@ -86,6 +86,15 @@ static void cmd_generic(yacli *cli,int cnt,char **cmd) {
 		yacli_print(cli,"some line #%d :)\n",i);
 }
 
+static void cmd_mix(yacli *cli,int cnt,char **cmd) { // exercises mixed literal/regex/dyn siblings
+	int i;
+
+	yacli_print(cli,"mix path matched, argc=%d:",cnt);
+	for (i=0;i<cnt;i++)
+		yacli_print(cli," [%s]",cmd[i]);
+	yacli_print(cli,"\n");
+}
+
 static void list_cb(yacli *cli,void *ctx,int code) {
 	char s[50];
 	int i,j;
@@ -194,8 +203,10 @@ int main(void) {
 	yacli_add_cmd(cli,ip3,"@4","Display IP information",cmd_generic);
 
 	pip=yacli_add_cmd(cli,pshow,"ip","Display IP information",cmd_generic);
-	//yacli_add_cmd(cli,pip,"<A.B.C.D|XX:XX::XX:XX>","Display IP information",cmd_generic);
 	yacli_add_cmd(cli,pip,"@1","Display IP information",cmd_generic);
+	// previously rejected by yacli (literal + regex/dyn at same level); now exercised end-to-end
+	yacli_add_cmd(cli,pip,"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[.]){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$","<A.B.C.D>",cmd_generic);
+	yacli_add_cmd(cli,pip,"summary","Summary view alongside the regex/dyn siblings",cmd_generic);
 	yacli_add_cmd(cli,pshow,"id","Display shaping class information",cmd_generic);
 	yacli_add_cmd(cli,pshow,"shaper","Display shaper tree information",cmd_generic);
 	yacli_add_cmd(cli,pshow,"map","Display traffic map information",cmd_generic);
@@ -237,6 +248,28 @@ int main(void) {
 
 	ip1=yacli_add_cmd(cli,NULL,"file","file path test",cmd_bliak);
 	yacli_add_cmd(cli,ip1,"^[^`{<|:,;>}'\"]+$","<file_path>",cmd_bliak);
+
+	// mixed-siblings probe: two literals + a regex + a dyn list at the same level
+	// expected behaviour (post-relaxation):
+	//   `mix start`  / `mix stop`         → literal exact match
+	//   `mix s` <TAB>                     → ambiguous prefix completion (start vs stop vs summary)
+	//   `mix 1.2.3.4`                     → falls through literals, hits the IPv4 regex
+	//   `mix eth0`                        → falls through literals, hits a dyn item
+	//   `?` at `mix `                     → lists literals + regex placeholder + dyn list
+	ip1=yacli_add_cmd(cli,NULL,"mix","Mixed literal/regex/dyn-sibling probe",NULL);
+	yacli_add_cmd(cli,ip1,"start","Mix: start literal",cmd_mix);
+	yacli_add_cmd(cli,ip1,"stop","Mix: stop literal",cmd_mix);
+	yacli_add_cmd(cli,ip1,"summary","Mix: summary literal (shares prefix with stop/start? no — distinct)",cmd_mix);
+	yacli_add_cmd(cli,ip1,"@0","interface name (dyn)",cmd_mix);
+	yacli_add_cmd(cli,ip1,"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[.]){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$","<A.B.C.D>",cmd_mix);
+
+	// malformed-regex rejection: yacli_add_cmd should refuse this and return NULL
+	if (yacli_add_cmd(cli,NULL,"^bad[regex","<bad-regex>",cmd_mix)!=NULL)
+		fprintf(stderr,"BUG: malformed regex was accepted\n");
+
+	// small history cap so eviction is easy to observe via Ctrl-X Ctrl-H
+	yacli_set_hist_max(cli,5);
+
 	yacli_start(cli);
 
 	for (;;) {