From b289411644a77d03a0b811918c6a5742aab8dfd2 Mon Sep 17 00:00:00 2001 From: FreeArtMan Date: Tue, 20 Aug 2019 18:39:19 +0100 Subject: Update parsing to enable dots in underscore in filenames when open file --- libcmd/cmd_parse.c | 18 ++++++++++-------- libcmd/cmd_parse.ragel | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libcmd/cmd_parse.c b/libcmd/cmd_parse.c index a45412c..2c0089a 100644 --- a/libcmd/cmd_parse.c +++ b/libcmd/cmd_parse.c @@ -50,12 +50,13 @@ static const char _cmd_trans_keys[] = { 49, 57, 65, 90, 97, 122, 48, 57, 46, 98, 120, 48, 57, 46, 48, 57, 48, 49, 48, 57, 65, 70, 97, 102, - 48, 57, 65, 90, 97, 122, 0 + 39, 46, 95, 48, 57, 65, 90, 97, + 122, 0 }; static const char _cmd_single_lengths[] = { 0, 3, 3, 0, 0, 0, 6, 0, - 3, 1, 0, 0, 0 + 3, 1, 0, 0, 3 }; static const char _cmd_range_lengths[] = { @@ -74,7 +75,8 @@ static const char _cmd_indicies[] = { 9, 0, 9, 9, 10, 11, 9, 12, 13, 13, 2, 5, 14, 10, 16, 17, 12, 15, 10, 12, 15, 7, 18, 8, - 8, 8, 19, 13, 13, 13, 20, 0 + 8, 8, 19, 13, 13, 13, 13, 13, + 13, 20, 0 }; static const char _cmd_trans_targs[] = { @@ -133,7 +135,7 @@ int parse_cmd( cmd_tok_t *tl, const char *str, size_t str_size ) */ -#line 137 "cmd_parse.c" +#line 139 "cmd_parse.c" { cs = cmd_start; ts = 0; @@ -143,7 +145,7 @@ int parse_cmd( cmd_tok_t *tl, const char *str, size_t str_size ) #line 83 "cmd_parse.ragel" -#line 147 "cmd_parse.c" +#line 149 "cmd_parse.c" { int _klen; unsigned int _trans; @@ -164,7 +166,7 @@ _resume: #line 1 "NONE" {ts = p;} break; -#line 168 "cmd_parse.c" +#line 170 "cmd_parse.c" } } @@ -282,7 +284,7 @@ _eof_trans: } } break; -#line 286 "cmd_parse.c" +#line 288 "cmd_parse.c" } } @@ -299,7 +301,7 @@ _again: #line 1 "NONE" {act = 0;} break; -#line 303 "cmd_parse.c" +#line 305 "cmd_parse.c" } } diff --git a/libcmd/cmd_parse.ragel b/libcmd/cmd_parse.ragel index 280d483..02b92ce 100644 --- a/libcmd/cmd_parse.ragel +++ b/libcmd/cmd_parse.ragel @@ -45,7 +45,7 @@ int print_token( char *s, char *e, int tok) '"'; quote = '"' (any-'"')* '"'; #seperate = ';'; - word = [a-zA-Z] ([a-zA-Z0-9])*; + word = [a-zA-Z] ([a-zA-Z0-9'._'])*; sp = ([' ','\t','\n']); main := |* -- cgit v1.2.3