trafgen: lexer/parser: fix cpu() selection and whitespacing

It looks unintuitive when once needs to write cpu(0:3), so also allow
cpu(0-3). Then it's quite stupid to enforce whitespace after the double
colon before the curley braces open. So make this rather optional here.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/trafgen_parser.y b/trafgen_parser.y
index 9d2dd09..b0e7e33 100644
--- a/trafgen_parser.y
+++ b/trafgen_parser.y
@@ -344,12 +344,22 @@ inline_comment
 	: K_COMMENT { }
 	;
 
+cpu_delim
+	: ':' { }
+	| '-' { }
+	;
+
+noenforce_white
+	: { }
+	| K_WHITE { }
+	;
+
 packet
 	: '{' delimiter payload delimiter '}' {
 			min_cpu = max_cpu = -1;
 			realloc_packet();
 		}
-	| K_CPU '(' number ':' number ')' ':' K_WHITE '{' delimiter payload delimiter '}' {
+	| K_CPU '(' number cpu_delim number ')' ':' noenforce_white '{' delimiter payload delimiter '}' {
 			min_cpu = $3;
 			max_cpu = $5;
 
@@ -362,7 +372,7 @@ packet
 
 			realloc_packet();
 		}
-	| K_CPU '(' number ')' ':' K_WHITE '{' delimiter payload delimiter '}' {
+	| K_CPU '(' number ')' ':' noenforce_white '{' delimiter payload delimiter '}' {
 			min_cpu = max_cpu = $3;
 			realloc_packet();
 		}