zscanner: fix bad EUI separator warning

refs #2388

Change-Id: Ib4b047618d84a3e0e38e809fcef748bff21fa5cc

src/common/errcode.c

@@ -148,6 +148,7 @@ const error_table_t knot_error_msgs[] = {
 	{ ZSCANNER_EBAD_EUI_LENGTH, "Bad EUI length." },
 	{ ZSCANNER_EBAD_L64_LENGTH, "Bad 64-bit locator." },
 	{ ZSCANNER_EBAD_CHAR_COLON, "Missing colon character." },
+	{ ZSCANNER_EBAD_CHAR_DASH, "Missing dash character." },
 
 	/* Encoding errors. */
 	{ KNOT_BASE64_ESIZE, "Invalid base64 string length." },

src/common/errcode.h

@@ -162,6 +162,7 @@ enum knot_error {
 	ZSCANNER_EBAD_EUI_LENGTH,
 	ZSCANNER_EBAD_L64_LENGTH,
 	ZSCANNER_EBAD_CHAR_COLON,
+	ZSCANNER_EBAD_CHAR_DASH,
 
 	/* Encoding errors. */
 	KNOT_BASE64_ESIZE,

src/zscanner/scanner_body.rl

@@ -1532,11 +1532,17 @@
 			fhold; fgoto err_line;
 		}
 	}
+	action _eui_sep_error {
+		SCANNER_WARNING(ZSCANNER_EBAD_CHAR_DASH);                       
+		fhold; fgoto err_line;
+	}
 
-	eui48 = (hex_char %_eui_count . ('-' . hex_char %_eui_count)+
+	eui48 = (hex_char %_eui_count .
+	         ('-' >!_eui_sep_error . hex_char %_eui_count)+
 		) $!_hex_char_error >_eui_init %_eui48_exit;
 
-	eui64 = (hex_char %_eui_count . ('-' . hex_char %_eui_count)+
+	eui64 = (hex_char %_eui_count .
+	         ('-' >!_eui_sep_error . hex_char %_eui_count)+
 		) $!_hex_char_error >_eui_init %_eui64_exit;
 	# END
 

src/zscanner/test/cases/43_EUI48.out

@@ -54,7 +54,7 @@ WARNG=ZSCANNER_EBAD_EUI_LENGTH
 ------
 WARNG=ZSCANNER_EBAD_HEX_CHAR
 ------
-WARNG=ZSCANNER_EBAD_HEX_CHAR
+WARNG=ZSCANNER_EBAD_CHAR_DASH
 ------
 WARNG=ZSCANNER_EBAD_HEX_CHAR
 ------

src/zscanner/test/cases/44_EUI64.out

@@ -54,7 +54,7 @@ WARNG=ZSCANNER_EBAD_EUI_LENGTH
 ------
 WARNG=ZSCANNER_EBAD_HEX_CHAR
 ------
-WARNG=ZSCANNER_EBAD_HEX_CHAR
+WARNG=ZSCANNER_EBAD_CHAR_DASH
 ------
 WARNG=ZSCANNER_EBAD_HEX_CHAR
 ------

src/zscanner/test/processing.c

@@ -81,6 +81,7 @@ const char *error_names[] = {
 	ERROR_CODE_TO_STRING(ZSCANNER_EBAD_EUI_LENGTH),
 	ERROR_CODE_TO_STRING(ZSCANNER_EBAD_L64_LENGTH),
 	ERROR_CODE_TO_STRING(ZSCANNER_EBAD_CHAR_COLON),
+	ERROR_CODE_TO_STRING(ZSCANNER_EBAD_CHAR_DASH),
 };
 #define ERROR_CODE_NAME(code) error_names[code - ZSCANNER_UNCOVERED_STATE]