diff --git a/NEWS b/NEWS index 88c0a85c..6c81ea8c 100644 --- a/NEWS +++ b/NEWS @@ -9,8 +9,10 @@ lnav v0.8.1: object or array, respectively. * The SQL view will now graph values found in JSON objects/arrays in addition to the regular columns in the result. - * Added an 'extract(, )' SQL function that can be used to + * Added an 'regexp_match(, )' SQL function that can be used to extract values from a string using a regular expression. + * Added an 'extract()' SQL function that extracts values using the + same data discover/extraction parser used in the 'logline' table. * Pressing 'V' in the DB view will now check for a column with a timestamp and move to the corresponding time in the log view. * Added ":hide-lines-before", ":hide-lines-after", and @@ -23,6 +25,8 @@ lnav v0.8.1: * Added an ":echo" command that can be useful for scripts to message the user. * The "log_part" column can now be set with an SQL UPDATE statement. + * Added a "log_body" hidden column that returns the body of the log + message. * Added ":config", ":reset-config", and ":save-config" commands to change configuration options, reset to default, and save them for future executions. diff --git a/docs/source/sqlext.rst b/docs/source/sqlext.rst index d371dd7c..9b1dd5ed 100644 --- a/docs/source/sqlext.rst +++ b/docs/source/sqlext.rst @@ -119,12 +119,15 @@ Additional string comparison and manipulation functions: starts with the given prefix. * endswith(s1,suffix) - Given a string and suffix, return 1 if the string ends with the given suffix. -* extract(re,str) - Extract values from a string using a regular expression. - The "re" argument should be a PCRE with captures. If there is a single - capture, that captured value will be directly returned. If there is more - than one capture, a JSON object will be returned with field names matching - the named capture groups or 'col_N' where 'N' is the index of the capture. - If the expression does not match the string, NULL is returned. +* regexp_match(re,str) - Match and extract values from a string using a regular + expression. The "re" argument should be a PCRE with captures. If there is + a single capture, that captured value will be directly returned. If there + is more than one capture, a JSON object will be returned with field names + matching the named capture groups or 'col_N' where 'N' is the index of the + capture. If the expression does not match the string, NULL is returned. +* extract(str) - Parse and extract values from a string using the same + algorithm as the *logline* table (see :ref:`data-ext`). The discovered + data is returned as a JSON-object that you can do further processing on. File Paths diff --git a/src/data_parser.hh b/src/data_parser.hh index 12d30a68..b123a090 100644 --- a/src/data_parser.hh +++ b/src/data_parser.hh @@ -35,6 +35,7 @@ #include "spookyhash/SpookyV2.h" #include +#include #include #include #include @@ -75,17 +76,23 @@ enum data_format_state_t { }; struct data_format { - data_format(const char *name, + data_format(const char *name = NULL, data_token_t appender = DT_INVALID, data_token_t terminator = DT_INVALID) : df_name(name), df_appender(appender), - df_terminator(terminator) + df_terminator(terminator), + df_qualifier(DT_INVALID), + df_separator(DT_COLON), + df_prefix_terminator(DT_INVALID) {}; const char * df_name; - const data_token_t df_appender; - const data_token_t df_terminator; + data_token_t df_appender; + data_token_t df_terminator; + data_token_t df_qualifier; + data_token_t df_separator; + data_token_t df_prefix_terminator; }; data_format_state_t dfs_prefix_next(data_format_state_t state, @@ -197,6 +204,10 @@ public: LIST_INIT_TRACE; }; + element_list_t(const element_list_t &other) : std::list(other) { + this->el_format = other.el_format; + } + ~element_list_t() { const char *fn = __FILE__; @@ -251,6 +262,8 @@ public: this->std::list::splice(pos, other, first, last); } + + data_format el_format; }; struct element { @@ -302,6 +315,7 @@ public: if (this->e_sub_elements == NULL) { this->e_sub_elements = new element_list_t("_sub_", __FILE__, __LINE__); + this->e_sub_elements->el_format = subs.el_format; } this->e_sub_elements->swap(subs); this->update_capture(); @@ -333,6 +347,9 @@ public: this->e_sub_elements->size() == 1) { retval = this->e_sub_elements->front().e_token; } + else { + retval = DT_SYMBOL; + } } else { retval = this->e_token; @@ -410,13 +427,72 @@ private: data_token_t ei_token; }; + struct discover_format_state { + discover_format_state() { + memset(this->dfs_hist, 0, sizeof(this->dfs_hist)); + this->dfs_prefix_state = DFS_INIT; + this->dfs_semi_state = DFS_INIT; + this->dfs_comma_state = DFS_INIT; + } + + void update_for_element(const element &elem) { + this->dfs_prefix_state = dfs_prefix_next(this->dfs_prefix_state, elem.e_token); + this->dfs_semi_state = dfs_semi_next(this->dfs_semi_state, elem.e_token); + this->dfs_comma_state = dfs_comma_next(this->dfs_comma_state, elem.e_token); + if (this->dfs_prefix_state != DFS_ERROR) { + if (this->dfs_semi_state == DFS_ERROR) { + this->dfs_semi_state = DFS_INIT; + } + if (this->dfs_comma_state == DFS_ERROR) { + this->dfs_comma_state = DFS_INIT; + } + } + this->dfs_hist[elem.e_token] += 1; + } + + void finalize() { + data_token_t qualifier = this->dfs_format.df_qualifier; + data_token_t separator = this->dfs_format.df_separator; + data_token_t prefix_term = this->dfs_format.df_prefix_terminator; + + this->dfs_format = FORMAT_PLAIN; + if (this->dfs_hist[DT_EQUALS]) { + qualifier = DT_COLON; + separator = DT_EQUALS; + } + + if (this->dfs_semi_state != DFS_ERROR && this->dfs_hist[DT_SEMI]) { + this->dfs_format = FORMAT_SEMI; + } + else if (this->dfs_comma_state != DFS_ERROR) { + this->dfs_format = FORMAT_COMMA; + if (separator == DT_COLON && this->dfs_hist[DT_COMMA] > 0) { + if (!((this->dfs_hist[DT_COLON] == this->dfs_hist[DT_COMMA]) || + ((this->dfs_hist[DT_COLON] - 1) == this->dfs_hist[DT_COMMA]))) { + separator = DT_INVALID; + if (this->dfs_hist[DT_COLON] == 1) { + prefix_term = DT_COLON; + } + } + } + } + + this->dfs_format.df_qualifier = qualifier; + this->dfs_format.df_separator = separator; + this->dfs_format.df_prefix_terminator = prefix_term; + }; + + data_format_state_t dfs_prefix_state; + data_format_state_t dfs_semi_state; + data_format_state_t dfs_comma_state; + int dfs_hist[DT_TERMINAL_MAX]; + + data_format dfs_format; + }; + data_parser(data_scanner *ds) : dp_errors("dp_errors", __FILE__, __LINE__), dp_pairs("dp_pairs", __FILE__, __LINE__), - dp_format(NULL), - dp_qualifier(DT_INVALID), - dp_separator(DT_INVALID), - dp_prefix_terminator(DT_INVALID), dp_msg_format(NULL), dp_msg_format_begin(ds->get_input().pi_offset), dp_scanner(ds) @@ -434,6 +510,8 @@ private: ELEMENT_LIST_T(prefix); SpookyHash context; + require(in_list.el_format.df_name != NULL); + POINT_TRACE("pairup_start"); for (element_list_t::iterator iter = in_list.begin(); @@ -448,20 +526,20 @@ private: } } - if (this->dp_prefix_terminator != DT_INVALID) { - if (iter->e_token == this->dp_prefix_terminator) { - this->dp_prefix_terminator = DT_INVALID; + if (in_list.el_format.df_prefix_terminator != DT_INVALID) { + if (iter->e_token == in_list.el_format.df_prefix_terminator) { + in_list.el_format.df_prefix_terminator = DT_INVALID; } else { el_stack.PUSH_BACK(*iter); } } - else if (iter->e_token == this->dp_format->df_terminator) { - this->end_of_value(el_stack, key_comps, value); + else if (iter->e_token == in_list.el_format.df_terminator) { + this->end_of_value(el_stack, key_comps, value, in_list); key_comps.PUSH_BACK(*iter); } - else if (iter->e_token == this->dp_qualifier) { + else if (iter->e_token == in_list.el_format.df_qualifier) { value.SPLICE(value.end(), key_comps, key_comps.begin(), @@ -471,13 +549,13 @@ private: el_stack.PUSH_BACK(element(value, DNT_VALUE)); } } - else if (iter->e_token == this->dp_separator) { + else if (iter->e_token == in_list.el_format.df_separator) { element_list_t::iterator key_iter = key_comps.end(); bool found = false, key_is_values = true; do { --key_iter; - if (key_iter->e_token == this->dp_format->df_appender) { + if (key_iter->e_token == in_list.el_format.df_appender) { ++key_iter; value.SPLICE(value.end(), key_comps, @@ -487,7 +565,7 @@ private: found = true; } else if (key_iter->e_token == - this->dp_format->df_terminator) { + in_list.el_format.df_terminator) { std::vector key_copy; value.SPLICE(value.end(), @@ -512,8 +590,8 @@ private: element_list_t::iterator value_iter; if (el_stack.size() > 1 && - this->dp_format->df_appender != DT_INVALID && - this->dp_format->df_terminator != DT_INVALID) { + in_list.el_format.df_appender != DT_INVALID && + in_list.el_format.df_terminator != DT_INVALID) { /* If we're expecting a terminator and haven't found it */ /* then this is part of the value. */ continue; @@ -563,7 +641,7 @@ private: key_comps, key_comps.begin(), key_comps.end()); } else { - this->end_of_value(el_stack, key_comps, value); + this->end_of_value(el_stack, key_comps, value, in_list); } POINT_TRACE("pairup_stack"); @@ -785,20 +863,13 @@ private: void discover_format(void) { pcre_context_static<30> pc; - int hist[DT_TERMINAL_MAX]; + std::stack state_stack; struct element elem; this->dp_group_token.push_back(DT_INVALID); this->dp_group_stack.resize(1); - this->dp_qualifier = DT_INVALID; - this->dp_separator = DT_COLON; - this->dp_prefix_terminator = DT_INVALID; - data_format_state_t prefix_state = DFS_INIT; - data_format_state_t semi_state = DFS_INIT; - data_format_state_t comma_state = DFS_INIT; - - memset(hist, 0, sizeof(hist)); + state_stack.push(discover_format_state()); while (this->dp_scanner->tokenize2(pc, elem.e_token)) { pcre_context::iterator pc_iter; @@ -810,18 +881,7 @@ private: require(elem.e_capture.c_begin != -1); require(elem.e_capture.c_end != -1); - prefix_state = dfs_prefix_next(prefix_state, elem.e_token); - semi_state = dfs_semi_next(semi_state, elem.e_token); - comma_state = dfs_comma_next(comma_state, elem.e_token); - if (prefix_state != DFS_ERROR) { - if (semi_state == DFS_ERROR) { - semi_state = DFS_INIT; - } - if (comma_state == DFS_ERROR) { - comma_state = DFS_INIT; - } - } - hist[elem.e_token] += 1; + state_stack.top().update_for_element(elem); switch (elem.e_token) { case DT_LPAREN: case DT_LANGLE: @@ -831,6 +891,7 @@ private: this->dp_group_stack.push_back(element_list_t("_anon_", __FILE__, __LINE__)); + state_stack.push(discover_format_state()); break; case DT_RPAREN: @@ -844,6 +905,9 @@ private: this->dp_group_stack.rbegin(); ++riter; if (!this->dp_group_stack.back().empty()) { + state_stack.top().finalize(); + this->dp_group_stack.back().el_format = state_stack.top().dfs_format; + state_stack.pop(); (*riter).PUSH_BACK(element(this->dp_group_stack.back(), DNT_GROUP)); } @@ -867,43 +931,28 @@ private: this->dp_group_stack.rbegin(); ++riter; if (!this->dp_group_stack.back().empty()) { + state_stack.top().finalize(); + this->dp_group_stack.back().el_format = state_stack.top().dfs_format; + state_stack.pop(); (*riter).PUSH_BACK(element(this->dp_group_stack.back(), DNT_GROUP)); } this->dp_group_stack.pop_back(); } - if (hist[DT_EQUALS]) { - this->dp_qualifier = DT_COLON; - this->dp_separator = DT_EQUALS; - } - - if (semi_state != DFS_ERROR && hist[DT_SEMI]) { - this->dp_format = &FORMAT_SEMI; - } - else if (comma_state != DFS_ERROR) { - this->dp_format = &FORMAT_COMMA; - if (this->dp_separator == DT_COLON && hist[DT_COMMA] > 0) { - if (!((hist[DT_COLON] == hist[DT_COMMA]) || - ((hist[DT_COLON] - 1) == hist[DT_COMMA]))) { - this->dp_separator = DT_INVALID; - if (hist[DT_COLON] == 1) { - this->dp_prefix_terminator = DT_COLON; - } - } - } - } - else { - this->dp_format = &FORMAT_PLAIN; - } + state_stack.top().finalize(); + this->dp_group_stack.back().el_format = state_stack.top().dfs_format; }; void end_of_value(element_list_t &el_stack, element_list_t &key_comps, - element_list_t &value) { - key_comps.remove_if(element_if(this->dp_format->df_terminator)); + element_list_t &value, + const element_list_t &in_list) { + bool key_added = false; + + key_comps.remove_if(element_if(in_list.el_format.df_terminator)); key_comps.remove_if(element_if(DT_COMMA)); - value.remove_if(element_if(this->dp_format->df_terminator)); + value.remove_if(element_if(in_list.el_format.df_terminator)); value.remove_if(element_if(DT_COMMA)); strip(key_comps, element_if(DT_WHITE)); strip(value, element_if(DT_WHITE)); @@ -943,6 +992,7 @@ private: strip(key_comps, element_if(DT_WHITE)); if (!key_comps.empty()) { el_stack.PUSH_BACK(element(key_comps, DNT_KEY, false)); + key_added = true; } key_comps.CLEAR(); } @@ -956,7 +1006,23 @@ private: strip(value, element_if(DT_COLON)); strip(value, element_if(DT_WHITE)); if (!value.empty()) { - el_stack.PUSH_BACK(element(value, DNT_VALUE)); + if (key_added && value.front().e_token == DNT_GROUP) { + element_list_t::iterator end_iter = el_stack.end(); + + --end_iter; + value.SPLICE(value.begin(), + el_stack, + end_iter, + el_stack.end()); + + element_list_t ELEMENT_LIST_T(group_pair); + + group_pair.PUSH_BACK(element(value, DNT_PAIR)); + el_stack.PUSH_BACK(element(group_pair, DNT_VALUE)); + } + else { + el_stack.PUSH_BACK(element(value, DNT_VALUE)); + } } value.CLEAR(); }; @@ -1040,10 +1106,6 @@ private: element_list_t dp_pairs; schema_id_t dp_schema_id; - data_format * dp_format; - data_token_t dp_qualifier; - data_token_t dp_separator; - data_token_t dp_prefix_terminator; std::string *dp_msg_format; int dp_msg_format_begin; diff --git a/src/data_scanner_re.cc b/src/data_scanner_re.cc index 9760c911..44e38100 100644 --- a/src/data_scanner_re.cc +++ b/src/data_scanner_re.cc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.14.2 on Thu Dec 31 20:59:27 2015 */ +/* Generated by re2c 0.14.2 on Tue Mar 8 22:12:04 2016 */ #line 1 "../../lnav2/src/data_scanner_re.re" /** * Copyright (c) 2015, Timothy Stack @@ -208,10 +208,10 @@ yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '"': goto yy968; + case '"': goto yy977; case '%': case '+': goto yy70; - case '\'': goto yy976; + case '\'': goto yy985; case '-': case '.': case '_': goto yy67; @@ -278,11 +278,11 @@ yy4: case 'x': case 'y': case 'z': goto yy472; - case 'e': goto yy983; + case 'e': goto yy992; default: goto yy63; } yy5: -#line 208 "../../lnav2/src/data_scanner_re.re" +#line 209 "../../lnav2/src/data_scanner_re.re" { RET(DT_SYMBOL); } @@ -291,10 +291,10 @@ yy6: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '"': goto yy968; + case '"': goto yy977; case '%': case '+': goto yy70; - case '\'': goto yy976; + case '\'': goto yy985; case '-': case '.': case '_': goto yy67; @@ -367,16 +367,16 @@ yy6: yy7: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if (yych >= 0x01) goto yy969; + if (yych >= 0x01) goto yy978; yy8: -#line 215 "../../lnav2/src/data_scanner_re.re" +#line 216 "../../lnav2/src/data_scanner_re.re" { RET(DT_GARBAGE); } #line 375 "../../lnav2/src/data_scanner_re.cc" yy9: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 0x00) goto yy8; - goto yy961; + goto yy970; yy10: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); @@ -413,7 +413,7 @@ yy10: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy816; + case '.': goto yy825; case '0': case '1': case '2': @@ -421,10 +421,10 @@ yy10: case '4': case '5': case '6': - case '7': goto yy950; + case '7': goto yy959; case '8': - case '9': goto yy817; - case ':': goto yy815; + case '9': goto yy826; + case ':': goto yy824; case '@': goto yy69; case 'A': case 'B': @@ -435,9 +435,9 @@ yy10: case 'b': case 'c': case 'd': - case 'f': goto yy818; + case 'f': goto yy827; case 'E': - case 'e': goto yy819; + case 'e': goto yy828; case 'G': case 'H': case 'I': @@ -477,7 +477,7 @@ yy10: case 'w': case 'y': case 'z': goto yy470; - case 'x': goto yy951; + case 'x': goto yy960; default: goto yy62; } yy11: @@ -520,7 +520,7 @@ yy12: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy816; + case '.': goto yy825; case '0': case '1': case '2': @@ -530,8 +530,8 @@ yy12: case '6': case '7': case '8': - case '9': goto yy947; - case ':': goto yy815; + case '9': goto yy956; + case ':': goto yy824; case '@': goto yy69; case 'A': case 'B': @@ -542,9 +542,9 @@ yy12: case 'b': case 'c': case 'd': - case 'f': goto yy818; + case 'f': goto yy827; case 'E': - case 'e': goto yy819; + case 'e': goto yy828; case 'G': case 'H': case 'I': @@ -623,18 +623,18 @@ yy13: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy816; + case '.': goto yy825; case '0': case '1': case '2': case '3': - case '4': goto yy947; - case '5': goto yy948; + case '4': goto yy956; + case '5': goto yy957; case '6': case '7': case '8': - case '9': goto yy817; - case ':': goto yy815; + case '9': goto yy826; + case ':': goto yy824; case '@': goto yy69; case 'A': case 'B': @@ -645,9 +645,9 @@ yy13: case 'b': case 'c': case 'd': - case 'f': goto yy818; + case 'f': goto yy827; case 'E': - case 'e': goto yy819; + case 'e': goto yy828; case 'G': case 'H': case 'I': @@ -726,7 +726,7 @@ yy14: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy816; + case '.': goto yy825; case '0': case '1': case '2': @@ -736,8 +736,8 @@ yy14: case '6': case '7': case '8': - case '9': goto yy817; - case ':': goto yy815; + case '9': goto yy826; + case ':': goto yy824; case '@': goto yy69; case 'A': case 'B': @@ -748,9 +748,9 @@ yy14: case 'b': case 'c': case 'd': - case 'f': goto yy818; + case 'f': goto yy827; case 'E': - case 'e': goto yy819; + case 'e': goto yy828; case 'G': case 'H': case 'I': @@ -818,8 +818,8 @@ yy15: case 'C': case 'D': case 'E': - case 'F': goto yy498; - case ':': goto yy497; + case 'F': goto yy503; + case ':': goto yy502; case '@': goto yy69; case 'G': case 'H': @@ -846,7 +846,7 @@ yy15: case 'c': case 'd': case 'e': - case 'f': goto yy500; + case 'f': goto yy505; case 'g': case 'h': case 'i': @@ -893,10 +893,10 @@ yy16: case 'C': case 'D': case 'E': - case 'F': goto yy498; - case ':': goto yy497; + case 'F': goto yy503; + case ':': goto yy502; case '@': goto yy69; - case 'A': goto yy809; + case 'A': goto yy818; case 'G': case 'H': case 'I': @@ -917,12 +917,12 @@ yy16: case 'X': case 'Y': case 'Z': goto yy470; - case 'a': goto yy810; + case 'a': goto yy819; case 'b': case 'c': case 'd': case 'e': - case 'f': goto yy500; + case 'f': goto yy505; case 'g': case 'h': case 'i': @@ -1068,7 +1068,7 @@ yy18: case 'Z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'U': goto yy805; + case 'U': goto yy814; case 'a': case 'b': case 'c': @@ -1094,7 +1094,7 @@ yy18: case 'x': case 'y': case 'z': goto yy472; - case 'o': goto yy806; + case 'o': goto yy815; default: goto yy63; } yy19: @@ -1144,7 +1144,7 @@ yy19: case 'Z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'R': goto yy800; + case 'R': goto yy805; case 'a': case 'b': case 'c': @@ -1170,7 +1170,7 @@ yy19: case 'x': case 'y': case 'z': goto yy472; - case 'r': goto yy801; + case 'r': goto yy806; default: goto yy63; } yy20: @@ -1198,8 +1198,8 @@ yy20: case 'C': case 'D': case 'E': - case 'F': goto yy498; - case ':': goto yy497; + case 'F': goto yy503; + case ':': goto yy502; case '@': goto yy69; case 'G': case 'H': @@ -1221,12 +1221,12 @@ yy20: case 'X': case 'Y': case 'Z': goto yy470; - case 'a': goto yy499; + case 'a': goto yy504; case 'b': case 'c': case 'd': case 'e': - case 'f': goto yy500; + case 'f': goto yy505; case 'g': case 'h': case 'i': @@ -1322,7 +1322,7 @@ yy21: case 'x': case 'y': case 'z': goto yy472; - case 'u': goto yy495; + case 'u': goto yy500; default: goto yy63; } yy22: @@ -1603,7 +1603,7 @@ yy26: default: goto yy441; } yy27: -#line 213 "../../lnav2/src/data_scanner_re.re" +#line 214 "../../lnav2/src/data_scanner_re.re" { RET(DT_WHITE); } #line 1609 "../../lnav2/src/data_scanner_re.cc" yy28: @@ -1628,7 +1628,7 @@ yy28: default: goto yy29; } yy29: -#line 212 "../../lnav2/src/data_scanner_re.re" +#line 213 "../../lnav2/src/data_scanner_re.re" { RET(DT_LINE); } #line 1634 "../../lnav2/src/data_scanner_re.cc" yy30: @@ -2042,17 +2042,17 @@ yy61: case 14: goto yy338; case 15: goto yy451; case 16: goto yy478; - case 17: goto yy487; - case 18: goto yy494; - case 19: goto yy544; - case 20: goto yy775; - case 21: goto yy845; - case 22: goto yy869; - case 23: goto yy887; + case 17: goto yy488; + case 18: goto yy499; + case 19: goto yy549; + case 20: goto yy780; + case 21: goto yy854; + case 22: goto yy878; + case 23: goto yy896; case 24: goto yy463; - case 25: goto yy936; - case 26: goto yy965; - default: goto yy973; + case 25: goto yy945; + case 26: goto yy974; + default: goto yy982; } yy62: yyaccept = 0; @@ -17349,7 +17349,7 @@ yy467: yy469: yych = *++YYCURSOR; switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case ':': goto yy64; default: goto yy61; } @@ -17705,7 +17705,7 @@ yy477: ++YYCURSOR; yy478: YYCURSOR = YYCTXMARKER; -#line 206 "../../lnav2/src/data_scanner_re.re" +#line 207 "../../lnav2/src/data_scanner_re.re" { RET(DT_WORD); } #line 17711 "../../lnav2/src/data_scanner_re.cc" yy479: @@ -17722,6 +17722,7 @@ yy480: yyaccept = 16; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; +yy481: switch (yych) { case 0x00: case '\t': @@ -17780,7 +17781,7 @@ yy483: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case ':': goto yy64; default: goto yy478; } @@ -17954,7 +17955,7 @@ yy485: } yy486: YYCTXMARKER = YYCURSOR + 1; - yyaccept = 17; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case 0x00: @@ -17966,30 +17967,16 @@ yy486: case '(': case ')': case '*': - case ';': goto yy477; + case ';': goto yy490; case '!': case ',': - case '?': goto yy479; - case '#': - case '&': - case '<': - case '=': - case '>': - case '[': - case '\\': - case ']': - case '^': - case '`': - case '{': - case '|': - case '}': - case '~': goto yy487; + case '?': goto yy491; case '%': case '+': goto yy70; - case '\'': goto yy480; + case '\'': goto yy492; case '-': case '_': goto yy67; - case '.': goto yy485; + case '.': goto yy489; case '0': case '1': case '2': @@ -18026,7 +18013,7 @@ yy486: case 'X': case 'Y': case 'Z': goto yy470; - case ':': goto yy483; + case ':': goto yy487; case '@': goto yy69; case 'a': case 'b': @@ -18054,19 +18041,167 @@ yy486: case 'x': case 'y': case 'z': goto yy472; - default: goto yy62; + default: goto yy63; } yy487: + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + switch (yych) { + case '/': goto yy493; + case ':': goto yy64; + default: goto yy488; + } +yy488: + YYCURSOR = YYCTXMARKER; #line 205 "../../lnav2/src/data_scanner_re.re" { RET(DT_CONSTANT); } -#line 18063 "../../lnav2/src/data_scanner_re.cc" -yy488: +#line 18059 "../../lnav2/src/data_scanner_re.cc" +yy489: + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + switch (yych) { + case '\t': + case '\n': + case '\r': + case ' ': goto yy490; + case '%': + case '+': goto yy70; + case '-': + case '.': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + case 'G': + case 'H': + case 'I': + case 'J': + case 'K': + case 'L': + case 'M': + case 'N': + case 'O': + case 'P': + case 'Q': + case 'R': + case 'S': + case 'T': + case 'U': + case 'V': + case 'W': + case 'X': + case 'Y': + case 'Z': + case '_': + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + case 'g': + case 'h': + case 'i': + case 'j': + case 'k': + case 'l': + case 'm': + case 'n': + case 'o': + case 'p': + case 'q': + case 'r': + case 's': + case 't': + case 'u': + case 'v': + case 'w': + case 'x': + case 'y': + case 'z': goto yy67; + case '@': goto yy69; + default: goto yy63; + } +yy490: yych = *++YYCURSOR; + goto yy488; +yy491: + yych = *++YYCURSOR; + switch (yych) { + case '\t': + case '\n': + case '\r': + case ' ': goto yy490; + default: goto yy488; + } +yy492: + YYCTXMARKER = YYCURSOR + 1; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy489; + case 0x00: + case '\t': + case '\n': + case '\r': + case ' ': + case '!': + case '"': + case '\'': + case '(': + case ')': + case '*': + case ',': + case '.': + case ':': + case ';': + case '?': + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + case 'g': + case 'h': + case 'i': + case 'j': + case 'k': + case 'l': + case 'm': + case 'n': + case 'o': + case 'p': + case 'q': + case 'r': + case 's': + case 't': + case 'u': + case 'v': + case 'w': + case 'x': + case 'y': + case 'z': goto yy481; + default: goto yy488; + } +yy493: + yych = *++YYCURSOR; + switch (yych) { + case '/': goto yy494; default: goto yy61; } -yy489: +yy494: yych = *++YYCURSOR; switch (yych) { case '%': @@ -18136,13 +18271,13 @@ yy489: case 'w': case 'x': case 'y': - case 'z': goto yy490; - default: goto yy491; + case 'z': goto yy495; + default: goto yy496; } -yy490: +yy495: ++YYCURSOR; yych = *YYCURSOR; -yy491: +yy496: switch (yych) { case 0x00: case '\t': @@ -18224,10 +18359,10 @@ yy491: case 'w': case 'x': case 'y': - case 'z': goto yy492; - default: goto yy490; + case 'z': goto yy497; + default: goto yy495; } -yy492: +yy497: yyaccept = 18; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -18244,7 +18379,7 @@ yy492: case '[': case ']': case '{': - case '}': goto yy494; + case '}': goto yy499; case '%': case '&': case '-': @@ -18312,14 +18447,14 @@ yy492: case 'w': case 'x': case 'y': - case 'z': goto yy492; - default: goto yy490; + case 'z': goto yy497; + default: goto yy495; } -yy494: +yy499: #line 145 "../../lnav2/src/data_scanner_re.re" { RET(DT_URL); } -#line 18322 "../../lnav2/src/data_scanner_re.cc" -yy495: +#line 18457 "../../lnav2/src/data_scanner_re.cc" +yy500: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -18406,10 +18541,10 @@ yy495: case 'x': case 'y': case 'z': goto yy472; - case 'l': goto yy496; + case 'l': goto yy501; default: goto yy63; } -yy496: +yy501: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -18499,10 +18634,10 @@ yy496: case 'l': goto yy486; default: goto yy63; } -yy497: +yy502: yych = *++YYCURSOR; switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case '0': case '1': case '2': @@ -18524,11 +18659,11 @@ yy497: case 'c': case 'd': case 'e': - case 'f': goto yy546; - case ':': goto yy746; + case 'f': goto yy551; + case ':': goto yy751; default: goto yy61; } -yy498: +yy503: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -18558,8 +18693,8 @@ yy498: case 'c': case 'd': case 'e': - case 'f': goto yy502; - case ':': goto yy799; + case 'f': goto yy507; + case ':': goto yy804; case '@': goto yy69; case 'G': case 'H': @@ -18603,7 +18738,7 @@ yy498: case 'z': goto yy470; default: goto yy63; } -yy499: +yy504: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -18642,8 +18777,8 @@ yy499: case 'C': case 'D': case 'E': - case 'F': goto yy502; - case ':': goto yy501; + case 'F': goto yy507; + case ':': goto yy506; case '@': goto yy69; case 'G': case 'H': @@ -18670,7 +18805,7 @@ yy499: case 'c': case 'd': case 'e': - case 'f': goto yy503; + case 'f': goto yy508; case 'g': case 'h': case 'i': @@ -18690,10 +18825,10 @@ yy499: case 'x': case 'y': case 'z': goto yy472; - case 'l': goto yy797; + case 'l': goto yy802; default: goto yy63; } -yy500: +yy505: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -18732,8 +18867,8 @@ yy500: case 'C': case 'D': case 'E': - case 'F': goto yy502; - case ':': goto yy501; + case 'F': goto yy507; + case ':': goto yy506; case '@': goto yy69; case 'G': case 'H': @@ -18760,7 +18895,7 @@ yy500: case 'c': case 'd': case 'e': - case 'f': goto yy503; + case 'f': goto yy508; case 'g': case 'h': case 'i': @@ -18783,11 +18918,11 @@ yy500: case 'z': goto yy472; default: goto yy63; } -yy501: +yy506: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case '0': case '1': case '2': @@ -18809,11 +18944,11 @@ yy501: case 'c': case 'd': case 'e': - case 'f': goto yy773; - case ':': goto yy746; + case 'f': goto yy778; + case ':': goto yy751; default: goto yy478; } -yy502: +yy507: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -18843,8 +18978,8 @@ yy502: case 'c': case 'd': case 'e': - case 'f': goto yy505; - case ':': goto yy497; + case 'f': goto yy510; + case ':': goto yy502; case '@': goto yy69; case 'G': case 'H': @@ -18888,7 +19023,7 @@ yy502: case 'z': goto yy470; default: goto yy63; } -yy503: +yy508: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -18927,8 +19062,8 @@ yy503: case 'C': case 'D': case 'E': - case 'F': goto yy505; - case ':': goto yy504; + case 'F': goto yy510; + case ':': goto yy509; case '@': goto yy69; case 'G': case 'H': @@ -18955,7 +19090,7 @@ yy503: case 'c': case 'd': case 'e': - case 'f': goto yy506; + case 'f': goto yy511; case 'g': case 'h': case 'i': @@ -18978,11 +19113,11 @@ yy503: case 'z': goto yy472; default: goto yy63; } -yy504: +yy509: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case '0': case '1': case '2': @@ -19004,11 +19139,11 @@ yy504: case 'c': case 'd': case 'e': - case 'f': goto yy546; - case ':': goto yy746; + case 'f': goto yy551; + case ':': goto yy751; default: goto yy478; } -yy505: +yy510: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -19038,8 +19173,8 @@ yy505: case 'c': case 'd': case 'e': - case 'f': goto yy508; - case ':': goto yy745; + case 'f': goto yy513; + case ':': goto yy750; case '@': goto yy69; case 'G': case 'H': @@ -19083,7 +19218,7 @@ yy505: case 'z': goto yy470; default: goto yy63; } -yy506: +yy511: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -19122,8 +19257,8 @@ yy506: case 'C': case 'D': case 'E': - case 'F': goto yy508; - case ':': goto yy507; + case 'F': goto yy513; + case ':': goto yy512; case '@': goto yy69; case 'G': case 'H': @@ -19150,7 +19285,7 @@ yy506: case 'c': case 'd': case 'e': - case 'f': goto yy509; + case 'f': goto yy514; case 'g': case 'h': case 'i': @@ -19173,12 +19308,12 @@ yy506: case 'z': goto yy472; default: goto yy63; } -yy507: +yy512: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '%': goto yy547; - case '/': goto yy488; + case '%': goto yy552; + case '/': goto yy493; case '0': case '1': case '2': @@ -19200,11 +19335,11 @@ yy507: case 'c': case 'd': case 'e': - case 'f': goto yy546; - case ':': goto yy545; + case 'f': goto yy551; + case ':': goto yy550; default: goto yy478; } -yy508: +yy513: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -19234,7 +19369,7 @@ yy508: case 'c': case 'd': case 'e': - case 'f': goto yy510; + case 'f': goto yy515; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -19279,7 +19414,7 @@ yy508: case 'z': goto yy470; default: goto yy63; } -yy509: +yy514: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -19318,7 +19453,7 @@ yy509: case 'C': case 'D': case 'E': - case 'F': goto yy510; + case 'F': goto yy515; case ':': goto yy483; case '@': goto yy69; case 'G': @@ -19346,7 +19481,7 @@ yy509: case 'c': case 'd': case 'e': - case 'f': goto yy511; + case 'f': goto yy516; case 'g': case 'h': case 'i': @@ -19369,7 +19504,7 @@ yy509: case 'z': goto yy472; default: goto yy63; } -yy510: +yy515: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -19399,7 +19534,7 @@ yy510: case 'c': case 'd': case 'e': - case 'f': goto yy512; + case 'f': goto yy517; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -19444,7 +19579,7 @@ yy510: case 'z': goto yy470; default: goto yy63; } -yy511: +yy516: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -19483,7 +19618,7 @@ yy511: case 'C': case 'D': case 'E': - case 'F': goto yy512; + case 'F': goto yy517; case ':': goto yy483; case '@': goto yy69; case 'G': @@ -19511,7 +19646,7 @@ yy511: case 'c': case 'd': case 'e': - case 'f': goto yy513; + case 'f': goto yy518; case 'g': case 'h': case 'i': @@ -19534,7 +19669,7 @@ yy511: case 'z': goto yy472; default: goto yy63; } -yy512: +yy517: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -19564,7 +19699,7 @@ yy512: case 'c': case 'd': case 'e': - case 'f': goto yy514; + case 'f': goto yy519; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -19609,7 +19744,7 @@ yy512: case 'z': goto yy470; default: goto yy63; } -yy513: +yy518: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -19648,7 +19783,7 @@ yy513: case 'C': case 'D': case 'E': - case 'F': goto yy514; + case 'F': goto yy519; case ':': goto yy483; case '@': goto yy69; case 'G': @@ -19676,7 +19811,7 @@ yy513: case 'c': case 'd': case 'e': - case 'f': goto yy515; + case 'f': goto yy520; case 'g': case 'h': case 'i': @@ -19699,13 +19834,13 @@ yy513: case 'z': goto yy472; default: goto yy63; } -yy514: +yy519: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': case '+': goto yy70; - case '-': goto yy516; + case '-': goto yy521; case '.': case '_': goto yy67; case '0': @@ -19774,7 +19909,7 @@ yy514: case '@': goto yy69; default: goto yy63; } -yy515: +yy520: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -19795,7 +19930,7 @@ yy515: case '%': case '+': goto yy70; case '\'': goto yy480; - case '-': goto yy516; + case '-': goto yy521; case '.': goto yy485; case '0': case '1': @@ -19864,7 +19999,7 @@ yy515: case 'z': goto yy472; default: goto yy63; } -yy516: +yy521: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -19934,11 +20069,11 @@ yy516: case 'c': case 'd': case 'e': - case 'f': goto yy517; + case 'f': goto yy522; case '@': goto yy69; default: goto yy63; } -yy517: +yy522: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20008,11 +20143,11 @@ yy517: case 'c': case 'd': case 'e': - case 'f': goto yy518; + case 'f': goto yy523; case '@': goto yy69; default: goto yy63; } -yy518: +yy523: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20082,11 +20217,11 @@ yy518: case 'c': case 'd': case 'e': - case 'f': goto yy519; + case 'f': goto yy524; case '@': goto yy69; default: goto yy63; } -yy519: +yy524: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20156,17 +20291,17 @@ yy519: case 'c': case 'd': case 'e': - case 'f': goto yy520; + case 'f': goto yy525; case '@': goto yy69; default: goto yy63; } -yy520: +yy525: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': case '+': goto yy70; - case '-': goto yy521; + case '-': goto yy526; case '.': case '0': case '1': @@ -20234,7 +20369,7 @@ yy520: case '@': goto yy69; default: goto yy63; } -yy521: +yy526: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20304,11 +20439,11 @@ yy521: case 'c': case 'd': case 'e': - case 'f': goto yy522; + case 'f': goto yy527; case '@': goto yy69; default: goto yy63; } -yy522: +yy527: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20378,11 +20513,11 @@ yy522: case 'c': case 'd': case 'e': - case 'f': goto yy523; + case 'f': goto yy528; case '@': goto yy69; default: goto yy63; } -yy523: +yy528: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20452,11 +20587,11 @@ yy523: case 'c': case 'd': case 'e': - case 'f': goto yy524; + case 'f': goto yy529; case '@': goto yy69; default: goto yy63; } -yy524: +yy529: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20526,17 +20661,17 @@ yy524: case 'c': case 'd': case 'e': - case 'f': goto yy525; + case 'f': goto yy530; case '@': goto yy69; default: goto yy63; } -yy525: +yy530: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': case '+': goto yy70; - case '-': goto yy526; + case '-': goto yy531; case '.': case '0': case '1': @@ -20604,7 +20739,7 @@ yy525: case '@': goto yy69; default: goto yy63; } -yy526: +yy531: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20674,11 +20809,11 @@ yy526: case 'c': case 'd': case 'e': - case 'f': goto yy527; + case 'f': goto yy532; case '@': goto yy69; default: goto yy63; } -yy527: +yy532: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20748,11 +20883,11 @@ yy527: case 'c': case 'd': case 'e': - case 'f': goto yy528; + case 'f': goto yy533; case '@': goto yy69; default: goto yy63; } -yy528: +yy533: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20822,11 +20957,11 @@ yy528: case 'c': case 'd': case 'e': - case 'f': goto yy529; + case 'f': goto yy534; case '@': goto yy69; default: goto yy63; } -yy529: +yy534: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -20896,17 +21031,17 @@ yy529: case 'c': case 'd': case 'e': - case 'f': goto yy530; + case 'f': goto yy535; case '@': goto yy69; default: goto yy63; } -yy530: +yy535: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': case '+': goto yy70; - case '-': goto yy531; + case '-': goto yy536; case '.': case '0': case '1': @@ -20974,7 +21109,7 @@ yy530: case '@': goto yy69; default: goto yy63; } -yy531: +yy536: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21044,11 +21179,11 @@ yy531: case 'c': case 'd': case 'e': - case 'f': goto yy532; + case 'f': goto yy537; case '@': goto yy69; default: goto yy63; } -yy532: +yy537: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21118,11 +21253,11 @@ yy532: case 'c': case 'd': case 'e': - case 'f': goto yy533; + case 'f': goto yy538; case '@': goto yy69; default: goto yy63; } -yy533: +yy538: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21192,11 +21327,11 @@ yy533: case 'c': case 'd': case 'e': - case 'f': goto yy534; + case 'f': goto yy539; case '@': goto yy69; default: goto yy63; } -yy534: +yy539: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21266,11 +21401,11 @@ yy534: case 'c': case 'd': case 'e': - case 'f': goto yy535; + case 'f': goto yy540; case '@': goto yy69; default: goto yy63; } -yy535: +yy540: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21340,11 +21475,11 @@ yy535: case 'c': case 'd': case 'e': - case 'f': goto yy536; + case 'f': goto yy541; case '@': goto yy69; default: goto yy63; } -yy536: +yy541: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21414,11 +21549,11 @@ yy536: case 'c': case 'd': case 'e': - case 'f': goto yy537; + case 'f': goto yy542; case '@': goto yy69; default: goto yy63; } -yy537: +yy542: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21488,11 +21623,11 @@ yy537: case 'c': case 'd': case 'e': - case 'f': goto yy538; + case 'f': goto yy543; case '@': goto yy69; default: goto yy63; } -yy538: +yy543: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21562,11 +21697,11 @@ yy538: case 'c': case 'd': case 'e': - case 'f': goto yy539; + case 'f': goto yy544; case '@': goto yy69; default: goto yy63; } -yy539: +yy544: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21636,11 +21771,11 @@ yy539: case 'c': case 'd': case 'e': - case 'f': goto yy540; + case 'f': goto yy545; case '@': goto yy69; default: goto yy63; } -yy540: +yy545: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21710,11 +21845,11 @@ yy540: case 'c': case 'd': case 'e': - case 'f': goto yy541; + case 'f': goto yy546; case '@': goto yy69; default: goto yy63; } -yy541: +yy546: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21784,11 +21919,11 @@ yy541: case 'c': case 'd': case 'e': - case 'f': goto yy542; + case 'f': goto yy547; case '@': goto yy69; default: goto yy63; } -yy542: +yy547: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21858,11 +21993,11 @@ yy542: case 'c': case 'd': case 'e': - case 'f': goto yy543; + case 'f': goto yy548; case '@': goto yy69; default: goto yy63; } -yy543: +yy548: yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -21893,7 +22028,7 @@ yy543: case '{': case '|': case '}': - case '~': goto yy544; + case '~': goto yy549; case '%': case '+': goto yy70; case '-': @@ -21965,11 +22100,11 @@ yy543: case '@': goto yy69; default: goto yy62; } -yy544: +yy549: #line 190 "../../lnav2/src/data_scanner_re.re" { RET(DT_UUID); } -#line 21972 "../../lnav2/src/data_scanner_re.cc" -yy545: +#line 22107 "../../lnav2/src/data_scanner_re.cc" +yy550: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22010,9 +22145,9 @@ yy545: case '6': case '7': case '8': - case '9': goto yy691; - case '1': goto yy692; - case '2': goto yy693; + case '9': goto yy696; + case '1': goto yy697; + case '2': goto yy698; case ':': goto yy61; case 'A': case 'B': @@ -22025,7 +22160,7 @@ yy545: case 'c': case 'd': case 'e': - case 'f': goto yy694; + case 'f': goto yy699; case 'G': case 'H': case 'I': @@ -22066,9 +22201,9 @@ yy545: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy546: +yy551: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22092,11 +22227,11 @@ yy546: case 'c': case 'd': case 'e': - case 'f': goto yy551; - case ':': goto yy550; + case 'f': goto yy556; + case ':': goto yy555; default: goto yy61; } -yy547: +yy552: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22160,10 +22295,10 @@ yy547: case 'w': case 'x': case 'y': - case 'z': goto yy548; + case 'z': goto yy553; default: goto yy61; } -yy548: +yy553: YYCTXMARKER = YYCURSOR + 1; ++YYCURSOR; yych = *YYCURSOR; @@ -22229,11 +22364,11 @@ yy548: case 'w': case 'x': case 'y': - case 'z': goto yy548; + case 'z': goto yy553; case ':': goto yy61; default: goto yy337; } -yy550: +yy555: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22257,11 +22392,11 @@ yy550: case 'c': case 'd': case 'e': - case 'f': goto yy554; - case ':': goto yy555; + case 'f': goto yy559; + case ':': goto yy560; default: goto yy61; } -yy551: +yy556: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22285,11 +22420,11 @@ yy551: case 'c': case 'd': case 'e': - case 'f': goto yy552; - case ':': goto yy550; + case 'f': goto yy557; + case ':': goto yy555; default: goto yy61; } -yy552: +yy557: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22313,17 +22448,17 @@ yy552: case 'c': case 'd': case 'e': - case 'f': goto yy553; - case ':': goto yy550; + case 'f': goto yy558; + case ':': goto yy555; default: goto yy61; } -yy553: +yy558: yych = *++YYCURSOR; switch (yych) { - case ':': goto yy550; + case ':': goto yy555; default: goto yy61; } -yy554: +yy559: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22347,11 +22482,11 @@ yy554: case 'c': case 'd': case 'e': - case 'f': goto yy604; - case ':': goto yy603; + case 'f': goto yy609; + case ':': goto yy608; default: goto yy61; } -yy555: +yy560: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22362,9 +22497,9 @@ yy555: case '6': case '7': case '8': - case '9': goto yy556; - case '1': goto yy557; - case '2': goto yy558; + case '9': goto yy561; + case '1': goto yy562; + case '2': goto yy563; case ':': case 'G': case 'H': @@ -22417,14 +22552,14 @@ yy555: case 'c': case 'd': case 'e': - case 'f': goto yy559; + case 'f': goto yy564; default: goto yy337; } -yy556: +yy561: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -22434,8 +22569,8 @@ yy556: case '6': case '7': case '8': - case '9': goto yy585; - case ':': goto yy560; + case '9': goto yy590; + case ':': goto yy565; case 'A': case 'B': case 'C': @@ -22447,7 +22582,7 @@ yy556: case 'c': case 'd': case 'e': - case 'f': goto yy561; + case 'f': goto yy566; case 'G': case 'H': case 'I': @@ -22490,11 +22625,11 @@ yy556: case 'z': goto yy61; default: goto yy337; } -yy557: +yy562: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -22504,8 +22639,8 @@ yy557: case '6': case '7': case '8': - case '9': goto yy583; - case ':': goto yy560; + case '9': goto yy588; + case ':': goto yy565; case 'A': case 'B': case 'C': @@ -22517,7 +22652,7 @@ yy557: case 'c': case 'd': case 'e': - case 'f': goto yy561; + case 'f': goto yy566; case 'G': case 'H': case 'I': @@ -22560,22 +22695,22 @@ yy557: case 'z': goto yy61; default: goto yy337; } -yy558: +yy563: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': case '3': - case '4': goto yy583; - case '5': goto yy584; + case '4': goto yy588; + case '5': goto yy589; case '6': case '7': case '8': - case '9': goto yy585; - case ':': goto yy560; + case '9': goto yy590; + case ':': goto yy565; case 'A': case 'B': case 'C': @@ -22587,7 +22722,7 @@ yy558: case 'c': case 'd': case 'e': - case 'f': goto yy561; + case 'f': goto yy566; case 'G': case 'H': case 'I': @@ -22630,7 +22765,7 @@ yy558: case 'z': goto yy61; default: goto yy337; } -yy559: +yy564: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22655,8 +22790,8 @@ yy559: case 'c': case 'd': case 'e': - case 'f': goto yy561; - case ':': goto yy560; + case 'f': goto yy566; + case ':': goto yy565; case 'G': case 'H': case 'I': @@ -22699,7 +22834,7 @@ yy559: case 'z': goto yy61; default: goto yy337; } -yy560: +yy565: yych = *++YYCURSOR; switch (yych) { case '0': @@ -22723,10 +22858,10 @@ yy560: case 'c': case 'd': case 'e': - case 'f': goto yy564; + case 'f': goto yy569; default: goto yy61; } -yy561: +yy566: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22751,8 +22886,8 @@ yy561: case 'c': case 'd': case 'e': - case 'f': goto yy562; - case ':': goto yy560; + case 'f': goto yy567; + case ':': goto yy565; case 'G': case 'H': case 'I': @@ -22795,7 +22930,7 @@ yy561: case 'z': goto yy61; default: goto yy337; } -yy562: +yy567: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22820,8 +22955,8 @@ yy562: case 'c': case 'd': case 'e': - case 'f': goto yy563; - case ':': goto yy560; + case 'f': goto yy568; + case ':': goto yy565; case 'G': case 'H': case 'I': @@ -22864,7 +22999,7 @@ yy562: case 'z': goto yy61; default: goto yy337; } -yy563: +yy568: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22930,10 +23065,10 @@ yy563: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy560; + case ':': goto yy565; default: goto yy337; } -yy564: +yy569: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -22958,8 +23093,8 @@ yy564: case 'c': case 'd': case 'e': - case 'f': goto yy566; - case ':': goto yy565; + case 'f': goto yy571; + case ':': goto yy570; case 'G': case 'H': case 'I': @@ -23002,7 +23137,7 @@ yy564: case 'z': goto yy61; default: goto yy337; } -yy565: +yy570: yych = *++YYCURSOR; switch (yych) { case '0': @@ -23026,10 +23161,10 @@ yy565: case 'c': case 'd': case 'e': - case 'f': goto yy569; + case 'f': goto yy574; default: goto yy61; } -yy566: +yy571: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23054,8 +23189,8 @@ yy566: case 'c': case 'd': case 'e': - case 'f': goto yy567; - case ':': goto yy565; + case 'f': goto yy572; + case ':': goto yy570; case 'G': case 'H': case 'I': @@ -23098,7 +23233,7 @@ yy566: case 'z': goto yy61; default: goto yy337; } -yy567: +yy572: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23123,8 +23258,8 @@ yy567: case 'c': case 'd': case 'e': - case 'f': goto yy568; - case ':': goto yy565; + case 'f': goto yy573; + case ':': goto yy570; case 'G': case 'H': case 'I': @@ -23167,7 +23302,7 @@ yy567: case 'z': goto yy61; default: goto yy337; } -yy568: +yy573: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23233,10 +23368,10 @@ yy568: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy565; + case ':': goto yy570; default: goto yy337; } -yy569: +yy574: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23261,8 +23396,8 @@ yy569: case 'c': case 'd': case 'e': - case 'f': goto yy571; - case ':': goto yy570; + case 'f': goto yy576; + case ':': goto yy575; case 'G': case 'H': case 'I': @@ -23305,7 +23440,7 @@ yy569: case 'z': goto yy61; default: goto yy337; } -yy570: +yy575: yych = *++YYCURSOR; switch (yych) { case '0': @@ -23329,10 +23464,10 @@ yy570: case 'c': case 'd': case 'e': - case 'f': goto yy574; + case 'f': goto yy579; default: goto yy61; } -yy571: +yy576: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23357,8 +23492,8 @@ yy571: case 'c': case 'd': case 'e': - case 'f': goto yy572; - case ':': goto yy570; + case 'f': goto yy577; + case ':': goto yy575; case 'G': case 'H': case 'I': @@ -23401,7 +23536,7 @@ yy571: case 'z': goto yy61; default: goto yy337; } -yy572: +yy577: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23426,8 +23561,8 @@ yy572: case 'c': case 'd': case 'e': - case 'f': goto yy573; - case ':': goto yy570; + case 'f': goto yy578; + case ':': goto yy575; case 'G': case 'H': case 'I': @@ -23470,7 +23605,7 @@ yy572: case 'z': goto yy61; default: goto yy337; } -yy573: +yy578: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23536,10 +23671,10 @@ yy573: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy570; + case ':': goto yy575; default: goto yy337; } -yy574: +yy579: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23564,8 +23699,8 @@ yy574: case 'c': case 'd': case 'e': - case 'f': goto yy576; - case ':': goto yy575; + case 'f': goto yy581; + case ':': goto yy580; case 'G': case 'H': case 'I': @@ -23608,7 +23743,7 @@ yy574: case 'z': goto yy61; default: goto yy337; } -yy575: +yy580: yych = *++YYCURSOR; switch (yych) { case '0': @@ -23632,10 +23767,10 @@ yy575: case 'c': case 'd': case 'e': - case 'f': goto yy579; + case 'f': goto yy584; default: goto yy61; } -yy576: +yy581: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23660,8 +23795,8 @@ yy576: case 'c': case 'd': case 'e': - case 'f': goto yy577; - case ':': goto yy575; + case 'f': goto yy582; + case ':': goto yy580; case 'G': case 'H': case 'I': @@ -23704,7 +23839,7 @@ yy576: case 'z': goto yy61; default: goto yy337; } -yy577: +yy582: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23729,8 +23864,8 @@ yy577: case 'c': case 'd': case 'e': - case 'f': goto yy578; - case ':': goto yy575; + case 'f': goto yy583; + case ':': goto yy580; case 'G': case 'H': case 'I': @@ -23773,7 +23908,7 @@ yy577: case 'z': goto yy61; default: goto yy337; } -yy578: +yy583: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23839,10 +23974,10 @@ yy578: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy575; + case ':': goto yy580; default: goto yy337; } -yy579: +yy584: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23867,7 +24002,7 @@ yy579: case 'c': case 'd': case 'e': - case 'f': goto yy580; + case 'f': goto yy585; case ':': case 'G': case 'H': @@ -23911,7 +24046,7 @@ yy579: case 'z': goto yy61; default: goto yy337; } -yy580: +yy585: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -23936,7 +24071,7 @@ yy580: case 'c': case 'd': case 'e': - case 'f': goto yy581; + case 'f': goto yy586; case ':': case 'G': case 'H': @@ -23980,7 +24115,7 @@ yy580: case 'z': goto yy61; default: goto yy337; } -yy581: +yy586: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -24049,7 +24184,7 @@ yy581: case 'z': goto yy61; default: goto yy337; } -yy582: +yy587: yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -24060,16 +24195,16 @@ yy582: case '6': case '7': case '8': - case '9': goto yy589; - case '1': goto yy588; - case '2': goto yy587; + case '9': goto yy594; + case '1': goto yy593; + case '2': goto yy592; default: goto yy338; } -yy583: +yy588: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -24079,8 +24214,8 @@ yy583: case '6': case '7': case '8': - case '9': goto yy586; - case ':': goto yy560; + case '9': goto yy591; + case ':': goto yy565; case 'A': case 'B': case 'C': @@ -24092,7 +24227,7 @@ yy583: case 'c': case 'd': case 'e': - case 'f': goto yy562; + case 'f': goto yy567; case 'G': case 'H': case 'I': @@ -24135,17 +24270,17 @@ yy583: case 'z': goto yy61; default: goto yy337; } -yy584: +yy589: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy586; + case '5': goto yy591; case '6': case '7': case '8': @@ -24161,8 +24296,8 @@ yy584: case 'c': case 'd': case 'e': - case 'f': goto yy562; - case ':': goto yy560; + case 'f': goto yy567; + case ':': goto yy565; case 'G': case 'H': case 'I': @@ -24205,11 +24340,11 @@ yy584: case 'z': goto yy61; default: goto yy337; } -yy585: +yy590: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -24231,8 +24366,8 @@ yy585: case 'c': case 'd': case 'e': - case 'f': goto yy562; - case ':': goto yy560; + case 'f': goto yy567; + case ':': goto yy565; case 'G': case 'H': case 'I': @@ -24275,11 +24410,11 @@ yy585: case 'z': goto yy61; default: goto yy337; } -yy586: +yy591: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -24301,8 +24436,8 @@ yy586: case 'c': case 'd': case 'e': - case 'f': goto yy563; - case ':': goto yy560; + case 'f': goto yy568; + case ':': goto yy565; case 'G': case 'H': case 'I': @@ -24345,26 +24480,26 @@ yy586: case 'z': goto yy61; default: goto yy337; } -yy587: +yy592: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy590; + case '.': goto yy595; case '0': case '1': case '2': case '3': - case '4': goto yy589; - case '5': goto yy602; + case '4': goto yy594; + case '5': goto yy607; case '6': case '7': case '8': - case '9': goto yy591; + case '9': goto yy596; default: goto yy61; } -yy588: +yy593: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy590; + case '.': goto yy595; case '0': case '1': case '2': @@ -24374,13 +24509,13 @@ yy588: case '6': case '7': case '8': - case '9': goto yy589; + case '9': goto yy594; default: goto yy61; } -yy589: +yy594: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy590; + case '.': goto yy595; case '0': case '1': case '2': @@ -24390,10 +24525,10 @@ yy589: case '6': case '7': case '8': - case '9': goto yy591; + case '9': goto yy596; default: goto yy61; } -yy590: +yy595: yych = *++YYCURSOR; switch (yych) { case '0': @@ -24403,37 +24538,37 @@ yy590: case '6': case '7': case '8': - case '9': goto yy594; - case '1': goto yy593; - case '2': goto yy592; + case '9': goto yy599; + case '1': goto yy598; + case '2': goto yy597; default: goto yy61; } -yy591: +yy596: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy590; + case '.': goto yy595; default: goto yy61; } -yy592: +yy597: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy595; + case '.': goto yy600; case '0': case '1': case '2': case '3': - case '4': goto yy594; - case '5': goto yy601; + case '4': goto yy599; + case '5': goto yy606; case '6': case '7': case '8': - case '9': goto yy596; + case '9': goto yy601; default: goto yy61; } -yy593: +yy598: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy595; + case '.': goto yy600; case '0': case '1': case '2': @@ -24443,13 +24578,13 @@ yy593: case '6': case '7': case '8': - case '9': goto yy594; + case '9': goto yy599; default: goto yy61; } -yy594: +yy599: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy595; + case '.': goto yy600; case '0': case '1': case '2': @@ -24459,10 +24594,10 @@ yy594: case '6': case '7': case '8': - case '9': goto yy596; + case '9': goto yy601; default: goto yy61; } -yy595: +yy600: yych = *++YYCURSOR; switch (yych) { case '0': @@ -24472,18 +24607,18 @@ yy595: case '6': case '7': case '8': - case '9': goto yy599; - case '1': goto yy598; - case '2': goto yy597; + case '9': goto yy604; + case '1': goto yy603; + case '2': goto yy602; default: goto yy61; } -yy596: +yy601: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy595; + case '.': goto yy600; default: goto yy61; } -yy597: +yy602: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -24491,8 +24626,8 @@ yy597: case '1': case '2': case '3': - case '4': goto yy599; - case '5': goto yy600; + case '4': goto yy604; + case '5': goto yy605; case '6': case '7': case '8': @@ -24552,7 +24687,7 @@ yy597: case 'z': goto yy61; default: goto yy337; } -yy598: +yy603: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -24565,7 +24700,7 @@ yy598: case '6': case '7': case '8': - case '9': goto yy599; + case '9': goto yy604; case ':': case 'A': case 'B': @@ -24621,7 +24756,7 @@ yy598: case 'z': goto yy61; default: goto yy337; } -yy599: +yy604: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -24690,7 +24825,7 @@ yy599: case 'z': goto yy61; default: goto yy337; } -yy600: +yy605: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -24759,31 +24894,31 @@ yy600: case 'z': goto yy61; default: goto yy337; } -yy601: +yy606: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy595; + case '.': goto yy600; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy596; + case '5': goto yy601; default: goto yy61; } -yy602: +yy607: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy590; + case '.': goto yy595; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy591; + case '5': goto yy596; default: goto yy61; } -yy603: +yy608: yych = *++YYCURSOR; switch (yych) { case '0': @@ -24807,11 +24942,11 @@ yy603: case 'c': case 'd': case 'e': - case 'f': goto yy607; - case ':': goto yy608; + case 'f': goto yy612; + case ':': goto yy613; default: goto yy61; } -yy604: +yy609: yych = *++YYCURSOR; switch (yych) { case '0': @@ -24835,11 +24970,11 @@ yy604: case 'c': case 'd': case 'e': - case 'f': goto yy605; - case ':': goto yy603; + case 'f': goto yy610; + case ':': goto yy608; default: goto yy61; } -yy605: +yy610: yych = *++YYCURSOR; switch (yych) { case '0': @@ -24863,17 +24998,17 @@ yy605: case 'c': case 'd': case 'e': - case 'f': goto yy606; - case ':': goto yy603; + case 'f': goto yy611; + case ':': goto yy608; default: goto yy61; } -yy606: +yy611: yych = *++YYCURSOR; switch (yych) { - case ':': goto yy603; + case ':': goto yy608; default: goto yy61; } -yy607: +yy612: yych = *++YYCURSOR; switch (yych) { case '0': @@ -24897,11 +25032,11 @@ yy607: case 'c': case 'd': case 'e': - case 'f': goto yy635; - case ':': goto yy634; + case 'f': goto yy640; + case ':': goto yy639; default: goto yy61; } -yy608: +yy613: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -24912,9 +25047,9 @@ yy608: case '6': case '7': case '8': - case '9': goto yy609; - case '1': goto yy610; - case '2': goto yy611; + case '9': goto yy614; + case '1': goto yy615; + case '2': goto yy616; case ':': case 'G': case 'H': @@ -24967,14 +25102,14 @@ yy608: case 'c': case 'd': case 'e': - case 'f': goto yy612; + case 'f': goto yy617; default: goto yy337; } -yy609: +yy614: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -24984,8 +25119,8 @@ yy609: case '6': case '7': case '8': - case '9': goto yy632; - case ':': goto yy613; + case '9': goto yy637; + case ':': goto yy618; case 'A': case 'B': case 'C': @@ -24997,7 +25132,7 @@ yy609: case 'c': case 'd': case 'e': - case 'f': goto yy614; + case 'f': goto yy619; case 'G': case 'H': case 'I': @@ -25040,11 +25175,11 @@ yy609: case 'z': goto yy61; default: goto yy337; } -yy610: +yy615: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -25054,8 +25189,8 @@ yy610: case '6': case '7': case '8': - case '9': goto yy630; - case ':': goto yy613; + case '9': goto yy635; + case ':': goto yy618; case 'A': case 'B': case 'C': @@ -25067,7 +25202,7 @@ yy610: case 'c': case 'd': case 'e': - case 'f': goto yy614; + case 'f': goto yy619; case 'G': case 'H': case 'I': @@ -25110,22 +25245,22 @@ yy610: case 'z': goto yy61; default: goto yy337; } -yy611: +yy616: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': case '3': - case '4': goto yy630; - case '5': goto yy631; + case '4': goto yy635; + case '5': goto yy636; case '6': case '7': case '8': - case '9': goto yy632; - case ':': goto yy613; + case '9': goto yy637; + case ':': goto yy618; case 'A': case 'B': case 'C': @@ -25137,7 +25272,7 @@ yy611: case 'c': case 'd': case 'e': - case 'f': goto yy614; + case 'f': goto yy619; case 'G': case 'H': case 'I': @@ -25180,7 +25315,7 @@ yy611: case 'z': goto yy61; default: goto yy337; } -yy612: +yy617: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25205,8 +25340,8 @@ yy612: case 'c': case 'd': case 'e': - case 'f': goto yy614; - case ':': goto yy613; + case 'f': goto yy619; + case ':': goto yy618; case 'G': case 'H': case 'I': @@ -25249,7 +25384,7 @@ yy612: case 'z': goto yy61; default: goto yy337; } -yy613: +yy618: yych = *++YYCURSOR; switch (yych) { case '0': @@ -25273,10 +25408,10 @@ yy613: case 'c': case 'd': case 'e': - case 'f': goto yy617; + case 'f': goto yy622; default: goto yy61; } -yy614: +yy619: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25301,8 +25436,8 @@ yy614: case 'c': case 'd': case 'e': - case 'f': goto yy615; - case ':': goto yy613; + case 'f': goto yy620; + case ':': goto yy618; case 'G': case 'H': case 'I': @@ -25345,7 +25480,7 @@ yy614: case 'z': goto yy61; default: goto yy337; } -yy615: +yy620: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25370,8 +25505,8 @@ yy615: case 'c': case 'd': case 'e': - case 'f': goto yy616; - case ':': goto yy613; + case 'f': goto yy621; + case ':': goto yy618; case 'G': case 'H': case 'I': @@ -25414,7 +25549,7 @@ yy615: case 'z': goto yy61; default: goto yy337; } -yy616: +yy621: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25480,10 +25615,10 @@ yy616: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy613; + case ':': goto yy618; default: goto yy337; } -yy617: +yy622: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25508,8 +25643,8 @@ yy617: case 'c': case 'd': case 'e': - case 'f': goto yy619; - case ':': goto yy618; + case 'f': goto yy624; + case ':': goto yy623; case 'G': case 'H': case 'I': @@ -25552,7 +25687,7 @@ yy617: case 'z': goto yy61; default: goto yy337; } -yy618: +yy623: yych = *++YYCURSOR; switch (yych) { case '0': @@ -25576,10 +25711,10 @@ yy618: case 'c': case 'd': case 'e': - case 'f': goto yy622; + case 'f': goto yy627; default: goto yy61; } -yy619: +yy624: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25604,8 +25739,8 @@ yy619: case 'c': case 'd': case 'e': - case 'f': goto yy620; - case ':': goto yy618; + case 'f': goto yy625; + case ':': goto yy623; case 'G': case 'H': case 'I': @@ -25648,7 +25783,7 @@ yy619: case 'z': goto yy61; default: goto yy337; } -yy620: +yy625: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25673,8 +25808,8 @@ yy620: case 'c': case 'd': case 'e': - case 'f': goto yy621; - case ':': goto yy618; + case 'f': goto yy626; + case ':': goto yy623; case 'G': case 'H': case 'I': @@ -25717,7 +25852,7 @@ yy620: case 'z': goto yy61; default: goto yy337; } -yy621: +yy626: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25783,10 +25918,10 @@ yy621: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy618; + case ':': goto yy623; default: goto yy337; } -yy622: +yy627: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25811,8 +25946,8 @@ yy622: case 'c': case 'd': case 'e': - case 'f': goto yy624; - case ':': goto yy623; + case 'f': goto yy629; + case ':': goto yy628; case 'G': case 'H': case 'I': @@ -25855,7 +25990,7 @@ yy622: case 'z': goto yy61; default: goto yy337; } -yy623: +yy628: yych = *++YYCURSOR; switch (yych) { case '0': @@ -25879,10 +26014,10 @@ yy623: case 'c': case 'd': case 'e': - case 'f': goto yy627; + case 'f': goto yy632; default: goto yy61; } -yy624: +yy629: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25907,8 +26042,8 @@ yy624: case 'c': case 'd': case 'e': - case 'f': goto yy625; - case ':': goto yy623; + case 'f': goto yy630; + case ':': goto yy628; case 'G': case 'H': case 'I': @@ -25951,7 +26086,7 @@ yy624: case 'z': goto yy61; default: goto yy337; } -yy625: +yy630: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -25976,8 +26111,8 @@ yy625: case 'c': case 'd': case 'e': - case 'f': goto yy626; - case ':': goto yy623; + case 'f': goto yy631; + case ':': goto yy628; case 'G': case 'H': case 'I': @@ -26020,7 +26155,7 @@ yy625: case 'z': goto yy61; default: goto yy337; } -yy626: +yy631: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -26086,10 +26221,10 @@ yy626: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy623; + case ':': goto yy628; default: goto yy337; } -yy627: +yy632: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -26114,7 +26249,7 @@ yy627: case 'c': case 'd': case 'e': - case 'f': goto yy628; + case 'f': goto yy633; case ':': case 'G': case 'H': @@ -26158,7 +26293,7 @@ yy627: case 'z': goto yy61; default: goto yy337; } -yy628: +yy633: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -26183,7 +26318,7 @@ yy628: case 'c': case 'd': case 'e': - case 'f': goto yy629; + case 'f': goto yy634; case ':': case 'G': case 'H': @@ -26227,7 +26362,7 @@ yy628: case 'z': goto yy61; default: goto yy337; } -yy629: +yy634: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -26296,11 +26431,11 @@ yy629: case 'z': goto yy61; default: goto yy337; } -yy630: +yy635: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -26310,8 +26445,8 @@ yy630: case '6': case '7': case '8': - case '9': goto yy633; - case ':': goto yy613; + case '9': goto yy638; + case ':': goto yy618; case 'A': case 'B': case 'C': @@ -26323,7 +26458,7 @@ yy630: case 'c': case 'd': case 'e': - case 'f': goto yy615; + case 'f': goto yy620; case 'G': case 'H': case 'I': @@ -26366,17 +26501,17 @@ yy630: case 'z': goto yy61; default: goto yy337; } -yy631: +yy636: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy633; + case '5': goto yy638; case '6': case '7': case '8': @@ -26392,8 +26527,8 @@ yy631: case 'c': case 'd': case 'e': - case 'f': goto yy615; - case ':': goto yy613; + case 'f': goto yy620; + case ':': goto yy618; case 'G': case 'H': case 'I': @@ -26436,11 +26571,11 @@ yy631: case 'z': goto yy61; default: goto yy337; } -yy632: +yy637: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -26462,8 +26597,8 @@ yy632: case 'c': case 'd': case 'e': - case 'f': goto yy615; - case ':': goto yy613; + case 'f': goto yy620; + case ':': goto yy618; case 'G': case 'H': case 'I': @@ -26506,11 +26641,11 @@ yy632: case 'z': goto yy61; default: goto yy337; } -yy633: +yy638: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -26532,8 +26667,8 @@ yy633: case 'c': case 'd': case 'e': - case 'f': goto yy616; - case ':': goto yy613; + case 'f': goto yy621; + case ':': goto yy618; case 'G': case 'H': case 'I': @@ -26576,7 +26711,7 @@ yy633: case 'z': goto yy61; default: goto yy337; } -yy634: +yy639: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26600,11 +26735,11 @@ yy634: case 'c': case 'd': case 'e': - case 'f': goto yy639; - case ':': goto yy638; + case 'f': goto yy644; + case ':': goto yy643; default: goto yy61; } -yy635: +yy640: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26628,11 +26763,11 @@ yy635: case 'c': case 'd': case 'e': - case 'f': goto yy636; - case ':': goto yy634; + case 'f': goto yy641; + case ':': goto yy639; default: goto yy61; } -yy636: +yy641: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26656,17 +26791,17 @@ yy636: case 'c': case 'd': case 'e': - case 'f': goto yy637; - case ':': goto yy634; + case 'f': goto yy642; + case ':': goto yy639; default: goto yy61; } -yy637: +yy642: yych = *++YYCURSOR; switch (yych) { - case ':': goto yy634; + case ':': goto yy639; default: goto yy61; } -yy638: +yy643: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -26677,9 +26812,9 @@ yy638: case '6': case '7': case '8': - case '9': goto yy670; - case '1': goto yy671; - case '2': goto yy672; + case '9': goto yy675; + case '1': goto yy676; + case '2': goto yy677; case ':': case 'G': case 'H': @@ -26732,10 +26867,10 @@ yy638: case 'c': case 'd': case 'e': - case 'f': goto yy673; + case 'f': goto yy678; default: goto yy337; } -yy639: +yy644: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26759,11 +26894,11 @@ yy639: case 'c': case 'd': case 'e': - case 'f': goto yy641; - case ':': goto yy640; + case 'f': goto yy646; + case ':': goto yy645; default: goto yy61; } -yy640: +yy645: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26787,11 +26922,11 @@ yy640: case 'c': case 'd': case 'e': - case 'f': goto yy645; - case ':': goto yy644; + case 'f': goto yy650; + case ':': goto yy649; default: goto yy61; } -yy641: +yy646: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26815,11 +26950,11 @@ yy641: case 'c': case 'd': case 'e': - case 'f': goto yy642; - case ':': goto yy640; + case 'f': goto yy647; + case ':': goto yy645; default: goto yy61; } -yy642: +yy647: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26843,17 +26978,17 @@ yy642: case 'c': case 'd': case 'e': - case 'f': goto yy643; - case ':': goto yy640; + case 'f': goto yy648; + case ':': goto yy645; default: goto yy61; } -yy643: +yy648: yych = *++YYCURSOR; switch (yych) { - case ':': goto yy640; + case ':': goto yy645; default: goto yy61; } -yy644: +yy649: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -26878,7 +27013,7 @@ yy644: case 'c': case 'd': case 'e': - case 'f': goto yy662; + case 'f': goto yy667; case ':': case 'G': case 'H': @@ -26922,7 +27057,7 @@ yy644: case 'z': goto yy61; default: goto yy337; } -yy645: +yy650: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26946,11 +27081,11 @@ yy645: case 'c': case 'd': case 'e': - case 'f': goto yy647; - case ':': goto yy646; + case 'f': goto yy652; + case ':': goto yy651; default: goto yy61; } -yy646: +yy651: yych = *++YYCURSOR; switch (yych) { case '0': @@ -26974,11 +27109,11 @@ yy646: case 'c': case 'd': case 'e': - case 'f': goto yy651; - case ':': goto yy650; + case 'f': goto yy656; + case ':': goto yy655; default: goto yy61; } -yy647: +yy652: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27002,11 +27137,11 @@ yy647: case 'c': case 'd': case 'e': - case 'f': goto yy648; - case ':': goto yy646; + case 'f': goto yy653; + case ':': goto yy651; default: goto yy61; } -yy648: +yy653: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27030,17 +27165,17 @@ yy648: case 'c': case 'd': case 'e': - case 'f': goto yy649; - case ':': goto yy646; + case 'f': goto yy654; + case ':': goto yy651; default: goto yy61; } -yy649: +yy654: yych = *++YYCURSOR; switch (yych) { - case ':': goto yy646; + case ':': goto yy651; default: goto yy61; } -yy650: +yy655: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27065,7 +27200,7 @@ yy650: case 'c': case 'd': case 'e': - case 'f': goto yy659; + case 'f': goto yy664; case ':': case 'G': case 'H': @@ -27109,7 +27244,7 @@ yy650: case 'z': goto yy61; default: goto yy337; } -yy651: +yy656: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27133,11 +27268,11 @@ yy651: case 'c': case 'd': case 'e': - case 'f': goto yy653; - case ':': goto yy652; + case 'f': goto yy658; + case ':': goto yy657; default: goto yy61; } -yy652: +yy657: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27161,11 +27296,11 @@ yy652: case 'c': case 'd': case 'e': - case 'f': goto yy656; + case 'f': goto yy661; case ':': goto yy372; default: goto yy61; } -yy653: +yy658: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27189,11 +27324,11 @@ yy653: case 'c': case 'd': case 'e': - case 'f': goto yy654; - case ':': goto yy652; + case 'f': goto yy659; + case ':': goto yy657; default: goto yy61; } -yy654: +yy659: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27217,17 +27352,17 @@ yy654: case 'c': case 'd': case 'e': - case 'f': goto yy655; - case ':': goto yy652; + case 'f': goto yy660; + case ':': goto yy657; default: goto yy61; } -yy655: +yy660: yych = *++YYCURSOR; switch (yych) { - case ':': goto yy652; + case ':': goto yy657; default: goto yy61; } -yy656: +yy661: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27252,7 +27387,7 @@ yy656: case 'c': case 'd': case 'e': - case 'f': goto yy657; + case 'f': goto yy662; case ':': case 'G': case 'H': @@ -27296,7 +27431,7 @@ yy656: case 'z': goto yy61; default: goto yy337; } -yy657: +yy662: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27321,7 +27456,7 @@ yy657: case 'c': case 'd': case 'e': - case 'f': goto yy658; + case 'f': goto yy663; case ':': case 'G': case 'H': @@ -27365,7 +27500,7 @@ yy657: case 'z': goto yy61; default: goto yy337; } -yy658: +yy663: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27434,7 +27569,7 @@ yy658: case 'z': goto yy61; default: goto yy337; } -yy659: +yy664: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27459,7 +27594,7 @@ yy659: case 'c': case 'd': case 'e': - case 'f': goto yy660; + case 'f': goto yy665; case ':': case 'G': case 'H': @@ -27503,7 +27638,7 @@ yy659: case 'z': goto yy61; default: goto yy337; } -yy660: +yy665: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27528,7 +27663,7 @@ yy660: case 'c': case 'd': case 'e': - case 'f': goto yy661; + case 'f': goto yy666; case ':': case 'G': case 'H': @@ -27572,7 +27707,7 @@ yy660: case 'z': goto yy61; default: goto yy337; } -yy661: +yy666: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27641,7 +27776,7 @@ yy661: case 'z': goto yy61; default: goto yy337; } -yy662: +yy667: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27666,8 +27801,8 @@ yy662: case 'c': case 'd': case 'e': - case 'f': goto yy664; - case ':': goto yy663; + case 'f': goto yy669; + case ':': goto yy668; case 'G': case 'H': case 'I': @@ -27710,7 +27845,7 @@ yy662: case 'z': goto yy61; default: goto yy337; } -yy663: +yy668: yych = *++YYCURSOR; switch (yych) { case '0': @@ -27734,10 +27869,10 @@ yy663: case 'c': case 'd': case 'e': - case 'f': goto yy667; + case 'f': goto yy672; default: goto yy61; } -yy664: +yy669: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27762,8 +27897,8 @@ yy664: case 'c': case 'd': case 'e': - case 'f': goto yy665; - case ':': goto yy663; + case 'f': goto yy670; + case ':': goto yy668; case 'G': case 'H': case 'I': @@ -27806,7 +27941,7 @@ yy664: case 'z': goto yy61; default: goto yy337; } -yy665: +yy670: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27831,8 +27966,8 @@ yy665: case 'c': case 'd': case 'e': - case 'f': goto yy666; - case ':': goto yy663; + case 'f': goto yy671; + case ':': goto yy668; case 'G': case 'H': case 'I': @@ -27875,7 +28010,7 @@ yy665: case 'z': goto yy61; default: goto yy337; } -yy666: +yy671: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27941,10 +28076,10 @@ yy666: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy663; + case ':': goto yy668; default: goto yy337; } -yy667: +yy672: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -27969,7 +28104,7 @@ yy667: case 'c': case 'd': case 'e': - case 'f': goto yy668; + case 'f': goto yy673; case ':': case 'G': case 'H': @@ -28013,7 +28148,7 @@ yy667: case 'z': goto yy61; default: goto yy337; } -yy668: +yy673: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28038,7 +28173,7 @@ yy668: case 'c': case 'd': case 'e': - case 'f': goto yy669; + case 'f': goto yy674; case ':': case 'G': case 'H': @@ -28082,7 +28217,7 @@ yy668: case 'z': goto yy61; default: goto yy337; } -yy669: +yy674: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28151,11 +28286,11 @@ yy669: case 'z': goto yy61; default: goto yy337; } -yy670: +yy675: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -28165,8 +28300,8 @@ yy670: case '6': case '7': case '8': - case '9': goto yy688; - case ':': goto yy674; + case '9': goto yy693; + case ':': goto yy679; case 'A': case 'B': case 'C': @@ -28178,7 +28313,7 @@ yy670: case 'c': case 'd': case 'e': - case 'f': goto yy675; + case 'f': goto yy680; case 'G': case 'H': case 'I': @@ -28221,11 +28356,11 @@ yy670: case 'z': goto yy61; default: goto yy337; } -yy671: +yy676: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -28235,8 +28370,8 @@ yy671: case '6': case '7': case '8': - case '9': goto yy686; - case ':': goto yy674; + case '9': goto yy691; + case ':': goto yy679; case 'A': case 'B': case 'C': @@ -28248,7 +28383,7 @@ yy671: case 'c': case 'd': case 'e': - case 'f': goto yy675; + case 'f': goto yy680; case 'G': case 'H': case 'I': @@ -28291,22 +28426,22 @@ yy671: case 'z': goto yy61; default: goto yy337; } -yy672: +yy677: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': case '3': - case '4': goto yy686; - case '5': goto yy687; + case '4': goto yy691; + case '5': goto yy692; case '6': case '7': case '8': - case '9': goto yy688; - case ':': goto yy674; + case '9': goto yy693; + case ':': goto yy679; case 'A': case 'B': case 'C': @@ -28318,7 +28453,7 @@ yy672: case 'c': case 'd': case 'e': - case 'f': goto yy675; + case 'f': goto yy680; case 'G': case 'H': case 'I': @@ -28361,7 +28496,7 @@ yy672: case 'z': goto yy61; default: goto yy337; } -yy673: +yy678: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28386,8 +28521,8 @@ yy673: case 'c': case 'd': case 'e': - case 'f': goto yy675; - case ':': goto yy674; + case 'f': goto yy680; + case ':': goto yy679; case 'G': case 'H': case 'I': @@ -28430,7 +28565,7 @@ yy673: case 'z': goto yy61; default: goto yy337; } -yy674: +yy679: yych = *++YYCURSOR; switch (yych) { case '0': @@ -28454,10 +28589,10 @@ yy674: case 'c': case 'd': case 'e': - case 'f': goto yy678; + case 'f': goto yy683; default: goto yy61; } -yy675: +yy680: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28482,8 +28617,8 @@ yy675: case 'c': case 'd': case 'e': - case 'f': goto yy676; - case ':': goto yy674; + case 'f': goto yy681; + case ':': goto yy679; case 'G': case 'H': case 'I': @@ -28526,7 +28661,7 @@ yy675: case 'z': goto yy61; default: goto yy337; } -yy676: +yy681: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28551,8 +28686,8 @@ yy676: case 'c': case 'd': case 'e': - case 'f': goto yy677; - case ':': goto yy674; + case 'f': goto yy682; + case ':': goto yy679; case 'G': case 'H': case 'I': @@ -28595,7 +28730,7 @@ yy676: case 'z': goto yy61; default: goto yy337; } -yy677: +yy682: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28661,10 +28796,10 @@ yy677: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy674; + case ':': goto yy679; default: goto yy337; } -yy678: +yy683: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28689,8 +28824,8 @@ yy678: case 'c': case 'd': case 'e': - case 'f': goto yy680; - case ':': goto yy679; + case 'f': goto yy685; + case ':': goto yy684; case 'G': case 'H': case 'I': @@ -28733,7 +28868,7 @@ yy678: case 'z': goto yy61; default: goto yy337; } -yy679: +yy684: yych = *++YYCURSOR; switch (yych) { case '0': @@ -28757,10 +28892,10 @@ yy679: case 'c': case 'd': case 'e': - case 'f': goto yy683; + case 'f': goto yy688; default: goto yy61; } -yy680: +yy685: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28785,8 +28920,8 @@ yy680: case 'c': case 'd': case 'e': - case 'f': goto yy681; - case ':': goto yy679; + case 'f': goto yy686; + case ':': goto yy684; case 'G': case 'H': case 'I': @@ -28829,7 +28964,7 @@ yy680: case 'z': goto yy61; default: goto yy337; } -yy681: +yy686: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28854,8 +28989,8 @@ yy681: case 'c': case 'd': case 'e': - case 'f': goto yy682; - case ':': goto yy679; + case 'f': goto yy687; + case ':': goto yy684; case 'G': case 'H': case 'I': @@ -28898,7 +29033,7 @@ yy681: case 'z': goto yy61; default: goto yy337; } -yy682: +yy687: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28964,10 +29099,10 @@ yy682: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy679; + case ':': goto yy684; default: goto yy337; } -yy683: +yy688: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -28992,7 +29127,7 @@ yy683: case 'c': case 'd': case 'e': - case 'f': goto yy684; + case 'f': goto yy689; case ':': case 'G': case 'H': @@ -29036,7 +29171,7 @@ yy683: case 'z': goto yy61; default: goto yy337; } -yy684: +yy689: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -29061,7 +29196,7 @@ yy684: case 'c': case 'd': case 'e': - case 'f': goto yy685; + case 'f': goto yy690; case ':': case 'G': case 'H': @@ -29105,7 +29240,7 @@ yy684: case 'z': goto yy61; default: goto yy337; } -yy685: +yy690: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -29174,11 +29309,11 @@ yy685: case 'z': goto yy61; default: goto yy337; } -yy686: +yy691: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -29188,8 +29323,8 @@ yy686: case '6': case '7': case '8': - case '9': goto yy689; - case ':': goto yy674; + case '9': goto yy694; + case ':': goto yy679; case 'A': case 'B': case 'C': @@ -29201,7 +29336,7 @@ yy686: case 'c': case 'd': case 'e': - case 'f': goto yy676; + case 'f': goto yy681; case 'G': case 'H': case 'I': @@ -29244,17 +29379,17 @@ yy686: case 'z': goto yy61; default: goto yy337; } -yy687: +yy692: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy689; + case '5': goto yy694; case '6': case '7': case '8': @@ -29270,8 +29405,8 @@ yy687: case 'c': case 'd': case 'e': - case 'f': goto yy676; - case ':': goto yy674; + case 'f': goto yy681; + case ':': goto yy679; case 'G': case 'H': case 'I': @@ -29314,11 +29449,11 @@ yy687: case 'z': goto yy61; default: goto yy337; } -yy688: +yy693: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -29340,8 +29475,8 @@ yy688: case 'c': case 'd': case 'e': - case 'f': goto yy676; - case ':': goto yy674; + case 'f': goto yy681; + case ':': goto yy679; case 'G': case 'H': case 'I': @@ -29384,11 +29519,11 @@ yy688: case 'z': goto yy61; default: goto yy337; } -yy689: +yy694: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '.': goto yy582; + case '.': goto yy587; case '0': case '1': case '2': @@ -29410,8 +29545,8 @@ yy689: case 'c': case 'd': case 'e': - case 'f': goto yy677; - case ':': goto yy674; + case 'f': goto yy682; + case ':': goto yy679; case 'G': case 'H': case 'I': @@ -29454,7 +29589,7 @@ yy689: case 'z': goto yy61; default: goto yy337; } -yy690: +yy695: yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -29490,7 +29625,7 @@ yy690: case '~': goto yy338; default: goto yy66; } -yy691: +yy696: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -29524,8 +29659,8 @@ yy691: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': @@ -29535,8 +29670,8 @@ yy691: case '6': case '7': case '8': - case '9': goto yy726; - case ':': goto yy695; + case '9': goto yy731; + case ':': goto yy700; case 'A': case 'B': case 'C': @@ -29548,7 +29683,7 @@ yy691: case 'c': case 'd': case 'e': - case 'f': goto yy696; + case 'f': goto yy701; case 'G': case 'H': case 'I': @@ -29589,9 +29724,9 @@ yy691: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy692: +yy697: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -29625,8 +29760,8 @@ yy692: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': @@ -29636,8 +29771,8 @@ yy692: case '6': case '7': case '8': - case '9': goto yy724; - case ':': goto yy695; + case '9': goto yy729; + case ':': goto yy700; case 'A': case 'B': case 'C': @@ -29649,7 +29784,7 @@ yy692: case 'c': case 'd': case 'e': - case 'f': goto yy696; + case 'f': goto yy701; case 'G': case 'H': case 'I': @@ -29690,9 +29825,9 @@ yy692: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy693: +yy698: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -29726,19 +29861,19 @@ yy693: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': case '3': - case '4': goto yy724; - case '5': goto yy725; + case '4': goto yy729; + case '5': goto yy730; case '6': case '7': case '8': - case '9': goto yy726; - case ':': goto yy695; + case '9': goto yy731; + case ':': goto yy700; case 'A': case 'B': case 'C': @@ -29750,7 +29885,7 @@ yy693: case 'c': case 'd': case 'e': - case 'f': goto yy696; + case 'f': goto yy701; case 'G': case 'H': case 'I': @@ -29791,9 +29926,9 @@ yy693: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy694: +yy699: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -29827,7 +29962,7 @@ yy694: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -29849,8 +29984,8 @@ yy694: case 'c': case 'd': case 'e': - case 'f': goto yy696; - case ':': goto yy695; + case 'f': goto yy701; + case ':': goto yy700; case 'G': case 'H': case 'I': @@ -29891,9 +30026,9 @@ yy694: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy695: +yy700: yych = *++YYCURSOR; switch (yych) { case '0': @@ -29917,11 +30052,11 @@ yy695: case 'c': case 'd': case 'e': - case 'f': goto yy700; + case 'f': goto yy705; case ':': goto yy64; default: goto yy61; } -yy696: +yy701: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -29955,7 +30090,7 @@ yy696: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -29977,8 +30112,8 @@ yy696: case 'c': case 'd': case 'e': - case 'f': goto yy698; - case ':': goto yy695; + case 'f': goto yy703; + case ':': goto yy700; case 'G': case 'H': case 'I': @@ -30019,9 +30154,9 @@ yy696: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy697: +yy702: yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -30086,10 +30221,10 @@ yy697: case 'w': case 'x': case 'y': - case 'z': goto yy548; + case 'z': goto yy553; default: goto yy338; } -yy698: +yy703: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -30123,7 +30258,7 @@ yy698: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30145,8 +30280,8 @@ yy698: case 'c': case 'd': case 'e': - case 'f': goto yy699; - case ':': goto yy695; + case 'f': goto yy704; + case ':': goto yy700; case 'G': case 'H': case 'I': @@ -30187,9 +30322,9 @@ yy698: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy699: +yy704: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -30223,7 +30358,7 @@ yy699: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30286,14 +30421,14 @@ yy699: case 'x': case 'y': case 'z': goto yy65; - case ':': goto yy695; - default: goto yy690; + case ':': goto yy700; + default: goto yy695; } -yy700: +yy705: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30315,8 +30450,8 @@ yy700: case 'c': case 'd': case 'e': - case 'f': goto yy702; - case ':': goto yy701; + case 'f': goto yy707; + case ':': goto yy706; case 'G': case 'H': case 'I': @@ -30359,7 +30494,7 @@ yy700: case 'z': goto yy61; default: goto yy337; } -yy701: +yy706: yych = *++YYCURSOR; switch (yych) { case '0': @@ -30383,14 +30518,14 @@ yy701: case 'c': case 'd': case 'e': - case 'f': goto yy705; + case 'f': goto yy710; default: goto yy61; } -yy702: +yy707: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30412,8 +30547,8 @@ yy702: case 'c': case 'd': case 'e': - case 'f': goto yy703; - case ':': goto yy701; + case 'f': goto yy708; + case ':': goto yy706; case 'G': case 'H': case 'I': @@ -30456,11 +30591,11 @@ yy702: case 'z': goto yy61; default: goto yy337; } -yy703: +yy708: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30482,8 +30617,8 @@ yy703: case 'c': case 'd': case 'e': - case 'f': goto yy704; - case ':': goto yy701; + case 'f': goto yy709; + case ':': goto yy706; case 'G': case 'H': case 'I': @@ -30526,11 +30661,11 @@ yy703: case 'z': goto yy61; default: goto yy337; } -yy704: +yy709: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30593,14 +30728,14 @@ yy704: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy701; + case ':': goto yy706; default: goto yy337; } -yy705: +yy710: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30622,8 +30757,8 @@ yy705: case 'c': case 'd': case 'e': - case 'f': goto yy707; - case ':': goto yy706; + case 'f': goto yy712; + case ':': goto yy711; case 'G': case 'H': case 'I': @@ -30666,7 +30801,7 @@ yy705: case 'z': goto yy61; default: goto yy337; } -yy706: +yy711: yych = *++YYCURSOR; switch (yych) { case '0': @@ -30690,14 +30825,14 @@ yy706: case 'c': case 'd': case 'e': - case 'f': goto yy710; + case 'f': goto yy715; default: goto yy61; } -yy707: +yy712: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30719,8 +30854,8 @@ yy707: case 'c': case 'd': case 'e': - case 'f': goto yy708; - case ':': goto yy706; + case 'f': goto yy713; + case ':': goto yy711; case 'G': case 'H': case 'I': @@ -30763,11 +30898,11 @@ yy707: case 'z': goto yy61; default: goto yy337; } -yy708: +yy713: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30789,8 +30924,8 @@ yy708: case 'c': case 'd': case 'e': - case 'f': goto yy709; - case ':': goto yy706; + case 'f': goto yy714; + case ':': goto yy711; case 'G': case 'H': case 'I': @@ -30833,11 +30968,11 @@ yy708: case 'z': goto yy61; default: goto yy337; } -yy709: +yy714: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30900,14 +31035,14 @@ yy709: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy706; + case ':': goto yy711; default: goto yy337; } -yy710: +yy715: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30929,8 +31064,8 @@ yy710: case 'c': case 'd': case 'e': - case 'f': goto yy711; - case ':': goto yy712; + case 'f': goto yy716; + case ':': goto yy717; case 'G': case 'H': case 'I': @@ -30973,11 +31108,11 @@ yy710: case 'z': goto yy61; default: goto yy337; } -yy711: +yy716: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -30999,8 +31134,8 @@ yy711: case 'c': case 'd': case 'e': - case 'f': goto yy721; - case ':': goto yy712; + case 'f': goto yy726; + case ':': goto yy717; case 'G': case 'H': case 'I': @@ -31043,7 +31178,7 @@ yy711: case 'z': goto yy61; default: goto yy337; } -yy712: +yy717: yych = *++YYCURSOR; switch (yych) { case '0': @@ -31067,10 +31202,10 @@ yy712: case 'c': case 'd': case 'e': - case 'f': goto yy713; + case 'f': goto yy718; default: goto yy61; } -yy713: +yy718: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31095,8 +31230,8 @@ yy713: case 'c': case 'd': case 'e': - case 'f': goto yy715; - case ':': goto yy714; + case 'f': goto yy720; + case ':': goto yy719; case 'G': case 'H': case 'I': @@ -31139,7 +31274,7 @@ yy713: case 'z': goto yy61; default: goto yy337; } -yy714: +yy719: yych = *++YYCURSOR; switch (yych) { case '0': @@ -31163,10 +31298,10 @@ yy714: case 'c': case 'd': case 'e': - case 'f': goto yy718; + case 'f': goto yy723; default: goto yy61; } -yy715: +yy720: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31191,8 +31326,8 @@ yy715: case 'c': case 'd': case 'e': - case 'f': goto yy716; - case ':': goto yy714; + case 'f': goto yy721; + case ':': goto yy719; case 'G': case 'H': case 'I': @@ -31235,7 +31370,7 @@ yy715: case 'z': goto yy61; default: goto yy337; } -yy716: +yy721: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31260,8 +31395,8 @@ yy716: case 'c': case 'd': case 'e': - case 'f': goto yy717; - case ':': goto yy714; + case 'f': goto yy722; + case ':': goto yy719; case 'G': case 'H': case 'I': @@ -31304,7 +31439,7 @@ yy716: case 'z': goto yy61; default: goto yy337; } -yy717: +yy722: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31370,10 +31505,10 @@ yy717: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy714; + case ':': goto yy719; default: goto yy337; } -yy718: +yy723: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31398,7 +31533,7 @@ yy718: case 'c': case 'd': case 'e': - case 'f': goto yy719; + case 'f': goto yy724; case ':': case 'G': case 'H': @@ -31442,7 +31577,7 @@ yy718: case 'z': goto yy61; default: goto yy337; } -yy719: +yy724: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31467,7 +31602,7 @@ yy719: case 'c': case 'd': case 'e': - case 'f': goto yy720; + case 'f': goto yy725; case ':': case 'G': case 'H': @@ -31511,7 +31646,7 @@ yy719: case 'z': goto yy61; default: goto yy337; } -yy720: +yy725: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -31580,11 +31715,11 @@ yy720: case 'z': goto yy61; default: goto yy337; } -yy721: +yy726: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -31606,8 +31741,8 @@ yy721: case 'c': case 'd': case 'e': - case 'f': goto yy722; - case ':': goto yy712; + case 'f': goto yy727; + case ':': goto yy717; case 'G': case 'H': case 'I': @@ -31650,11 +31785,11 @@ yy721: case 'z': goto yy61; default: goto yy337; } -yy722: +yy727: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { - case '%': goto yy697; + case '%': goto yy702; case '0': case '1': case '2': @@ -31717,10 +31852,10 @@ yy722: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy712; + case ':': goto yy717; default: goto yy337; } -yy723: +yy728: yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -31761,13 +31896,13 @@ yy723: case '6': case '7': case '8': - case '9': goto yy730; - case '1': goto yy729; - case '2': goto yy728; + case '9': goto yy735; + case '1': goto yy734; + case '2': goto yy733; case ':': goto yy60; default: goto yy65; } -yy724: +yy729: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -31801,8 +31936,8 @@ yy724: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': @@ -31812,8 +31947,8 @@ yy724: case '6': case '7': case '8': - case '9': goto yy727; - case ':': goto yy695; + case '9': goto yy732; + case ':': goto yy700; case 'A': case 'B': case 'C': @@ -31825,7 +31960,7 @@ yy724: case 'c': case 'd': case 'e': - case 'f': goto yy698; + case 'f': goto yy703; case 'G': case 'H': case 'I': @@ -31866,9 +32001,9 @@ yy724: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy725: +yy730: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -31902,14 +32037,14 @@ yy725: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy727; + case '5': goto yy732; case '6': case '7': case '8': @@ -31925,8 +32060,8 @@ yy725: case 'c': case 'd': case 'e': - case 'f': goto yy698; - case ':': goto yy695; + case 'f': goto yy703; + case ':': goto yy700; case 'G': case 'H': case 'I': @@ -31967,9 +32102,9 @@ yy725: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy726: +yy731: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32003,8 +32138,8 @@ yy726: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': @@ -32026,8 +32161,8 @@ yy726: case 'c': case 'd': case 'e': - case 'f': goto yy698; - case ':': goto yy695; + case 'f': goto yy703; + case ':': goto yy700; case 'G': case 'H': case 'I': @@ -32068,9 +32203,9 @@ yy726: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy727: +yy732: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32104,8 +32239,8 @@ yy727: case '|': case '}': case '~': goto yy337; - case '%': goto yy697; - case '.': goto yy723; + case '%': goto yy702; + case '.': goto yy728; case '0': case '1': case '2': @@ -32127,8 +32262,8 @@ yy727: case 'c': case 'd': case 'e': - case 'f': goto yy699; - case ':': goto yy695; + case 'f': goto yy704; + case ':': goto yy700; case 'G': case 'H': case 'I': @@ -32169,30 +32304,30 @@ yy727: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy728: +yy733: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy731; + case '.': goto yy736; case '0': case '1': case '2': case '3': - case '4': goto yy730; - case '5': goto yy744; + case '4': goto yy735; + case '5': goto yy749; case '6': case '7': case '8': - case '9': goto yy732; + case '9': goto yy737; default: goto yy66; } -yy729: +yy734: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy731; + case '.': goto yy736; case '0': case '1': case '2': @@ -32202,14 +32337,14 @@ yy729: case '6': case '7': case '8': - case '9': goto yy730; + case '9': goto yy735; default: goto yy66; } -yy730: +yy735: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy731; + case '.': goto yy736; case '0': case '1': case '2': @@ -32219,10 +32354,10 @@ yy730: case '6': case '7': case '8': - case '9': goto yy732; + case '9': goto yy737; default: goto yy66; } -yy731: +yy736: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -32233,40 +32368,40 @@ yy731: case '6': case '7': case '8': - case '9': goto yy735; - case '1': goto yy734; - case '2': goto yy733; + case '9': goto yy740; + case '1': goto yy739; + case '2': goto yy738; default: goto yy66; } -yy732: +yy737: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy731; + case '.': goto yy736; default: goto yy66; } -yy733: +yy738: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy736; + case '.': goto yy741; case '0': case '1': case '2': case '3': - case '4': goto yy735; - case '5': goto yy743; + case '4': goto yy740; + case '5': goto yy748; case '6': case '7': case '8': - case '9': goto yy737; + case '9': goto yy742; default: goto yy66; } -yy734: +yy739: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy736; + case '.': goto yy741; case '0': case '1': case '2': @@ -32276,14 +32411,14 @@ yy734: case '6': case '7': case '8': - case '9': goto yy735; + case '9': goto yy740; default: goto yy66; } -yy735: +yy740: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy736; + case '.': goto yy741; case '0': case '1': case '2': @@ -32293,10 +32428,10 @@ yy735: case '6': case '7': case '8': - case '9': goto yy737; + case '9': goto yy742; default: goto yy66; } -yy736: +yy741: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -32307,19 +32442,19 @@ yy736: case '6': case '7': case '8': - case '9': goto yy740; - case '1': goto yy739; - case '2': goto yy738; + case '9': goto yy745; + case '1': goto yy744; + case '2': goto yy743; default: goto yy66; } -yy737: +yy742: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy736; + case '.': goto yy741; default: goto yy66; } -yy738: +yy743: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32358,12 +32493,12 @@ yy738: case '1': case '2': case '3': - case '4': goto yy740; - case '5': goto yy742; + case '4': goto yy745; + case '5': goto yy747; case '6': case '7': case '8': - case '9': goto yy741; + case '9': goto yy746; case ':': goto yy60; case 'A': case 'B': @@ -32417,9 +32552,9 @@ yy738: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy739: +yy744: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32463,7 +32598,7 @@ yy739: case '6': case '7': case '8': - case '9': goto yy740; + case '9': goto yy745; case ':': goto yy60; case 'A': case 'B': @@ -32517,9 +32652,9 @@ yy739: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy740: +yy745: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32563,7 +32698,7 @@ yy740: case '6': case '7': case '8': - case '9': goto yy741; + case '9': goto yy746; case ':': goto yy60; case 'A': case 'B': @@ -32617,9 +32752,9 @@ yy740: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy741: +yy746: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32717,9 +32852,9 @@ yy741: case 'x': case 'y': case 'z': goto yy66; - default: goto yy690; + default: goto yy695; } -yy742: +yy747: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -32759,7 +32894,7 @@ yy742: case '2': case '3': case '4': - case '5': goto yy741; + case '5': goto yy746; case '6': case '7': case '8': @@ -32817,39 +32952,39 @@ yy742: case 'x': case 'y': case 'z': goto yy66; - default: goto yy690; + default: goto yy695; } -yy743: +yy748: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy736; + case '.': goto yy741; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy737; + case '5': goto yy742; default: goto yy66; } -yy744: +yy749: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy731; + case '.': goto yy736; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy732; + case '5': goto yy737; default: goto yy66; } -yy745: +yy750: yych = *++YYCURSOR; switch (yych) { - case '%': goto yy547; - case '/': goto yy488; + case '%': goto yy552; + case '/': goto yy493; case '0': case '1': case '2': @@ -32871,11 +33006,11 @@ yy745: case 'c': case 'd': case 'e': - case 'f': goto yy546; - case ':': goto yy545; + case 'f': goto yy551; + case ':': goto yy550; default: goto yy61; } -yy746: +yy751: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -32916,9 +33051,9 @@ yy746: case '6': case '7': case '8': - case '9': goto yy747; - case '1': goto yy748; - case '2': goto yy749; + case '9': goto yy752; + case '1': goto yy753; + case '2': goto yy754; case ':': goto yy61; case 'A': case 'B': @@ -32931,7 +33066,7 @@ yy746: case 'c': case 'd': case 'e': - case 'f': goto yy750; + case 'f': goto yy755; case 'G': case 'H': case 'I': @@ -32972,9 +33107,9 @@ yy746: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy747: +yy752: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -33009,7 +33144,7 @@ yy747: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': @@ -33019,8 +33154,8 @@ yy747: case '6': case '7': case '8': - case '9': goto yy771; - case ':': goto yy752; + case '9': goto yy776; + case ':': goto yy757; case 'A': case 'B': case 'C': @@ -33032,7 +33167,7 @@ yy747: case 'c': case 'd': case 'e': - case 'f': goto yy751; + case 'f': goto yy756; case 'G': case 'H': case 'I': @@ -33073,9 +33208,9 @@ yy747: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy748: +yy753: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -33110,7 +33245,7 @@ yy748: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': @@ -33120,8 +33255,8 @@ yy748: case '6': case '7': case '8': - case '9': goto yy769; - case ':': goto yy752; + case '9': goto yy774; + case ':': goto yy757; case 'A': case 'B': case 'C': @@ -33133,7 +33268,7 @@ yy748: case 'c': case 'd': case 'e': - case 'f': goto yy751; + case 'f': goto yy756; case 'G': case 'H': case 'I': @@ -33174,9 +33309,9 @@ yy748: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy749: +yy754: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -33211,18 +33346,18 @@ yy749: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': case '3': - case '4': goto yy769; - case '5': goto yy770; + case '4': goto yy774; + case '5': goto yy775; case '6': case '7': case '8': - case '9': goto yy771; - case ':': goto yy752; + case '9': goto yy776; + case ':': goto yy757; case 'A': case 'B': case 'C': @@ -33234,7 +33369,7 @@ yy749: case 'c': case 'd': case 'e': - case 'f': goto yy751; + case 'f': goto yy756; case 'G': case 'H': case 'I': @@ -33275,9 +33410,9 @@ yy749: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy750: +yy755: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -33333,8 +33468,8 @@ yy750: case 'c': case 'd': case 'e': - case 'f': goto yy751; - case ':': goto yy752; + case 'f': goto yy756; + case ':': goto yy757; case 'G': case 'H': case 'I': @@ -33375,9 +33510,9 @@ yy750: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy751: +yy756: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -33433,8 +33568,8 @@ yy751: case 'c': case 'd': case 'e': - case 'f': goto yy767; - case ':': goto yy752; + case 'f': goto yy772; + case ':': goto yy757; case 'G': case 'H': case 'I': @@ -33475,9 +33610,9 @@ yy751: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy752: +yy757: yych = *++YYCURSOR; switch (yych) { case '0': @@ -33501,11 +33636,11 @@ yy752: case 'c': case 'd': case 'e': - case 'f': goto yy753; + case 'f': goto yy758; case ':': goto yy64; default: goto yy61; } -yy753: +yy758: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33530,8 +33665,8 @@ yy753: case 'c': case 'd': case 'e': - case 'f': goto yy754; - case ':': goto yy755; + case 'f': goto yy759; + case ':': goto yy760; case 'G': case 'H': case 'I': @@ -33574,7 +33709,7 @@ yy753: case 'z': goto yy61; default: goto yy337; } -yy754: +yy759: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33599,8 +33734,8 @@ yy754: case 'c': case 'd': case 'e': - case 'f': goto yy765; - case ':': goto yy755; + case 'f': goto yy770; + case ':': goto yy760; case 'G': case 'H': case 'I': @@ -33643,7 +33778,7 @@ yy754: case 'z': goto yy61; default: goto yy337; } -yy755: +yy760: yych = *++YYCURSOR; switch (yych) { case '0': @@ -33667,10 +33802,10 @@ yy755: case 'c': case 'd': case 'e': - case 'f': goto yy756; + case 'f': goto yy761; default: goto yy61; } -yy756: +yy761: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33695,8 +33830,8 @@ yy756: case 'c': case 'd': case 'e': - case 'f': goto yy757; - case ':': goto yy758; + case 'f': goto yy762; + case ':': goto yy763; case 'G': case 'H': case 'I': @@ -33739,7 +33874,7 @@ yy756: case 'z': goto yy61; default: goto yy337; } -yy757: +yy762: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33764,8 +33899,8 @@ yy757: case 'c': case 'd': case 'e': - case 'f': goto yy763; - case ':': goto yy758; + case 'f': goto yy768; + case ':': goto yy763; case 'G': case 'H': case 'I': @@ -33808,7 +33943,7 @@ yy757: case 'z': goto yy61; default: goto yy337; } -yy758: +yy763: yych = *++YYCURSOR; switch (yych) { case '0': @@ -33832,10 +33967,10 @@ yy758: case 'c': case 'd': case 'e': - case 'f': goto yy759; + case 'f': goto yy764; default: goto yy61; } -yy759: +yy764: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33860,8 +33995,8 @@ yy759: case 'c': case 'd': case 'e': - case 'f': goto yy760; - case ':': goto yy712; + case 'f': goto yy765; + case ':': goto yy717; case 'G': case 'H': case 'I': @@ -33904,7 +34039,7 @@ yy759: case 'z': goto yy61; default: goto yy337; } -yy760: +yy765: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33929,8 +34064,8 @@ yy760: case 'c': case 'd': case 'e': - case 'f': goto yy761; - case ':': goto yy712; + case 'f': goto yy766; + case ':': goto yy717; case 'G': case 'H': case 'I': @@ -33973,7 +34108,7 @@ yy760: case 'z': goto yy61; default: goto yy337; } -yy761: +yy766: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -33998,8 +34133,8 @@ yy761: case 'c': case 'd': case 'e': - case 'f': goto yy762; - case ':': goto yy712; + case 'f': goto yy767; + case ':': goto yy717; case 'G': case 'H': case 'I': @@ -34042,7 +34177,7 @@ yy761: case 'z': goto yy61; default: goto yy337; } -yy762: +yy767: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -34108,10 +34243,10 @@ yy762: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy712; + case ':': goto yy717; default: goto yy337; } -yy763: +yy768: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -34136,8 +34271,8 @@ yy763: case 'c': case 'd': case 'e': - case 'f': goto yy764; - case ':': goto yy758; + case 'f': goto yy769; + case ':': goto yy763; case 'G': case 'H': case 'I': @@ -34180,7 +34315,7 @@ yy763: case 'z': goto yy61; default: goto yy337; } -yy764: +yy769: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -34246,10 +34381,10 @@ yy764: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy758; + case ':': goto yy763; default: goto yy337; } -yy765: +yy770: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -34274,8 +34409,8 @@ yy765: case 'c': case 'd': case 'e': - case 'f': goto yy766; - case ':': goto yy755; + case 'f': goto yy771; + case ':': goto yy760; case 'G': case 'H': case 'I': @@ -34318,7 +34453,7 @@ yy765: case 'z': goto yy61; default: goto yy337; } -yy766: +yy771: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -34384,10 +34519,10 @@ yy766: case 'x': case 'y': case 'z': goto yy61; - case ':': goto yy755; + case ':': goto yy760; default: goto yy337; } -yy767: +yy772: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -34443,8 +34578,8 @@ yy767: case 'c': case 'd': case 'e': - case 'f': goto yy768; - case ':': goto yy752; + case 'f': goto yy773; + case ':': goto yy757; case 'G': case 'H': case 'I': @@ -34485,9 +34620,9 @@ yy767: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy768: +yy773: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -34584,10 +34719,10 @@ yy768: case 'x': case 'y': case 'z': goto yy65; - case ':': goto yy752; - default: goto yy690; + case ':': goto yy757; + default: goto yy695; } -yy769: +yy774: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -34622,7 +34757,7 @@ yy769: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': @@ -34632,8 +34767,8 @@ yy769: case '6': case '7': case '8': - case '9': goto yy772; - case ':': goto yy752; + case '9': goto yy777; + case ':': goto yy757; case 'A': case 'B': case 'C': @@ -34645,7 +34780,7 @@ yy769: case 'c': case 'd': case 'e': - case 'f': goto yy767; + case 'f': goto yy772; case 'G': case 'H': case 'I': @@ -34686,9 +34821,9 @@ yy769: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy770: +yy775: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -34723,13 +34858,13 @@ yy770: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy772; + case '5': goto yy777; case '6': case '7': case '8': @@ -34745,8 +34880,8 @@ yy770: case 'c': case 'd': case 'e': - case 'f': goto yy767; - case ':': goto yy752; + case 'f': goto yy772; + case ':': goto yy757; case 'G': case 'H': case 'I': @@ -34787,9 +34922,9 @@ yy770: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy771: +yy776: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -34824,7 +34959,7 @@ yy771: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': @@ -34846,8 +34981,8 @@ yy771: case 'c': case 'd': case 'e': - case 'f': goto yy767; - case ':': goto yy752; + case 'f': goto yy772; + case ':': goto yy757; case 'G': case 'H': case 'I': @@ -34888,9 +35023,9 @@ yy771: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy772: +yy777: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -34925,7 +35060,7 @@ yy772: case '|': case '}': case '~': goto yy337; - case '.': goto yy723; + case '.': goto yy728; case '0': case '1': case '2': @@ -34947,8 +35082,8 @@ yy772: case 'c': case 'd': case 'e': - case 'f': goto yy768; - case ':': goto yy752; + case 'f': goto yy773; + case ':': goto yy757; case 'G': case 'H': case 'I': @@ -34989,9 +35124,9 @@ yy772: case 'x': case 'y': case 'z': goto yy65; - default: goto yy690; + default: goto yy695; } -yy773: +yy778: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35015,11 +35150,11 @@ yy773: case 'c': case 'd': case 'e': - case 'f': goto yy774; - case ':': goto yy550; + case 'f': goto yy779; + case ':': goto yy555; default: goto yy61; } -yy774: +yy779: yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35044,11 +35179,11 @@ yy774: case 'c': case 'd': case 'e': - case 'f': goto yy552; - case ':': goto yy776; - default: goto yy775; + case 'f': goto yy557; + case ':': goto yy781; + default: goto yy780; } -yy775: +yy780: #line 149 "../../lnav2/src/data_scanner_re.re" { if ((YYCURSOR - pi.get_string()) == 17) { @@ -35057,8 +35192,8 @@ yy775: RET(DT_HEX_DUMP); } } -#line 35061 "../../lnav2/src/data_scanner_re.cc" -yy776: +#line 35196 "../../lnav2/src/data_scanner_re.cc" +yy781: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35082,11 +35217,11 @@ yy776: case 'c': case 'd': case 'e': - case 'f': goto yy777; - case ':': goto yy555; + case 'f': goto yy782; + case ':': goto yy560; default: goto yy61; } -yy777: +yy782: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35110,11 +35245,11 @@ yy777: case 'c': case 'd': case 'e': - case 'f': goto yy778; - case ':': goto yy603; + case 'f': goto yy783; + case ':': goto yy608; default: goto yy61; } -yy778: +yy783: yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35139,11 +35274,11 @@ yy778: case 'c': case 'd': case 'e': - case 'f': goto yy605; - case ':': goto yy779; - default: goto yy775; + case 'f': goto yy610; + case ':': goto yy784; + default: goto yy780; } -yy779: +yy784: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35167,11 +35302,11 @@ yy779: case 'c': case 'd': case 'e': - case 'f': goto yy780; - case ':': goto yy608; + case 'f': goto yy785; + case ':': goto yy613; default: goto yy61; } -yy780: +yy785: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35195,11 +35330,11 @@ yy780: case 'c': case 'd': case 'e': - case 'f': goto yy781; - case ':': goto yy634; + case 'f': goto yy786; + case ':': goto yy639; default: goto yy61; } -yy781: +yy786: yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35224,11 +35359,11 @@ yy781: case 'c': case 'd': case 'e': - case 'f': goto yy636; - case ':': goto yy782; - default: goto yy775; + case 'f': goto yy641; + case ':': goto yy787; + default: goto yy780; } -yy782: +yy787: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35252,11 +35387,11 @@ yy782: case 'c': case 'd': case 'e': - case 'f': goto yy783; - case ':': goto yy638; + case 'f': goto yy788; + case ':': goto yy643; default: goto yy61; } -yy783: +yy788: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35280,11 +35415,11 @@ yy783: case 'c': case 'd': case 'e': - case 'f': goto yy784; - case ':': goto yy640; + case 'f': goto yy789; + case ':': goto yy645; default: goto yy61; } -yy784: +yy789: yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35309,11 +35444,11 @@ yy784: case 'c': case 'd': case 'e': - case 'f': goto yy642; - case ':': goto yy785; - default: goto yy775; + case 'f': goto yy647; + case ':': goto yy790; + default: goto yy780; } -yy785: +yy790: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35337,11 +35472,11 @@ yy785: case 'c': case 'd': case 'e': - case 'f': goto yy786; - case ':': goto yy644; + case 'f': goto yy791; + case ':': goto yy649; default: goto yy61; } -yy786: +yy791: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35365,11 +35500,11 @@ yy786: case 'c': case 'd': case 'e': - case 'f': goto yy787; - case ':': goto yy646; + case 'f': goto yy792; + case ':': goto yy651; default: goto yy61; } -yy787: +yy792: yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35394,11 +35529,11 @@ yy787: case 'c': case 'd': case 'e': - case 'f': goto yy648; - case ':': goto yy788; - default: goto yy775; + case 'f': goto yy653; + case ':': goto yy793; + default: goto yy780; } -yy788: +yy793: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35422,11 +35557,11 @@ yy788: case 'c': case 'd': case 'e': - case 'f': goto yy789; - case ':': goto yy650; + case 'f': goto yy794; + case ':': goto yy655; default: goto yy61; } -yy789: +yy794: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35450,11 +35585,11 @@ yy789: case 'c': case 'd': case 'e': - case 'f': goto yy790; - case ':': goto yy652; + case 'f': goto yy795; + case ':': goto yy657; default: goto yy61; } -yy790: +yy795: yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35479,11 +35614,11 @@ yy790: case 'c': case 'd': case 'e': - case 'f': goto yy654; - case ':': goto yy791; - default: goto yy775; + case 'f': goto yy659; + case ':': goto yy796; + default: goto yy780; } -yy791: +yy796: yych = *++YYCURSOR; switch (yych) { case '0': @@ -35507,11 +35642,11 @@ yy791: case 'c': case 'd': case 'e': - case 'f': goto yy792; + case 'f': goto yy797; case ':': goto yy372; default: goto yy61; } -yy792: +yy797: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -35536,7 +35671,7 @@ yy792: case 'c': case 'd': case 'e': - case 'f': goto yy793; + case 'f': goto yy798; case ':': case 'G': case 'H': @@ -35580,7 +35715,7 @@ yy792: case 'z': goto yy61; default: goto yy337; } -yy793: +yy798: YYCTXMARKER = YYCURSOR + 1; yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); @@ -35606,8 +35741,8 @@ yy793: case 'c': case 'd': case 'e': - case 'f': goto yy658; - case ':': goto yy794; + case 'f': goto yy663; + case ':': goto yy799; case 'G': case 'H': case 'I': @@ -35647,10 +35782,10 @@ yy793: case 'w': case 'x': case 'y': - case 'z': goto yy775; + case 'z': goto yy780; default: goto yy337; } -yy794: +yy799: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { @@ -35675,10 +35810,10 @@ yy794: case 'c': case 'd': case 'e': - case 'f': goto yy795; + case 'f': goto yy800; default: goto yy61; } -yy795: +yy800: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { @@ -35703,18 +35838,18 @@ yy795: case 'c': case 'd': case 'e': - case 'f': goto yy796; + case 'f': goto yy801; default: goto yy61; } -yy796: +yy801: yyaccept = 20; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case ':': goto yy794; - default: goto yy775; + case ':': goto yy799; + default: goto yy780; } -yy797: +yy802: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -35801,10 +35936,10 @@ yy797: case 'x': case 'y': case 'z': goto yy472; - case 's': goto yy798; + case 's': goto yy803; default: goto yy63; } -yy798: +yy803: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -35894,10 +36029,10 @@ yy798: case 'e': goto yy486; default: goto yy63; } -yy799: +yy804: yych = *++YYCURSOR; switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case '0': case '1': case '2': @@ -35919,11 +36054,11 @@ yy799: case 'c': case 'd': case 'e': - case 'f': goto yy773; - case ':': goto yy746; + case 'f': goto yy778; + case ':': goto yy751; default: goto yy61; } -yy800: +yy805: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -35995,10 +36130,10 @@ yy800: case 'z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'U': goto yy803; + case 'U': goto yy808; default: goto yy63; } -yy801: +yy806: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -36085,10 +36220,10 @@ yy801: case 'x': case 'y': case 'z': goto yy472; - case 'u': goto yy802; + case 'u': goto yy807; default: goto yy63; } -yy802: +yy807: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -36178,7 +36313,7 @@ yy802: case 'e': goto yy486; default: goto yy63; } -yy803: +yy808: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -36247,116 +36382,201 @@ yy803: case 'w': case 'x': case 'y': - case 'z': goto yy470; - case ':': goto yy469; + case 'z': goto yy470; + case ':': goto yy469; + case '@': goto yy69; + case 'E': goto yy809; + default: goto yy63; + } +yy809: + YYCTXMARKER = YYCURSOR + 1; + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + switch (yych) { + case 0x00: + case '\t': + case '\n': + case '\r': + case ' ': + case '"': + case '\'': + case '(': + case ')': + case '*': + case ';': goto yy812; + case '!': + case ',': + case '?': goto yy813; + case '%': + case '+': goto yy70; + case '-': + case '_': goto yy67; + case '.': goto yy811; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + case 'G': + case 'H': + case 'I': + case 'J': + case 'K': + case 'L': + case 'M': + case 'N': + case 'O': + case 'P': + case 'Q': + case 'R': + case 'S': + case 'T': + case 'U': + case 'V': + case 'W': + case 'X': + case 'Y': + case 'Z': + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + case 'g': + case 'h': + case 'i': + case 'j': + case 'k': + case 'l': + case 'm': + case 'n': + case 'o': + case 'p': + case 'q': + case 'r': + case 's': + case 't': + case 'u': + case 'v': + case 'w': + case 'x': + case 'y': + case 'z': goto yy470; + case ':': goto yy810; + case '@': goto yy69; + default: goto yy63; + } +yy810: + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + switch (yych) { + case '/': goto yy493; + case ':': goto yy64; + default: goto yy488; + } +yy811: + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + switch (yych) { + case '\t': + case '\n': + case '\r': + case ' ': goto yy812; + case '%': + case '+': goto yy70; + case '-': + case '.': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + case 'G': + case 'H': + case 'I': + case 'J': + case 'K': + case 'L': + case 'M': + case 'N': + case 'O': + case 'P': + case 'Q': + case 'R': + case 'S': + case 'T': + case 'U': + case 'V': + case 'W': + case 'X': + case 'Y': + case 'Z': + case '_': + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + case 'g': + case 'h': + case 'i': + case 'j': + case 'k': + case 'l': + case 'm': + case 'n': + case 'o': + case 'p': + case 'q': + case 'r': + case 's': + case 't': + case 'u': + case 'v': + case 'w': + case 'x': + case 'y': + case 'z': goto yy67; case '@': goto yy69; - case 'E': goto yy804; default: goto yy63; } -yy804: - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); +yy812: + yych = *++YYCURSOR; + goto yy488; +yy813: + yych = *++YYCURSOR; switch (yych) { - case 0x00: case '\t': case '\n': case '\r': - case ' ': - case '!': - case '"': - case '#': - case '&': - case '\'': - case '(': - case ')': - case '*': - case ',': - case ';': - case '<': - case '=': - case '>': - case '?': - case '[': - case '\\': - case ']': - case '^': - case '`': - case '{': - case '|': - case '}': - case '~': goto yy487; - case '%': - case '+': goto yy70; - case '-': - case '.': - case '_': goto yy67; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'T': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy470; - case ':': goto yy469; - case '@': goto yy69; - default: goto yy62; + case ' ': goto yy812; + default: goto yy488; } -yy805: +yy814: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -36428,10 +36648,10 @@ yy805: case 'z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'L': goto yy808; + case 'L': goto yy817; default: goto yy63; } -yy806: +yy815: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -36518,10 +36738,10 @@ yy806: case 'x': case 'y': case 'z': goto yy472; - case 'n': goto yy807; + case 'n': goto yy816; default: goto yy63; } -yy807: +yy816: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -36611,7 +36831,7 @@ yy807: case 'e': goto yy486; default: goto yy63; } -yy808: +yy817: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -36683,10 +36903,10 @@ yy808: case 'z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'L': goto yy804; + case 'L': goto yy809; default: goto yy63; } -yy809: +yy818: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -36716,8 +36936,8 @@ yy809: case 'c': case 'd': case 'e': - case 'f': goto yy502; - case ':': goto yy799; + case 'f': goto yy507; + case ':': goto yy804; case '@': goto yy69; case 'G': case 'H': @@ -36758,10 +36978,10 @@ yy809: case 'x': case 'y': case 'z': goto yy470; - case 'L': goto yy813; + case 'L': goto yy822; default: goto yy63; } -yy810: +yy819: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -36800,8 +37020,8 @@ yy810: case 'C': case 'D': case 'E': - case 'F': goto yy502; - case ':': goto yy501; + case 'F': goto yy507; + case ':': goto yy506; case '@': goto yy69; case 'G': case 'H': @@ -36828,7 +37048,7 @@ yy810: case 'c': case 'd': case 'e': - case 'f': goto yy503; + case 'f': goto yy508; case 'g': case 'h': case 'i': @@ -36848,10 +37068,10 @@ yy810: case 'x': case 'y': case 'z': goto yy472; - case 'l': goto yy811; + case 'l': goto yy820; default: goto yy63; } -yy811: +yy820: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -36938,10 +37158,10 @@ yy811: case 'x': case 'y': case 'z': goto yy472; - case 's': goto yy812; + case 's': goto yy821; default: goto yy63; } -yy812: +yy821: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -37031,7 +37251,7 @@ yy812: case 'e': goto yy486; default: goto yy63; } -yy813: +yy822: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37103,10 +37323,10 @@ yy813: case 'z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'S': goto yy814; + case 'S': goto yy823; default: goto yy63; } -yy814: +yy823: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37178,13 +37398,13 @@ yy814: case 'z': goto yy470; case ':': goto yy469; case '@': goto yy69; - case 'E': goto yy804; + case 'E': goto yy809; default: goto yy63; } -yy815: +yy824: yych = *++YYCURSOR; switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case '0': case '1': case '2': @@ -37194,8 +37414,8 @@ yy815: case '6': case '7': case '8': - case '9': goto yy942; - case ':': goto yy746; + case '9': goto yy951; + case ':': goto yy751; case 'A': case 'B': case 'C': @@ -37207,10 +37427,10 @@ yy815: case 'c': case 'd': case 'e': - case 'f': goto yy546; + case 'f': goto yy551; default: goto yy61; } -yy816: +yy825: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37278,13 +37498,13 @@ yy816: case '6': case '7': case '8': - case '9': goto yy929; - case '1': goto yy928; - case '2': goto yy927; + case '9': goto yy938; + case '1': goto yy937; + case '2': goto yy936; case '@': goto yy69; default: goto yy63; } -yy817: +yy826: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37320,8 +37540,8 @@ yy817: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy832; - case '/': goto yy831; + case '.': goto yy841; + case '/': goto yy840; case '0': case '1': case '2': @@ -37331,8 +37551,8 @@ yy817: case '6': case '7': case '8': - case '9': goto yy829; - case ':': goto yy828; + case '9': goto yy838; + case ':': goto yy837; case '@': goto yy69; case 'A': case 'B': @@ -37343,9 +37563,9 @@ yy817: case 'b': case 'c': case 'd': - case 'f': goto yy820; + case 'f': goto yy829; case 'E': - case 'e': goto yy830; + case 'e': goto yy839; case 'G': case 'H': case 'I': @@ -37388,7 +37608,7 @@ yy817: case 'z': goto yy470; default: goto yy62; } -yy818: +yy827: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37446,8 +37666,8 @@ yy818: case 'c': case 'd': case 'e': - case 'f': goto yy820; - case ':': goto yy799; + case 'f': goto yy829; + case ':': goto yy804; case '@': goto yy69; case 'G': case 'H': @@ -37491,7 +37711,7 @@ yy818: case 'z': goto yy470; default: goto yy62; } -yy819: +yy828: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37549,8 +37769,8 @@ yy819: case 'c': case 'd': case 'e': - case 'f': goto yy820; - case ':': goto yy799; + case 'f': goto yy829; + case ':': goto yy804; case '@': goto yy69; case 'G': case 'H': @@ -37594,7 +37814,7 @@ yy819: case 'z': goto yy470; default: goto yy62; } -yy820: +yy829: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37652,8 +37872,8 @@ yy820: case 'c': case 'd': case 'e': - case 'f': goto yy821; - case ':': goto yy497; + case 'f': goto yy830; + case ':': goto yy502; case '@': goto yy69; case 'G': case 'H': @@ -37697,7 +37917,7 @@ yy820: case 'z': goto yy470; default: goto yy62; } -yy821: +yy830: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37755,8 +37975,8 @@ yy821: case 'c': case 'd': case 'e': - case 'f': goto yy822; - case ':': goto yy745; + case 'f': goto yy831; + case ':': goto yy750; case '@': goto yy69; case 'G': case 'H': @@ -37800,7 +38020,7 @@ yy821: case 'z': goto yy470; default: goto yy62; } -yy822: +yy831: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37858,7 +38078,7 @@ yy822: case 'c': case 'd': case 'e': - case 'f': goto yy823; + case 'f': goto yy832; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -37903,7 +38123,7 @@ yy822: case 'z': goto yy470; default: goto yy62; } -yy823: +yy832: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -37961,7 +38181,7 @@ yy823: case 'c': case 'd': case 'e': - case 'f': goto yy824; + case 'f': goto yy833; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -38006,7 +38226,7 @@ yy823: case 'z': goto yy470; default: goto yy62; } -yy824: +yy833: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38064,7 +38284,7 @@ yy824: case 'c': case 'd': case 'e': - case 'f': goto yy825; + case 'f': goto yy834; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -38109,7 +38329,7 @@ yy824: case 'z': goto yy470; default: goto yy62; } -yy825: +yy834: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38143,7 +38363,7 @@ yy825: case '~': goto yy96; case '%': case '+': goto yy70; - case '-': goto yy516; + case '-': goto yy521; case '.': case '_': goto yy67; case '0': @@ -38167,7 +38387,7 @@ yy825: case 'c': case 'd': case 'e': - case 'f': goto yy826; + case 'f': goto yy835; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -38212,7 +38432,7 @@ yy825: case 'z': goto yy470; default: goto yy62; } -yy826: +yy835: yyaccept = 10; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -38271,7 +38491,7 @@ yy826: case 'c': case 'd': case 'e': - case 'f': goto yy826; + case 'f': goto yy835; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -38316,10 +38536,10 @@ yy826: case 'z': goto yy470; default: goto yy62; } -yy828: +yy837: yych = *++YYCURSOR; switch (yych) { - case '/': goto yy488; + case '/': goto yy493; case '0': case '1': case '2': @@ -38329,8 +38549,8 @@ yy828: case '6': case '7': case '8': - case '9': goto yy920; - case ':': goto yy746; + case '9': goto yy929; + case ':': goto yy751; case 'A': case 'B': case 'C': @@ -38342,10 +38562,10 @@ yy828: case 'c': case 'd': case 'e': - case 'f': goto yy773; + case 'f': goto yy778; default: goto yy61; } -yy829: +yy838: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38381,7 +38601,7 @@ yy829: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -38391,8 +38611,8 @@ yy829: case '6': case '7': case '8': - case '9': goto yy890; - case ':': goto yy497; + case '9': goto yy899; + case ':': goto yy502; case '@': goto yy69; case 'A': case 'B': @@ -38403,9 +38623,9 @@ yy829: case 'b': case 'c': case 'd': - case 'f': goto yy821; + case 'f': goto yy830; case 'E': - case 'e': goto yy891; + case 'e': goto yy900; case 'G': case 'H': case 'I': @@ -38448,7 +38668,7 @@ yy829: case 'z': goto yy470; default: goto yy62; } -yy830: +yy839: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38506,8 +38726,8 @@ yy830: case 'c': case 'd': case 'e': - case 'f': goto yy821; - case ':': goto yy497; + case 'f': goto yy830; + case ':': goto yy502; case '@': goto yy69; case 'G': case 'H': @@ -38551,7 +38771,7 @@ yy830: case 'z': goto yy470; default: goto yy62; } -yy831: +yy840: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38606,10 +38826,10 @@ yy831: case 'w': case 'x': case 'y': - case 'z': goto yy879; + case 'z': goto yy888; default: goto yy63; } -yy832: +yy841: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38677,13 +38897,13 @@ yy832: case '6': case '7': case '8': - case '9': goto yy833; - case '1': goto yy834; - case '2': goto yy835; + case '9': goto yy842; + case '1': goto yy843; + case '2': goto yy844; case '@': goto yy69; default: goto yy63; } -yy833: +yy842: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38717,8 +38937,8 @@ yy833: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': @@ -38728,7 +38948,7 @@ yy833: case '6': case '7': case '8': - case '9': goto yy838; + case '9': goto yy847; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -38781,12 +39001,12 @@ yy833: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy841; + case 'e': goto yy850; default: goto yy62; } -yy834: +yy843: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38820,8 +39040,8 @@ yy834: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': @@ -38831,7 +39051,7 @@ yy834: case '6': case '7': case '8': - case '9': goto yy833; + case '9': goto yy842; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -38884,12 +39104,12 @@ yy834: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy841; + case 'e': goto yy850; default: goto yy62; } -yy835: +yy844: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -38923,18 +39143,18 @@ yy835: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': case '3': - case '4': goto yy833; - case '5': goto yy837; + case '4': goto yy842; + case '5': goto yy846; case '6': case '7': case '8': - case '9': goto yy838; + case '9': goto yy847; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -38987,12 +39207,12 @@ yy835: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy841; + case 'e': goto yy850; default: goto yy62; } -yy836: +yy845: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -39060,13 +39280,13 @@ yy836: case '6': case '7': case '8': - case '9': goto yy859; - case '1': goto yy860; - case '2': goto yy861; + case '9': goto yy868; + case '1': goto yy869; + case '2': goto yy870; case '@': goto yy69; default: goto yy63; } -yy837: +yy846: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -39100,18 +39320,18 @@ yy837: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy838; + case '5': goto yy847; case '6': case '7': case '8': - case '9': goto yy857; + case '9': goto yy866; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -39164,12 +39384,12 @@ yy837: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy841; + case 'e': goto yy850; default: goto yy62; } -yy838: +yy847: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -39203,8 +39423,8 @@ yy838: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': @@ -39214,7 +39434,7 @@ yy838: case '6': case '7': case '8': - case '9': goto yy857; + case '9': goto yy866; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -39267,12 +39487,12 @@ yy838: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy841; + case 'e': goto yy850; default: goto yy62; } -yy839: +yy848: yyaccept = 0; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -39307,8 +39527,8 @@ yy839: case '~': goto yy5; case '%': case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy847; + case '-': goto yy851; + case '.': goto yy856; case '0': case '1': case '2': @@ -39371,19 +39591,19 @@ yy839: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy841: +yy850: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': goto yy70; case '+': goto yy100; - case '-': goto yy846; - case '.': goto yy847; + case '-': goto yy855; + case '.': goto yy856; case '0': case '1': case '2': @@ -39446,11 +39666,11 @@ yy841: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case '@': goto yy69; default: goto yy63; } -yy842: +yy851: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -39520,11 +39740,11 @@ yy842: case 'w': case 'x': case 'y': - case 'z': goto yy843; + case 'z': goto yy852; case '@': goto yy69; default: goto yy63; } -yy843: +yy852: yyaccept = 21; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -39556,7 +39776,7 @@ yy843: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; case '-': @@ -39623,18 +39843,18 @@ yy843: case 'w': case 'x': case 'y': - case 'z': goto yy843; + case 'z': goto yy852; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy845: +yy854: #line 194 "../../lnav2/src/data_scanner_re.re" { RET(DT_VERSION_NUMBER); } -#line 39637 "../../lnav2/src/data_scanner_re.cc" -yy846: +#line 39857 "../../lnav2/src/data_scanner_re.cc" +yy855: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -39651,7 +39871,7 @@ yy846: case '6': case '7': case '8': - case '9': goto yy855; + case '9': goto yy864; case '@': goto yy69; case 'A': case 'B': @@ -39705,10 +39925,10 @@ yy846: case 'w': case 'x': case 'y': - case 'z': goto yy843; + case 'z': goto yy852; default: goto yy63; } -yy847: +yy856: yyaccept = 0; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -39807,12 +40027,12 @@ yy847: case '6': case '7': case '8': - case '9': goto yy848; + case '9': goto yy857; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy848: +yy857: yyaccept = 21; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -39844,11 +40064,11 @@ yy848: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy847; + case '-': goto yy859; + case '.': goto yy856; case '0': case '1': case '2': @@ -39858,7 +40078,7 @@ yy848: case '6': case '7': case '8': - case '9': goto yy848; + case '9': goto yy857; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -39913,10 +40133,10 @@ yy848: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; default: goto yy62; } -yy850: +yy859: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -39986,11 +40206,11 @@ yy850: case 'w': case 'x': case 'y': - case 'z': goto yy853; + case 'z': goto yy862; case '@': goto yy69; default: goto yy63; } -yy851: +yy860: yyaccept = 21; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -40022,11 +40242,11 @@ yy851: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy847; + case '-': goto yy859; + case '.': goto yy856; case '0': case '1': case '2': @@ -40089,12 +40309,12 @@ yy851: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy853: +yy862: yyaccept = 21; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -40126,7 +40346,7 @@ yy853: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; case '-': @@ -40193,12 +40413,12 @@ yy853: case 'w': case 'x': case 'y': - case 'z': goto yy853; + case 'z': goto yy862; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy855: +yy864: yyaccept = 21; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -40230,7 +40450,7 @@ yy855: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; case '-': @@ -40244,7 +40464,7 @@ yy855: case '6': case '7': case '8': - case '9': goto yy855; + case '9': goto yy864; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40299,10 +40519,10 @@ yy855: case 'w': case 'x': case 'y': - case 'z': goto yy843; + case 'z': goto yy852; default: goto yy62; } -yy857: +yy866: yyaccept = 2; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -40337,8 +40557,8 @@ yy857: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy847; + case '-': goto yy851; + case '.': goto yy856; case '0': case '1': case '2': @@ -40348,7 +40568,7 @@ yy857: case '6': case '7': case '8': - case '9': goto yy857; + case '9': goto yy866; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40401,12 +40621,12 @@ yy857: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy841; + case 'e': goto yy850; default: goto yy62; } -yy859: +yy868: yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -40437,11 +40657,11 @@ yy859: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy862; + case '-': goto yy859; + case '.': goto yy871; case '0': case '1': case '2': @@ -40451,7 +40671,7 @@ yy859: case '6': case '7': case '8': - case '9': goto yy864; + case '9': goto yy873; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40506,10 +40726,10 @@ yy859: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; default: goto yy62; } -yy860: +yy869: yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -40540,11 +40760,11 @@ yy860: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy862; + case '-': goto yy859; + case '.': goto yy871; case '0': case '1': case '2': @@ -40554,7 +40774,7 @@ yy860: case '6': case '7': case '8': - case '9': goto yy859; + case '9': goto yy868; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40609,10 +40829,10 @@ yy860: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; default: goto yy62; } -yy861: +yy870: yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -40643,21 +40863,21 @@ yy861: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy862; + case '-': goto yy859; + case '.': goto yy871; case '0': case '1': case '2': case '3': - case '4': goto yy859; - case '5': goto yy863; + case '4': goto yy868; + case '5': goto yy872; case '6': case '7': case '8': - case '9': goto yy864; + case '9': goto yy873; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40712,10 +40932,10 @@ yy861: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; default: goto yy62; } -yy862: +yy871: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -40783,13 +41003,13 @@ yy862: case '6': case '7': case '8': - case '9': goto yy865; - case '1': goto yy866; - case '2': goto yy867; + case '9': goto yy874; + case '1': goto yy875; + case '2': goto yy876; case '@': goto yy69; default: goto yy63; } -yy863: +yy872: yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -40820,21 +41040,21 @@ yy863: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy862; + case '-': goto yy859; + case '.': goto yy871; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy864; + case '5': goto yy873; case '6': case '7': case '8': - case '9': goto yy848; + case '9': goto yy857; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40889,10 +41109,10 @@ yy863: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; default: goto yy62; } -yy864: +yy873: yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -40923,11 +41143,11 @@ yy864: case '{': case '|': case '}': - case '~': goto yy845; + case '~': goto yy854; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy862; + case '-': goto yy859; + case '.': goto yy871; case '0': case '1': case '2': @@ -40937,7 +41157,7 @@ yy864: case '6': case '7': case '8': - case '9': goto yy848; + case '9': goto yy857; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -40992,10 +41212,10 @@ yy864: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; default: goto yy62; } -yy865: +yy874: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -41026,11 +41246,11 @@ yy865: case '{': case '|': case '}': - case '~': goto yy868; + case '~': goto yy877; case '%': - case '+': goto yy871; - case '-': goto yy872; - case '.': goto yy873; + case '+': goto yy880; + case '-': goto yy881; + case '.': goto yy882; case '0': case '1': case '2': @@ -41040,9 +41260,9 @@ yy865: case '6': case '7': case '8': - case '9': goto yy878; - case ':': goto yy874; - case '@': goto yy875; + case '9': goto yy887; + case ':': goto yy883; + case '@': goto yy884; case 'A': case 'B': case 'C': @@ -41095,10 +41315,10 @@ yy865: case 'w': case 'x': case 'y': - case 'z': goto yy876; - default: goto yy870; + case 'z': goto yy885; + default: goto yy879; } -yy866: +yy875: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -41129,11 +41349,11 @@ yy866: case '{': case '|': case '}': - case '~': goto yy868; + case '~': goto yy877; case '%': - case '+': goto yy871; - case '-': goto yy872; - case '.': goto yy873; + case '+': goto yy880; + case '-': goto yy881; + case '.': goto yy882; case '0': case '1': case '2': @@ -41143,9 +41363,9 @@ yy866: case '6': case '7': case '8': - case '9': goto yy865; - case ':': goto yy874; - case '@': goto yy875; + case '9': goto yy874; + case ':': goto yy883; + case '@': goto yy884; case 'A': case 'B': case 'C': @@ -41198,10 +41418,10 @@ yy866: case 'w': case 'x': case 'y': - case 'z': goto yy876; - default: goto yy870; + case 'z': goto yy885; + default: goto yy879; } -yy867: +yy876: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -41232,23 +41452,23 @@ yy867: case '{': case '|': case '}': - case '~': goto yy868; + case '~': goto yy877; case '%': - case '+': goto yy871; - case '-': goto yy872; - case '.': goto yy873; + case '+': goto yy880; + case '-': goto yy881; + case '.': goto yy882; case '0': case '1': case '2': case '3': - case '4': goto yy865; - case '5': goto yy877; + case '4': goto yy874; + case '5': goto yy886; case '6': case '7': case '8': - case '9': goto yy878; - case ':': goto yy874; - case '@': goto yy875; + case '9': goto yy887; + case ':': goto yy883; + case '@': goto yy884; case 'A': case 'B': case 'C': @@ -41301,19 +41521,19 @@ yy867: case 'w': case 'x': case 'y': - case 'z': goto yy876; - default: goto yy870; + case 'z': goto yy885; + default: goto yy879; } -yy868: +yy877: ++YYCURSOR; -yy869: +yy878: YYCURSOR = YYCTXMARKER; #line 186 "../../lnav2/src/data_scanner_re.re" { RET(DT_IPV4_ADDRESS); } -#line 41316 "../../lnav2/src/data_scanner_re.cc" -yy870: +#line 41536 "../../lnav2/src/data_scanner_re.cc" +yy879: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -41346,10 +41566,10 @@ yy870: case '{': case '|': case '}': - case '~': goto yy869; + case '~': goto yy878; default: goto yy63; } -yy871: +yy880: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -41421,9 +41641,9 @@ yy871: case 'x': case 'y': case 'z': goto yy71; - default: goto yy869; + default: goto yy878; } -yy872: +yy881: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -41454,7 +41674,7 @@ yy872: case '{': case '|': case '}': - case '~': goto yy869; + case '~': goto yy878; case '%': case '+': goto yy70; case '-': @@ -41521,12 +41741,12 @@ yy872: case 'w': case 'x': case 'y': - case 'z': goto yy853; + case 'z': goto yy862; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy873: +yy882: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -41557,7 +41777,7 @@ yy873: case '{': case '|': case '}': - case '~': goto yy869; + case '~': goto yy878; case '%': case '+': goto yy70; case '-': @@ -41624,19 +41844,19 @@ yy873: case '6': case '7': case '8': - case '9': goto yy848; + case '9': goto yy857; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy874: +yy883: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case ':': goto yy64; - default: goto yy869; + default: goto yy878; } -yy875: +yy884: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -41669,7 +41889,7 @@ yy875: case '{': case '|': case '}': - case '~': goto yy869; + case '~': goto yy878; case '-': case '.': case '0': @@ -41737,7 +41957,7 @@ yy875: case ':': goto yy60; default: goto yy62; } -yy876: +yy885: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -41768,11 +41988,11 @@ yy876: case '{': case '|': case '}': - case '~': goto yy869; + case '~': goto yy878; case '%': case '+': goto yy70; - case '-': goto yy850; - case '.': goto yy847; + case '-': goto yy859; + case '.': goto yy856; case '0': case '1': case '2': @@ -41835,12 +42055,12 @@ yy876: case 'w': case 'x': case 'y': - case 'z': goto yy851; + case 'z': goto yy860; case ':': goto yy60; case '@': goto yy69; default: goto yy62; } -yy877: +yy886: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -41871,23 +42091,23 @@ yy877: case '{': case '|': case '}': - case '~': goto yy868; + case '~': goto yy877; case '%': - case '+': goto yy871; - case '-': goto yy872; - case '.': goto yy873; + case '+': goto yy880; + case '-': goto yy881; + case '.': goto yy882; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy878; + case '5': goto yy887; case '6': case '7': case '8': - case '9': goto yy848; - case ':': goto yy874; - case '@': goto yy875; + case '9': goto yy857; + case ':': goto yy883; + case '@': goto yy884; case 'A': case 'B': case 'C': @@ -41940,10 +42160,10 @@ yy877: case 'w': case 'x': case 'y': - case 'z': goto yy876; - default: goto yy870; + case 'z': goto yy885; + default: goto yy879; } -yy878: +yy887: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -41974,11 +42194,11 @@ yy878: case '{': case '|': case '}': - case '~': goto yy868; + case '~': goto yy877; case '%': - case '+': goto yy871; - case '-': goto yy872; - case '.': goto yy873; + case '+': goto yy880; + case '-': goto yy881; + case '.': goto yy882; case '0': case '1': case '2': @@ -41988,9 +42208,9 @@ yy878: case '6': case '7': case '8': - case '9': goto yy848; - case ':': goto yy874; - case '@': goto yy875; + case '9': goto yy857; + case ':': goto yy883; + case '@': goto yy884; case 'A': case 'B': case 'C': @@ -42043,10 +42263,10 @@ yy878: case 'w': case 'x': case 'y': - case 'z': goto yy876; - default: goto yy870; + case 'z': goto yy885; + default: goto yy879; } -yy879: +yy888: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42101,10 +42321,10 @@ yy879: case 'w': case 'x': case 'y': - case 'z': goto yy880; + case 'z': goto yy889; default: goto yy63; } -yy880: +yy889: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42159,17 +42379,17 @@ yy880: case 'w': case 'x': case 'y': - case 'z': goto yy881; + case 'z': goto yy890; default: goto yy63; } -yy881: +yy890: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy882; + case '/': goto yy891; default: goto yy63; } -yy882: +yy891: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42182,10 +42402,10 @@ yy882: case '6': case '7': case '8': - case '9': goto yy883; + case '9': goto yy892; default: goto yy63; } -yy883: +yy892: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42198,10 +42418,10 @@ yy883: case '6': case '7': case '8': - case '9': goto yy884; + case '9': goto yy893; default: goto yy63; } -yy884: +yy893: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42214,10 +42434,10 @@ yy884: case '6': case '7': case '8': - case '9': goto yy885; + case '9': goto yy894; default: goto yy63; } -yy885: +yy894: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42230,10 +42450,10 @@ yy885: case '6': case '7': case '8': - case '9': goto yy886; + case '9': goto yy895; default: goto yy63; } -yy886: +yy895: yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42266,17 +42486,17 @@ yy886: case '{': case '|': case '}': - case '~': goto yy887; - case 'T': goto yy888; + case '~': goto yy896; + case 'T': goto yy897; default: goto yy63; } -yy887: +yy896: #line 156 "../../lnav2/src/data_scanner_re.re" { RET(DT_DATE); } -#line 42279 "../../lnav2/src/data_scanner_re.cc" -yy888: +#line 42499 "../../lnav2/src/data_scanner_re.cc" +yy897: yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42309,10 +42529,10 @@ yy888: case '{': case '|': case '}': - case '~': goto yy887; + case '~': goto yy896; default: goto yy63; } -yy889: +yy898: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42382,11 +42602,11 @@ yy889: case '6': case '7': case '8': - case '9': goto yy857; + case '9': goto yy866; case '@': goto yy69; default: goto yy63; } -yy890: +yy899: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42420,9 +42640,9 @@ yy890: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy895; - case '.': goto yy889; - case '/': goto yy894; + case '-': goto yy904; + case '.': goto yy898; + case '/': goto yy903; case '0': case '1': case '2': @@ -42432,8 +42652,8 @@ yy890: case '6': case '7': case '8': - case '9': goto yy892; - case ':': goto yy745; + case '9': goto yy901; + case ':': goto yy750; case '@': goto yy69; case 'A': case 'B': @@ -42444,9 +42664,9 @@ yy890: case 'b': case 'c': case 'd': - case 'f': goto yy822; + case 'f': goto yy831; case 'E': - case 'e': goto yy893; + case 'e': goto yy902; case 'G': case 'H': case 'I': @@ -42490,7 +42710,7 @@ yy890: case '_': goto yy67; default: goto yy62; } -yy891: +yy900: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42548,8 +42768,8 @@ yy891: case 'c': case 'd': case 'e': - case 'f': goto yy822; - case ':': goto yy745; + case 'f': goto yy831; + case ':': goto yy750; case '@': goto yy69; case 'G': case 'H': @@ -42593,7 +42813,7 @@ yy891: case 'z': goto yy470; default: goto yy62; } -yy892: +yy901: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42629,7 +42849,7 @@ yy892: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -42639,7 +42859,7 @@ yy892: case '6': case '7': case '8': - case '9': goto yy906; + case '9': goto yy915; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -42651,9 +42871,9 @@ yy892: case 'b': case 'c': case 'd': - case 'f': goto yy823; + case 'f': goto yy832; case 'E': - case 'e': goto yy907; + case 'e': goto yy916; case 'G': case 'H': case 'I': @@ -42696,7 +42916,7 @@ yy892: case 'z': goto yy470; default: goto yy62; } -yy893: +yy902: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42754,7 +42974,7 @@ yy893: case 'c': case 'd': case 'e': - case 'f': goto yy823; + case 'f': goto yy832; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -42799,7 +43019,7 @@ yy893: case 'z': goto yy470; default: goto yy62; } -yy894: +yy903: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42812,10 +43032,10 @@ yy894: case '6': case '7': case '8': - case '9': goto yy902; + case '9': goto yy911; default: goto yy63; } -yy895: +yy904: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -42885,17 +43105,17 @@ yy895: case '6': case '7': case '8': - case '9': goto yy896; + case '9': goto yy905; case '@': goto yy69; default: goto yy63; } -yy896: +yy905: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': case '+': goto yy70; - case '-': goto yy897; + case '-': goto yy906; case '.': case 'A': case 'B': @@ -42959,11 +43179,11 @@ yy896: case '6': case '7': case '8': - case '9': goto yy898; + case '9': goto yy907; case '@': goto yy69; default: goto yy63; } -yy897: +yy906: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43033,17 +43253,17 @@ yy897: case '6': case '7': case '8': - case '9': goto yy899; + case '9': goto yy908; case '@': goto yy69; default: goto yy63; } -yy898: +yy907: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': case '+': goto yy70; - case '-': goto yy897; + case '-': goto yy906; case '.': case '0': case '1': @@ -43111,7 +43331,7 @@ yy898: case '@': goto yy69; default: goto yy63; } -yy899: +yy908: yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43142,7 +43362,7 @@ yy899: case '{': case '|': case '}': - case '~': goto yy887; + case '~': goto yy896; case '%': case '+': goto yy70; case '-': @@ -43208,13 +43428,13 @@ yy899: case '6': case '7': case '8': - case '9': goto yy901; + case '9': goto yy910; case ':': goto yy60; case '@': goto yy69; - case 'T': goto yy900; + case 'T': goto yy909; default: goto yy62; } -yy900: +yy909: yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43245,7 +43465,7 @@ yy900: case '{': case '|': case '}': - case '~': goto yy887; + case '~': goto yy896; case '%': case '+': goto yy70; case '-': @@ -43317,7 +43537,7 @@ yy900: case '@': goto yy69; default: goto yy62; } -yy901: +yy910: yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43348,7 +43568,7 @@ yy901: case '{': case '|': case '}': - case '~': goto yy887; + case '~': goto yy896; case '%': case '+': goto yy70; case '-': @@ -43417,14 +43637,14 @@ yy901: case 'z': goto yy67; case ':': goto yy60; case '@': goto yy69; - case 'T': goto yy900; + case 'T': goto yy909; default: goto yy62; } -yy902: +yy911: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy903; + case '/': goto yy912; case '0': case '1': case '2': @@ -43434,10 +43654,10 @@ yy902: case '6': case '7': case '8': - case '9': goto yy904; + case '9': goto yy913; default: goto yy63; } -yy903: +yy912: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43450,17 +43670,17 @@ yy903: case '6': case '7': case '8': - case '9': goto yy905; + case '9': goto yy914; default: goto yy63; } -yy904: +yy913: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '/': goto yy903; + case '/': goto yy912; default: goto yy63; } -yy905: +yy914: yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43493,7 +43713,7 @@ yy905: case '{': case '|': case '}': - case '~': goto yy887; + case '~': goto yy896; case '0': case '1': case '2': @@ -43503,12 +43723,12 @@ yy905: case '6': case '7': case '8': - case '9': goto yy886; + case '9': goto yy895; case ':': goto yy60; - case 'T': goto yy888; + case 'T': goto yy897; default: goto yy62; } -yy906: +yy915: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43544,7 +43764,7 @@ yy906: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -43554,7 +43774,7 @@ yy906: case '6': case '7': case '8': - case '9': goto yy908; + case '9': goto yy917; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -43566,9 +43786,9 @@ yy906: case 'b': case 'c': case 'd': - case 'f': goto yy824; + case 'f': goto yy833; case 'E': - case 'e': goto yy909; + case 'e': goto yy918; case 'G': case 'H': case 'I': @@ -43611,7 +43831,7 @@ yy906: case 'z': goto yy470; default: goto yy62; } -yy907: +yy916: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43669,7 +43889,7 @@ yy907: case 'c': case 'd': case 'e': - case 'f': goto yy824; + case 'f': goto yy833; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -43714,7 +43934,7 @@ yy907: case 'z': goto yy470; default: goto yy62; } -yy908: +yy917: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43750,7 +43970,7 @@ yy908: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -43760,7 +43980,7 @@ yy908: case '6': case '7': case '8': - case '9': goto yy910; + case '9': goto yy919; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -43772,9 +43992,9 @@ yy908: case 'b': case 'c': case 'd': - case 'f': goto yy825; + case 'f': goto yy834; case 'E': - case 'e': goto yy911; + case 'e': goto yy920; case 'G': case 'H': case 'I': @@ -43817,7 +44037,7 @@ yy908: case 'z': goto yy470; default: goto yy62; } -yy909: +yy918: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43875,7 +44095,7 @@ yy909: case 'c': case 'd': case 'e': - case 'f': goto yy825; + case 'f': goto yy834; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -43920,7 +44140,7 @@ yy909: case 'z': goto yy470; default: goto yy62; } -yy910: +yy919: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -43954,8 +44174,8 @@ yy910: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy516; - case '.': goto yy889; + case '-': goto yy521; + case '.': goto yy898; case '0': case '1': case '2': @@ -43965,7 +44185,7 @@ yy910: case '6': case '7': case '8': - case '9': goto yy917; + case '9': goto yy926; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -43977,9 +44197,9 @@ yy910: case 'b': case 'c': case 'd': - case 'f': goto yy826; + case 'f': goto yy835; case 'E': - case 'e': goto yy919; + case 'e': goto yy928; case 'G': case 'H': case 'I': @@ -44023,7 +44243,7 @@ yy910: case '_': goto yy67; default: goto yy62; } -yy911: +yy920: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44057,7 +44277,7 @@ yy911: case '~': goto yy96; case '%': goto yy70; case '+': goto yy100; - case '-': goto yy912; + case '-': goto yy921; case '.': case '_': goto yy67; case '0': @@ -44081,7 +44301,7 @@ yy911: case 'c': case 'd': case 'e': - case 'f': goto yy826; + case 'f': goto yy835; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -44126,7 +44346,7 @@ yy911: case 'z': goto yy470; default: goto yy62; } -yy912: +yy921: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44184,7 +44404,7 @@ yy912: case '6': case '7': case '8': - case '9': goto yy913; + case '9': goto yy922; case '@': goto yy69; case 'A': case 'B': @@ -44197,10 +44417,10 @@ yy912: case 'c': case 'd': case 'e': - case 'f': goto yy517; + case 'f': goto yy522; default: goto yy63; } -yy913: +yy922: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44286,7 +44506,7 @@ yy913: case '6': case '7': case '8': - case '9': goto yy914; + case '9': goto yy923; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -44300,10 +44520,10 @@ yy913: case 'c': case 'd': case 'e': - case 'f': goto yy518; + case 'f': goto yy523; default: goto yy62; } -yy914: +yy923: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44389,7 +44609,7 @@ yy914: case '6': case '7': case '8': - case '9': goto yy915; + case '9': goto yy924; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -44403,10 +44623,10 @@ yy914: case 'c': case 'd': case 'e': - case 'f': goto yy519; + case 'f': goto yy524; default: goto yy62; } -yy915: +yy924: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44492,7 +44712,7 @@ yy915: case '6': case '7': case '8': - case '9': goto yy916; + case '9': goto yy925; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -44506,10 +44726,10 @@ yy915: case 'c': case 'd': case 'e': - case 'f': goto yy520; + case 'f': goto yy525; default: goto yy62; } -yy916: +yy925: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44543,7 +44763,7 @@ yy916: case '~': goto yy11; case '%': case '+': goto yy70; - case '-': goto yy521; + case '-': goto yy526; case '.': case 'A': case 'B': @@ -44612,7 +44832,7 @@ yy916: case '@': goto yy69; default: goto yy62; } -yy917: +yy926: yyaccept = 2; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -44649,7 +44869,7 @@ yy917: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -44659,7 +44879,7 @@ yy917: case '6': case '7': case '8': - case '9': goto yy917; + case '9': goto yy926; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -44671,9 +44891,9 @@ yy917: case 'b': case 'c': case 'd': - case 'f': goto yy826; + case 'f': goto yy835; case 'E': - case 'e': goto yy919; + case 'e': goto yy928; case 'G': case 'H': case 'I': @@ -44716,7 +44936,7 @@ yy917: case 'z': goto yy470; default: goto yy62; } -yy919: +yy928: yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44774,7 +44994,7 @@ yy919: case 'c': case 'd': case 'e': - case 'f': goto yy826; + case 'f': goto yy835; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -44819,7 +45039,7 @@ yy919: case 'z': goto yy470; default: goto yy62; } -yy920: +yy929: yych = *++YYCURSOR; switch (yych) { case '0': @@ -44831,8 +45051,8 @@ yy920: case '6': case '7': case '8': - case '9': goto yy921; - case ':': goto yy550; + case '9': goto yy930; + case ':': goto yy555; case 'A': case 'B': case 'C': @@ -44844,10 +45064,10 @@ yy920: case 'c': case 'd': case 'e': - case 'f': goto yy774; + case 'f': goto yy779; default: goto yy61; } -yy921: +yy930: YYCTXMARKER = YYCURSOR + 1; yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); @@ -44873,11 +45093,11 @@ yy921: case 'c': case 'd': case 'e': - case 'f': goto yy923; - case ':': goto yy922; + case 'f': goto yy932; + case ':': goto yy931; default: goto yy462; } -yy922: +yy931: yych = *++YYCURSOR; switch (yych) { case '0': @@ -44889,8 +45109,8 @@ yy922: case '6': case '7': case '8': - case '9': goto yy924; - case ':': goto yy555; + case '9': goto yy933; + case ':': goto yy560; case 'A': case 'B': case 'C': @@ -44902,10 +45122,10 @@ yy922: case 'c': case 'd': case 'e': - case 'f': goto yy777; + case 'f': goto yy782; default: goto yy61; } -yy923: +yy932: yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -44930,11 +45150,11 @@ yy923: case 'c': case 'd': case 'e': - case 'f': goto yy553; - case ':': goto yy550; + case 'f': goto yy558; + case ':': goto yy555; default: goto yy463; } -yy924: +yy933: yych = *++YYCURSOR; switch (yych) { case '0': @@ -44946,8 +45166,8 @@ yy924: case '6': case '7': case '8': - case '9': goto yy925; - case ':': goto yy603; + case '9': goto yy934; + case ':': goto yy608; case 'A': case 'B': case 'C': @@ -44959,10 +45179,10 @@ yy924: case 'c': case 'd': case 'e': - case 'f': goto yy778; + case 'f': goto yy783; default: goto yy61; } -yy925: +yy934: YYCTXMARKER = YYCURSOR + 1; yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); @@ -44989,11 +45209,11 @@ yy925: case 'c': case 'd': case 'e': - case 'f': goto yy926; - case ':': goto yy779; + case 'f': goto yy935; + case ':': goto yy784; default: goto yy452; } -yy926: +yy935: yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45018,11 +45238,11 @@ yy926: case 'c': case 'd': case 'e': - case 'f': goto yy606; - case ':': goto yy603; + case 'f': goto yy611; + case ':': goto yy608; default: goto yy451; } -yy927: +yy936: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45056,18 +45276,18 @@ yy927: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': case '3': - case '4': goto yy929; - case '5': goto yy941; + case '4': goto yy938; + case '5': goto yy950; case '6': case '7': case '8': - case '9': goto yy930; + case '9': goto yy939; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45120,12 +45340,12 @@ yy927: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy931; + case 'e': goto yy940; default: goto yy62; } -yy928: +yy937: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45159,8 +45379,8 @@ yy928: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': @@ -45170,7 +45390,7 @@ yy928: case '6': case '7': case '8': - case '9': goto yy929; + case '9': goto yy938; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45223,12 +45443,12 @@ yy928: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy931; + case 'e': goto yy940; default: goto yy62; } -yy929: +yy938: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45262,8 +45482,8 @@ yy929: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': @@ -45273,7 +45493,7 @@ yy929: case '6': case '7': case '8': - case '9': goto yy930; + case '9': goto yy939; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45326,12 +45546,12 @@ yy929: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy931; + case 'e': goto yy940; default: goto yy62; } -yy930: +yy939: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45365,8 +45585,8 @@ yy930: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': @@ -45376,7 +45596,7 @@ yy930: case '6': case '7': case '8': - case '9': goto yy939; + case '9': goto yy948; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45429,19 +45649,19 @@ yy930: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy931; + case 'e': goto yy940; default: goto yy62; } -yy931: +yy940: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case '%': goto yy70; - case '+': goto yy932; - case '-': goto yy933; - case '.': goto yy847; + case '+': goto yy941; + case '-': goto yy942; + case '.': goto yy856; case '0': case '1': case '2': @@ -45504,11 +45724,11 @@ yy931: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case '@': goto yy69; default: goto yy63; } -yy932: +yy941: yych = *++YYCURSOR; switch (yych) { case '0': @@ -45520,10 +45740,10 @@ yy932: case '6': case '7': case '8': - case '9': goto yy937; + case '9': goto yy946; default: goto yy71; } -yy933: +yy942: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45540,7 +45760,7 @@ yy933: case '6': case '7': case '8': - case '9': goto yy934; + case '9': goto yy943; case '@': goto yy69; case 'A': case 'B': @@ -45594,10 +45814,10 @@ yy933: case 'w': case 'x': case 'y': - case 'z': goto yy843; + case 'z': goto yy852; default: goto yy63; } -yy934: +yy943: yyaccept = 25; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -45629,7 +45849,7 @@ yy934: case '{': case '|': case '}': - case '~': goto yy936; + case '~': goto yy945; case '%': case '+': goto yy70; case '-': @@ -45643,7 +45863,7 @@ yy934: case '6': case '7': case '8': - case '9': goto yy934; + case '9': goto yy943; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45698,14 +45918,14 @@ yy934: case 'w': case 'x': case 'y': - case 'z': goto yy843; + case 'z': goto yy852; default: goto yy62; } -yy936: +yy945: #line 192 "../../lnav2/src/data_scanner_re.re" { RET(DT_NUMBER); } -#line 45708 "../../lnav2/src/data_scanner_re.cc" -yy937: +#line 45928 "../../lnav2/src/data_scanner_re.cc" +yy946: yyaccept = 25; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -45776,11 +45996,11 @@ yy937: case '6': case '7': case '8': - case '9': goto yy937; + case '9': goto yy946; case '@': goto yy72; - default: goto yy936; + default: goto yy945; } -yy939: +yy948: yyaccept = 2; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -45815,8 +46035,8 @@ yy939: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy847; + case '-': goto yy851; + case '.': goto yy856; case '0': case '1': case '2': @@ -45826,7 +46046,7 @@ yy939: case '6': case '7': case '8': - case '9': goto yy939; + case '9': goto yy948; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45879,12 +46099,12 @@ yy939: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy931; + case 'e': goto yy940; default: goto yy62; } -yy941: +yy950: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -45918,18 +46138,18 @@ yy941: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy842; - case '.': goto yy836; + case '-': goto yy851; + case '.': goto yy845; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy930; + case '5': goto yy939; case '6': case '7': case '8': - case '9': goto yy939; + case '9': goto yy948; case ':': goto yy60; case '@': goto yy69; case 'A': @@ -45982,12 +46202,12 @@ yy941: case 'w': case 'x': case 'y': - case 'z': goto yy839; + case 'z': goto yy848; case 'E': - case 'e': goto yy931; + case 'e': goto yy940; default: goto yy62; } -yy942: +yy951: yych = *++YYCURSOR; switch (yych) { case '0': @@ -45999,8 +46219,8 @@ yy942: case '6': case '7': case '8': - case '9': goto yy943; - case ':': goto yy550; + case '9': goto yy952; + case ':': goto yy555; case 'A': case 'B': case 'C': @@ -46012,10 +46232,10 @@ yy942: case 'c': case 'd': case 'e': - case 'f': goto yy551; + case 'f': goto yy556; default: goto yy61; } -yy943: +yy952: yych = *++YYCURSOR; switch (yych) { case '0': @@ -46039,11 +46259,11 @@ yy943: case 'c': case 'd': case 'e': - case 'f': goto yy552; - case ':': goto yy944; + case 'f': goto yy557; + case ':': goto yy953; default: goto yy61; } -yy944: +yy953: yych = *++YYCURSOR; switch (yych) { case '0': @@ -46055,8 +46275,8 @@ yy944: case '6': case '7': case '8': - case '9': goto yy945; - case ':': goto yy555; + case '9': goto yy954; + case ':': goto yy560; case 'A': case 'B': case 'C': @@ -46068,10 +46288,10 @@ yy944: case 'c': case 'd': case 'e': - case 'f': goto yy554; + case 'f': goto yy559; default: goto yy61; } -yy945: +yy954: yych = *++YYCURSOR; switch (yych) { case '0': @@ -46083,8 +46303,8 @@ yy945: case '6': case '7': case '8': - case '9': goto yy946; - case ':': goto yy603; + case '9': goto yy955; + case ':': goto yy608; case 'A': case 'B': case 'C': @@ -46096,10 +46316,10 @@ yy945: case 'c': case 'd': case 'e': - case 'f': goto yy604; + case 'f': goto yy609; default: goto yy61; } -yy946: +yy955: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -46125,11 +46345,11 @@ yy946: case 'c': case 'd': case 'e': - case 'f': goto yy926; - case ':': goto yy603; + case 'f': goto yy935; + case ':': goto yy608; default: goto yy452; } -yy947: +yy956: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46165,8 +46385,8 @@ yy947: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy832; - case '/': goto yy831; + case '.': goto yy841; + case '/': goto yy840; case '0': case '1': case '2': @@ -46176,8 +46396,8 @@ yy947: case '6': case '7': case '8': - case '9': goto yy949; - case ':': goto yy828; + case '9': goto yy958; + case ':': goto yy837; case '@': goto yy69; case 'A': case 'B': @@ -46188,9 +46408,9 @@ yy947: case 'b': case 'c': case 'd': - case 'f': goto yy820; + case 'f': goto yy829; case 'E': - case 'e': goto yy830; + case 'e': goto yy839; case 'G': case 'H': case 'I': @@ -46233,7 +46453,7 @@ yy947: case 'z': goto yy470; default: goto yy62; } -yy948: +yy957: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46269,19 +46489,19 @@ yy948: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy832; - case '/': goto yy831; + case '.': goto yy841; + case '/': goto yy840; case '0': case '1': case '2': case '3': case '4': - case '5': goto yy949; + case '5': goto yy958; case '6': case '7': case '8': - case '9': goto yy829; - case ':': goto yy828; + case '9': goto yy838; + case ':': goto yy837; case '@': goto yy69; case 'A': case 'B': @@ -46292,9 +46512,9 @@ yy948: case 'b': case 'c': case 'd': - case 'f': goto yy820; + case 'f': goto yy829; case 'E': - case 'e': goto yy830; + case 'e': goto yy839; case 'G': case 'H': case 'I': @@ -46337,7 +46557,7 @@ yy948: case 'z': goto yy470; default: goto yy62; } -yy949: +yy958: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46373,7 +46593,7 @@ yy949: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy832; + case '.': goto yy841; case '0': case '1': case '2': @@ -46383,8 +46603,8 @@ yy949: case '6': case '7': case '8': - case '9': goto yy890; - case ':': goto yy497; + case '9': goto yy899; + case ':': goto yy502; case '@': goto yy69; case 'A': case 'B': @@ -46395,9 +46615,9 @@ yy949: case 'b': case 'c': case 'd': - case 'f': goto yy821; + case 'f': goto yy830; case 'E': - case 'e': goto yy891; + case 'e': goto yy900; case 'G': case 'H': case 'I': @@ -46440,7 +46660,7 @@ yy949: case 'z': goto yy470; default: goto yy62; } -yy950: +yy959: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46476,8 +46696,8 @@ yy950: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy832; - case '/': goto yy831; + case '.': goto yy841; + case '/': goto yy840; case '0': case '1': case '2': @@ -46485,10 +46705,10 @@ yy950: case '4': case '5': case '6': - case '7': goto yy952; + case '7': goto yy961; case '8': - case '9': goto yy829; - case ':': goto yy828; + case '9': goto yy838; + case ':': goto yy837; case '@': goto yy69; case 'A': case 'B': @@ -46499,9 +46719,9 @@ yy950: case 'b': case 'c': case 'd': - case 'f': goto yy820; + case 'f': goto yy829; case 'E': - case 'e': goto yy830; + case 'e': goto yy839; case 'G': case 'H': case 'I': @@ -46544,7 +46764,7 @@ yy950: case 'z': goto yy470; default: goto yy62; } -yy951: +yy960: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46574,7 +46794,7 @@ yy951: case 'c': case 'd': case 'e': - case 'f': goto yy826; + case 'f': goto yy835; case ':': goto yy469; case '@': goto yy69; case 'G': @@ -46619,7 +46839,7 @@ yy951: case 'z': goto yy470; default: goto yy63; } -yy952: +yy961: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46655,7 +46875,7 @@ yy952: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -46663,10 +46883,10 @@ yy952: case '4': case '5': case '6': - case '7': goto yy953; + case '7': goto yy962; case '8': - case '9': goto yy890; - case ':': goto yy497; + case '9': goto yy899; + case ':': goto yy502; case '@': goto yy69; case 'A': case 'B': @@ -46677,9 +46897,9 @@ yy952: case 'b': case 'c': case 'd': - case 'f': goto yy821; + case 'f': goto yy830; case 'E': - case 'e': goto yy891; + case 'e': goto yy900; case 'G': case 'H': case 'I': @@ -46722,7 +46942,7 @@ yy952: case 'z': goto yy470; default: goto yy62; } -yy953: +yy962: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46756,9 +46976,9 @@ yy953: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy895; - case '.': goto yy889; - case '/': goto yy894; + case '-': goto yy904; + case '.': goto yy898; + case '/': goto yy903; case '0': case '1': case '2': @@ -46766,10 +46986,10 @@ yy953: case '4': case '5': case '6': - case '7': goto yy954; + case '7': goto yy963; case '8': - case '9': goto yy892; - case ':': goto yy745; + case '9': goto yy901; + case ':': goto yy750; case '@': goto yy69; case 'A': case 'B': @@ -46780,9 +47000,9 @@ yy953: case 'b': case 'c': case 'd': - case 'f': goto yy822; + case 'f': goto yy831; case 'E': - case 'e': goto yy893; + case 'e': goto yy902; case 'G': case 'H': case 'I': @@ -46826,7 +47046,7 @@ yy953: case '_': goto yy67; default: goto yy62; } -yy954: +yy963: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46862,7 +47082,7 @@ yy954: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -46870,9 +47090,9 @@ yy954: case '4': case '5': case '6': - case '7': goto yy955; + case '7': goto yy964; case '8': - case '9': goto yy906; + case '9': goto yy915; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -46884,9 +47104,9 @@ yy954: case 'b': case 'c': case 'd': - case 'f': goto yy823; + case 'f': goto yy832; case 'E': - case 'e': goto yy907; + case 'e': goto yy916; case 'G': case 'H': case 'I': @@ -46929,7 +47149,7 @@ yy954: case 'z': goto yy470; default: goto yy62; } -yy955: +yy964: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -46965,7 +47185,7 @@ yy955: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -46973,9 +47193,9 @@ yy955: case '4': case '5': case '6': - case '7': goto yy956; + case '7': goto yy965; case '8': - case '9': goto yy908; + case '9': goto yy917; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -46987,9 +47207,9 @@ yy955: case 'b': case 'c': case 'd': - case 'f': goto yy824; + case 'f': goto yy833; case 'E': - case 'e': goto yy909; + case 'e': goto yy918; case 'G': case 'H': case 'I': @@ -47032,7 +47252,7 @@ yy955: case 'z': goto yy470; default: goto yy62; } -yy956: +yy965: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -47068,7 +47288,7 @@ yy956: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -47076,9 +47296,9 @@ yy956: case '4': case '5': case '6': - case '7': goto yy957; + case '7': goto yy966; case '8': - case '9': goto yy910; + case '9': goto yy919; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -47090,9 +47310,9 @@ yy956: case 'b': case 'c': case 'd': - case 'f': goto yy825; + case 'f': goto yy834; case 'E': - case 'e': goto yy911; + case 'e': goto yy920; case 'G': case 'H': case 'I': @@ -47135,7 +47355,7 @@ yy956: case 'z': goto yy470; default: goto yy62; } -yy957: +yy966: yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -47169,8 +47389,8 @@ yy957: case ' ': goto yy89; case '%': goto yy91; case '+': goto yy70; - case '-': goto yy516; - case '.': goto yy889; + case '-': goto yy521; + case '.': goto yy898; case '0': case '1': case '2': @@ -47178,9 +47398,9 @@ yy957: case '4': case '5': case '6': - case '7': goto yy958; + case '7': goto yy967; case '8': - case '9': goto yy917; + case '9': goto yy926; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -47192,9 +47412,9 @@ yy957: case 'b': case 'c': case 'd': - case 'f': goto yy826; + case 'f': goto yy835; case 'E': - case 'e': goto yy919; + case 'e': goto yy928; case 'G': case 'H': case 'I': @@ -47238,7 +47458,7 @@ yy957: case '_': goto yy67; default: goto yy62; } -yy958: +yy967: yyaccept = 11; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; @@ -47275,7 +47495,7 @@ yy958: case '+': goto yy70; case '-': case '_': goto yy67; - case '.': goto yy889; + case '.': goto yy898; case '0': case '1': case '2': @@ -47283,9 +47503,9 @@ yy958: case '4': case '5': case '6': - case '7': goto yy958; + case '7': goto yy967; case '8': - case '9': goto yy917; + case '9': goto yy926; case ':': goto yy469; case '@': goto yy69; case 'A': @@ -47297,9 +47517,9 @@ yy958: case 'b': case 'c': case 'd': - case 'f': goto yy826; + case 'f': goto yy835; case 'E': - case 'e': goto yy919; + case 'e': goto yy928; case 'G': case 'H': case 'I': @@ -47342,33 +47562,33 @@ yy958: case 'z': goto yy470; default: goto yy62; } -yy960: +yy969: ++YYCURSOR; yych = *YYCURSOR; -yy961: +yy970: switch (yych) { case 0x00: goto yy61; - case '\'': goto yy964; - case '\\': goto yy962; - default: goto yy960; + case '\'': goto yy973; + case '\\': goto yy971; + default: goto yy969; } -yy962: +yy971: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case '\'': goto yy966; - case '\\': goto yy962; - default: goto yy960; + case '\'': goto yy975; + case '\\': goto yy971; + default: goto yy969; } -yy964: +yy973: yyaccept = 26; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case '\'': goto yy960; - default: goto yy965; + case '\'': goto yy969; + default: goto yy974; } -yy965: +yy974: #line 133 "../../lnav2/src/data_scanner_re.re" { CAPTURE(DT_QUOTED_STRING); @@ -47382,44 +47602,44 @@ yy965: cap[1].c_end -= 1; return true; } -#line 47386 "../../lnav2/src/data_scanner_re.cc" -yy966: +#line 47606 "../../lnav2/src/data_scanner_re.cc" +yy975: yyaccept = 26; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0x00: goto yy965; - case '\'': goto yy966; - case '\\': goto yy962; - default: goto yy960; + case 0x00: goto yy974; + case '\'': goto yy975; + case '\\': goto yy971; + default: goto yy969; } -yy968: +yy977: ++YYCURSOR; yych = *YYCURSOR; -yy969: +yy978: switch (yych) { case 0x00: goto yy61; - case '"': goto yy972; - case '\\': goto yy970; - default: goto yy968; + case '"': goto yy981; + case '\\': goto yy979; + default: goto yy977; } -yy970: +yy979: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case '"': goto yy974; - case '\\': goto yy970; - default: goto yy968; + case '"': goto yy983; + case '\\': goto yy979; + default: goto yy977; } -yy972: +yy981: yyaccept = 27; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case '"': goto yy968; - default: goto yy973; + case '"': goto yy977; + default: goto yy982; } -yy973: +yy982: #line 121 "../../lnav2/src/data_scanner_re.re" { CAPTURE(DT_QUOTED_STRING); @@ -47433,18 +47653,18 @@ yy973: cap[1].c_end -= 1; return true; } -#line 47437 "../../lnav2/src/data_scanner_re.cc" -yy974: +#line 47657 "../../lnav2/src/data_scanner_re.cc" +yy983: yyaccept = 27; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0x00: goto yy973; - case '"': goto yy974; - case '\\': goto yy970; - default: goto yy968; + case 0x00: goto yy982; + case '"': goto yy983; + case '\\': goto yy979; + default: goto yy977; } -yy976: +yy985: YYCTXMARKER = YYCURSOR + 1; ++YYCURSOR; yych = *YYCURSOR; @@ -47459,13 +47679,13 @@ yy976: case ')': case '*': case ':': - case ';': goto yy978; + case ';': goto yy987; case '!': case ',': - case '?': goto yy979; - case '\'': goto yy981; - case '.': goto yy980; - case '\\': goto yy962; + case '?': goto yy988; + case '\'': goto yy990; + case '.': goto yy989; + case '\\': goto yy971; case 'a': case 'b': case 'c': @@ -47491,15 +47711,15 @@ yy976: case 'w': case 'x': case 'y': - case 'z': goto yy976; - default: goto yy960; + case 'z': goto yy985; + default: goto yy969; } -yy978: +yy987: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 0x00) goto yy478; - goto yy961; -yy979: + goto yy970; +yy988: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -47507,19 +47727,19 @@ yy979: case '\t': case '\n': case '\r': - case ' ': goto yy978; - default: goto yy961; + case ' ': goto yy987; + default: goto yy970; } -yy980: +yy989: yych = *++YYCURSOR; switch (yych) { case '\t': case '\n': case '\r': - case ' ': goto yy978; - default: goto yy961; + case ' ': goto yy987; + default: goto yy970; } -yy981: +yy990: YYCTXMARKER = YYCURSOR + 1; yyaccept = 26; YYMARKER = ++YYCURSOR; @@ -47539,7 +47759,7 @@ yy981: case '!': case ',': case '?': goto yy479; - case '\'': goto yy982; + case '\'': goto yy991; case '.': goto yy482; case 'a': case 'b': @@ -47567,9 +47787,9 @@ yy981: case 'x': case 'y': case 'z': goto yy475; - default: goto yy965; + default: goto yy974; } -yy982: +yy991: YYCTXMARKER = YYCURSOR + 1; yyaccept = 16; YYMARKER = ++YYCURSOR; @@ -47585,13 +47805,13 @@ yy982: case ')': case '*': case ':': - case ';': goto yy978; + case ';': goto yy987; case '!': case ',': - case '?': goto yy979; - case '\'': goto yy981; - case '.': goto yy980; - case '\\': goto yy962; + case '?': goto yy988; + case '\'': goto yy990; + case '.': goto yy989; + case '\\': goto yy971; case 'a': case 'b': case 'c': @@ -47617,10 +47837,10 @@ yy982: case 'w': case 'x': case 'y': - case 'z': goto yy976; - default: goto yy960; + case 'z': goto yy985; + default: goto yy969; } -yy983: +yy992: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -47641,7 +47861,7 @@ yy983: case '%': case '+': goto yy70; case '\'': goto yy480; - case '-': goto yy984; + case '-': goto yy993; case '.': goto yy485; case '0': case '1': @@ -47710,7 +47930,7 @@ yy983: case 'z': goto yy472; default: goto yy63; } -yy984: +yy993: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -47781,10 +48001,10 @@ yy984: case 'w': case 'x': case 'y': - case 'z': goto yy985; + case 'z': goto yy994; default: goto yy63; } -yy985: +yy994: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -47856,10 +48076,10 @@ yy985: case 'w': case 'x': case 'y': - case 'z': goto yy986; + case 'z': goto yy995; default: goto yy63; } -yy986: +yy995: YYCTXMARKER = YYCURSOR + 1; yyaccept = 0; YYMARKER = ++YYCURSOR; @@ -47934,7 +48154,7 @@ yy986: case 'Z': case '_': goto yy67; case '.': goto yy485; - case ':': goto yy988; + case ':': goto yy997; case '@': goto yy69; case 'a': case 'b': @@ -47961,10 +48181,10 @@ yy986: case 'w': case 'x': case 'y': - case 'z': goto yy986; + case 'z': goto yy995; default: goto yy62; } -yy988: +yy997: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -47972,6 +48192,6 @@ yy988: default: goto yy478; } } -#line 217 "../../lnav2/src/data_scanner_re.re" +#line 218 "../../lnav2/src/data_scanner_re.re" } diff --git a/src/data_scanner_re.re b/src/data_scanner_re.re index a316e705..d9ef3778 100644 --- a/src/data_scanner_re.re +++ b/src/data_scanner_re.re @@ -202,7 +202,8 @@ bool data_scanner::tokenize2(pcre_context &pc, data_token_t &token_out) [a-zA-Z0-9\._%+-]+"@"[a-zA-Z0-9\.-]+"."[a-zA-Z]+ { RET(DT_EMAIL); } - ("true"|"True"|"TRUE"|"false"|"False"|"FALSE"|"None"|"null"|"NULL") { RET(DT_CONSTANT); } + "true"|"True"|"TRUE"|"false"|"False"|"FALSE"|"None"|"null"|"NULL"/([\r\n\t \(\)!\*:;'\"\?,]|[\.\!,\?]SPACE|EOF) { RET(DT_CONSTANT); } + ("re-")?[a-zA-Z][a-z']+/([\r\n\t \(\)!\*:;'\"\?,]|[\.\!,\?]SPACE|EOF) { RET(DT_WORD); } [^\x00"; \t\r\n:=,\(\)\{\}\[\]\+#!%\^&\*'\?<>\~`\|\\]+("::"[^\x00"; \r\n\t:=,\(\)\{\}\[\]\+#!%\^&\*'\?<>\~`\|\\]+)* { diff --git a/src/dhclient-summary.lnav b/src/dhclient-summary.lnav index b69dd03d..bed7675b 100644 --- a/src/dhclient-summary.lnav +++ b/src/dhclient-summary.lnav @@ -14,7 +14,7 @@ FROM (WITH lease_times AS (SELECT min(log_time) AS start_time, ip FROM - (SELECT log_time,extract('bound to (\S+) --', log_text) AS ip FROM syslog_log WHERE ip IS NOT NULL) + (SELECT log_time, regexp_match('bound to (\S+) --', log_text) AS ip FROM syslog_log WHERE ip IS NOT NULL) GROUP BY ip ORDER BY start_time ASC) SELECT start_time, (SELECT lt2.start_time AS end_time FROM lease_times AS lt2 WHERE lt1.start_time < lt2.start_time LIMIT 1) AS end_time, diff --git a/src/lnav.cc b/src/lnav.cc index dcd2f7f2..0db7a4b6 100644 --- a/src/lnav.cc +++ b/src/lnav.cc @@ -239,6 +239,7 @@ bool setup_logline_table() static const char *hidden_table_columns[] = { "log_path", "log_text", + "log_body", NULL }; diff --git a/src/lnav_commands.cc b/src/lnav_commands.cc index 1372a8d4..3bae7330 100644 --- a/src/lnav_commands.cc +++ b/src/lnav_commands.cc @@ -607,7 +607,7 @@ static string com_save_to(string cmdline, vector &args) for (iter = row_iter->begin(); iter != row_iter->end(); ++iter) { - csv_write_string(outfile, *iter); + fputs(*iter, outfile); } fprintf(outfile, "\n"); } diff --git a/src/log_vtab_impl.cc b/src/log_vtab_impl.cc index 77e7f64c..e70560eb 100644 --- a/src/log_vtab_impl.cc +++ b/src/log_vtab_impl.cc @@ -90,7 +90,8 @@ std::string log_vtab_impl::get_table_statement(void) oss << coldecl; } oss << " log_path text hidden collate naturalnocase,\n" - << " log_text text hidden\n" + << " log_text text hidden,\n" + << " log_body text hidden\n" << ");\n"; return oss.str(); @@ -368,22 +369,52 @@ static int vt_column(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int col) (VT_COL_MAX + vt->vi->vi_column_count - 1) - 1; - if (post_col_number == 0) { - const string &fn = lf->get_filename(); + switch (post_col_number) { + case 0: { + const string &fn = lf->get_filename(); - sqlite3_result_text(ctx, - fn.c_str(), - fn.length(), - SQLITE_STATIC); - } - else { - shared_buffer_ref line; + sqlite3_result_text(ctx, + fn.c_str(), + fn.length(), + SQLITE_STATIC); + break; + } + case 1: { + shared_buffer_ref line; - lf->read_full_message(ll, line); - sqlite3_result_text(ctx, - line.get_data(), - line.length(), - SQLITE_TRANSIENT); + lf->read_full_message(ll, line); + sqlite3_result_text(ctx, + line.get_data(), + line.length(), + SQLITE_TRANSIENT); + break; + } + case 2: { + if (vc->line_values.empty()) { + logfile::iterator line_iter; + + line_iter = lf->begin() + cl; + lf->read_full_message(line_iter, vc->log_msg); + vt->vi->extract(lf, vc->log_msg, vc->line_values); + } + + struct line_range body_range; + + body_range = find_string_attr_range( + vt->vi->vi_attrs, &textview_curses::SA_BODY); + if (!body_range.is_valid()) { + sqlite3_result_null(ctx); + } + else { + const char *msg_start = vc->log_msg.get_data(); + + sqlite3_result_text(ctx, + &msg_start[body_range.lr_start], + body_range.length(), + SQLITE_TRANSIENT); + } + break; + } } } else { diff --git a/src/log_vtab_impl.hh b/src/log_vtab_impl.hh index 42d7504f..6687dcc9 100644 --- a/src/log_vtab_impl.hh +++ b/src/log_vtab_impl.hh @@ -110,7 +110,7 @@ public: shared_buffer_ref &line, std::vector &values) { - log_format * format = lf->get_format(); + log_format *format = lf->get_format(); this->vi_attrs.clear(); format->annotate(line, this->vi_attrs, values); @@ -118,9 +118,9 @@ public: bool vi_supports_indexes; int vi_column_count; + string_attrs_t vi_attrs; protected: const intern_string_t vi_name; - string_attrs_t vi_attrs; }; class log_format_vtab_impl : public log_vtab_impl { diff --git a/src/string-extension-functions.cc b/src/string-extension-functions.cc index 51c6d379..9e3f4496 100644 --- a/src/string-extension-functions.cc +++ b/src/string-extension-functions.cc @@ -21,6 +21,8 @@ #include "column_namer.hh" #include "yajl/api/yajl_gen.h" #include "sqlite-extension-func.h" +#include "data_scanner.hh" +#include "data_parser.hh" typedef struct { char * s; @@ -119,7 +121,7 @@ void regexp(sqlite3_context *ctx, int argc, sqlite3_value **argv) } static -void extract(sqlite3_context *ctx, int argc, sqlite3_value **argv) +void regexp_match(sqlite3_context *ctx, int argc, sqlite3_value **argv) { const char *re, *str; cache_entry *reobj; @@ -134,7 +136,7 @@ void extract(sqlite3_context *ctx, int argc, sqlite3_value **argv) str = (const char *)sqlite3_value_text(argv[1]); if (!str) { - sqlite3_result_error(ctx, "no string", -1); + sqlite3_result_null(ctx); return; } @@ -242,6 +244,141 @@ void extract(sqlite3_context *ctx, int argc, sqlite3_value **argv) #endif } +static +void elements_to_json(yajl_gen gen, data_parser &dp, data_parser::element_list_t *el); + +static +void element_to_json(yajl_gen gen, data_parser &dp, const data_parser::element &elem) +{ + size_t value_len; + const char *value_str = dp.get_element_string(elem, value_len); + + switch (elem.value_token()) { + case DT_NUMBER: { + yajl_gen_number(gen, value_str, value_len); + break; + } + case DNT_GROUP: { + elements_to_json(gen, dp, elem.e_sub_elements); + break; + } + case DNT_PAIR: { + const data_parser::element &pair_elem = elem.e_sub_elements->front(); + yajlpp_map singleton_map(gen); + + singleton_map.gen(dp.get_element_string(pair_elem.e_sub_elements->front())); + element_to_json(gen, dp, pair_elem.get_pair_value()); + break; + } + case DT_CONSTANT: { + if (strncasecmp("true", value_str, value_len) == 0) { + yajl_gen_bool(gen, true); + } + else if (strncasecmp("false", value_str, value_len) == 0) { + yajl_gen_bool(gen, false); + } + else { + yajl_gen_null(gen); + } + break; + } + default: + yajl_gen_pstring(gen, value_str, value_len); + break; + } +} + +static +void map_elements_to_json(yajl_gen gen, data_parser &dp, data_parser::element_list_t *el) +{ + yajlpp_map root_map(gen); + column_namer cn; + + for (data_parser::element_list_t::iterator iter = el->begin(); + iter != el->end(); + ++iter) { + const data_parser::element &pvalue = iter->get_pair_value(); + + if (pvalue.value_token() == DT_INVALID) { + log_debug("invalid!!"); + // continue; + } + + std::string key_str = dp.get_element_string( + iter->e_sub_elements->front()); + string colname = cn.add_column(key_str); + + root_map.gen(colname); + element_to_json(gen, dp, pvalue); + } +} + +static +void list_elements_to_json(yajl_gen gen, data_parser &dp, data_parser::element_list_t *el) +{ + yajlpp_array root_array(gen); + + for (data_parser::element_list_t::iterator iter = el->begin(); + iter != el->end(); + ++iter) { + element_to_json(gen, dp, *iter); + } +} + +static +void elements_to_json(yajl_gen gen, data_parser &dp, data_parser::element_list_t *el) +{ + if (el->empty()) { + yajl_gen_null(gen); + } + else { + switch (el->front().e_token) { + case DNT_PAIR: + map_elements_to_json(gen, dp, el); + break; + default: + list_elements_to_json(gen, dp, el); + break; + } + } +} + +static +void extract(sqlite3_context *ctx, int argc, sqlite3_value **argv) +{ + const char *str; + + assert(argc == 1); + + str = (const char *)sqlite3_value_text(argv[0]); + if (!str) { + sqlite3_result_null(ctx); + return; + } + + data_scanner ds(str); + data_parser dp(&ds); + + dp.parse(); + // dp.print(stderr, dp.dp_pairs); + + auto_mem gen(yajl_gen_free); + + gen = yajl_gen_alloc(NULL); + yajl_gen_config(gen.in(), yajl_gen_beautify, false); + + elements_to_json(gen, dp, &dp.dp_pairs); + + const unsigned char *buf; + size_t len; + + yajl_gen_get_buf(gen, &buf, &len); + sqlite3_result_text(ctx, (const char *) buf, len, SQLITE_TRANSIENT); +#ifdef HAVE_SQLITE3_VALUE_SUBTYPE + sqlite3_result_subtype(ctx, JSON_SUBTYPE); +#endif +} + static void regexp_replace(sqlite3_context *ctx, int argc, sqlite3_value **argv) { @@ -338,8 +475,9 @@ int string_extension_functions(const struct FuncDef **basic_funcs, static const struct FuncDef string_funcs[] = { { "regexp", 2, 0, SQLITE_UTF8, 0, regexp }, { "regexp_replace", 3, 0, SQLITE_UTF8, 0, regexp_replace }, + { "regexp_match", 2, 0, SQLITE_UTF8, 0, regexp_match }, - { "extract", 2, 0, SQLITE_UTF8, 0, extract }, + { "extract", 1, 0, SQLITE_UTF8, 0, extract }, { "startswith", 2, 0, SQLITE_UTF8, 0, sql_startswith }, { "endswith", 2, 0, SQLITE_UTF8, 0, sql_endswith }, diff --git a/test/datafile_simple.14 b/test/datafile_simple.14 new file mode 100644 index 00000000..f9be7628 --- /dev/null +++ b/test/datafile_simple.14 @@ -0,0 +1,43 @@ + FSChange(Direction.DOWNLOAD, Action.CREATE, name=Baby Names, route=[CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names)]) + key 0:0 + sym 0:8 ^------^ FSChange +pair 0:8 ^------^ FSChange + key 9:9 ^ + key 9:9 ^ + sym 9:27 ^----------------^ Direction.DOWNLOAD + val 9:27 ^----------------^ Direction.DOWNLOAD +pair 9:27 ^----------------^ Direction.DOWNLOAD + key 29:29 ^ + sym 29:42 ^-----------^ Action.CREATE + val 29:42 ^-----------^ Action.CREATE +pair 29:42 ^-----------^ Action.CREATE + key 44:48 ^--^ name +word 49:53 ^--^ Baby +wspc 53:54 ^ +word 54:59 ^---^ Names + val 49:59 ^--------^ Baby Names +pair 44:59 ^-------------^ name=Baby Names + key 61:66 ^---^ route + key 68:68 ^ + sym 68:78 ^--------^ CloudEntry +pair 68:78 ^--------^ CloudEntry + key 79:79 ^ + key 79:85 ^----^ doc_id + sym 86:130 ^------------------------------------------^ 1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg + val 86:130 ^------------------------------------------^ 1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg +pair 79:130 ^-------------------------------------------------^ doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg + key 131:139 ^------^ filename +word 140:144 ^--^ Baby +wspc 144:145 ^ +word 145:150 ^---^ Names + val 140:150 ^--------^ Baby Names +pair 131:150 ^-----------------^ filename=Baby Names + grp 79:150 ^---------------------------------------------------------------------^ doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names +pair 79:150 ^---------------------------------------------------------------------^ doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names + grp 68:150 ^--------------------------------------------------------------------------------^ CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names + val 68:150 ^--------------------------------------------------------------------------------^ CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names +pair 61:150 ^---------------------------------------------------------------------------------------^ route=[CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names + grp 9:150 ^-------------------------------------------------------------------------------------------------------------------------------------------^ Direction.DOWNLOAD, Action.CREATE, name=Baby Names, route=[CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names +pair 9:150 ^-------------------------------------------------------------------------------------------------------------------------------------------^ Direction.DOWNLOAD, Action.CREATE, name=Baby Names, route=[CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names +msg :FSChange(Direction.DOWNLOAD, Action.CREATE, name=Baby Names, route=[CloudEntry(doc_id=1g5Yho6JmysVGRO-Xmfurra_cQRFb0nTIfZRhGompweg,filename=Baby Names)]) +format :#(#)]) diff --git a/test/datafile_simple.15 b/test/datafile_simple.15 new file mode 100644 index 00000000..067fea52 --- /dev/null +++ b/test/datafile_simple.15 @@ -0,0 +1,52 @@ + Worker successfully completed [ImmutableChange(Direction.UPLOAD, Action.CREATE, ino=LocalID(inode=5567236), path=u'/Users/stack/Google Drive', name=u'pyjsonpath1.patch', parent_ino=LocalID(inode=46166734), is_folder=False)] + key 31:31 ^ + key 31:31 ^ + sym 31:46 ^-------------^ ImmutableChange +pair 31:46 ^-------------^ ImmutableChange + key 47:47 ^ + key 47:47 ^ + sym 47:63 ^--------------^ Direction.UPLOAD + val 47:63 ^--------------^ Direction.UPLOAD +pair 47:63 ^--------------^ Direction.UPLOAD + key 65:65 ^ + sym 65:78 ^-----------^ Action.CREATE + val 65:78 ^-----------^ Action.CREATE +pair 65:78 ^-----------^ Action.CREATE + key 80:83 ^-^ ino + key 84:91 ^-----^ LocalID + key 92:97 ^---^ inode + num 98:105 ^-----^ 5567236 + val 98:105 ^-----^ 5567236 +pair 92:105 ^-----------^ inode=5567236 + grp 92:105 ^-----------^ inode=5567236 +pair 84:105 ^-------------------^ LocalID(inode=5567236 + val 84:105 ^-------------------^ LocalID(inode=5567236 +pair 80:105 ^-----------------------^ ino=LocalID(inode=5567236 + key 108:112 ^--^ path +quot 115:140 ^-----------------------^ /Users/stack/Google Drive + val 115:140 ^-----------------------^ /Users/stack/Google Drive +pair 108:140 ^------------------------------^ path=u'/Users/stack/Google Drive + key 143:147 ^--^ name +quot 150:167 ^---------------^ pyjsonpath1.patch + val 150:167 ^---------------^ pyjsonpath1.patch +pair 143:167 ^----------------------^ name=u'pyjsonpath1.patch + key 170:180 ^--------^ parent_ino + key 181:188 ^-----^ LocalID + key 189:194 ^---^ inode + num 195:203 ^------^ 46166734 + val 195:203 ^------^ 46166734 +pair 189:203 ^------------^ inode=46166734 + grp 189:203 ^------------^ inode=46166734 +pair 181:203 ^--------------------^ LocalID(inode=46166734 + val 181:203 ^--------------------^ LocalID(inode=46166734 +pair 170:203 ^-------------------------------^ parent_ino=LocalID(inode=46166734 + key 206:215 ^-------^ is_folder +cnst 216:221 ^---^ False + val 216:221 ^---^ False +pair 206:221 ^-------------^ is_folder=False + grp 47:221 ^----------------------------------------------------------------------------------------------------------------------------------------------------------------------------^ Direction.UPLOAD, Action.CREATE, ino=LocalID(inode=5567236), path=u'/Users/stack/Google Drive', name=u'pyjsonpath1.patch', parent_ino=LocalID(inode=46166734), is_folder=False +pair 47:221 ^----------------------------------------------------------------------------------------------------------------------------------------------------------------------------^ Direction.UPLOAD, Action.CREATE, ino=LocalID(inode=5567236), path=u'/Users/stack/Google Drive', name=u'pyjsonpath1.patch', parent_ino=LocalID(inode=46166734), is_folder=False + grp 31:221 ^--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------^ ImmutableChange(Direction.UPLOAD, Action.CREATE, ino=LocalID(inode=5567236), path=u'/Users/stack/Google Drive', name=u'pyjsonpath1.patch', parent_ino=LocalID(inode=46166734), is_folder=False +pair 31:221 ^--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------^ ImmutableChange(Direction.UPLOAD, Action.CREATE, ino=LocalID(inode=5567236), path=u'/Users/stack/Google Drive', name=u'pyjsonpath1.patch', parent_ino=LocalID(inode=46166734), is_folder=False +msg :Worker successfully completed [ImmutableChange(Direction.UPLOAD, Action.CREATE, ino=LocalID(inode=5567236), path=u'/Users/stack/Google Drive', name=u'pyjsonpath1.patch', parent_ino=LocalID(inode=46166734), is_folder=False)] +format :Worker successfully completed [#)] diff --git a/test/datafile_simple.8 b/test/datafile_simple.8 index 8c0a43bc..e9e31f54 100644 --- a/test/datafile_simple.8 +++ b/test/datafile_simple.8 @@ -23,9 +23,11 @@ pair 160:165 key 168:168 ^ key 168:168 ^ num 168:174 ^----^ 100003 + val 168:174 ^----^ 100003 pair 168:174 ^----^ 100003 key 175:175 ^ num 175:176 ^ 1 + val 175:176 ^ 1 pair 175:176 ^ 1 grp 168:176 ^------^ 100003,1 pair 168:176 ^------^ 100003,1 diff --git a/test/parser_debugger.py b/test/parser_debugger.py index 9267444d..65416cf1 100755 --- a/test/parser_debugger.py +++ b/test/parser_debugger.py @@ -175,8 +175,21 @@ while True: if not cmd or cmd[0] == '': pass + elif cmd[0] == 'h': + print 'Help:' + print ' q - quit' + print ' s - Start over' + print ' n - Next step' + print ' r - Previous step' + print ' b - Previous breakpoint' + print ' c - Next breakpoint' + print ' p - Print state' + print ' w - Add a variable to the watch list' + print ' u - Remove a variable from the watch list' elif cmd[0] == 'q': break + elif cmd[0] == 's': + index = 0 elif cmd[0] == 'n': if index < len(ops): index += 1 diff --git a/test/test_sql_str_func.sh b/test/test_sql_str_func.sh index 631d89c3..cfde030d 100644 --- a/test/test_sql_str_func.sh +++ b/test/test_sql_str_func.sh @@ -78,25 +78,26 @@ Row 0: EOF -run_test ./drive_sql "select extract('abc', 'abc')" +run_test ./drive_sql "select regexp_match('abc', 'abc')" check_error_output "" <\w+); (\w+)', 'foo=abc; 123') as result" +run_test ./drive_sql "select regexp_match('foo=(?\w+); (\w+)', 'foo=abc; 123') as result" check_output "" <\w+); (\w+\.\w+)', 'foo=abc; 123.456') as result" +run_test ./drive_sql "select regexp_match('foo=(?\w+); (\w+\.\w+)', 'foo=abc; 123.456') as result" check_output "" <