summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2015-04-11 14:54:19 +0100
committerPatrick McHardy <kaber@trash.net>2015-04-12 19:59:27 +0100
commit87908ff7a12c969ca21338ab7ed27ed93a9b09c3 (patch)
tree5ebdb13c778b3e65e3c6c256c5b05ed2b370f79d /src/scanner.l
parent3ed296118a065caff5600e60d4f7ef18e137f9a0 (diff)
datatype: fix parsing of time type
Properly detect time strings in the lexer without quotation marks. Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 73c4f8b1..27d95bfc 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -117,6 +117,8 @@ quotedstring \"[^"]*\"
comment #.*$
slash \/
+timestring ([0-9]+d)?([0-9]+h)?([0-9]+m)?([0-9]+s)?
+
hex4 ([[:xdigit:]]{1,4})
v680 (({hex4}:){7}{hex4})
v670 ((:)((:{hex4}){7}))
@@ -457,6 +459,11 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr})
return STRING;
}
+{timestring} {
+ yylval->string = xstrdup(yytext);
+ return STRING;
+ }
+
{decstring} {
errno = 0;
yylval->val = strtoull(yytext, NULL, 0);