diff --git a/NEWS b/NEWS index 5c1712569ed92..6b4dd24a1f221 100644 --- a/NEWS +++ b/NEWS @@ -13,10 +13,13 @@ PHP NEWS - Curl: . Added support for CURLOPT_XFERINFOFUNCTION. (David Carlier) + . Added support for CURLOPT_MAXFILESIZE_LARGE. (David Carlier) - Date: . Fixed GH-8458 (DateInterval::createFromDateString does not throw if non-relative items are present). (Derick) + . Fixed bug #52015 (Allow including end date in DatePeriod iterations) + (Daniel Egeberg, Derick) . idate() now accepts format specifiers "N" (ISO Day-of-Week) and "o" (ISO Year). (Pavel Djundik) @@ -44,16 +47,20 @@ PHP NEWS . Added ReflectionFunction::isAnonymous(). (Nicolas Grekas) . Added ReflectionMethod::hasPrototype(). (Ollie Read) +- Session: + . Fixed bug GH-7787 (Improve session write failure message for user error + handlers). (ilutov) + +- Sockets: + . Added TCP_NOTSENT_LOWAT socket option. (David Carlier) + . Added SO_MEMINFO socket option. (David Carlier) + - Sodium: . Added sodium_crypto_stream_xchacha20_xor_ic(). (Scott) - SQLite3: . Changed sqlite3.defensive from PHP_INI_SYSTEM to PHP_INI_USER. (bohwaz) -- Streams: - . Set IP_BIND_ADDRESS_NO_PORT if available when connecting to remote host. - (Cristian Rodríguez) - - Standard: . net_get_interfaces() also reports wireless network interfaces on Windows. (Yurun) @@ -61,14 +68,17 @@ PHP NEWS . Fixed bug GH-7847 (stripos with large haystack has bad performance). (ilutov) . New function memory_reset_peak_usage(). (Patrick Allaert) + . Fixed parse_url(): can not recognize port without scheme. (pandaLIU) + +- Streams: + . Set IP_BIND_ADDRESS_NO_PORT if available when connecting to remote host. + (Cristian Rodríguez) - Zip: . add ZipArchive::clearError() method . add ZipArchive::getStreamName() method . add ZipArchive::getStreamIndex() method - -- Session: - . Fixed bug GH-7787 (Improve session write failure message for user error - handlers). (ilutov) + . On Windows, the Zip extension is now built as shared library (DLL) by + default. (cmb) <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>> diff --git a/UPGRADING b/UPGRADING index 565759e86f9af..4802708699825 100644 --- a/UPGRADING +++ b/UPGRADING @@ -199,9 +199,12 @@ PHP 8.2 UPGRADE NOTES - Curl: . CURLOPT_XFERINFOFUNCTION + . CURLOPT_MAXFILESIZE_LARGE - Sockets: . SO_INCOMING_CPU + . TCP_NOTSENT_LOWAT + . SO_MEMINFO ======================================== 11. Changes to INI File Handling @@ -220,6 +223,9 @@ PHP 8.2 UPGRADE NOTES the configuration option --with-oci8 has been dropped. --with-oci8-11g, --with-oci8-12c and --with-oci8-19 are still supported. +- Zip: + . The Zip extension is now built as shared library (DLL) by default. + ======================================== 13. Other Changes ======================================== diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 28fcb5e5a9540..ddeff945b2058 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -34,6 +34,9 @@ PHP 8.2 INTERNALS UPGRADE NOTES string_natural_case_compare_function(), and string_natural_compare_function() have been removed. They always returned SUCCESS and were a wrapper around strnatcmp_ex(). Use strnatcmp_ex() directly instead. + b. ext/pdo + - pdo_raise_impl_error()'s parameter sqlstate has been changed from + const char * to pdo_error_type (aka char [6]). ======================== 4. OpCode changes diff --git a/Zend/Optimizer/sccp.c b/Zend/Optimizer/sccp.c index 3ac97e0f89533..ba4bdab6c0a7a 100644 --- a/Zend/Optimizer/sccp.c +++ b/Zend/Optimizer/sccp.c @@ -2067,8 +2067,39 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var, } return 0; } - if (ssa_op->op1_def >= 0 - || ssa_op->op2_def >= 0) { + if (ssa_op->op1_def >= 0 || ssa_op->op2_def >= 0) { + if (var->use_chain < 0 && var->phi_use_chain == NULL) { + switch (opline->opcode) { + case ZEND_ASSIGN: + case ZEND_ASSIGN_REF: + case ZEND_ASSIGN_DIM: + case ZEND_ASSIGN_OBJ: + case ZEND_ASSIGN_OBJ_REF: + case ZEND_ASSIGN_STATIC_PROP: + case ZEND_ASSIGN_STATIC_PROP_REF: + case ZEND_ASSIGN_OP: + case ZEND_ASSIGN_DIM_OP: + case ZEND_ASSIGN_OBJ_OP: + case ZEND_ASSIGN_STATIC_PROP_OP: + case ZEND_PRE_INC: + case ZEND_PRE_DEC: + case ZEND_PRE_INC_OBJ: + case ZEND_PRE_DEC_OBJ: + case ZEND_DO_ICALL: + case ZEND_DO_UCALL: + case ZEND_DO_FCALL_BY_NAME: + case ZEND_DO_FCALL: + case ZEND_INCLUDE_OR_EVAL: + case ZEND_YIELD: + case ZEND_YIELD_FROM: + case ZEND_ASSERT_CHECK: + opline->result_type = IS_UNUSED; + zend_ssa_remove_result_def(ssa, ssa_op); + break; + default: + break; + } + } /* we cannot remove instruction that defines other variables */ return 0; } else if (opline->opcode == ZEND_JMPZ_EX diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c index 2e1e2164c0adc..406bbb4dd1ac2 100644 --- a/Zend/Optimizer/zend_inference.c +++ b/Zend/Optimizer/zend_inference.c @@ -2708,8 +2708,8 @@ static zend_always_inline zend_result _zend_update_type_info( tmp |= MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING; } } - if (!tmp) { - tmp = MAY_BE_NULL; + if (t1 & (MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_RESOURCE)) { + tmp |= MAY_BE_NULL; } tmp |= MAY_BE_RC1 | MAY_BE_RCN; UPDATE_SSA_TYPE(tmp, ssa_op->result_def); diff --git a/Zend/tests/readonly_classes/readonly_class_duplicated_modifier.phpt b/Zend/tests/readonly_classes/readonly_class_duplicated_modifier.phpt new file mode 100644 index 0000000000000..bd04220447c78 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_duplicated_modifier.phpt @@ -0,0 +1,12 @@ +--TEST-- +The readonly class modifier can only be added once +--FILE-- + +--EXPECTF-- +Fatal error: Multiple readonly modifiers are not allowed in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_dynamic_property.phpt b/Zend/tests/readonly_classes/readonly_class_dynamic_property.phpt new file mode 100644 index 0000000000000..b4da25ab0fec8 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_dynamic_property.phpt @@ -0,0 +1,20 @@ +--TEST-- +Readonly classes cannot use dynamic properties +--FILE-- +bar = 1; +} catch (Error $exception) { + echo $exception->getMessage() . "\n"; +} + +?> +--EXPECT-- +Cannot create dynamic property Foo::$bar diff --git a/Zend/tests/readonly_classes/readonly_class_dynamic_property_attribute.phpt b/Zend/tests/readonly_classes/readonly_class_dynamic_property_attribute.phpt new file mode 100644 index 0000000000000..ace50c572aced --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_dynamic_property_attribute.phpt @@ -0,0 +1,13 @@ +--TEST-- +Readonly classes cannot apply the #[AllowDynamicProperties] attribute +--FILE-- + +--EXPECTF-- +Fatal error: Cannot apply #[AllowDynamicProperties] to readonly class Foo in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_final_modifier.phpt b/Zend/tests/readonly_classes/readonly_class_final_modifier.phpt new file mode 100644 index 0000000000000..e530534c9f585 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_final_modifier.phpt @@ -0,0 +1,16 @@ +--TEST-- +The readonly and final class modifiers can be defined in the same time +--FILE-- + +--EXPECTF-- +Fatal error: Class Bar cannot extend final class Foo in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_inheritance_error1.phpt b/Zend/tests/readonly_classes/readonly_class_inheritance_error1.phpt new file mode 100644 index 0000000000000..2d76d844cfa49 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_inheritance_error1.phpt @@ -0,0 +1,16 @@ +--TEST-- +Non-readonly class cannot extend a readonly class +--FILE-- + +--EXPECTF-- +Fatal error: Non-readonly class Bar cannot extend readonly class Foo in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_inheritance_error2.phpt b/Zend/tests/readonly_classes/readonly_class_inheritance_error2.phpt new file mode 100644 index 0000000000000..0996653681e5c --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_inheritance_error2.phpt @@ -0,0 +1,16 @@ +--TEST-- +Readonly class cannot extend a non-readonly class +--FILE-- + +--EXPECTF-- +Fatal error: Readonly class Bar cannot extend non-readonly class Foo in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_inheritance_success.phpt b/Zend/tests/readonly_classes/readonly_class_inheritance_success.phpt new file mode 100644 index 0000000000000..33e73554ce017 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_inheritance_success.phpt @@ -0,0 +1,15 @@ +--TEST-- +Readonly class can extend a readonly class +--FILE-- + +--EXPECT-- diff --git a/Zend/tests/readonly_classes/readonly_class_missing_type1.phpt b/Zend/tests/readonly_classes/readonly_class_missing_type1.phpt new file mode 100644 index 0000000000000..ef4d7c0af786b --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_missing_type1.phpt @@ -0,0 +1,13 @@ +--TEST-- +Normal properties of a readonly class must have type +--FILE-- + +--EXPECTF-- +Fatal error: Readonly property Foo::$bar must have type in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_missing_type2.phpt b/Zend/tests/readonly_classes/readonly_class_missing_type2.phpt new file mode 100644 index 0000000000000..38fbd7222f7da --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_missing_type2.phpt @@ -0,0 +1,15 @@ +--TEST-- +Promoted properties of a readonly class must have type +--FILE-- + +--EXPECTF-- +Fatal error: Readonly property Foo::$bar must have type in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_class_property1.phpt b/Zend/tests/readonly_classes/readonly_class_property1.phpt new file mode 100644 index 0000000000000..34e09eecd7fc2 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_property1.phpt @@ -0,0 +1,25 @@ +--TEST-- +Normal properties of a readonly class are implicitly declared as readonly +--FILE-- +bar = 1; + } +} + +$foo = new Foo(); + +try { + $foo->bar = 2; +} catch (Error $exception) { + echo $exception->getMessage() . "\n"; +} + +?> +--EXPECT-- +Cannot modify readonly property Foo::$bar diff --git a/Zend/tests/readonly_classes/readonly_class_property2.phpt b/Zend/tests/readonly_classes/readonly_class_property2.phpt new file mode 100644 index 0000000000000..6db08f4dfb389 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_property2.phpt @@ -0,0 +1,23 @@ +--TEST-- +Promoted properties of a readonly class are implicitly declared as readonly +--FILE-- +bar = 2; +} catch (Error $exception) { + echo $exception->getMessage() . "\n"; +} + +?> +--EXPECT-- +Cannot modify readonly property Foo::$bar diff --git a/Zend/tests/readonly_classes/readonly_class_property3.phpt b/Zend/tests/readonly_classes/readonly_class_property3.phpt new file mode 100644 index 0000000000000..e121f4e49ee77 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_class_property3.phpt @@ -0,0 +1,13 @@ +--TEST-- +Declaring static property for a readonly class is forbidden +--FILE-- + +--EXPECTF-- +Fatal error: Readonly class Foo cannot declare static properties in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_enum.phpt b/Zend/tests/readonly_classes/readonly_enum.phpt new file mode 100644 index 0000000000000..afc1f235ce2da --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_enum.phpt @@ -0,0 +1,12 @@ +--TEST-- +Enums cannot be readonly +--FILE-- + +--EXPECTF-- +Parse error: syntax error, unexpected token "enum", expecting "abstract" or "final" or "readonly" or "class" in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_interface.phpt b/Zend/tests/readonly_classes/readonly_interface.phpt new file mode 100644 index 0000000000000..c6fd42d5adca9 --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_interface.phpt @@ -0,0 +1,12 @@ +--TEST-- +Interfaces cannot be readonly +--FILE-- + +--EXPECTF-- +Parse error: syntax error, unexpected token "interface", expecting "abstract" or "final" or "readonly" or "class" in %s on line %d diff --git a/Zend/tests/readonly_classes/readonly_trait.phpt b/Zend/tests/readonly_classes/readonly_trait.phpt new file mode 100644 index 0000000000000..0e18d14bf8dcd --- /dev/null +++ b/Zend/tests/readonly_classes/readonly_trait.phpt @@ -0,0 +1,12 @@ +--TEST-- +Traits cannot be readonly +--FILE-- + +--EXPECTF-- +Parse error: syntax error, unexpected token "trait", expecting "abstract" or "final" or "readonly" or "class" in %s on line %d diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 3511c48a76f5e..0ed2ee2a79aec 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -364,7 +364,7 @@ static ZEND_COLD ZEND_NORETURN void zend_mm_panic(const char *message) #if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID) kill(getpid(), SIGSEGV); #endif - exit(1); + abort(); } static ZEND_COLD ZEND_NORETURN void zend_mm_safe_error(zend_mm_heap *heap, diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 8f248b464c9b3..e996a3f26ab2c 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -1715,6 +1715,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio if (decl->flags & ZEND_ACC_FINAL) { smart_str_appends(str, "final "); } + if (decl->flags & ZEND_ACC_READONLY_CLASS) { + smart_str_appends(str, "readonly "); + } smart_str_appends(str, "class "); } smart_str_appendl(str, ZSTR_VAL(decl->name), ZSTR_LEN(decl->name)); diff --git a/Zend/zend_attributes.c b/Zend/zend_attributes.c index 433586f55f08c..6330887b29084 100644 --- a/Zend/zend_attributes.c +++ b/Zend/zend_attributes.c @@ -71,6 +71,11 @@ static void validate_allow_dynamic_properties( if (scope->ce_flags & ZEND_ACC_INTERFACE) { zend_error_noreturn(E_ERROR, "Cannot apply #[AllowDynamicProperties] to interface"); } + if (scope->ce_flags & ZEND_ACC_READONLY_CLASS) { + zend_error_noreturn(E_ERROR, "Cannot apply #[AllowDynamicProperties] to readonly class %s", + ZSTR_VAL(scope->name) + ); + } scope->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 76470e811cea9..227b793d1c87b 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -797,6 +797,10 @@ uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */ zend_throw_exception(zend_ce_compile_error, "Multiple final modifiers are not allowed", 0); return 0; } + if ((flags & ZEND_ACC_READONLY_CLASS) && (new_flag & ZEND_ACC_READONLY_CLASS)) { + zend_throw_exception(zend_ce_compile_error, "Multiple readonly modifiers are not allowed", 0); + return 0; + } if ((new_flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) && (new_flags & ZEND_ACC_FINAL)) { zend_throw_exception(zend_ce_compile_error, "Cannot use the final modifier on an abstract class", 0); @@ -5328,6 +5332,12 @@ static void zend_compile_if(zend_ast *ast) /* {{{ */ if (cond_ast) { znode cond_node; uint32_t opnum_jmpz; + + if (i > 0) { + CG(zend_lineno) = cond_ast->lineno; + zend_do_extended_stmt(); + } + zend_compile_expr(&cond_node, cond_ast); opnum_jmpz = zend_emit_cond_jump(ZEND_JMPZ, &cond_node, 0); @@ -6673,6 +6683,7 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32 if (property_flags) { zend_op_array *op_array = CG(active_op_array); zend_class_entry *scope = op_array->scope; + bool is_ctor = scope && zend_is_constructor(op_array->function_name); if (!is_ctor) { @@ -6699,6 +6710,10 @@ static void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32 ZSTR_VAL(scope->name), ZSTR_VAL(name), ZSTR_VAL(str)); } + if (!(property_flags & ZEND_ACC_READONLY) && (scope->ce_flags & ZEND_ACC_READONLY_CLASS)) { + property_flags |= ZEND_ACC_READONLY; + } + /* Recompile the type, as it has different memory management requirements. */ zend_type type = ZEND_TYPE_INIT_NONE(0); if (type_ast) { @@ -7241,6 +7256,12 @@ static void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t f zend_error_noreturn(E_COMPILE_ERROR, "Properties cannot be declared abstract"); } + if ((ce->ce_flags & ZEND_ACC_READONLY_CLASS) && (flags & ZEND_ACC_STATIC)) { + zend_error_noreturn(E_COMPILE_ERROR, "Readonly class %s cannot declare static properties", + ZSTR_VAL(ce->name) + ); + } + for (i = 0; i < children; ++i) { zend_property_info *info; zend_ast *prop_ast = list->child[i]; @@ -7306,6 +7327,10 @@ static void zend_compile_prop_decl(zend_ast *ast, zend_ast *type_ast, uint32_t f ZVAL_UNDEF(&value_zv); } + if ((ce->ce_flags & ZEND_ACC_READONLY_CLASS)) { + flags |= ZEND_ACC_READONLY; + } + if (flags & ZEND_ACC_READONLY) { if (!ZEND_TYPE_IS_SET(type)) { zend_error_noreturn(E_COMPILE_ERROR, "Readonly property %s::$%s must have type", diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 038eb6543f19e..72726bdab02af 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -240,7 +240,7 @@ typedef struct _zend_oparray_context { /* or IS_CONSTANT_VISITED_MARK | | | */ #define ZEND_CLASS_CONST_IS_CASE (1 << 6) /* | | | X */ /* | | | */ -/* Class Flags (unused: 16,21,30,31) | | | */ +/* Class Flags (unused: 21,30,31) | | | */ /* =========== | | | */ /* | | | */ /* Special class types | | | */ @@ -273,6 +273,9 @@ typedef struct _zend_oparray_context { /* without triggering a deprecation warning | | | */ #define ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES (1 << 15) /* X | | | */ /* | | | */ +/* Readonly class | | | */ +#define ZEND_ACC_READONLY_CLASS (1 << 16) /* X | | | */ +/* | | | */ /* Parent class is resolved (CE). | | | */ #define ZEND_ACC_RESOLVED_PARENT (1 << 17) /* X | | | */ /* | | | */ diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index c5660d258d88b..3921ee35fe0d6 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1430,6 +1430,13 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par } } + if (UNEXPECTED((ce->ce_flags & ZEND_ACC_READONLY_CLASS) != (parent_ce->ce_flags & ZEND_ACC_READONLY_CLASS))) { + zend_error_noreturn(E_COMPILE_ERROR, "%s class %s cannot extend %s class %s", + ce->ce_flags & ZEND_ACC_READONLY_CLASS ? "Readonly" : "Non-readonly", ZSTR_VAL(ce->name), + parent_ce->ce_flags & ZEND_ACC_READONLY_CLASS ? "readonly" : "non-readonly", ZSTR_VAL(parent_ce->name) + ); + } + if (ce->parent_name) { zend_string_release_ex(ce->parent_name, 0); } diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 01adacf065ef4..a333bf52a8dad 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -595,6 +595,7 @@ class_modifiers: class_modifier: T_ABSTRACT { $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; } | T_FINAL { $$ = ZEND_ACC_FINAL; } + | T_READONLY { $$ = ZEND_ACC_READONLY_CLASS|ZEND_ACC_NO_DYNAMIC_PROPERTIES; } ; trait_declaration_statement: diff --git a/build/gen_stub.php b/build/gen_stub.php index bd8166d3afe0d..b4daed524128d 100755 --- a/build/gen_stub.php +++ b/build/gen_stub.php @@ -1797,6 +1797,10 @@ private function getFlagsAsString(): string $flags[] = "ZEND_ACC_ABSTRACT"; } + if ($this->flags & Class_::MODIFIER_READONLY) { + $flags[] = "ZEND_ACC_READONLY_CLASS"; + } + if ($this->isDeprecated) { $flags[] = "ZEND_ACC_DEPRECATED"; } diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 7fee37770f7d3..ff827aa697262 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -664,6 +664,9 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL); REGISTER_CURL_CONSTANT(CURLOPT_NETRC_FILE); + /* Available since 7.11.1 */ + REGISTER_CURL_CONSTANT(CURLOPT_MAXFILESIZE_LARGE); + /* Available since 7.11.2 */ REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY); @@ -2981,6 +2984,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue /* Curl off_t options */ case CURLOPT_MAX_RECV_SPEED_LARGE: case CURLOPT_MAX_SEND_SPEED_LARGE: + case CURLOPT_MAXFILESIZE_LARGE: #if LIBCURL_VERSION_NUM >= 0x073b00 /* Available since 7.59.0 */ case CURLOPT_TIMEVALUE_LARGE: #endif diff --git a/ext/date/lib/interval.c b/ext/date/lib/interval.c index 408e844775cd1..b97bf1298c7f9 100644 --- a/ext/date/lib/interval.c +++ b/ext/date/lib/interval.c @@ -308,6 +308,7 @@ timelib_time *timelib_sub_wall(timelib_time *old_time, timelib_rel_time *interva memcpy(&t->relative, interval, sizeof(timelib_rel_time)); timelib_update_ts(t, NULL); + timelib_update_from_sse(t); } else { if (interval->invert) { bias = -1; @@ -331,7 +332,6 @@ timelib_time *timelib_sub_wall(timelib_time *old_time, timelib_rel_time *interva timelib_do_normalize(t); } - timelib_update_from_sse(t); if (t->zone_type == TIMELIB_ZONETYPE_ID) { timelib_set_timezone(t, t->tz_info); } diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 2e08a647dfb11..cd8829809e51b 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.15.3 on Sun Aug 8 13:05:44 2021 */ +/* Generated by re2c 0.15.3 on Fri May 20 12:52:14 2022 */ #line 1 "ext/date/lib/parse_date.re" /* * The MIT License (MIT) @@ -31,6 +31,7 @@ #include #include #include +#include #if defined(_MSC_VER) # define strtoll(s, f, b) _atoi64(s) @@ -168,7 +169,13 @@ static const timelib_tz_lookup_table timelib_timezone_utc[] = { { "utc", 0, 0, "UTC" }, }; -#define MAX_ABBR_LEN 5 /* the longest name in "timezonemap.h" and "fallbackmap.h" */ +#if defined(_POSIX_TZNAME_MAX) +# define MAX_ABBR_LEN _POSIX_TZNAME_MAX +#elif defined(TZNAME_MAX) +# define MAX_ABBR_LEN TZNAME_MAX +#else +# define MAX_ABBR_LEN 6 +#endif static timelib_relunit const timelib_relunit_lookup[] = { { "ms", TIMELIB_MICROSEC, 1000 }, @@ -206,18 +213,25 @@ static timelib_relunit const timelib_relunit_lookup[] = { { "year", TIMELIB_YEAR, 1 }, { "years", TIMELIB_YEAR, 1 }, + { "mondays", TIMELIB_WEEKDAY, 1 }, { "monday", TIMELIB_WEEKDAY, 1 }, { "mon", TIMELIB_WEEKDAY, 1 }, + { "tuesdays", TIMELIB_WEEKDAY, 2 }, { "tuesday", TIMELIB_WEEKDAY, 2 }, { "tue", TIMELIB_WEEKDAY, 2 }, + { "wednesdays", TIMELIB_WEEKDAY, 3 }, { "wednesday", TIMELIB_WEEKDAY, 3 }, { "wed", TIMELIB_WEEKDAY, 3 }, + { "thursdays", TIMELIB_WEEKDAY, 4 }, { "thursday", TIMELIB_WEEKDAY, 4 }, { "thu", TIMELIB_WEEKDAY, 4 }, + { "fridays", TIMELIB_WEEKDAY, 5 }, { "friday", TIMELIB_WEEKDAY, 5 }, { "fri", TIMELIB_WEEKDAY, 5 }, + { "saturdays", TIMELIB_WEEKDAY, 6 }, { "saturday", TIMELIB_WEEKDAY, 6 }, { "sat", TIMELIB_WEEKDAY, 6 }, + { "sundays", TIMELIB_WEEKDAY, 0 }, { "sunday", TIMELIB_WEEKDAY, 0 }, { "sun", TIMELIB_WEEKDAY, 0 }, @@ -808,6 +822,22 @@ static timelib_long timelib_parse_tz_cor(const char **ptr, int *tz_not_found) *tz_not_found = 0; tmp = sHOUR(strtol(begin, NULL, 10)) + sMIN(strtol(begin + 3, NULL, 10)); return tmp; + + case 6: /* HHMMSS */ + *tz_not_found = 0; + tmp = strtol(begin, NULL, 10); + tmp = sHOUR(tmp / 10000) + sMIN((tmp / 100) % 100) + (tmp % 100); + return tmp; + + case 8: /* HH:MM:SS */ + if (begin[2] != ':' || begin[5] != ':') { + break; + } + + *tz_not_found = 0; + tmp = sHOUR(strtol(begin, NULL, 10)) + sMIN(strtol(begin + 3, NULL, 10)) + strtol(begin + 6, NULL, 10); + return tmp; + } return 0; } @@ -923,11 +953,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) std: s->tok = cursor; s->len = 0; -#line 1050 "ext/date/lib/parse_date.re" +#line 1084 "ext/date/lib/parse_date.re" -#line 929 "" +#line 961 "" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -966,7 +996,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) 0, 0, 0, 0, 0, 0, 0, 0, }; YYDEBUG(0, *YYCURSOR); - if ((YYLIMIT - YYCURSOR) < 33) YYFILL(33); + if ((YYLIMIT - YYCURSOR) < 36) YYFILL(36); yych = *YYCURSOR; switch (yych) { case 0x00: @@ -1048,24 +1078,24 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) ++YYCURSOR; if ((yych = *YYCURSOR) <= 'E') { if (yych <= ')') { - if (yych >= ')') goto yy174; + if (yych >= ')') goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy1558; + if (yych <= 'D') goto yy182; + goto yy1635; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; - if (yych >= 'a') goto yy180; + if (yych <= 'Z') goto yy182; + if (yych >= 'a') goto yy187; } else { - if (yych <= 'e') goto yy1567; - if (yych <= 'z') goto yy180; + if (yych <= 'e') goto yy1644; + if (yych <= 'z') goto yy187; } } yy3: YYDEBUG(3, *YYCURSOR); -#line 1775 "ext/date/lib/parse_date.re" +#line 1818 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("tzcorrection | tz"); @@ -1078,27 +1108,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_TIMEZONE; } -#line 1080 "" +#line 1112 "" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy1558; + if (yych <= 'D') goto yy182; + goto yy1635; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'e') goto yy1558; - if (yych <= 'z') goto yy175; + if (yych <= 'e') goto yy1635; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1107,35 +1137,35 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'D') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1529; - goto yy175; + if (yych <= 'E') goto yy1606; + goto yy182; } else { - if (yych <= 'I') goto yy1530; - if (yych <= 'N') goto yy175; - goto yy1528; + if (yych <= 'I') goto yy1607; + if (yych <= 'N') goto yy182; + goto yy1605; } } } else { if (yych <= 'h') { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych == 'e') goto yy1545; - goto yy180; + if (yych == 'e') goto yy1622; + goto yy187; } } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1546; - goto yy180; + if (yych <= 'i') goto yy1623; + goto yy187; } else { - if (yych <= 'o') goto yy1544; - if (yych <= 'z') goto yy180; + if (yych <= 'o') goto yy1621; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1145,35 +1175,35 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'D') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1529; - goto yy175; + if (yych <= 'E') goto yy1606; + goto yy182; } else { - if (yych <= 'I') goto yy1530; - if (yych <= 'N') goto yy175; - goto yy1528; + if (yych <= 'I') goto yy1607; + if (yych <= 'N') goto yy182; + goto yy1605; } } } else { if (yych <= 'h') { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych == 'e') goto yy1529; - goto yy175; + if (yych == 'e') goto yy1606; + goto yy182; } } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1530; - goto yy175; + if (yych <= 'i') goto yy1607; + goto yy182; } else { - if (yych <= 'o') goto yy1528; - if (yych <= 'z') goto yy175; + if (yych <= 'o') goto yy1605; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1183,27 +1213,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1498; + goto yy1573; } else { - if (yych == 'I') goto yy1499; - if (yych <= 'N') goto yy175; - goto yy1500; + if (yych == 'I') goto yy1574; + if (yych <= 'N') goto yy182; + goto yy1575; } } else { if (yych <= 'h') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1513; - goto yy180; + if (yych <= 'a') goto yy1589; + goto yy187; } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1514; - goto yy180; + if (yych <= 'i') goto yy1590; + goto yy187; } else { - if (yych <= 'o') goto yy1515; - if (yych <= 'z') goto yy180; + if (yych <= 'o') goto yy1591; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1213,47 +1243,46 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1498; + goto yy1573; } else { - if (yych == 'I') goto yy1499; - if (yych <= 'N') goto yy175; - goto yy1500; + if (yych == 'I') goto yy1574; + if (yych <= 'N') goto yy182; + goto yy1575; } } else { if (yych <= 'h') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1498; - goto yy175; + if (yych <= 'a') goto yy1573; + goto yy182; } else { if (yych <= 'n') { - if (yych <= 'i') goto yy1499; - goto yy175; + if (yych <= 'i') goto yy1574; + goto yy182; } else { - if (yych <= 'o') goto yy1500; - if (yych <= 'z') goto yy175; + if (yych <= 'o') goto yy1575; + if (yych <= 'z') goto yy182; goto yy3; } } } yy9: YYDEBUG(9, *YYCURSOR); - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); + yych = *++YYCURSOR; switch (yych) { - case ')': goto yy174; + case ')': goto yy181; case '0': - case '1': goto yy1428; - case '2': goto yy1429; + case '1': goto yy1499; + case '2': goto yy1500; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1430; + case '9': goto yy1501; case 'A': case 'B': case 'C': @@ -1274,12 +1303,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case 'V': case 'X': case 'Y': - case 'Z': goto yy175; - case 'E': goto yy1423; - case 'H': goto yy1424; - case 'O': goto yy1425; - case 'U': goto yy1426; - case 'W': goto yy1427; + case 'Z': goto yy182; + case 'E': goto yy1494; + case 'H': goto yy1495; + case 'O': goto yy1496; + case 'U': goto yy1497; + case 'W': goto yy1498; case 'a': case 'b': case 'c': @@ -1300,30 +1329,29 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case 'v': case 'x': case 'y': - case 'z': goto yy180; - case 'e': goto yy1466; - case 'h': goto yy1467; - case 'o': goto yy1468; - case 'u': goto yy1469; - case 'w': goto yy1470; + case 'z': goto yy187; + case 'e': goto yy1539; + case 'h': goto yy1540; + case 'o': goto yy1541; + case 'u': goto yy1542; + case 'w': goto yy1543; default: goto yy3; } yy10: YYDEBUG(10, *YYCURSOR); - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); + yych = *++YYCURSOR; switch (yych) { - case ')': goto yy174; + case ')': goto yy181; case '0': - case '1': goto yy1428; - case '2': goto yy1429; + case '1': goto yy1499; + case '2': goto yy1500; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1430; + case '9': goto yy1501; case 'A': case 'B': case 'C': @@ -1365,34 +1393,34 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case 'v': case 'x': case 'y': - case 'z': goto yy175; + case 'z': goto yy182; case 'E': - case 'e': goto yy1423; + case 'e': goto yy1494; case 'H': - case 'h': goto yy1424; + case 'h': goto yy1495; case 'O': - case 'o': goto yy1425; + case 'o': goto yy1496; case 'U': - case 'u': goto yy1426; + case 'u': goto yy1497; case 'W': - case 'w': goto yy1427; + case 'w': goto yy1498; default: goto yy3; } yy11: YYDEBUG(11, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy1411; + if (yych == '-') goto yy1482; if (yych <= '/') goto yy12; - if (yych <= '9') goto yy1412; + if (yych <= '9') goto yy1483; yy12: YYDEBUG(12, *YYCURSOR); -#line 1870 "ext/date/lib/parse_date.re" +#line 1913 "ext/date/lib/parse_date.re" { add_error(s, TIMELIB_ERR_UNEXPECTED_CHARACTER, "Unexpected character"); goto std; } -#line 1394 "" +#line 1424 "" yy13: YYDEBUG(13, *YYCURSOR); yych = *++YYCURSOR; @@ -1400,40 +1428,40 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy1346; + if (yych <= 'D') goto yy182; + goto yy1415; } } else { if (yych <= 'N') { - if (yych == 'I') goto yy1347; - goto yy175; + if (yych == 'I') goto yy1416; + goto yy182; } else { - if (yych <= 'O') goto yy1348; - if (yych <= 'Q') goto yy175; - goto yy1349; + if (yych <= 'O') goto yy1417; + if (yych <= 'Q') goto yy182; + goto yy1418; } } } else { if (yych <= 'i') { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy180; + goto yy187; } else { - if (yych <= 'e') goto yy1388; - if (yych <= 'h') goto yy180; - goto yy1389; + if (yych <= 'e') goto yy1458; + if (yych <= 'h') goto yy187; + goto yy1459; } } else { if (yych <= 'q') { - if (yych == 'o') goto yy1390; - goto yy180; + if (yych == 'o') goto yy1460; + goto yy187; } else { - if (yych <= 'r') goto yy1391; - if (yych <= 'z') goto yy180; + if (yych <= 'r') goto yy1461; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1445,40 +1473,40 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy1346; + if (yych <= 'D') goto yy182; + goto yy1415; } } else { if (yych <= 'N') { - if (yych == 'I') goto yy1347; - goto yy175; + if (yych == 'I') goto yy1416; + goto yy182; } else { - if (yych <= 'O') goto yy1348; - if (yych <= 'Q') goto yy175; - goto yy1349; + if (yych <= 'O') goto yy1417; + if (yych <= 'Q') goto yy182; + goto yy1418; } } } else { if (yych <= 'i') { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'e') goto yy1346; - if (yych <= 'h') goto yy175; - goto yy1347; + if (yych <= 'e') goto yy1415; + if (yych <= 'h') goto yy182; + goto yy1416; } } else { if (yych <= 'q') { - if (yych == 'o') goto yy1348; - goto yy175; + if (yych == 'o') goto yy1417; + goto yy182; } else { - if (yych <= 'r') goto yy1349; - if (yych <= 'z') goto yy175; + if (yych <= 'r') goto yy1418; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1487,16 +1515,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(15, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1332; + goto yy1401; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych <= 'a') goto yy1343; - if (yych <= 'z') goto yy180; + if (yych <= 'a') goto yy1412; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1504,16 +1532,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(16, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1332; + goto yy1401; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych <= 'a') goto yy1332; - if (yych <= 'z') goto yy175; + if (yych <= 'a') goto yy1401; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1521,16 +1549,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(17, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1311; + goto yy1380; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych <= 'a') goto yy1329; - if (yych <= 'z') goto yy180; + if (yych <= 'a') goto yy1398; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1538,16 +1566,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(18, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1311; + goto yy1380; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych <= 'a') goto yy1311; - if (yych <= 'z') goto yy175; + if (yych <= 'a') goto yy1380; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1558,39 +1586,39 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy1254; - goto yy175; + if (yych <= 'A') goto yy1321; + goto yy182; } } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1253; - goto yy175; + if (yych <= 'E') goto yy1320; + goto yy182; } else { - if (yych <= 'I') goto yy1255; - if (yych <= 'T') goto yy175; - goto yy1256; + if (yych <= 'I') goto yy1322; + if (yych <= 'T') goto yy182; + goto yy1323; } } } else { if (yych <= 'e') { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych <= 'a') goto yy1283; - if (yych <= 'd') goto yy180; - goto yy1282; + if (yych <= 'a') goto yy1351; + if (yych <= 'd') goto yy187; + goto yy1350; } } else { if (yych <= 't') { - if (yych == 'i') goto yy1284; - goto yy180; + if (yych == 'i') goto yy1352; + goto yy187; } else { - if (yych <= 'u') goto yy1285; - if (yych <= 'z') goto yy180; + if (yych <= 'u') goto yy1353; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1602,39 +1630,39 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy1254; - goto yy175; + if (yych <= 'A') goto yy1321; + goto yy182; } } else { if (yych <= 'H') { - if (yych <= 'E') goto yy1253; - goto yy175; + if (yych <= 'E') goto yy1320; + goto yy182; } else { - if (yych <= 'I') goto yy1255; - if (yych <= 'T') goto yy175; - goto yy1256; + if (yych <= 'I') goto yy1322; + if (yych <= 'T') goto yy182; + goto yy1323; } } } else { if (yych <= 'e') { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych <= 'a') goto yy1254; - if (yych <= 'd') goto yy175; - goto yy1253; + if (yych <= 'a') goto yy1321; + if (yych <= 'd') goto yy182; + goto yy1320; } } else { if (yych <= 't') { - if (yych == 'i') goto yy1255; - goto yy175; + if (yych == 'i') goto yy1322; + goto yy182; } else { - if (yych <= 'u') goto yy1256; - if (yych <= 'z') goto yy175; + if (yych <= 'u') goto yy1323; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1644,22 +1672,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'L') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'I') goto yy1223; - if (yych <= 'K') goto yy175; - goto yy1224; + if (yych == 'I') goto yy1290; + if (yych <= 'K') goto yy182; + goto yy1291; } } else { if (yych <= 'i') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'h') goto yy180; - goto yy1241; + if (yych <= 'h') goto yy187; + goto yy1308; } else { - if (yych == 'l') goto yy1242; - if (yych <= 'z') goto yy180; + if (yych == 'l') goto yy1309; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1668,22 +1696,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'L') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'I') goto yy1223; - if (yych <= 'K') goto yy175; - goto yy1224; + if (yych == 'I') goto yy1290; + if (yych <= 'K') goto yy182; + goto yy1291; } } else { if (yych <= 'i') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'h') goto yy175; - goto yy1223; + if (yych <= 'h') goto yy182; + goto yy1290; } else { - if (yych == 'l') goto yy1224; - if (yych <= 'z') goto yy175; + if (yych == 'l') goto yy1291; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -1693,20 +1721,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy175; - goto yy1097; + if (yych <= 'Q') goto yy182; + goto yy1157; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy180; + goto yy187; } else { - if (yych <= 'r') goto yy1216; - if (yych <= 'z') goto yy180; + if (yych <= 'r') goto yy1283; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -1716,67 +1744,67 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy175; - goto yy1097; + if (yych <= 'Q') goto yy182; + goto yy1157; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'r') goto yy1097; - if (yych <= 'z') goto yy175; + if (yych <= 'r') goto yy1157; + if (yych <= 'z') goto yy182; goto yy3; } } yy25: YYDEBUG(25, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '`') { if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1051; + if (yych == '\t') goto yy1111; goto yy12; } else { - if (yych <= ' ') goto yy1053; + if (yych <= ' ') goto yy1113; if (yych <= ',') goto yy12; - goto yy472; + goto yy506; } } else { if (yych <= '0') { - if (yych <= '.') goto yy1063; - if (yych <= '/') goto yy471; - goto yy1096; + if (yych <= '.') goto yy1123; + if (yych <= '/') goto yy505; + goto yy1156; } else { - if (yych <= '9') goto yy1095; - if (yych <= ':') goto yy1064; + if (yych <= '9') goto yy1155; + if (yych <= ':') goto yy1124; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy1053; + if (yych <= 'A') goto yy1113; if (yych <= 'C') goto yy12; - goto yy1053; + goto yy1113; } else { - if (yych == 'F') goto yy1053; + if (yych == 'F') goto yy1113; goto yy12; } } else { if (yych <= 'O') { - if (yych <= 'J') goto yy1053; + if (yych <= 'J') goto yy1113; if (yych <= 'L') goto yy12; - goto yy1053; + goto yy1113; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy1053; + if (yych <= 'Y') goto yy1113; goto yy12; } } @@ -1785,41 +1813,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy1053; + if (yych <= 'a') goto yy1113; if (yych <= 'c') goto yy12; - goto yy1053; + goto yy1113; } else { - if (yych == 'f') goto yy1053; + if (yych == 'f') goto yy1113; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy1053; + goto yy1113; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy1053; - goto yy469; + if (yych <= 'm') goto yy1113; + goto yy503; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'o') goto yy1053; + if (yych <= 'o') goto yy1113; if (yych <= 'q') goto yy12; - goto yy470; + goto yy504; } else { - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy1053; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy1113; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy1053; + if (yych == 'w') goto yy1113; goto yy12; } else { - if (yych <= 'y') goto yy1053; - if (yych == 0xC2) goto yy1053; + if (yych <= 'y') goto yy1113; + if (yych == 0xC2) goto yy1113; goto yy12; } } @@ -1827,48 +1855,48 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } yy26: YYDEBUG(26, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '`') { if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy459; + if (yych == '\t') goto yy493; goto yy12; } else { - if (yych <= ' ') goto yy461; + if (yych <= ' ') goto yy495; if (yych <= ',') goto yy12; - goto yy472; + goto yy506; } } else { if (yych <= '2') { - if (yych <= '.') goto yy473; - if (yych <= '/') goto yy471; - goto yy1095; + if (yych <= '.') goto yy507; + if (yych <= '/') goto yy505; + goto yy1155; } else { - if (yych <= '9') goto yy1062; - if (yych <= ':') goto yy482; + if (yych <= '9') goto yy1122; + if (yych <= ':') goto yy516; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy461; + if (yych <= 'A') goto yy495; if (yych <= 'C') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 'F') goto yy461; + if (yych == 'F') goto yy495; goto yy12; } } else { if (yych <= 'P') { - if (yych <= 'J') goto yy461; + if (yych <= 'J') goto yy495; if (yych <= 'L') goto yy12; - goto yy461; + goto yy495; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy461; + if (yych <= 'Y') goto yy495; goto yy12; } } @@ -1877,41 +1905,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy461; + if (yych <= 'a') goto yy495; if (yych <= 'c') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 'f') goto yy461; + if (yych == 'f') goto yy495; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy461; + goto yy495; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy461; - goto yy469; + if (yych <= 'm') goto yy495; + goto yy503; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'p') goto yy461; + if (yych <= 'p') goto yy495; if (yych <= 'q') goto yy12; - goto yy470; + goto yy504; } else { - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy461; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy495; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy461; + if (yych == 'w') goto yy495; goto yy12; } else { - if (yych <= 'y') goto yy461; - if (yych == 0xC2) goto yy461; + if (yych <= 'y') goto yy495; + if (yych == 0xC2) goto yy495; goto yy12; } } @@ -1919,48 +1947,48 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } yy27: YYDEBUG(27, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '`') { if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy459; + if (yych == '\t') goto yy493; goto yy12; } else { - if (yych <= ' ') goto yy461; + if (yych <= ' ') goto yy495; if (yych <= ',') goto yy12; - goto yy472; + goto yy506; } } else { if (yych <= '4') { - if (yych <= '.') goto yy473; - if (yych <= '/') goto yy471; - goto yy1062; + if (yych <= '.') goto yy507; + if (yych <= '/') goto yy505; + goto yy1122; } else { - if (yych <= '9') goto yy1049; - if (yych <= ':') goto yy482; + if (yych <= '9') goto yy1109; + if (yych <= ':') goto yy516; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy461; + if (yych <= 'A') goto yy495; if (yych <= 'C') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 'F') goto yy461; + if (yych == 'F') goto yy495; goto yy12; } } else { if (yych <= 'P') { - if (yych <= 'J') goto yy461; + if (yych <= 'J') goto yy495; if (yych <= 'L') goto yy12; - goto yy461; + goto yy495; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy461; + if (yych <= 'Y') goto yy495; goto yy12; } } @@ -1969,41 +1997,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy461; + if (yych <= 'a') goto yy495; if (yych <= 'c') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 'f') goto yy461; + if (yych == 'f') goto yy495; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy461; + goto yy495; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy461; - goto yy469; + if (yych <= 'm') goto yy495; + goto yy503; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'p') goto yy461; + if (yych <= 'p') goto yy495; if (yych <= 'q') goto yy12; - goto yy470; + goto yy504; } else { - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy461; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy495; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy461; + if (yych == 'w') goto yy495; goto yy12; } else { - if (yych <= 'y') goto yy461; - if (yych == 0xC2) goto yy461; + if (yych <= 'y') goto yy495; + if (yych == 0xC2) goto yy495; goto yy12; } } @@ -2011,48 +2039,48 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } yy28: YYDEBUG(28, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '`') { if (yych <= '@') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy459; + if (yych == '\t') goto yy493; goto yy12; } else { - if (yych <= ' ') goto yy461; + if (yych <= ' ') goto yy495; if (yych <= ',') goto yy12; - goto yy472; + goto yy506; } } else { if (yych <= '1') { - if (yych <= '.') goto yy473; - if (yych <= '/') goto yy471; - goto yy1049; + if (yych <= '.') goto yy507; + if (yych <= '/') goto yy505; + goto yy1109; } else { - if (yych <= '9') goto yy468; - if (yych <= ':') goto yy482; + if (yych <= '9') goto yy502; + if (yych <= ':') goto yy516; goto yy12; } } } else { if (yych <= 'G') { if (yych <= 'D') { - if (yych <= 'A') goto yy461; + if (yych <= 'A') goto yy495; if (yych <= 'C') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 'F') goto yy461; + if (yych == 'F') goto yy495; goto yy12; } } else { if (yych <= 'P') { - if (yych <= 'J') goto yy461; + if (yych <= 'J') goto yy495; if (yych <= 'L') goto yy12; - goto yy461; + goto yy495; } else { if (yych <= 'R') goto yy12; - if (yych <= 'Y') goto yy461; + if (yych <= 'Y') goto yy495; goto yy12; } } @@ -2061,41 +2089,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'n') { if (yych <= 'g') { if (yych <= 'd') { - if (yych <= 'a') goto yy461; + if (yych <= 'a') goto yy495; if (yych <= 'c') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 'f') goto yy461; + if (yych == 'f') goto yy495; goto yy12; } } else { if (yych <= 'j') { if (yych == 'i') goto yy12; - goto yy461; + goto yy495; } else { if (yych <= 'l') goto yy12; - if (yych <= 'm') goto yy461; - goto yy469; + if (yych <= 'm') goto yy495; + goto yy503; } } } else { if (yych <= 'u') { if (yych <= 'r') { - if (yych <= 'p') goto yy461; + if (yych <= 'p') goto yy495; if (yych <= 'q') goto yy12; - goto yy470; + goto yy504; } else { - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy461; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy495; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy461; + if (yych == 'w') goto yy495; goto yy12; } else { - if (yych <= 'y') goto yy461; - if (yych == 0xC2) goto yy461; + if (yych <= 'y') goto yy495; + if (yych == 0xC2) goto yy495; goto yy12; } } @@ -2103,48 +2131,48 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } yy29: YYDEBUG(29, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'a') { if (yych <= 'A') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy459; + if (yych == '\t') goto yy493; goto yy12; } else { - if (yych <= ' ') goto yy461; + if (yych <= ' ') goto yy495; if (yych <= ',') goto yy12; - goto yy472; + goto yy506; } } else { if (yych <= '9') { - if (yych <= '.') goto yy473; - if (yych <= '/') goto yy471; - goto yy468; + if (yych <= '.') goto yy507; + if (yych <= '/') goto yy505; + goto yy502; } else { - if (yych <= ':') goto yy482; + if (yych <= ':') goto yy516; if (yych <= '@') goto yy12; - goto yy461; + goto yy495; } } } else { if (yych <= 'J') { if (yych <= 'E') { - if (yych == 'D') goto yy461; + if (yych == 'D') goto yy495; goto yy12; } else { if (yych == 'G') goto yy12; - goto yy461; + goto yy495; } } else { if (yych <= 'R') { if (yych <= 'L') goto yy12; - if (yych <= 'P') goto yy461; + if (yych <= 'P') goto yy495; goto yy12; } else { - if (yych <= 'Y') goto yy461; + if (yych <= 'Y') goto yy495; if (yych <= '`') goto yy12; - goto yy461; + goto yy495; } } } @@ -2152,38 +2180,38 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'p') { if (yych <= 'h') { if (yych <= 'e') { - if (yych == 'd') goto yy461; + if (yych == 'd') goto yy495; goto yy12; } else { if (yych == 'g') goto yy12; - goto yy461; + goto yy495; } } else { if (yych <= 'l') { - if (yych == 'j') goto yy461; + if (yych == 'j') goto yy495; goto yy12; } else { - if (yych == 'n') goto yy469; - goto yy461; + if (yych == 'n') goto yy503; + goto yy495; } } } else { if (yych <= 'v') { if (yych <= 's') { if (yych <= 'q') goto yy12; - if (yych <= 'r') goto yy470; - goto yy464; + if (yych <= 'r') goto yy504; + goto yy498; } else { - if (yych <= 't') goto yy467; - if (yych <= 'u') goto yy461; + if (yych <= 't') goto yy501; + if (yych <= 'u') goto yy495; goto yy12; } } else { if (yych <= 'y') { if (yych == 'x') goto yy12; - goto yy461; + goto yy495; } else { - if (yych == 0xC2) goto yy461; + if (yych == 0xC2) goto yy495; goto yy12; } } @@ -2191,127 +2219,127 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } yy30: YYDEBUG(30, *YYCURSOR); - yyaccept = 1; + yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 2) { goto yy56; } switch (yych) { case '+': - case '-': goto yy414; + case '-': goto yy445; case '0': - case '1': goto yy411; - case '2': goto yy412; + case '1': goto yy442; + case '2': goto yy443; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy413; + case '9': goto yy444; default: goto yy12; } yy31: YYDEBUG(31, *YYCURSOR); - yyaccept = 0; + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ' ') goto yy230; + if (yych == ' ') goto yy250; goto yy3; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; goto yy3; } else { if (yych == '/') goto yy3; - goto yy230; + goto yy250; } } } else { if (yych <= 'V') { if (yych <= 'H') { if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'I') goto yy410; - if (yych <= 'U') goto yy175; - goto yy409; + if (yych <= 'I') goto yy441; + if (yych <= 'U') goto yy182; + goto yy440; } } else { if (yych <= 'Z') { - if (yych == 'X') goto yy409; - goto yy175; + if (yych == 'X') goto yy440; + goto yy182; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy180; + if (yych <= 'z') goto yy187; goto yy3; } } } yy32: YYDEBUG(32, *YYCURSOR); - yyaccept = 0; + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; if (yych <= 0x1F) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy230; + goto yy250; } } else { if (yych <= 'H') { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'Z') { - if (yych <= 'I') goto yy406; - goto yy175; + if (yych <= 'I') goto yy437; + goto yy182; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy180; + if (yych <= 'z') goto yy187; goto yy3; } } } yy33: YYDEBUG(33, *YYCURSOR); - yyaccept = 0; + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; if (yych <= 0x1F) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy230; + goto yy250; } } else { if (yych <= 'H') { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'Z') { - if (yych <= 'I') goto yy404; - goto yy175; + if (yych <= 'I') goto yy435; + goto yy182; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy180; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2321,21 +2349,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'A') goto yy387; - if (yych <= 'T') goto yy175; - goto yy386; + if (yych <= 'A') goto yy418; + if (yych <= 'T') goto yy182; + goto yy417; } } else { if (yych <= 'a') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy396; + goto yy427; } else { - if (yych == 'u') goto yy395; - if (yych <= 'z') goto yy180; + if (yych == 'u') goto yy426; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2344,21 +2372,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'A') goto yy387; - if (yych <= 'T') goto yy175; - goto yy386; + if (yych <= 'A') goto yy418; + if (yych <= 'T') goto yy182; + goto yy417; } } else { if (yych <= 'a') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy387; + goto yy418; } else { - if (yych == 'u') goto yy386; - if (yych <= 'z') goto yy175; + if (yych == 'u') goto yy417; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -2367,35 +2395,35 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'F') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'O') { - if (yych <= 'G') goto yy365; - goto yy175; + if (yych <= 'G') goto yy396; + goto yy182; } else { - if (yych <= 'P') goto yy364; - if (yych <= 'T') goto yy175; - goto yy363; + if (yych <= 'P') goto yy395; + if (yych <= 'T') goto yy182; + goto yy394; } } } else { if (yych <= 'o') { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych == 'g') goto yy377; - goto yy180; + if (yych == 'g') goto yy408; + goto yy187; } } else { if (yych <= 't') { - if (yych <= 'p') goto yy376; - goto yy180; + if (yych <= 'p') goto yy407; + goto yy187; } else { - if (yych <= 'u') goto yy375; - if (yych <= 'z') goto yy180; + if (yych <= 'u') goto yy406; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2405,35 +2433,35 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'F') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'O') { - if (yych <= 'G') goto yy365; - goto yy175; + if (yych <= 'G') goto yy396; + goto yy182; } else { - if (yych <= 'P') goto yy364; - if (yych <= 'T') goto yy175; - goto yy363; + if (yych <= 'P') goto yy395; + if (yych <= 'T') goto yy182; + goto yy394; } } } else { if (yych <= 'o') { if (yych <= '`') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; goto yy3; } else { - if (yych == 'g') goto yy365; - goto yy175; + if (yych == 'g') goto yy396; + goto yy182; } } else { if (yych <= 't') { - if (yych <= 'p') goto yy364; - goto yy175; + if (yych <= 'p') goto yy395; + goto yy182; } else { - if (yych <= 'u') goto yy363; - if (yych <= 'z') goto yy175; + if (yych <= 'u') goto yy394; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -2444,20 +2472,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'C') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'B') goto yy175; - goto yy353; + if (yych <= 'B') goto yy182; + goto yy384; } } else { if (yych <= 'b') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy180; + goto yy187; } else { - if (yych <= 'c') goto yy358; - if (yych <= 'z') goto yy180; + if (yych <= 'c') goto yy389; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2467,20 +2495,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'C') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'B') goto yy175; - goto yy353; + if (yych <= 'B') goto yy182; + goto yy384; } } else { if (yych <= 'b') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'c') goto yy353; - if (yych <= 'z') goto yy175; + if (yych <= 'c') goto yy384; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -2490,20 +2518,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy226; + if (yych <= 'D') goto yy182; + goto yy246; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy180; + goto yy187; } else { - if (yych <= 'e') goto yy344; - if (yych <= 'z') goto yy180; + if (yych <= 'e') goto yy375; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2513,20 +2541,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy226; + if (yych <= 'D') goto yy182; + goto yy246; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'e') goto yy226; - if (yych <= 'z') goto yy175; + if (yych <= 'e') goto yy246; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -2536,20 +2564,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy199; + if (yych <= 'D') goto yy182; + goto yy217; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy180; + goto yy187; } else { - if (yych <= 'e') goto yy213; - if (yych <= 'z') goto yy180; + if (yych <= 'e') goto yy232; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2559,20 +2587,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy175; - goto yy199; + if (yych <= 'D') goto yy182; + goto yy217; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - goto yy175; + goto yy182; } else { - if (yych <= 'e') goto yy199; - if (yych <= 'z') goto yy175; + if (yych <= 'e') goto yy217; + if (yych <= 'z') goto yy182; goto yy3; } } @@ -2580,16 +2608,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(44, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy175; + goto yy182; } else { if (yych <= 'Z') { - if (yych <= 'M') goto yy191; - goto yy175; + if (yych <= 'M') goto yy198; + goto yy182; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy180; + if (yych <= 'z') goto yy187; goto yy3; } } @@ -2597,32 +2625,32 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(45, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') goto yy12; - if (yych <= 'Z') goto yy190; + if (yych <= 'Z') goto yy197; if (yych <= '`') goto yy12; - if (yych <= 'z') goto yy190; + if (yych <= 'z') goto yy197; goto yy12; yy46: YYDEBUG(46, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy180; + if (yych <= 'z') goto yy187; goto yy3; } yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy175; + if (yych <= 'z') goto yy182; goto yy3; } yy48: @@ -2636,11 +2664,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= '9') goto yy54; yy49: YYDEBUG(49, *YYCURSOR); -#line 1859 "ext/date/lib/parse_date.re" +#line 1902 "ext/date/lib/parse_date.re" { goto std; } -#line 2642 "" +#line 2672 "" yy50: YYDEBUG(50, *YYCURSOR); yych = *++YYCURSOR; @@ -2649,12 +2677,12 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) YYDEBUG(51, *YYCURSOR); ++YYCURSOR; YYDEBUG(52, *YYCURSOR); -#line 1864 "ext/date/lib/parse_date.re" +#line 1907 "ext/date/lib/parse_date.re" { s->pos = cursor; s->line++; goto std; } -#line 2656 "" +#line 2686 "" yy53: YYDEBUG(53, *YYCURSOR); yych = *++YYCURSOR; @@ -2674,9 +2702,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yyaccept <= 2) { if (yyaccept <= 1) { if (yyaccept == 0) { - goto yy3; - } else { goto yy12; + } else { + goto yy3; } } else { goto yy49; @@ -2685,21 +2713,21 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yyaccept == 3) { goto yy84; } else { - goto yy201; + goto yy219; } } } else { if (yyaccept <= 6) { if (yyaccept == 5) { - goto yy228; + goto yy248; } else { - goto yy242; + goto yy262; } } else { if (yyaccept == 7) { - goto yy256; + goto yy276; } else { - goto yy367; + goto yy398; } } } @@ -2707,91 +2735,95 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yyaccept <= 12) { if (yyaccept <= 10) { if (yyaccept == 9) { - goto yy475; + goto yy509; } else { - goto yy490; + goto yy524; } } else { if (yyaccept == 11) { - goto yy611; + goto yy645; } else { - goto yy656; + goto yy690; } } } else { if (yyaccept <= 14) { if (yyaccept == 13) { - goto yy666; + goto yy700; } else { - goto yy763; + goto yy734; } } else { if (yyaccept == 15) { - goto yy783; + goto yy808; } else { - goto yy814; + goto yy828; } } } } } else { - if (yyaccept <= 24) { - if (yyaccept <= 20) { - if (yyaccept <= 18) { - if (yyaccept == 17) { - goto yy821; + if (yyaccept <= 25) { + if (yyaccept <= 21) { + if (yyaccept <= 19) { + if (yyaccept <= 18) { + if (yyaccept == 17) { + goto yy859; + } else { + goto yy866; + } } else { - goto yy848; + goto yy893; } } else { - if (yyaccept == 19) { - goto yy793; + if (yyaccept == 20) { + goto yy838; } else { - goto yy430; + goto yy461; } } } else { - if (yyaccept <= 22) { - if (yyaccept == 21) { - goto yy973; + if (yyaccept <= 23) { + if (yyaccept == 22) { + goto yy1018; } else { - goto yy842; + goto yy887; } } else { - if (yyaccept == 23) { - goto yy1067; + if (yyaccept == 24) { + goto yy1127; } else { - goto yy1075; + goto yy1135; } } } } else { - if (yyaccept <= 28) { - if (yyaccept <= 26) { - if (yyaccept == 25) { - goto yy1119; + if (yyaccept <= 29) { + if (yyaccept <= 27) { + if (yyaccept == 26) { + goto yy1179; } else { - goto yy1143; + goto yy1206; } } else { - if (yyaccept == 27) { - goto yy1319; + if (yyaccept == 28) { + goto yy1388; } else { - goto yy1452; + goto yy1524; } } } else { - if (yyaccept <= 30) { - if (yyaccept == 29) { - goto yy1455; + if (yyaccept <= 31) { + if (yyaccept == 30) { + goto yy1527; } else { - goto yy1535; + goto yy1612; } } else { - if (yyaccept == 31) { - goto yy1543; + if (yyaccept == 32) { + goto yy1620; } else { - goto yy1566; + goto yy1643; } } } @@ -2896,95 +2928,95 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'N') { - if (yych == 'I') goto yy148; + if (yych == 'I') goto yy154; goto yy55; } else { - if (yych <= 'O') goto yy147; + if (yych <= 'O') goto yy153; if (yych <= 'R') goto yy55; - goto yy149; + goto yy155; } } else { if (yych <= 'n') { - if (yych == 'i') goto yy148; + if (yych == 'i') goto yy154; goto yy55; } else { - if (yych <= 'o') goto yy147; - if (yych == 's') goto yy149; + if (yych <= 'o') goto yy153; + if (yych == 's') goto yy155; goto yy55; } } yy61: YYDEBUG(61, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 0xB5) goto yy144; + if (yych == 0xB5) goto yy150; goto yy55; yy62: YYDEBUG(62, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy142; - if (yych == 's') goto yy142; + if (yych == 'S') goto yy148; + if (yych == 's') goto yy148; goto yy55; yy63: YYDEBUG(63, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { - if (yych == 'A') goto yy129; + if (yych == 'A') goto yy133; goto yy55; } else { - if (yych <= 'E') goto yy130; + if (yych <= 'E') goto yy134; if (yych <= 'T') goto yy55; - goto yy128; + goto yy132; } } else { if (yych <= 'd') { - if (yych == 'a') goto yy129; + if (yych == 'a') goto yy133; goto yy55; } else { - if (yych <= 'e') goto yy130; - if (yych == 'u') goto yy128; + if (yych <= 'e') goto yy134; + if (yych == 'u') goto yy132; goto yy55; } } yy64: YYDEBUG(64, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy126; - if (yych == 'o') goto yy126; + if (yych == 'O') goto yy130; + if (yych == 'o') goto yy130; goto yy55; yy65: YYDEBUG(65, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy125; - if (yych == 'a') goto yy125; + if (yych == 'A') goto yy129; + if (yych == 'a') goto yy129; goto yy55; yy66: YYDEBUG(66, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { - if (yych == 'O') goto yy110; + if (yych == 'O') goto yy113; if (yych <= 'Q') goto yy55; - goto yy109; + goto yy112; } else { if (yych <= 'o') { if (yych <= 'n') goto yy55; - goto yy110; + goto yy113; } else { - if (yych == 'r') goto yy109; + if (yych == 'r') goto yy112; goto yy55; } } yy67: YYDEBUG(67, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy106; - if (yych == 'e') goto yy106; + if (yych == 'E') goto yy109; + if (yych == 'e') goto yy109; goto yy55; yy68: YYDEBUG(68, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy94; - if (yych == 'e') goto yy94; + if (yych == 'E') goto yy96; + if (yych == 'e') goto yy96; goto yy55; yy69: YYDEBUG(69, *YYCURSOR); @@ -3056,8 +3088,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yy81: YYDEBUG(81, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy89; - if (yych == 'u') goto yy89; + if (yych == 'U') goto yy90; + if (yych == 'u') goto yy90; goto yy55; yy82: YYDEBUG(82, *YYCURSOR); @@ -3072,7 +3104,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych == 's') goto yy85; yy84: YYDEBUG(84, *YYCURSOR); -#line 1843 "ext/date/lib/parse_date.re" +#line 1886 "ext/date/lib/parse_date.re" { timelib_ull i; DEBUG_OUTPUT("relative"); @@ -3087,7 +3119,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 3089 "" +#line 3123 "" yy85: YYDEBUG(85, *YYCURSOR); yych = *++YYCURSOR; @@ -3106,114 +3138,113 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yy88: YYDEBUG(88, *YYCURSOR); yych = *++YYCURSOR; - goto yy84; + if (yych == 'S') goto yy89; + if (yych != 's') goto yy84; yy89: YYDEBUG(89, *YYCURSOR); + yych = *++YYCURSOR; + goto yy84; +yy90: + YYDEBUG(90, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'R') goto yy90; + if (yych == 'R') goto yy91; if (yych != 'r') goto yy84; -yy90: - YYDEBUG(90, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'S') goto yy91; - if (yych != 's') goto yy55; yy91: YYDEBUG(91, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy92; - if (yych != 'd') goto yy55; + if (yych == 'S') goto yy92; + if (yych != 's') goto yy55; yy92: YYDEBUG(92, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy93; - if (yych != 'a') goto yy55; + if (yych == 'D') goto yy93; + if (yych != 'd') goto yy55; yy93: YYDEBUG(93, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy88; - if (yych == 'y') goto yy88; - goto yy55; + if (yych == 'A') goto yy94; + if (yych != 'a') goto yy55; yy94: YYDEBUG(94, *YYCURSOR); yych = *++YYCURSOR; + if (yych == 'Y') goto yy95; + if (yych != 'y') goto yy55; +yy95: + YYDEBUG(95, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; +yy96: + YYDEBUG(96, *YYCURSOR); + yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= 'C') goto yy55; - if (yych <= 'D') goto yy96; + if (yych <= 'D') goto yy98; } else { if (yych <= 'c') goto yy55; - if (yych <= 'd') goto yy96; + if (yych <= 'd') goto yy98; if (yych >= 'f') goto yy55; } - YYDEBUG(95, *YYCURSOR); + YYDEBUG(97, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'K') goto yy102; - if (yych == 'k') goto yy102; + if (yych == 'K') goto yy105; + if (yych == 'k') goto yy105; goto yy55; -yy96: - YYDEBUG(96, *YYCURSOR); +yy98: + YYDEBUG(98, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'N') goto yy97; + if (yych == 'N') goto yy99; if (yych != 'n') goto yy84; -yy97: - YYDEBUG(97, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy98; - if (yych != 'e') goto yy55; -yy98: - YYDEBUG(98, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'S') goto yy99; - if (yych != 's') goto yy55; yy99: YYDEBUG(99, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy100; - if (yych != 'd') goto yy55; + if (yych == 'E') goto yy100; + if (yych != 'e') goto yy55; yy100: YYDEBUG(100, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy101; - if (yych != 'a') goto yy55; + if (yych == 'S') goto yy101; + if (yych != 's') goto yy55; yy101: YYDEBUG(101, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy88; - if (yych == 'y') goto yy88; - goto yy55; + if (yych == 'D') goto yy102; + if (yych != 'd') goto yy55; yy102: YYDEBUG(102, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy103; + if (yych != 'a') goto yy55; +yy103: + YYDEBUG(103, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'Y') goto yy104; + if (yych != 'y') goto yy55; +yy104: + YYDEBUG(104, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; +yy105: + YYDEBUG(105, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == 'D') goto yy103; + if (yych == 'D') goto yy106; if (yych <= 'R') goto yy84; - goto yy88; + goto yy89; } else { if (yych <= 'd') { if (yych <= 'c') goto yy84; } else { - if (yych == 's') goto yy88; + if (yych == 's') goto yy89; goto yy84; } } -yy103: - YYDEBUG(103, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'A') goto yy104; - if (yych != 'a') goto yy55; -yy104: - YYDEBUG(104, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'Y') goto yy105; - if (yych != 'y') goto yy55; -yy105: - YYDEBUG(105, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'S') goto yy88; - if (yych == 's') goto yy88; - goto yy84; yy106: YYDEBUG(106, *YYCURSOR); yych = *++YYCURSOR; @@ -3222,20 +3253,19 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yy107: YYDEBUG(107, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy108; - if (yych != 'r') goto yy55; + if (yych == 'Y') goto yy108; + if (yych != 'y') goto yy55; yy108: YYDEBUG(108, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy88; - if (yych == 's') goto yy88; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; goto yy84; yy109: YYDEBUG(109, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy122; - if (yych == 'i') goto yy122; - goto yy55; + if (yych == 'A') goto yy110; + if (yych != 'a') goto yy55; yy110: YYDEBUG(110, *YYCURSOR); yych = *++YYCURSOR; @@ -3244,53 +3274,54 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yy111: YYDEBUG(111, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy112; - if (yych != 't') goto yy55; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; yy112: YYDEBUG(112, *YYCURSOR); yych = *++YYCURSOR; + if (yych == 'I') goto yy125; + if (yych == 'i') goto yy125; + goto yy55; +yy113: + YYDEBUG(113, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy114; + if (yych != 'r') goto yy55; +yy114: + YYDEBUG(114, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'T') goto yy115; + if (yych != 't') goto yy55; +yy115: + YYDEBUG(115, *YYCURSOR); + yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'H') goto yy114; + if (yych == 'H') goto yy117; if (yych <= 'M') goto yy55; } else { if (yych <= 'h') { if (yych <= 'g') goto yy55; - goto yy114; + goto yy117; } else { if (yych != 'n') goto yy55; } } - YYDEBUG(113, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'I') goto yy119; - if (yych == 'i') goto yy119; - goto yy55; -yy114: - YYDEBUG(114, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'N') goto yy115; - if (yych != 'n') goto yy55; -yy115: - YYDEBUG(115, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'I') goto yy116; - if (yych != 'i') goto yy55; -yy116: YYDEBUG(116, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy117; - if (yych != 'g') goto yy55; + if (yych == 'I') goto yy122; + if (yych == 'i') goto yy122; + goto yy55; yy117: YYDEBUG(117, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy118; - if (yych != 'h') goto yy55; + if (yych == 'N') goto yy118; + if (yych != 'n') goto yy55; yy118: YYDEBUG(118, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy108; - if (yych == 't') goto yy108; - goto yy55; + if (yych == 'I') goto yy119; + if (yych != 'i') goto yy55; yy119: YYDEBUG(119, *YYCURSOR); yych = *++YYCURSOR; @@ -3304,425 +3335,461 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) yy121: YYDEBUG(121, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy108; - if (yych == 't') goto yy108; + if (yych == 'T') goto yy111; + if (yych == 't') goto yy111; goto yy55; yy122: YYDEBUG(122, *YYCURSOR); - yyaccept = 3; - yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'D') goto yy123; - if (yych != 'd') goto yy84; + yych = *++YYCURSOR; + if (yych == 'G') goto yy123; + if (yych != 'g') goto yy55; yy123: YYDEBUG(123, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy124; - if (yych != 'a') goto yy55; + if (yych == 'H') goto yy124; + if (yych != 'h') goto yy55; yy124: YYDEBUG(124, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy88; - if (yych == 'y') goto yy88; + if (yych == 'T') goto yy111; + if (yych == 't') goto yy111; goto yy55; yy125: YYDEBUG(125, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'Y') goto yy108; - if (yych == 'y') goto yy108; - goto yy55; + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == 'D') goto yy126; + if (yych != 'd') goto yy84; yy126: YYDEBUG(126, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy127; - if (yych != 'u') goto yy55; + if (yych == 'A') goto yy127; + if (yych != 'a') goto yy55; yy127: YYDEBUG(127, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy108; - if (yych == 'r') goto yy108; - goto yy55; + if (yych == 'Y') goto yy128; + if (yych != 'y') goto yy55; yy128: YYDEBUG(128, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy139; - if (yych == 'n') goto yy139; - goto yy55; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; yy129: YYDEBUG(129, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy134; - if (yych == 't') goto yy134; + if (yych == 'Y') goto yy111; + if (yych == 'y') goto yy111; goto yy55; yy130: YYDEBUG(130, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy131; - if (yych != 'c') goto yy55; + if (yych == 'U') goto yy131; + if (yych != 'u') goto yy55; yy131: YYDEBUG(131, *YYCURSOR); - yyaccept = 3; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'S') { - if (yych == 'O') goto yy132; - if (yych <= 'R') goto yy84; - goto yy88; - } else { - if (yych <= 'o') { - if (yych <= 'n') goto yy84; - } else { - if (yych == 's') goto yy88; - goto yy84; - } - } + yych = *++YYCURSOR; + if (yych == 'R') goto yy111; + if (yych == 'r') goto yy111; + goto yy55; yy132: YYDEBUG(132, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy133; - if (yych != 'n') goto yy55; + if (yych == 'N') goto yy144; + if (yych == 'n') goto yy144; + goto yy55; yy133: YYDEBUG(133, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy108; - if (yych == 'd') goto yy108; + if (yych == 'T') goto yy138; + if (yych == 't') goto yy138; goto yy55; yy134: YYDEBUG(134, *YYCURSOR); - yyaccept = 3; - yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'U') goto yy135; - if (yych != 'u') goto yy84; + yych = *++YYCURSOR; + if (yych == 'C') goto yy135; + if (yych != 'c') goto yy55; yy135: YYDEBUG(135, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'R') goto yy136; - if (yych != 'r') goto yy55; + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'S') { + if (yych == 'O') goto yy136; + if (yych <= 'R') goto yy84; + goto yy89; + } else { + if (yych <= 'o') { + if (yych <= 'n') goto yy84; + } else { + if (yych == 's') goto yy89; + goto yy84; + } + } yy136: YYDEBUG(136, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy137; - if (yych != 'd') goto yy55; + if (yych == 'N') goto yy137; + if (yych != 'n') goto yy55; yy137: YYDEBUG(137, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy138; - if (yych != 'a') goto yy55; + if (yych == 'D') goto yy111; + if (yych == 'd') goto yy111; + goto yy55; yy138: YYDEBUG(138, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'Y') goto yy88; - if (yych == 'y') goto yy88; - goto yy55; -yy139: - YYDEBUG(139, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'D') goto yy140; - if (yych != 'd') goto yy84; + if (yych == 'U') goto yy139; + if (yych != 'u') goto yy84; +yy139: + YYDEBUG(139, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'R') goto yy140; + if (yych != 'r') goto yy55; yy140: YYDEBUG(140, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy141; - if (yych != 'a') goto yy55; + if (yych == 'D') goto yy141; + if (yych != 'd') goto yy55; yy141: YYDEBUG(141, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy88; - if (yych == 'y') goto yy88; - goto yy55; + if (yych == 'A') goto yy142; + if (yych != 'a') goto yy55; yy142: YYDEBUG(142, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy143; - if (yych != 'e') goto yy55; + if (yych == 'Y') goto yy143; + if (yych != 'y') goto yy55; yy143: YYDEBUG(143, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy108; - if (yych == 'c') goto yy108; - goto yy55; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; yy144: YYDEBUG(144, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'S') goto yy145; - if (yych != 's') goto yy55; -yy145: - YYDEBUG(145, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy146; - if (yych != 'e') goto yy84; + if (yych == 'D') goto yy145; + if (yych != 'd') goto yy84; +yy145: + YYDEBUG(145, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'A') goto yy146; + if (yych != 'a') goto yy55; yy146: YYDEBUG(146, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy108; - if (yych == 'c') goto yy108; - goto yy55; + if (yych == 'Y') goto yy147; + if (yych != 'y') goto yy55; yy147: YYDEBUG(147, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy170; - if (yych == 'n') goto yy170; - goto yy55; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; yy148: YYDEBUG(148, *YYCURSOR); yych = *++YYCURSOR; + if (yych == 'E') goto yy149; + if (yych != 'e') goto yy55; +yy149: + YYDEBUG(149, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'C') goto yy111; + if (yych == 'c') goto yy111; + goto yy55; +yy150: + YYDEBUG(150, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy151; + if (yych != 's') goto yy55; +yy151: + YYDEBUG(151, *YYCURSOR); + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == 'E') goto yy152; + if (yych != 'e') goto yy84; +yy152: + YYDEBUG(152, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'C') goto yy111; + if (yych == 'c') goto yy111; + goto yy55; +yy153: + YYDEBUG(153, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'N') goto yy176; + if (yych == 'n') goto yy176; + goto yy55; +yy154: + YYDEBUG(154, *YYCURSOR); + yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= 'K') { - if (yych == 'C') goto yy152; + if (yych == 'C') goto yy158; goto yy55; } else { - if (yych <= 'L') goto yy151; + if (yych <= 'L') goto yy157; if (yych <= 'M') goto yy55; - goto yy153; + goto yy159; } } else { if (yych <= 'k') { - if (yych == 'c') goto yy152; + if (yych == 'c') goto yy158; goto yy55; } else { - if (yych <= 'l') goto yy151; - if (yych == 'n') goto yy153; + if (yych <= 'l') goto yy157; + if (yych == 'n') goto yy159; goto yy55; } } -yy149: - YYDEBUG(149, *YYCURSOR); +yy155: + YYDEBUG(155, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy150; + if (yych == 'E') goto yy156; if (yych != 'e') goto yy84; -yy150: - YYDEBUG(150, *YYCURSOR); +yy156: + YYDEBUG(156, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy108; - if (yych == 'c') goto yy108; + if (yych == 'C') goto yy111; + if (yych == 'c') goto yy111; goto yy55; -yy151: - YYDEBUG(151, *YYCURSOR); +yy157: + YYDEBUG(157, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy163; - if (yych == 'l') goto yy163; + if (yych == 'L') goto yy169; + if (yych == 'l') goto yy169; goto yy55; -yy152: - YYDEBUG(152, *YYCURSOR); +yy158: + YYDEBUG(158, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy156; - if (yych == 'r') goto yy156; + if (yych == 'R') goto yy162; + if (yych == 'r') goto yy162; goto yy55; -yy153: - YYDEBUG(153, *YYCURSOR); +yy159: + YYDEBUG(159, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { - if (yych == 'S') goto yy88; + if (yych == 'S') goto yy89; if (yych <= 'T') goto yy84; } else { if (yych <= 's') { if (yych <= 'r') goto yy84; - goto yy88; + goto yy89; } else { if (yych != 'u') goto yy84; } } - YYDEBUG(154, *YYCURSOR); + YYDEBUG(160, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy155; + if (yych == 'T') goto yy161; if (yych != 't') goto yy55; -yy155: - YYDEBUG(155, *YYCURSOR); +yy161: + YYDEBUG(161, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy108; - if (yych == 'e') goto yy108; + if (yych == 'E') goto yy111; + if (yych == 'e') goto yy111; goto yy55; -yy156: - YYDEBUG(156, *YYCURSOR); +yy162: + YYDEBUG(162, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy157; + if (yych == 'O') goto yy163; if (yych != 'o') goto yy55; -yy157: - YYDEBUG(157, *YYCURSOR); +yy163: + YYDEBUG(163, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy158; + if (yych == 'S') goto yy164; if (yych != 's') goto yy55; -yy158: - YYDEBUG(158, *YYCURSOR); +yy164: + YYDEBUG(164, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy159; + if (yych == 'E') goto yy165; if (yych != 'e') goto yy55; -yy159: - YYDEBUG(159, *YYCURSOR); +yy165: + YYDEBUG(165, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy160; + if (yych == 'C') goto yy166; if (yych != 'c') goto yy55; -yy160: - YYDEBUG(160, *YYCURSOR); +yy166: + YYDEBUG(166, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy161; + if (yych == 'O') goto yy167; if (yych != 'o') goto yy55; -yy161: - YYDEBUG(161, *YYCURSOR); +yy167: + YYDEBUG(167, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy162; + if (yych == 'N') goto yy168; if (yych != 'n') goto yy55; -yy162: - YYDEBUG(162, *YYCURSOR); +yy168: + YYDEBUG(168, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy108; - if (yych == 'd') goto yy108; + if (yych == 'D') goto yy111; + if (yych == 'd') goto yy111; goto yy55; -yy163: - YYDEBUG(163, *YYCURSOR); +yy169: + YYDEBUG(169, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy164; + if (yych == 'I') goto yy170; if (yych != 'i') goto yy55; -yy164: - YYDEBUG(164, *YYCURSOR); +yy170: + YYDEBUG(170, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy165; + if (yych == 'S') goto yy171; if (yych != 's') goto yy55; -yy165: - YYDEBUG(165, *YYCURSOR); +yy171: + YYDEBUG(171, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy166; + if (yych == 'E') goto yy172; if (yych != 'e') goto yy55; -yy166: - YYDEBUG(166, *YYCURSOR); +yy172: + YYDEBUG(172, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy167; + if (yych == 'C') goto yy173; if (yych != 'c') goto yy55; -yy167: - YYDEBUG(167, *YYCURSOR); +yy173: + YYDEBUG(173, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy168; + if (yych == 'O') goto yy174; if (yych != 'o') goto yy55; -yy168: - YYDEBUG(168, *YYCURSOR); +yy174: + YYDEBUG(174, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy169; + if (yych == 'N') goto yy175; if (yych != 'n') goto yy55; -yy169: - YYDEBUG(169, *YYCURSOR); +yy175: + YYDEBUG(175, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy108; - if (yych == 'd') goto yy108; + if (yych == 'D') goto yy111; + if (yych == 'd') goto yy111; goto yy55; -yy170: - YYDEBUG(170, *YYCURSOR); +yy176: + YYDEBUG(176, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { - if (yych == 'D') goto yy171; + if (yych == 'D') goto yy177; if (yych <= 'S') goto yy84; - goto yy172; + goto yy178; } else { if (yych <= 'd') { if (yych <= 'c') goto yy84; } else { - if (yych == 't') goto yy172; + if (yych == 't') goto yy178; goto yy84; } } -yy171: - YYDEBUG(171, *YYCURSOR); +yy177: + YYDEBUG(177, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy173; - if (yych == 'a') goto yy173; + if (yych == 'A') goto yy179; + if (yych == 'a') goto yy179; goto yy55; -yy172: - YYDEBUG(172, *YYCURSOR); +yy178: + YYDEBUG(178, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy108; - if (yych == 'h') goto yy108; + if (yych == 'H') goto yy111; + if (yych == 'h') goto yy111; goto yy55; -yy173: - YYDEBUG(173, *YYCURSOR); +yy179: + YYDEBUG(179, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy88; - if (yych == 'y') goto yy88; - goto yy55; -yy174: - YYDEBUG(174, *YYCURSOR); + if (yych == 'Y') goto yy180; + if (yych != 'y') goto yy55; +yy180: + YYDEBUG(180, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy89; + if (yych == 's') goto yy89; + goto yy84; +yy181: + YYDEBUG(181, *YYCURSOR); yych = *++YYCURSOR; goto yy3; -yy175: - YYDEBUG(175, *YYCURSOR); +yy182: + YYDEBUG(182, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } -yy176: - YYDEBUG(176, *YYCURSOR); +yy183: + YYDEBUG(183, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } -yy177: - YYDEBUG(177, *YYCURSOR); +yy184: + YYDEBUG(184, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } -yy178: - YYDEBUG(178, *YYCURSOR); +yy185: + YYDEBUG(185, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } -yy179: - YYDEBUG(179, *YYCURSOR); +yy186: + YYDEBUG(186, *YYCURSOR); yych = *++YYCURSOR; - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; -yy180: - YYDEBUG(180, *YYCURSOR); - yyaccept = 0; +yy187: + YYDEBUG(187, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= '^') { if (yych <= '@') goto yy3; - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } } -yy181: - YYDEBUG(181, *YYCURSOR); - yyaccept = 0; +yy188: + YYDEBUG(188, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; @@ -3730,267 +3797,338 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= '^') { if (yych <= '@') goto yy3; - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy185; + if (yych <= 'z') goto yy192; goto yy3; } } -yy182: - YYDEBUG(182, *YYCURSOR); +yy189: + YYDEBUG(189, *YYCURSOR); ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yybm[0+yych] & 4) { - goto yy183; + goto yy190; } goto yy55; -yy183: - YYDEBUG(183, *YYCURSOR); - yyaccept = 0; +yy190: + YYDEBUG(190, *YYCURSOR); + yyaccept = 1; YYMARKER = ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; - YYDEBUG(184, *YYCURSOR); + YYDEBUG(191, *YYCURSOR); if (yybm[0+yych] & 4) { - goto yy183; + goto yy190; } if (yych <= '.') { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; goto yy3; } -yy185: - YYDEBUG(185, *YYCURSOR); - yyaccept = 0; +yy192: + YYDEBUG(192, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= '^') { if (yych <= '@') goto yy3; - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } } -yy186: - YYDEBUG(186, *YYCURSOR); - yyaccept = 0; +yy193: + YYDEBUG(193, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= '^') { if (yych <= '@') goto yy3; - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; if (yych >= '{') goto yy3; } } -yy187: - YYDEBUG(187, *YYCURSOR); - yyaccept = 0; +yy194: + YYDEBUG(194, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '/') { if (yych <= '.') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } -yy188: - YYDEBUG(188, *YYCURSOR); +yy195: + YYDEBUG(195, *YYCURSOR); ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy189: - YYDEBUG(189, *YYCURSOR); +yy196: + YYDEBUG(196, *YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '.') { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy55; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; goto yy55; } -yy190: - YYDEBUG(190, *YYCURSOR); +yy197: + YYDEBUG(197, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Z') goto yy175; + if (yych <= 'Z') goto yy182; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy175; + if (yych <= 'z') goto yy182; goto yy3; } -yy191: - YYDEBUG(191, *YYCURSOR); +yy198: + YYDEBUG(198, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { if (yych <= 'Z') { - if (yych >= 'U') goto yy176; + if (yych >= 'U') goto yy183; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy176; + if (yych <= 'z') goto yy183; goto yy3; } } - YYDEBUG(192, *YYCURSOR); - yyaccept = 0; + YYDEBUG(199, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych != '+') goto yy3; } } else { if (yych <= 'Z') { - if (yych <= '-') goto yy193; + if (yych <= '-') goto yy200; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy177; + if (yych <= 'z') goto yy184; goto yy3; } } -yy193: - YYDEBUG(193, *YYCURSOR); +yy200: + YYDEBUG(200, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy194; - if (yych <= '2') goto yy195; - if (yych <= '9') goto yy196; + if (yych <= '1') goto yy201; + if (yych <= '2') goto yy202; + if (yych <= '9') goto yy203; goto yy55; -yy194: - YYDEBUG(194, *YYCURSOR); - yych = *++YYCURSOR; +yy201: + YYDEBUG(201, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') goto yy3; - if (yych <= '9') goto yy196; - if (yych <= ':') goto yy197; + if (yych <= '9') goto yy206; + if (yych <= ':') goto yy204; goto yy3; -yy195: - YYDEBUG(195, *YYCURSOR); - yych = *++YYCURSOR; +yy202: + YYDEBUG(202, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '5') { if (yych <= '/') goto yy3; - if (yych >= '5') goto yy198; + if (yych <= '4') goto yy206; + goto yy205; } else { - if (yych <= '9') goto yy174; - if (yych <= ':') goto yy197; + if (yych <= '9') goto yy181; + if (yych <= ':') goto yy204; goto yy3; } -yy196: - YYDEBUG(196, *YYCURSOR); - yych = *++YYCURSOR; +yy203: + YYDEBUG(203, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') goto yy3; - if (yych <= '5') goto yy198; - if (yych <= '9') goto yy174; + if (yych <= '5') goto yy205; + if (yych <= '9') goto yy181; if (yych >= ';') goto yy3; -yy197: - YYDEBUG(197, *YYCURSOR); +yy204: + YYDEBUG(204, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy205; + if (yych <= '9') goto yy181; + goto yy55; +yy205: + YYDEBUG(205, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy3; - if (yych <= '5') goto yy198; - if (yych <= '9') goto yy174; + if (yych <= '9') goto yy181; goto yy3; -yy198: - YYDEBUG(198, *YYCURSOR); +yy206: + YYDEBUG(206, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy3; + if (yych <= '5') goto yy207; + if (yych <= '9') goto yy181; + if (yych <= ':') goto yy208; + goto yy3; +yy207: + YYDEBUG(207, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy3; - if (yych <= '9') goto yy174; + if (yych <= '9') goto yy214; goto yy3; -yy199: - YYDEBUG(199, *YYCURSOR); +yy208: + YYDEBUG(208, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy209; + if (yych <= '9') goto yy181; + goto yy55; +yy209: + YYDEBUG(209, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy3; + if (yych >= ':') goto yy3; + YYDEBUG(210, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yych != ':') goto yy3; + YYDEBUG(211, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy212; + if (yych <= '6') goto yy213; + goto yy55; +yy212: + YYDEBUG(212, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy181; + goto yy55; +yy213: + YYDEBUG(213, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy181; + goto yy55; +yy214: + YYDEBUG(214, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy3; + if (yych <= '5') goto yy215; + if (yych <= '6') goto yy216; + goto yy3; +yy215: + YYDEBUG(215, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy181; + goto yy55; +yy216: + YYDEBUG(216, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy181; + goto yy55; +yy217: + YYDEBUG(217, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'C') goto yy176; - if (yych >= 'E') goto yy202; + if (yych <= 'C') goto yy183; + if (yych >= 'E') goto yy220; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'd') goto yy200; - if (yych <= 'e') goto yy202; - if (yych <= 'z') goto yy176; + if (yych <= 'd') goto yy218; + if (yych <= 'e') goto yy220; + if (yych <= 'z') goto yy183; goto yy3; } } -yy200: - YYDEBUG(200, *YYCURSOR); +yy218: + YYDEBUG(218, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= 'N') { if (yych <= ')') { - if (yych >= ')') goto yy174; + if (yych >= ')') goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'M') goto yy177; - goto yy208; + if (yych <= '@') goto yy219; + if (yych <= 'M') goto yy184; + goto yy226; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy177; - if (yych >= 'a') goto yy177; + if (yych <= 'Z') goto yy184; + if (yych >= 'a') goto yy184; } else { - if (yych <= 'n') goto yy208; - if (yych <= 'z') goto yy177; + if (yych <= 'n') goto yy226; + if (yych <= 'z') goto yy184; } } -yy201: - YYDEBUG(201, *YYCURSOR); -#line 1706 "ext/date/lib/parse_date.re" +yy219: + YYDEBUG(219, *YYCURSOR); +#line 1749 "ext/date/lib/parse_date.re" { const timelib_relunit* relunit; DEBUG_OUTPUT("daytext"); @@ -4007,527 +4145,553 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_WEEKDAY; } -#line 4009 "" -yy202: - YYDEBUG(202, *YYCURSOR); +#line 4149 "" +yy220: + YYDEBUG(220, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'K') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'J') goto yy177; + if (yych <= 'J') goto yy184; } } else { if (yych <= 'j') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'k') goto yy203; - if (yych <= 'z') goto yy177; + if (yych <= 'k') goto yy221; + if (yych <= 'z') goto yy184; goto yy3; } } -yy203: - YYDEBUG(203, *YYCURSOR); +yy221: + YYDEBUG(221, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy178; + if (yych <= 'C') goto yy185; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'd') goto yy204; - if (yych <= 'z') goto yy178; + if (yych <= 'd') goto yy222; + if (yych <= 'z') goto yy185; goto yy3; } } -yy204: - YYDEBUG(204, *YYCURSOR); +yy222: + YYDEBUG(222, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; goto yy3; } else { - if (yych <= 'a') goto yy205; - if (yych <= 'z') goto yy179; + if (yych <= 'a') goto yy223; + if (yych <= 'z') goto yy186; goto yy3; } } -yy205: - YYDEBUG(205, *YYCURSOR); +yy223: + YYDEBUG(223, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'X') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Y') goto yy206; + if (yych <= 'Y') goto yy224; if (yych != 'y') goto yy3; } -yy206: - YYDEBUG(206, *YYCURSOR); +yy224: + YYDEBUG(224, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy207; - if (yych != 's') goto yy201; -yy207: - YYDEBUG(207, *YYCURSOR); + if (yych == 'S') goto yy225; + if (yych != 's') goto yy219; +yy225: + YYDEBUG(225, *YYCURSOR); yych = *++YYCURSOR; - goto yy201; -yy208: - YYDEBUG(208, *YYCURSOR); + goto yy219; +yy226: + YYDEBUG(226, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy178; + if (yych <= 'D') goto yy185; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'e') goto yy209; - if (yych <= 'z') goto yy178; + if (yych <= 'e') goto yy227; + if (yych <= 'z') goto yy185; goto yy3; } } -yy209: - YYDEBUG(209, *YYCURSOR); +yy227: + YYDEBUG(227, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy179; + if (yych <= 'R') goto yy186; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 's') goto yy210; - if (yych <= 'z') goto yy179; + if (yych <= 's') goto yy228; + if (yych <= 'z') goto yy186; goto yy3; } } -yy210: - YYDEBUG(210, *YYCURSOR); - yyaccept = 0; +yy228: + YYDEBUG(228, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'D') goto yy211; + if (yych <= 'D') goto yy229; if (yych != 'd') goto yy3; } -yy211: - YYDEBUG(211, *YYCURSOR); +yy229: + YYDEBUG(229, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy212; + if (yych == 'A') goto yy230; if (yych != 'a') goto yy55; -yy212: - YYDEBUG(212, *YYCURSOR); +yy230: + YYDEBUG(230, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy207; - if (yych == 'y') goto yy207; - goto yy55; -yy213: - YYDEBUG(213, *YYCURSOR); - yyaccept = 0; + if (yych == 'Y') goto yy231; + if (yych != 'y') goto yy55; +yy231: + YYDEBUG(231, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; +yy232: + YYDEBUG(232, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '/') { if (yych <= '.') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy176; - goto yy200; + if (yych <= 'C') goto yy183; + goto yy218; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'E') goto yy202; - goto yy176; + if (yych <= 'E') goto yy220; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'd') { - if (yych <= 'c') goto yy181; + if (yych <= 'c') goto yy188; } else { - if (yych <= 'e') goto yy215; - if (yych <= 'z') goto yy181; + if (yych <= 'e') goto yy234; + if (yych <= 'z') goto yy188; goto yy3; } } } - YYDEBUG(214, *YYCURSOR); + YYDEBUG(233, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy208; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'N') goto yy226; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 'm') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 'n') goto yy221; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 'n') goto yy240; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy215: - YYDEBUG(215, *YYCURSOR); - yyaccept = 0; +yy234: + YYDEBUG(234, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'J') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'K') goto yy203; - if (yych <= 'Z') goto yy177; + if (yych <= 'K') goto yy221; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'j') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'k') goto yy216; - if (yych <= 'z') goto yy185; + if (yych <= 'k') goto yy235; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy216: - YYDEBUG(216, *YYCURSOR); - yyaccept = 0; +yy235: + YYDEBUG(235, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy204; - if (yych <= 'Z') goto yy178; + if (yych <= 'D') goto yy222; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'd') goto yy217; - if (yych <= 'z') goto yy186; + if (yych <= 'd') goto yy236; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy217: - YYDEBUG(217, *YYCURSOR); - yyaccept = 0; +yy236: + YYDEBUG(236, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy205; - if (yych <= 'Z') goto yy179; + if (yych <= 'A') goto yy223; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy218; - if (yych <= 'z') goto yy187; + if (yych <= 'a') goto yy237; + if (yych <= 'z') goto yy194; goto yy3; } } -yy218: - YYDEBUG(218, *YYCURSOR); - yyaccept = 0; +yy237: + YYDEBUG(237, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'Y') goto yy206; - if (yych == '_') goto yy182; + if (yych <= 'Y') goto yy224; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'y') goto yy219; - if (yych <= 'z') goto yy188; + if (yych == 'y') goto yy238; + if (yych <= 'z') goto yy195; goto yy3; } } -yy219: - YYDEBUG(219, *YYCURSOR); +yy238: + YYDEBUG(238, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '.') { - if (yych == '-') goto yy182; - goto yy201; + if (yych == '-') goto yy189; + goto yy219; } else { - if (yych <= '/') goto yy182; - if (yych <= 'R') goto yy201; - goto yy207; + if (yych <= '/') goto yy189; + if (yych <= 'R') goto yy219; + goto yy225; } } else { if (yych <= '`') { - if (yych == '_') goto yy182; - goto yy201; + if (yych == '_') goto yy189; + goto yy219; } else { - if (yych == 's') goto yy220; - if (yych <= 'z') goto yy188; - goto yy201; + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; } } -yy220: - YYDEBUG(220, *YYCURSOR); +yy239: + YYDEBUG(239, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '.') { - if (yych == '-') goto yy182; - goto yy201; + if (yych == '-') goto yy189; + goto yy219; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; - goto yy201; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; + goto yy219; } -yy221: - YYDEBUG(221, *YYCURSOR); - yyaccept = 0; +yy240: + YYDEBUG(240, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy209; - if (yych <= 'Z') goto yy178; + if (yych <= 'E') goto yy227; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'e') goto yy222; - if (yych <= 'z') goto yy186; + if (yych <= 'e') goto yy241; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy222: - YYDEBUG(222, *YYCURSOR); - yyaccept = 0; +yy241: + YYDEBUG(241, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy210; - if (yych <= 'Z') goto yy179; + if (yych <= 'S') goto yy228; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'r') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 's') goto yy223; - if (yych <= 'z') goto yy187; + if (yych <= 's') goto yy242; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy223: - YYDEBUG(223, *YYCURSOR); - yyaccept = 0; +yy242: + YYDEBUG(242, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'D') goto yy211; - if (yych == '_') goto yy182; + if (yych <= 'D') goto yy229; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'd') goto yy224; - if (yych <= 'z') goto yy188; + if (yych == 'd') goto yy243; + if (yych <= 'z') goto yy195; goto yy3; } } -yy224: - YYDEBUG(224, *YYCURSOR); +yy243: + YYDEBUG(243, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy212; - if (yych != 'a') goto yy189; - YYDEBUG(225, *YYCURSOR); + if (yych == 'A') goto yy230; + if (yych != 'a') goto yy196; + YYDEBUG(244, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy207; - if (yych == 'y') goto yy220; - goto yy189; -yy226: - YYDEBUG(226, *YYCURSOR); + if (yych == 'Y') goto yy231; + if (yych != 'y') goto yy196; + YYDEBUG(245, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'S') { + if (yych <= '.') { + if (yych == '-') goto yy189; + goto yy219; + } else { + if (yych <= '/') goto yy189; + if (yych <= 'R') goto yy219; + goto yy225; + } + } else { + if (yych <= '`') { + if (yych == '_') goto yy189; + goto yy219; + } else { + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; + } + } +yy246: + YYDEBUG(246, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'C') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'B') goto yy176; + if (yych <= 'B') goto yy183; } } else { if (yych <= 'b') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'c') goto yy227; - if (yych <= 'z') goto yy176; + if (yych <= 'c') goto yy247; + if (yych <= 'z') goto yy183; goto yy3; } } -yy227: - YYDEBUG(227, *YYCURSOR); +yy247: + YYDEBUG(247, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych >= '\t') goto yy230; + if (yych >= '\t') goto yy250; } else { - if (yych == ' ') goto yy230; + if (yych == ' ') goto yy250; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; } else { - if (yych == 'E') goto yy235; - goto yy177; + if (yych == 'E') goto yy255; + goto yy184; } } else { if (yych <= 'd') { - if (yych >= 'a') goto yy177; + if (yych >= 'a') goto yy184; } else { - if (yych <= 'e') goto yy235; - if (yych <= 'z') goto yy177; + if (yych <= 'e') goto yy255; + if (yych <= 'z') goto yy184; } } } -yy228: - YYDEBUG(228, *YYCURSOR); -#line 1765 "ext/date/lib/parse_date.re" +yy248: + YYDEBUG(248, *YYCURSOR); +#line 1808 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("monthtext"); TIMELIB_INIT; @@ -4536,256 +4700,256 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 4538 "" -yy229: - YYDEBUG(229, *YYCURSOR); +#line 4704 "" +yy249: + YYDEBUG(249, *YYCURSOR); ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 23) YYFILL(23); + if ((YYLIMIT - YYCURSOR) < 26) YYFILL(26); yych = *YYCURSOR; -yy230: - YYDEBUG(230, *YYCURSOR); +yy250: + YYDEBUG(250, *YYCURSOR); if (yybm[0+yych] & 16) { - goto yy229; + goto yy249; } if (yych <= '/') goto yy55; - if (yych <= '2') goto yy232; - if (yych <= '3') goto yy233; - if (yych <= '9') goto yy234; + if (yych <= '2') goto yy252; + if (yych <= '3') goto yy253; + if (yych <= '9') goto yy254; goto yy55; -yy231: - YYDEBUG(231, *YYCURSOR); +yy251: + YYDEBUG(251, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy230; - if (yych <= '0') goto yy334; - if (yych <= '2') goto yy335; - if (yych <= '3') goto yy336; - goto yy230; -yy232: - YYDEBUG(232, *YYCURSOR); + if (yych <= '/') goto yy250; + if (yych <= '0') goto yy365; + if (yych <= '2') goto yy366; + if (yych <= '3') goto yy367; + goto yy250; +yy252: + YYDEBUG(252, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy333; + goto yy364; } } } else { if (yych <= 'm') { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy233: - YYDEBUG(233, *YYCURSOR); +yy253: + YYDEBUG(253, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '1') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy333; + goto yy364; } } } else { if (yych <= 'm') { if (yych <= 'd') { - if (yych <= '9') goto yy240; + if (yych <= '9') goto yy260; if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy234: - YYDEBUG(234, *YYCURSOR); +yy254: + YYDEBUG(254, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy240; + goto yy260; } } } else { if (yych <= 'm') { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy235: - YYDEBUG(235, *YYCURSOR); +yy255: + YYDEBUG(255, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'L') goto yy178; + if (yych <= 'L') goto yy185; } } else { if (yych <= 'l') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'm') goto yy236; - if (yych <= 'z') goto yy178; + if (yych <= 'm') goto yy256; + if (yych <= 'z') goto yy185; goto yy3; } } -yy236: - YYDEBUG(236, *YYCURSOR); +yy256: + YYDEBUG(256, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy179; + if (yych <= 'A') goto yy186; } } else { if (yych <= 'a') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'b') goto yy237; - if (yych <= 'z') goto yy179; + if (yych <= 'b') goto yy257; + if (yych <= 'z') goto yy186; goto yy3; } } -yy237: - YYDEBUG(237, *YYCURSOR); - yyaccept = 0; +yy257: + YYDEBUG(257, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'E') goto yy238; + if (yych <= 'E') goto yy258; if (yych != 'e') goto yy3; } -yy238: - YYDEBUG(238, *YYCURSOR); +yy258: + YYDEBUG(258, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy239; + if (yych == 'R') goto yy259; if (yych != 'r') goto yy55; -yy239: - YYDEBUG(239, *YYCURSOR); +yy259: + YYDEBUG(259, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy230; - if (yych <= 0x1F) goto yy228; - goto yy230; + if (yych == '\t') goto yy250; + if (yych <= 0x1F) goto yy248; + goto yy250; } else { if (yych <= '.') { - if (yych <= ',') goto yy228; - goto yy230; + if (yych <= ',') goto yy248; + goto yy250; } else { - if (yych <= '/') goto yy228; - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '/') goto yy248; + if (yych <= '9') goto yy250; + goto yy248; } } -yy240: - YYDEBUG(240, *YYCURSOR); +yy260: + YYDEBUG(260, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy330; + if (yych <= '9') goto yy361; goto yy55; -yy241: - YYDEBUG(241, *YYCURSOR); +yy261: + YYDEBUG(261, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 't') goto yy329; - goto yy247; -yy242: - YYDEBUG(242, *YYCURSOR); -#line 1511 "ext/date/lib/parse_date.re" + if (yych == 't') goto yy360; + goto yy267; +yy262: + YYDEBUG(262, *YYCURSOR); +#line 1554 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datetextual | datenoyear"); @@ -4798,134 +4962,134 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 4800 "" -yy243: - YYDEBUG(243, *YYCURSOR); +#line 4966 "" +yy263: + YYDEBUG(263, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'd') goto yy329; - goto yy247; -yy244: - YYDEBUG(244, *YYCURSOR); + if (yych == 'd') goto yy360; + goto yy267; +yy264: + YYDEBUG(264, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'd') goto yy329; - goto yy247; -yy245: - YYDEBUG(245, *YYCURSOR); + if (yych == 'd') goto yy360; + goto yy267; +yy265: + YYDEBUG(265, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'h') goto yy329; - goto yy247; -yy246: - YYDEBUG(246, *YYCURSOR); + if (yych == 'h') goto yy360; + goto yy267; +yy266: + YYDEBUG(266, *YYCURSOR); yyaccept = 6; YYMARKER = ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 18) YYFILL(18); + if ((YYLIMIT - YYCURSOR) < 21) YYFILL(21); yych = *YYCURSOR; -yy247: - YYDEBUG(247, *YYCURSOR); +yy267: + YYDEBUG(267, *YYCURSOR); if (yybm[0+yych] & 32) { - goto yy246; + goto yy266; } if (yych <= '2') { - if (yych <= '/') goto yy242; - if (yych <= '0') goto yy320; - if (yych <= '1') goto yy321; - goto yy322; + if (yych <= '/') goto yy262; + if (yych <= '0') goto yy351; + if (yych <= '1') goto yy352; + goto yy353; } else { - if (yych <= '9') goto yy323; - if (yych == 'T') goto yy249; - goto yy242; + if (yych <= '9') goto yy354; + if (yych == 'T') goto yy269; + goto yy262; } -yy248: - YYDEBUG(248, *YYCURSOR); +yy268: + YYDEBUG(268, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '0') { - if (yych <= '/') goto yy242; - goto yy250; + if (yych <= '/') goto yy262; + goto yy270; } else { - if (yych <= '1') goto yy251; - if (yych <= '2') goto yy252; - goto yy253; + if (yych <= '1') goto yy271; + if (yych <= '2') goto yy272; + goto yy273; } } else { if (yych <= 'T') { - if (yych <= 'S') goto yy242; + if (yych <= 'S') goto yy262; } else { - if (yych != 't') goto yy242; + if (yych != 't') goto yy262; } } -yy249: - YYDEBUG(249, *YYCURSOR); +yy269: + YYDEBUG(269, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy318; - if (yych <= '2') goto yy319; - if (yych <= '9') goto yy308; + if (yych <= '1') goto yy349; + if (yych <= '2') goto yy350; + if (yych <= '9') goto yy339; goto yy55; -yy250: - YYDEBUG(250, *YYCURSOR); +yy270: + YYDEBUG(270, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy309; + if (yych == '.') goto yy340; goto yy55; } else { - if (yych <= '0') goto yy308; - if (yych <= '9') goto yy253; - if (yych <= ':') goto yy309; + if (yych <= '0') goto yy339; + if (yych <= '9') goto yy273; + if (yych <= ':') goto yy340; goto yy55; } -yy251: - YYDEBUG(251, *YYCURSOR); +yy271: + YYDEBUG(271, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy254; + if (yych == '.') goto yy274; goto yy55; } else { - if (yych <= '2') goto yy253; - if (yych <= '9') goto yy308; - if (yych <= ':') goto yy254; + if (yych <= '2') goto yy273; + if (yych <= '9') goto yy339; + if (yych <= ':') goto yy274; goto yy55; } -yy252: - YYDEBUG(252, *YYCURSOR); +yy272: + YYDEBUG(272, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy254; + if (yych == '.') goto yy274; goto yy55; } else { - if (yych <= '4') goto yy308; - if (yych == ':') goto yy254; + if (yych <= '4') goto yy339; + if (yych == ':') goto yy274; goto yy55; } -yy253: - YYDEBUG(253, *YYCURSOR); +yy273: + YYDEBUG(273, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '.') goto yy254; + if (yych == '.') goto yy274; if (yych != ':') goto yy55; -yy254: - YYDEBUG(254, *YYCURSOR); +yy274: + YYDEBUG(274, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy255; - if (yych <= '9') goto yy257; + if (yych <= '5') goto yy275; + if (yych <= '9') goto yy277; goto yy55; -yy255: - YYDEBUG(255, *YYCURSOR); +yy275: + YYDEBUG(275, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy258; + if (yych == '.') goto yy278; } else { - if (yych <= '9') goto yy301; - if (yych <= ':') goto yy258; + if (yych <= '9') goto yy332; + if (yych <= ':') goto yy278; } -yy256: - YYDEBUG(256, *YYCURSOR); -#line 1813 "ext/date/lib/parse_date.re" +yy276: + YYDEBUG(276, *YYCURSOR); +#line 1856 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); @@ -4954,305 +5118,305 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 4956 "" -yy257: - YYDEBUG(257, *YYCURSOR); +#line 5122 "" +yy277: + YYDEBUG(277, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy258; - if (yych != ':') goto yy256; -yy258: - YYDEBUG(258, *YYCURSOR); + if (yych == '.') goto yy278; + if (yych != ':') goto yy276; +yy278: + YYDEBUG(278, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy259; - if (yych <= '6') goto yy260; - if (yych <= '9') goto yy261; + if (yych <= '5') goto yy279; + if (yych <= '6') goto yy280; + if (yych <= '9') goto yy281; goto yy55; -yy259: - YYDEBUG(259, *YYCURSOR); +yy279: + YYDEBUG(279, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy256; - if (yych <= '9') goto yy262; - goto yy256; -yy260: - YYDEBUG(260, *YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '9') goto yy282; + goto yy276; +yy280: + YYDEBUG(280, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '0') goto yy262; - goto yy256; -yy261: - YYDEBUG(261, *YYCURSOR); + if (yych == '0') goto yy282; + goto yy276; +yy281: + YYDEBUG(281, *YYCURSOR); yych = *++YYCURSOR; - goto yy256; -yy262: - YYDEBUG(262, *YYCURSOR); + goto yy276; +yy282: + YYDEBUG(282, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '*') { if (yych <= 0x1F) { - if (yych == '\t') goto yy264; - goto yy256; + if (yych == '\t') goto yy284; + goto yy276; } else { - if (yych <= ' ') goto yy264; - if (yych == '(') goto yy264; - goto yy256; + if (yych <= ' ') goto yy284; + if (yych == '(') goto yy284; + goto yy276; } } else { if (yych <= '@') { - if (yych == ',') goto yy256; - if (yych <= '-') goto yy264; - goto yy256; + if (yych == ',') goto yy276; + if (yych <= '-') goto yy284; + goto yy276; } else { - if (yych <= 'Z') goto yy264; - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy264; - goto yy256; + if (yych <= 'Z') goto yy284; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy284; + goto yy276; } } -yy263: - YYDEBUG(263, *YYCURSOR); +yy283: + YYDEBUG(283, *YYCURSOR); ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); + if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy264: - YYDEBUG(264, *YYCURSOR); +yy284: + YYDEBUG(284, *YYCURSOR); if (yych <= '@') { if (yych <= '\'') { if (yych <= '\t') { if (yych <= 0x08) goto yy55; - goto yy263; + goto yy283; } else { - if (yych == ' ') goto yy263; + if (yych == ' ') goto yy283; goto yy55; } } else { if (yych <= '+') { - if (yych <= '(') goto yy267; + if (yych <= '(') goto yy287; if (yych <= '*') goto yy55; - goto yy266; + goto yy286; } else { - if (yych == '-') goto yy266; + if (yych == '-') goto yy286; goto yy55; } } } else { if (yych <= 'Z') { if (yych <= 'G') { - if (yych <= 'A') goto yy268; - if (yych <= 'F') goto yy269; + if (yych <= 'A') goto yy288; + if (yych <= 'F') goto yy289; } else { - if (yych == 'P') goto yy268; - goto yy269; + if (yych == 'P') goto yy288; + goto yy289; } } else { if (yych <= 'o') { if (yych <= '`') goto yy55; - if (yych <= 'a') goto yy270; - goto yy271; + if (yych <= 'a') goto yy290; + goto yy291; } else { - if (yych <= 'p') goto yy270; - if (yych <= 'z') goto yy271; + if (yych <= 'p') goto yy290; + if (yych <= 'z') goto yy291; goto yy55; } } } -yy265: - YYDEBUG(265, *YYCURSOR); +yy285: + YYDEBUG(285, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { - if (yych == ')') goto yy261; - if (yych <= '@') goto yy256; - goto yy272; + if (yych == ')') goto yy281; + if (yych <= '@') goto yy276; + goto yy292; } else { if (yych <= 'Z') { - if (yych <= 'M') goto yy299; - goto yy272; + if (yych <= 'M') goto yy330; + goto yy292; } else { - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy283; - goto yy256; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy303; + goto yy276; } } -yy266: - YYDEBUG(266, *YYCURSOR); +yy286: + YYDEBUG(286, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy294; - if (yych <= '2') goto yy295; - if (yych <= '9') goto yy296; + if (yych <= '1') goto yy314; + if (yych <= '2') goto yy315; + if (yych <= '9') goto yy316; goto yy55; -yy267: - YYDEBUG(267, *YYCURSOR); +yy287: + YYDEBUG(287, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') goto yy55; - if (yych <= 'Z') goto yy271; + if (yych <= 'Z') goto yy291; if (yych <= '`') goto yy55; - if (yych <= 'z') goto yy271; + if (yych <= 'z') goto yy291; goto yy55; -yy268: - YYDEBUG(268, *YYCURSOR); +yy288: + YYDEBUG(288, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '-') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= '.') goto yy277; - if (yych <= '@') goto yy256; - goto yy272; + if (yych <= '.') goto yy297; + if (yych <= '@') goto yy276; + goto yy292; } } else { if (yych <= '`') { - if (yych <= 'M') goto yy278; - if (yych <= 'Z') goto yy272; - goto yy256; + if (yych <= 'M') goto yy298; + if (yych <= 'Z') goto yy292; + goto yy276; } else { - if (yych == 'm') goto yy293; - if (yych <= 'z') goto yy283; - goto yy256; + if (yych == 'm') goto yy313; + if (yych <= 'z') goto yy303; + goto yy276; } } -yy269: - YYDEBUG(269, *YYCURSOR); +yy289: + YYDEBUG(289, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= 'Z') goto yy272; - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy283; - goto yy256; + if (yych <= 'Z') goto yy292; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy303; + goto yy276; } -yy270: - YYDEBUG(270, *YYCURSOR); +yy290: + YYDEBUG(290, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '-') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= '.') goto yy277; - if (yych <= '@') goto yy256; - goto yy272; + if (yych <= '.') goto yy297; + if (yych <= '@') goto yy276; + goto yy292; } } else { if (yych <= '`') { - if (yych <= 'M') goto yy278; - if (yych <= 'Z') goto yy272; - goto yy256; + if (yych <= 'M') goto yy298; + if (yych <= 'Z') goto yy292; + goto yy276; } else { - if (yych == 'm') goto yy278; - if (yych <= 'z') goto yy272; - goto yy256; + if (yych == 'm') goto yy298; + if (yych <= 'z') goto yy292; + goto yy276; } } -yy271: - YYDEBUG(271, *YYCURSOR); +yy291: + YYDEBUG(291, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= 'Z') goto yy272; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= 'Z') goto yy292; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } -yy272: - YYDEBUG(272, *YYCURSOR); +yy292: + YYDEBUG(292, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= 'Z') goto yy273; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= 'Z') goto yy293; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } -yy273: - YYDEBUG(273, *YYCURSOR); +yy293: + YYDEBUG(293, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= 'Z') goto yy274; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= 'Z') goto yy294; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } -yy274: - YYDEBUG(274, *YYCURSOR); +yy294: + YYDEBUG(294, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= 'Z') goto yy275; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= 'Z') goto yy295; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } -yy275: - YYDEBUG(275, *YYCURSOR); +yy295: + YYDEBUG(295, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '@') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych <= 'Z') goto yy276; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= 'Z') goto yy296; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } -yy276: - YYDEBUG(276, *YYCURSOR); +yy296: + YYDEBUG(296, *YYCURSOR); yych = *++YYCURSOR; - if (yych == ')') goto yy261; - goto yy256; -yy277: - YYDEBUG(277, *YYCURSOR); + if (yych == ')') goto yy281; + goto yy276; +yy297: + YYDEBUG(297, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy282; - if (yych == 'm') goto yy282; + if (yych == 'M') goto yy302; + if (yych == 'm') goto yy302; goto yy55; -yy278: - YYDEBUG(278, *YYCURSOR); +yy298: + YYDEBUG(298, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ')') { if (yych <= '\t') { - if (yych <= 0x00) goto yy280; - if (yych <= 0x08) goto yy256; - goto yy280; + if (yych <= 0x00) goto yy300; + if (yych <= 0x08) goto yy276; + goto yy300; } else { - if (yych == ' ') goto yy280; - if (yych <= '(') goto yy256; - goto yy261; + if (yych == ' ') goto yy300; + if (yych <= '(') goto yy276; + goto yy281; } } else { if (yych <= '@') { - if (yych != '.') goto yy256; + if (yych != '.') goto yy276; } else { - if (yych <= 'Z') goto yy273; - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy273; - goto yy256; + if (yych <= 'Z') goto yy293; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy293; + goto yy276; } } -yy279: - YYDEBUG(279, *YYCURSOR); +yy299: + YYDEBUG(299, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy280; + if (yych <= 0x00) goto yy300; if (yych <= 0x08) goto yy55; } else { if (yych != ' ') goto yy55; } -yy280: - YYDEBUG(280, *YYCURSOR); +yy300: + YYDEBUG(300, *YYCURSOR); ++YYCURSOR; - YYDEBUG(281, *YYCURSOR); -#line 1789 "ext/date/lib/parse_date.re" + YYDEBUG(301, *YYCURSOR); +#line 1832 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); TIMELIB_INIT; @@ -5275,614 +5439,685 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 5277 "" -yy282: - YYDEBUG(282, *YYCURSOR); +#line 5443 "" +yy302: + YYDEBUG(302, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy280; - if (yych == '\t') goto yy280; + if (yych <= 0x00) goto yy300; + if (yych == '\t') goto yy300; goto yy55; } else { - if (yych <= ' ') goto yy280; - if (yych == '.') goto yy279; + if (yych <= ' ') goto yy300; + if (yych == '.') goto yy299; goto yy55; } -yy283: - YYDEBUG(283, *YYCURSOR); +yy303: + YYDEBUG(303, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych == '.') goto yy256; - goto yy285; + if (yych == '.') goto yy276; + goto yy305; } } else { if (yych <= '^') { - if (yych <= '@') goto yy256; - if (yych <= 'Z') goto yy273; - goto yy256; + if (yych <= '@') goto yy276; + if (yych <= 'Z') goto yy293; + goto yy276; } else { - if (yych <= '_') goto yy285; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= '_') goto yy305; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } } -yy284: - YYDEBUG(284, *YYCURSOR); +yy304: + YYDEBUG(304, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych == '.') goto yy256; + if (yych == '.') goto yy276; } } else { if (yych <= '^') { - if (yych <= '@') goto yy256; - if (yych <= 'Z') goto yy274; - goto yy256; + if (yych <= '@') goto yy276; + if (yych <= 'Z') goto yy294; + goto yy276; } else { - if (yych <= '_') goto yy285; - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy288; - goto yy256; + if (yych <= '_') goto yy305; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy308; + goto yy276; } } -yy285: - YYDEBUG(285, *YYCURSOR); +yy305: + YYDEBUG(305, *YYCURSOR); ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; if (yych <= '@') goto yy55; - if (yych <= 'Z') goto yy286; + if (yych <= 'Z') goto yy306; if (yych <= '`') goto yy55; if (yych >= '{') goto yy55; -yy286: - YYDEBUG(286, *YYCURSOR); +yy306: + YYDEBUG(306, *YYCURSOR); yyaccept = 7; YYMARKER = ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; - YYDEBUG(287, *YYCURSOR); + YYDEBUG(307, *YYCURSOR); if (yych <= '@') { if (yych <= '-') { - if (yych <= ',') goto yy256; - goto yy285; + if (yych <= ',') goto yy276; + goto yy305; } else { - if (yych == '/') goto yy285; - goto yy256; + if (yych == '/') goto yy305; + goto yy276; } } else { if (yych <= '_') { - if (yych <= 'Z') goto yy286; - if (yych <= '^') goto yy256; - goto yy285; + if (yych <= 'Z') goto yy306; + if (yych <= '^') goto yy276; + goto yy305; } else { - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy286; - goto yy256; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy306; + goto yy276; } } -yy288: - YYDEBUG(288, *YYCURSOR); +yy308: + YYDEBUG(308, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych == '.') goto yy256; - goto yy285; + if (yych == '.') goto yy276; + goto yy305; } } else { if (yych <= '^') { - if (yych <= '@') goto yy256; - if (yych <= 'Z') goto yy275; - goto yy256; + if (yych <= '@') goto yy276; + if (yych <= 'Z') goto yy295; + goto yy276; } else { - if (yych <= '_') goto yy285; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= '_') goto yy305; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } } - YYDEBUG(289, *YYCURSOR); + YYDEBUG(309, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy261; - goto yy256; + if (yych == ')') goto yy281; + goto yy276; } else { - if (yych == '.') goto yy256; - goto yy285; + if (yych == '.') goto yy276; + goto yy305; } } else { if (yych <= '^') { - if (yych <= '@') goto yy256; - if (yych <= 'Z') goto yy276; - goto yy256; + if (yych <= '@') goto yy276; + if (yych <= 'Z') goto yy296; + goto yy276; } else { - if (yych <= '_') goto yy285; - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= '_') goto yy305; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } } - YYDEBUG(290, *YYCURSOR); + YYDEBUG(310, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ')') { - if (yych <= '(') goto yy256; - goto yy261; + if (yych <= '(') goto yy276; + goto yy281; } else { - if (yych == '-') goto yy285; - goto yy256; + if (yych == '-') goto yy305; + goto yy276; } } else { if (yych <= '_') { - if (yych <= '/') goto yy285; - if (yych <= '^') goto yy256; - goto yy285; + if (yych <= '/') goto yy305; + if (yych <= '^') goto yy276; + goto yy305; } else { - if (yych <= '`') goto yy256; - if (yych >= '{') goto yy256; + if (yych <= '`') goto yy276; + if (yych >= '{') goto yy276; } } -yy291: - YYDEBUG(291, *YYCURSOR); +yy311: + YYDEBUG(311, *YYCURSOR); ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; - YYDEBUG(292, *YYCURSOR); + YYDEBUG(312, *YYCURSOR); if (yych <= '/') { - if (yych == '-') goto yy285; + if (yych == '-') goto yy305; if (yych <= '.') goto yy55; - goto yy285; + goto yy305; } else { if (yych <= '_') { if (yych <= '^') goto yy55; - goto yy285; + goto yy305; } else { if (yych <= '`') goto yy55; - if (yych <= 'z') goto yy291; + if (yych <= 'z') goto yy311; goto yy55; } } -yy293: - YYDEBUG(293, *YYCURSOR); +yy313: + YYDEBUG(313, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= 0x1F) { - if (yych <= 0x00) goto yy280; - if (yych == '\t') goto yy280; - goto yy256; + if (yych <= 0x00) goto yy300; + if (yych == '\t') goto yy300; + goto yy276; } else { if (yych <= '(') { - if (yych <= ' ') goto yy280; - goto yy256; + if (yych <= ' ') goto yy300; + goto yy276; } else { - if (yych <= ')') goto yy261; - if (yych <= ',') goto yy256; - goto yy285; + if (yych <= ')') goto yy281; + if (yych <= ',') goto yy276; + goto yy305; } } } else { if (yych <= 'Z') { - if (yych <= '.') goto yy279; - if (yych <= '/') goto yy285; - if (yych <= '@') goto yy256; - goto yy273; + if (yych <= '.') goto yy299; + if (yych <= '/') goto yy305; + if (yych <= '@') goto yy276; + goto yy293; } else { if (yych <= '_') { - if (yych <= '^') goto yy256; - goto yy285; + if (yych <= '^') goto yy276; + goto yy305; } else { - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy284; - goto yy256; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy304; + goto yy276; } } } -yy294: - YYDEBUG(294, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy256; - if (yych <= '9') goto yy296; - if (yych <= ':') goto yy297; - goto yy256; -yy295: - YYDEBUG(295, *YYCURSOR); - yych = *++YYCURSOR; +yy314: + YYDEBUG(314, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '9') goto yy319; + if (yych <= ':') goto yy317; + goto yy276; +yy315: + YYDEBUG(315, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '5') { - if (yych <= '/') goto yy256; - if (yych >= '5') goto yy298; + if (yych <= '/') goto yy276; + if (yych <= '4') goto yy319; + goto yy318; } else { - if (yych <= '9') goto yy261; - if (yych <= ':') goto yy297; - goto yy256; + if (yych <= '9') goto yy281; + if (yych <= ':') goto yy317; + goto yy276; } -yy296: - YYDEBUG(296, *YYCURSOR); +yy316: + YYDEBUG(316, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '5') goto yy318; + if (yych <= '9') goto yy281; + if (yych >= ';') goto yy276; +yy317: + YYDEBUG(317, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy256; - if (yych <= '5') goto yy298; - if (yych <= '9') goto yy261; - if (yych >= ';') goto yy256; -yy297: - YYDEBUG(297, *YYCURSOR); + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy318; + if (yych <= '9') goto yy281; + goto yy55; +yy318: + YYDEBUG(318, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy256; - if (yych <= '5') goto yy298; - if (yych <= '9') goto yy261; - goto yy256; -yy298: - YYDEBUG(298, *YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '9') goto yy281; + goto yy276; +yy319: + YYDEBUG(319, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '5') goto yy320; + if (yych <= '9') goto yy281; + if (yych <= ':') goto yy321; + goto yy276; +yy320: + YYDEBUG(320, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy256; - if (yych <= '9') goto yy261; - goto yy256; -yy299: - YYDEBUG(299, *YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '9') goto yy327; + goto yy276; +yy321: + YYDEBUG(321, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy322; + if (yych <= '9') goto yy281; + goto yy55; +yy322: + YYDEBUG(322, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy276; + if (yych >= ':') goto yy276; + YYDEBUG(323, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych != ':') goto yy276; + YYDEBUG(324, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy325; + if (yych <= '6') goto yy326; + goto yy55; +yy325: + YYDEBUG(325, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy281; + goto yy55; +yy326: + YYDEBUG(326, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy281; + goto yy55; +yy327: + YYDEBUG(327, *YYCURSOR); + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '5') goto yy328; + if (yych <= '6') goto yy329; + goto yy276; +yy328: + YYDEBUG(328, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy281; + goto yy55; +yy329: + YYDEBUG(329, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy281; + goto yy55; +yy330: + YYDEBUG(330, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == ')') goto yy261; - if (yych <= '@') goto yy256; - goto yy273; + if (yych == ')') goto yy281; + if (yych <= '@') goto yy276; + goto yy293; } else { if (yych <= 'Z') { - if (yych >= 'U') goto yy273; + if (yych >= 'U') goto yy293; } else { - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy273; - goto yy256; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy293; + goto yy276; } } - YYDEBUG(300, *YYCURSOR); + YYDEBUG(331, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= ')') { - if (yych <= '(') goto yy256; - goto yy261; + if (yych <= '(') goto yy276; + goto yy281; } else { - if (yych == '+') goto yy266; - goto yy256; + if (yych == '+') goto yy286; + goto yy276; } } else { if (yych <= 'Z') { - if (yych <= '-') goto yy266; - if (yych <= '@') goto yy256; - goto yy274; + if (yych <= '-') goto yy286; + if (yych <= '@') goto yy276; + goto yy294; } else { - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy274; - goto yy256; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy294; + goto yy276; } } -yy301: - YYDEBUG(301, *YYCURSOR); +yy332: + YYDEBUG(332, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy302; - if (yych <= 0x1F) goto yy256; + if (yych == '\t') goto yy333; + if (yych <= 0x1F) goto yy276; } else { - if (yych == '.') goto yy258; - if (yych <= '9') goto yy256; - goto yy258; + if (yych == '.') goto yy278; + if (yych <= '9') goto yy276; + goto yy278; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy304; - if (yych <= 'O') goto yy256; - goto yy304; + if (yych == 'A') goto yy335; + if (yych <= 'O') goto yy276; + goto yy335; } else { if (yych <= 'a') { - if (yych <= '`') goto yy256; - goto yy304; + if (yych <= '`') goto yy276; + goto yy335; } else { - if (yych == 'p') goto yy304; - goto yy256; + if (yych == 'p') goto yy335; + goto yy276; } } } -yy302: - YYDEBUG(302, *YYCURSOR); +yy333: + YYDEBUG(333, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(303, *YYCURSOR); + YYDEBUG(334, *YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy302; + if (yych == '\t') goto yy333; goto yy55; } else { - if (yych <= ' ') goto yy302; + if (yych <= ' ') goto yy333; if (yych <= '@') goto yy55; } } else { if (yych <= '`') { if (yych != 'P') goto yy55; } else { - if (yych <= 'a') goto yy304; + if (yych <= 'a') goto yy335; if (yych != 'p') goto yy55; } } -yy304: - YYDEBUG(304, *YYCURSOR); +yy335: + YYDEBUG(335, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy55; } else { - if (yych <= 'M') goto yy306; - if (yych == 'm') goto yy306; + if (yych <= 'M') goto yy337; + if (yych == 'm') goto yy337; goto yy55; } - YYDEBUG(305, *YYCURSOR); + YYDEBUG(336, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy306; + if (yych == 'M') goto yy337; if (yych != 'm') goto yy55; -yy306: - YYDEBUG(306, *YYCURSOR); +yy337: + YYDEBUG(337, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy280; - if (yych == '\t') goto yy280; + if (yych <= 0x00) goto yy300; + if (yych == '\t') goto yy300; goto yy55; } else { - if (yych <= ' ') goto yy280; + if (yych <= ' ') goto yy300; if (yych != '.') goto yy55; } - YYDEBUG(307, *YYCURSOR); + YYDEBUG(338, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy280; + if (yych <= 0x00) goto yy300; if (yych <= 0x08) goto yy55; - goto yy280; + goto yy300; } else { - if (yych == ' ') goto yy280; + if (yych == ' ') goto yy300; goto yy55; } -yy308: - YYDEBUG(308, *YYCURSOR); +yy339: + YYDEBUG(339, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '.') goto yy309; + if (yych == '.') goto yy340; if (yych != ':') goto yy55; -yy309: - YYDEBUG(309, *YYCURSOR); +yy340: + YYDEBUG(340, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy310; - if (yych <= '9') goto yy311; + if (yych <= '5') goto yy341; + if (yych <= '9') goto yy342; goto yy55; -yy310: - YYDEBUG(310, *YYCURSOR); +yy341: + YYDEBUG(341, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy312; - goto yy256; + if (yych == '.') goto yy343; + goto yy276; } else { - if (yych <= '9') goto yy311; - if (yych <= ':') goto yy312; - goto yy256; + if (yych <= '9') goto yy342; + if (yych <= ':') goto yy343; + goto yy276; } -yy311: - YYDEBUG(311, *YYCURSOR); +yy342: + YYDEBUG(342, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy312; - if (yych != ':') goto yy256; -yy312: - YYDEBUG(312, *YYCURSOR); + if (yych == '.') goto yy343; + if (yych != ':') goto yy276; +yy343: + YYDEBUG(343, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy313; - if (yych <= '6') goto yy314; - if (yych <= '9') goto yy261; + if (yych <= '5') goto yy344; + if (yych <= '6') goto yy345; + if (yych <= '9') goto yy281; goto yy55; -yy313: - YYDEBUG(313, *YYCURSOR); +yy344: + YYDEBUG(344, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy256; - if (yych <= '9') goto yy315; - goto yy256; -yy314: - YYDEBUG(314, *YYCURSOR); + if (yych <= '/') goto yy276; + if (yych <= '9') goto yy346; + goto yy276; +yy345: + YYDEBUG(345, *YYCURSOR); yych = *++YYCURSOR; - if (yych != '0') goto yy256; -yy315: - YYDEBUG(315, *YYCURSOR); + if (yych != '0') goto yy276; +yy346: + YYDEBUG(346, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '*') { if (yych <= 0x1F) { - if (yych == '\t') goto yy317; - goto yy256; + if (yych == '\t') goto yy348; + goto yy276; } else { - if (yych <= ' ') goto yy317; - if (yych == '(') goto yy317; - goto yy256; + if (yych <= ' ') goto yy348; + if (yych == '(') goto yy348; + goto yy276; } } else { if (yych <= '@') { - if (yych == ',') goto yy256; - if (yych <= '-') goto yy317; - goto yy256; + if (yych == ',') goto yy276; + if (yych <= '-') goto yy348; + goto yy276; } else { - if (yych <= 'Z') goto yy317; - if (yych <= '`') goto yy256; - if (yych <= 'z') goto yy317; - goto yy256; + if (yych <= 'Z') goto yy348; + if (yych <= '`') goto yy276; + if (yych <= 'z') goto yy348; + goto yy276; } } -yy316: - YYDEBUG(316, *YYCURSOR); +yy347: + YYDEBUG(347, *YYCURSOR); ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); + if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy317: - YYDEBUG(317, *YYCURSOR); +yy348: + YYDEBUG(348, *YYCURSOR); if (yych <= '+') { if (yych <= ' ') { - if (yych == '\t') goto yy316; + if (yych == '\t') goto yy347; if (yych <= 0x1F) goto yy55; - goto yy316; + goto yy347; } else { - if (yych == '(') goto yy267; + if (yych == '(') goto yy287; if (yych <= '*') goto yy55; - goto yy266; + goto yy286; } } else { if (yych <= 'F') { - if (yych == '-') goto yy266; + if (yych == '-') goto yy286; if (yych <= '@') goto yy55; - goto yy269; + goto yy289; } else { if (yych <= 'Z') { - if (yych <= 'G') goto yy265; - goto yy269; + if (yych <= 'G') goto yy285; + goto yy289; } else { if (yych <= '`') goto yy55; - if (yych <= 'z') goto yy271; + if (yych <= 'z') goto yy291; goto yy55; } } } -yy318: - YYDEBUG(318, *YYCURSOR); +yy349: + YYDEBUG(349, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy309; + if (yych == '.') goto yy340; goto yy55; } else { - if (yych <= '9') goto yy308; - if (yych <= ':') goto yy309; + if (yych <= '9') goto yy339; + if (yych <= ':') goto yy340; goto yy55; } -yy319: - YYDEBUG(319, *YYCURSOR); +yy350: + YYDEBUG(350, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy309; + if (yych == '.') goto yy340; goto yy55; } else { - if (yych <= '4') goto yy308; - if (yych == ':') goto yy309; + if (yych <= '4') goto yy339; + if (yych == ':') goto yy340; goto yy55; } -yy320: - YYDEBUG(320, *YYCURSOR); +yy351: + YYDEBUG(351, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy309; - goto yy242; + if (yych == '.') goto yy340; + goto yy262; } else { - if (yych <= '0') goto yy327; - if (yych <= '9') goto yy328; - if (yych <= ':') goto yy309; - goto yy242; + if (yych <= '0') goto yy358; + if (yych <= '9') goto yy359; + if (yych <= ':') goto yy340; + goto yy262; } -yy321: - YYDEBUG(321, *YYCURSOR); +yy352: + YYDEBUG(352, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy254; - goto yy242; + if (yych == '.') goto yy274; + goto yy262; } else { - if (yych <= '2') goto yy328; - if (yych <= '9') goto yy327; - if (yych <= ':') goto yy254; - goto yy242; + if (yych <= '2') goto yy359; + if (yych <= '9') goto yy358; + if (yych <= ':') goto yy274; + goto yy262; } -yy322: - YYDEBUG(322, *YYCURSOR); +yy353: + YYDEBUG(353, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy254; - goto yy242; + if (yych == '.') goto yy274; + goto yy262; } else { - if (yych <= '4') goto yy327; - if (yych <= '9') goto yy324; - if (yych <= ':') goto yy254; - goto yy242; + if (yych <= '4') goto yy358; + if (yych <= '9') goto yy355; + if (yych <= ':') goto yy274; + goto yy262; } -yy323: - YYDEBUG(323, *YYCURSOR); +yy354: + YYDEBUG(354, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy254; - goto yy242; + if (yych == '.') goto yy274; + goto yy262; } else { - if (yych <= '9') goto yy324; - if (yych <= ':') goto yy254; - goto yy242; + if (yych <= '9') goto yy355; + if (yych <= ':') goto yy274; + goto yy262; } -yy324: - YYDEBUG(324, *YYCURSOR); +yy355: + YYDEBUG(355, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy242; - if (yych >= ':') goto yy242; -yy325: - YYDEBUG(325, *YYCURSOR); + if (yych <= '/') goto yy262; + if (yych >= ':') goto yy262; +yy356: + YYDEBUG(356, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy242; - if (yych >= ':') goto yy242; - YYDEBUG(326, *YYCURSOR); + if (yych <= '/') goto yy262; + if (yych >= ':') goto yy262; + YYDEBUG(357, *YYCURSOR); yych = *++YYCURSOR; - goto yy242; -yy327: - YYDEBUG(327, *YYCURSOR); + goto yy262; +yy358: + YYDEBUG(358, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy309; - goto yy242; + if (yych == '.') goto yy340; + goto yy262; } else { - if (yych <= '9') goto yy325; - if (yych <= ':') goto yy309; - goto yy242; + if (yych <= '9') goto yy356; + if (yych <= ':') goto yy340; + goto yy262; } -yy328: - YYDEBUG(328, *YYCURSOR); +yy359: + YYDEBUG(359, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy254; - goto yy242; + if (yych == '.') goto yy274; + goto yy262; } else { - if (yych <= '9') goto yy325; - if (yych <= ':') goto yy254; - goto yy242; + if (yych <= '9') goto yy356; + if (yych <= ':') goto yy274; + goto yy262; } -yy329: - YYDEBUG(329, *YYCURSOR); +yy360: + YYDEBUG(360, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 0x00) goto yy248; - goto yy247; -yy330: - YYDEBUG(330, *YYCURSOR); + if (yych <= 0x00) goto yy268; + goto yy267; +yy361: + YYDEBUG(361, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(331, *YYCURSOR); + YYDEBUG(362, *YYCURSOR); ++YYCURSOR; - YYDEBUG(332, *YYCURSOR); -#line 1483 "ext/date/lib/parse_date.re" + YYDEBUG(363, *YYCURSOR); +#line 1526 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenoday"); @@ -5895,239 +6130,239 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 5897 "" -yy333: - YYDEBUG(333, *YYCURSOR); +#line 6134 "" +yy364: + YYDEBUG(364, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy330; + goto yy361; } } } else { if (yych <= 'm') { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy334: - YYDEBUG(334, *YYCURSOR); +yy365: + YYDEBUG(365, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy337; + goto yy368; } } } else { if (yych <= 'm') { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy335: - YYDEBUG(335, *YYCURSOR); +yy366: + YYDEBUG(366, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy337; + goto yy368; } } } else { if (yych <= 'm') { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy336: - YYDEBUG(336, *YYCURSOR); +yy367: + YYDEBUG(367, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '1') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { - if (yych == ',') goto yy246; + if (yych == ',') goto yy266; goto yy55; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; } } } else { if (yych <= 'm') { if (yych <= 'd') { - if (yych <= '9') goto yy240; + if (yych <= '9') goto yy260; if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } -yy337: - YYDEBUG(337, *YYCURSOR); +yy368: + YYDEBUG(368, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ' ') { if (yych <= 0x08) { - if (yych <= 0x00) goto yy248; + if (yych <= 0x00) goto yy268; goto yy55; } else { - if (yych <= '\t') goto yy246; + if (yych <= '\t') goto yy266; if (yych <= 0x1F) goto yy55; - goto yy246; + goto yy266; } } else { if (yych <= '-') { if (yych <= '+') goto yy55; - if (yych <= ',') goto yy246; + if (yych <= ',') goto yy266; } else { - if (yych <= '.') goto yy246; + if (yych <= '.') goto yy266; if (yych <= '/') goto yy55; - goto yy330; + goto yy361; } } } else { if (yych <= 'm') { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy246; + goto yy266; } else { - if (yych == 'h') goto yy246; + if (yych == 'h') goto yy266; goto yy55; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy243; + if (yych <= 'n') goto yy263; if (yych <= 'q') goto yy55; - goto yy244; + goto yy264; } else { - if (yych <= 's') goto yy241; - if (yych <= 't') goto yy245; + if (yych <= 's') goto yy261; + if (yych <= 't') goto yy265; goto yy55; } } } - YYDEBUG(338, *YYCURSOR); + YYDEBUG(369, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(339, *YYCURSOR); + YYDEBUG(370, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy340; - if (yych <= '9') goto yy341; -yy340: - YYDEBUG(340, *YYCURSOR); -#line 1627 "ext/date/lib/parse_date.re" - { + if ((yych = *YYCURSOR) <= '/') goto yy371; + if (yych <= '9') goto yy372; +yy371: + YYDEBUG(371, *YYCURSOR); +#line 1670 "ext/date/lib/parse_date.re" + { int length = 0; DEBUG_OUTPUT("pgtextshort"); TIMELIB_INIT; @@ -6139,589 +6374,589 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 6141 "" -yy341: - YYDEBUG(341, *YYCURSOR); +#line 6378 "" +yy372: + YYDEBUG(372, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy340; - if (yych >= ':') goto yy340; - YYDEBUG(342, *YYCURSOR); + if (yych <= '/') goto yy371; + if (yych >= ':') goto yy371; + YYDEBUG(373, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy340; - if (yych >= ':') goto yy340; - YYDEBUG(343, *YYCURSOR); + if (yych <= '/') goto yy371; + if (yych >= ':') goto yy371; + YYDEBUG(374, *YYCURSOR); yych = *++YYCURSOR; - goto yy340; -yy344: - YYDEBUG(344, *YYCURSOR); - yyaccept = 0; + goto yy371; +yy375: + YYDEBUG(375, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'C') goto yy227; - if (yych <= 'Z') goto yy176; + if (yych <= 'C') goto yy247; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'b') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'c') goto yy345; - if (yych <= 'z') goto yy181; + if (yych <= 'c') goto yy376; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy345: - YYDEBUG(345, *YYCURSOR); +yy376: + YYDEBUG(376, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'D') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'E') goto yy235; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'E') goto yy255; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'd') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'e') goto yy347; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'e') goto yy378; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy346: - YYDEBUG(346, *YYCURSOR); +yy377: + YYDEBUG(377, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 4) { - goto yy183; + goto yy190; } - if (yych <= '/') goto yy230; - if (yych <= '0') goto yy334; - if (yych <= '2') goto yy335; - if (yych <= '3') goto yy336; - goto yy230; -yy347: - YYDEBUG(347, *YYCURSOR); - yyaccept = 0; + if (yych <= '/') goto yy250; + if (yych <= '0') goto yy365; + if (yych <= '2') goto yy366; + if (yych <= '3') goto yy367; + goto yy250; +yy378: + YYDEBUG(378, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'M') goto yy236; - if (yych <= 'Z') goto yy178; + if (yych <= 'M') goto yy256; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'l') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'm') goto yy348; - if (yych <= 'z') goto yy186; + if (yych <= 'm') goto yy379; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy348: - YYDEBUG(348, *YYCURSOR); - yyaccept = 0; +yy379: + YYDEBUG(379, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'B') goto yy237; - if (yych <= 'Z') goto yy179; + if (yych <= 'B') goto yy257; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'a') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'b') goto yy349; - if (yych <= 'z') goto yy187; + if (yych <= 'b') goto yy380; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy349: - YYDEBUG(349, *YYCURSOR); - yyaccept = 0; +yy380: + YYDEBUG(380, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'E') goto yy238; - if (yych == '_') goto yy182; + if (yych <= 'E') goto yy258; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'e') goto yy350; - if (yych <= 'z') goto yy188; + if (yych == 'e') goto yy381; + if (yych <= 'z') goto yy195; goto yy3; } } -yy350: - YYDEBUG(350, *YYCURSOR); +yy381: + YYDEBUG(381, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy239; - if (yych != 'r') goto yy189; -yy351: - YYDEBUG(351, *YYCURSOR); + if (yych == 'R') goto yy259; + if (yych != 'r') goto yy196; +yy382: + YYDEBUG(382, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; - goto yy228; + if (yych == '\t') goto yy250; + goto yy248; } else { - if (yych <= ' ') goto yy230; - if (yych <= ',') goto yy228; + if (yych <= ' ') goto yy250; + if (yych <= ',') goto yy248; } } else { if (yych <= '9') { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } else { - if (yych == '_') goto yy182; - goto yy228; + if (yych == '_') goto yy189; + goto yy248; } } -yy352: - YYDEBUG(352, *YYCURSOR); +yy383: + YYDEBUG(383, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 4) { - goto yy183; + goto yy190; } - goto yy230; -yy353: - YYDEBUG(353, *YYCURSOR); + goto yy250; +yy384: + YYDEBUG(384, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy176; + if (yych <= 'S') goto yy183; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 't') goto yy354; - if (yych <= 'z') goto yy176; + if (yych <= 't') goto yy385; + if (yych <= 'z') goto yy183; goto yy3; } } -yy354: - YYDEBUG(354, *YYCURSOR); +yy385: + YYDEBUG(385, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'O') goto yy177; + if (yych != 'O') goto yy184; } } else { if (yych <= 'n') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'o') goto yy355; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'o') goto yy386; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy355: - YYDEBUG(355, *YYCURSOR); +yy386: + YYDEBUG(386, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy178; + if (yych <= 'A') goto yy185; } } else { if (yych <= 'a') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'b') goto yy356; - if (yych <= 'z') goto yy178; + if (yych <= 'b') goto yy387; + if (yych <= 'z') goto yy185; goto yy3; } } -yy356: - YYDEBUG(356, *YYCURSOR); +yy387: + YYDEBUG(387, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy179; + if (yych <= 'D') goto yy186; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'e') goto yy357; - if (yych <= 'z') goto yy179; + if (yych <= 'e') goto yy388; + if (yych <= 'z') goto yy186; goto yy3; } } -yy357: - YYDEBUG(357, *YYCURSOR); +yy388: + YYDEBUG(388, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Q') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'R') goto yy239; - if (yych == 'r') goto yy239; + if (yych <= 'R') goto yy259; + if (yych == 'r') goto yy259; goto yy3; } -yy358: - YYDEBUG(358, *YYCURSOR); - yyaccept = 0; +yy389: + YYDEBUG(389, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy354; - if (yych <= 'Z') goto yy176; + if (yych <= 'T') goto yy385; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 't') goto yy359; - if (yych <= 'z') goto yy181; + if (yych <= 't') goto yy390; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy359: - YYDEBUG(359, *YYCURSOR); +yy390: + YYDEBUG(390, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'N') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'O') goto yy355; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'O') goto yy386; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'n') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'o') goto yy360; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'o') goto yy391; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy360: - YYDEBUG(360, *YYCURSOR); - yyaccept = 0; +yy391: + YYDEBUG(391, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'B') goto yy356; - if (yych <= 'Z') goto yy178; + if (yych <= 'B') goto yy387; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'a') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'b') goto yy361; - if (yych <= 'z') goto yy186; + if (yych <= 'b') goto yy392; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy361: - YYDEBUG(361, *YYCURSOR); - yyaccept = 0; +yy392: + YYDEBUG(392, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy357; - if (yych <= 'Z') goto yy179; + if (yych <= 'E') goto yy388; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'e') goto yy362; - if (yych <= 'z') goto yy187; + if (yych <= 'e') goto yy393; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy362: - YYDEBUG(362, *YYCURSOR); - yyaccept = 0; +yy393: + YYDEBUG(393, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'R') goto yy239; - if (yych == '_') goto yy182; + if (yych <= 'R') goto yy259; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'r') goto yy351; - if (yych <= 'z') goto yy188; + if (yych == 'r') goto yy382; + if (yych <= 'z') goto yy195; goto yy3; } } -yy363: - YYDEBUG(363, *YYCURSOR); +yy394: + YYDEBUG(394, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'G') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'F') goto yy176; - goto yy371; + if (yych <= 'F') goto yy183; + goto yy402; } } else { if (yych <= 'f') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'g') goto yy371; - if (yych <= 'z') goto yy176; + if (yych <= 'g') goto yy402; + if (yych <= 'z') goto yy183; goto yy3; } } -yy364: - YYDEBUG(364, *YYCURSOR); +yy395: + YYDEBUG(395, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy176; - goto yy368; + if (yych <= 'Q') goto yy183; + goto yy399; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'r') goto yy368; - if (yych <= 'z') goto yy176; + if (yych <= 'r') goto yy399; + if (yych <= 'z') goto yy183; goto yy3; } } -yy365: - YYDEBUG(365, *YYCURSOR); +yy396: + YYDEBUG(396, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'N') goto yy176; + if (yych <= 'N') goto yy183; } } else { if (yych <= 'n') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'o') goto yy366; - if (yych <= 'z') goto yy176; + if (yych <= 'o') goto yy397; + if (yych <= 'z') goto yy183; goto yy3; } } -yy366: - YYDEBUG(366, *YYCURSOR); +yy397: + YYDEBUG(397, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; } else { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy367; - if (yych <= 'z') goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy398; + if (yych <= 'z') goto yy184; } -yy367: - YYDEBUG(367, *YYCURSOR); -#line 1685 "ext/date/lib/parse_date.re" +yy398: + YYDEBUG(398, *YYCURSOR); +#line 1728 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("ago"); TIMELIB_INIT; @@ -6741,1337 +6976,1337 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_AGO; } -#line 6743 "" -yy368: - YYDEBUG(368, *YYCURSOR); +#line 6980 "" +yy399: + YYDEBUG(399, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'I') goto yy177; + if (yych != 'I') goto yy184; } } else { if (yych <= 'h') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'i') goto yy369; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'i') goto yy400; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy369: - YYDEBUG(369, *YYCURSOR); +yy400: + YYDEBUG(400, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'K') goto yy178; + if (yych <= 'K') goto yy185; } } else { if (yych <= 'k') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'l') goto yy370; - if (yych <= 'z') goto yy178; + if (yych <= 'l') goto yy401; + if (yych <= 'z') goto yy185; goto yy3; } } -yy370: - YYDEBUG(370, *YYCURSOR); +yy401: + YYDEBUG(401, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; - goto yy228; + if (yych == '\t') goto yy250; + goto yy248; } else { - if (yych <= ' ') goto yy230; - if (yych == ')') goto yy174; - goto yy228; + if (yych <= ' ') goto yy250; + if (yych == ')') goto yy181; + goto yy248; } } else { if (yych <= '@') { - if (yych == '/') goto yy228; - if (yych <= '9') goto yy230; - goto yy228; + if (yych == '/') goto yy248; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych <= 'Z') goto yy179; - if (yych <= '`') goto yy228; - if (yych <= 'z') goto yy179; - goto yy228; + if (yych <= 'Z') goto yy186; + if (yych <= '`') goto yy248; + if (yych <= 'z') goto yy186; + goto yy248; } } -yy371: - YYDEBUG(371, *YYCURSOR); +yy402: + YYDEBUG(402, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'U') goto yy177; + if (yych != 'U') goto yy184; } } else { if (yych <= 't') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'u') goto yy372; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'u') goto yy403; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy372: - YYDEBUG(372, *YYCURSOR); +yy403: + YYDEBUG(403, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy178; + if (yych <= 'R') goto yy185; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 's') goto yy373; - if (yych <= 'z') goto yy178; + if (yych <= 's') goto yy404; + if (yych <= 'z') goto yy185; goto yy3; } } -yy373: - YYDEBUG(373, *YYCURSOR); +yy404: + YYDEBUG(404, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy179; + if (yych <= 'S') goto yy186; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 't') goto yy374; - if (yych <= 'z') goto yy179; + if (yych <= 't') goto yy405; + if (yych <= 'z') goto yy186; goto yy3; } } -yy374: - YYDEBUG(374, *YYCURSOR); +yy405: + YYDEBUG(405, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '.') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy230; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy250; } else { - if (yych <= '/') goto yy228; - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '/') goto yy248; + if (yych <= '9') goto yy250; + goto yy248; } } -yy375: - YYDEBUG(375, *YYCURSOR); - yyaccept = 0; +yy406: + YYDEBUG(406, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'F') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'G') goto yy371; - if (yych <= 'Z') goto yy176; + if (yych <= 'G') goto yy402; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'f') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'g') goto yy382; - if (yych <= 'z') goto yy181; + if (yych <= 'g') goto yy413; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy376: - YYDEBUG(376, *YYCURSOR); - yyaccept = 0; +yy407: + YYDEBUG(407, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy368; - if (yych <= 'Z') goto yy176; + if (yych <= 'R') goto yy399; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'r') goto yy379; - if (yych <= 'z') goto yy181; + if (yych <= 'r') goto yy410; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy377: - YYDEBUG(377, *YYCURSOR); - yyaccept = 0; +yy408: + YYDEBUG(408, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'O') goto yy366; - if (yych <= 'Z') goto yy176; + if (yych <= 'O') goto yy397; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'n') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'o') goto yy378; - if (yych <= 'z') goto yy181; + if (yych <= 'o') goto yy409; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy378: - YYDEBUG(378, *YYCURSOR); +yy409: + YYDEBUG(409, *YYCURSOR); yyaccept = 8; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; - goto yy367; + if (yych == ')') goto yy181; + goto yy398; } else { - if (yych == '.') goto yy367; - goto yy182; + if (yych == '.') goto yy398; + goto yy189; } } else { if (yych <= '^') { - if (yych <= '@') goto yy367; - if (yych <= 'Z') goto yy177; - goto yy367; + if (yych <= '@') goto yy398; + if (yych <= 'Z') goto yy184; + goto yy398; } else { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy367; - if (yych <= 'z') goto yy185; - goto yy367; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy398; + if (yych <= 'z') goto yy192; + goto yy398; } } -yy379: - YYDEBUG(379, *YYCURSOR); +yy410: + YYDEBUG(410, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'H') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'I') goto yy369; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'I') goto yy400; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'h') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'i') goto yy380; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'i') goto yy411; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy380: - YYDEBUG(380, *YYCURSOR); - yyaccept = 0; +yy411: + YYDEBUG(411, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'K') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'L') goto yy370; - if (yych <= 'Z') goto yy178; + if (yych <= 'L') goto yy401; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'k') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'l') goto yy381; - if (yych <= 'z') goto yy186; + if (yych <= 'l') goto yy412; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy381: - YYDEBUG(381, *YYCURSOR); +yy412: + YYDEBUG(412, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; - if (yych <= 0x1F) goto yy228; - goto yy230; + if (yych == '\t') goto yy250; + if (yych <= 0x1F) goto yy248; + goto yy250; } else { if (yych <= ')') { - if (yych <= '(') goto yy228; - goto yy174; + if (yych <= '(') goto yy248; + goto yy181; } else { - if (yych <= ',') goto yy228; - if (yych <= '-') goto yy352; - goto yy230; + if (yych <= ',') goto yy248; + if (yych <= '-') goto yy383; + goto yy250; } } } else { if (yych <= 'Z') { - if (yych <= '/') goto yy182; - if (yych <= '9') goto yy230; - if (yych <= '@') goto yy228; - goto yy179; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy250; + if (yych <= '@') goto yy248; + goto yy186; } else { if (yych <= '_') { - if (yych <= '^') goto yy228; - goto yy182; + if (yych <= '^') goto yy248; + goto yy189; } else { - if (yych <= '`') goto yy228; - if (yych <= 'z') goto yy187; - goto yy228; + if (yych <= '`') goto yy248; + if (yych <= 'z') goto yy194; + goto yy248; } } } -yy382: - YYDEBUG(382, *YYCURSOR); +yy413: + YYDEBUG(413, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'T') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'U') goto yy372; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'U') goto yy403; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 't') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'u') goto yy383; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'u') goto yy414; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy383: - YYDEBUG(383, *YYCURSOR); - yyaccept = 0; +yy414: + YYDEBUG(414, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy373; - if (yych <= 'Z') goto yy178; + if (yych <= 'S') goto yy404; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'r') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 's') goto yy384; - if (yych <= 'z') goto yy186; + if (yych <= 's') goto yy415; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy384: - YYDEBUG(384, *YYCURSOR); - yyaccept = 0; +yy415: + YYDEBUG(415, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy374; - if (yych <= 'Z') goto yy179; + if (yych <= 'T') goto yy405; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 't') goto yy385; - if (yych <= 'z') goto yy187; + if (yych <= 't') goto yy416; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy385: - YYDEBUG(385, *YYCURSOR); +yy416: + YYDEBUG(416, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= ',') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; - goto yy228; + if (yych == '\t') goto yy250; + goto yy248; } else { - if (yych <= ' ') goto yy230; - if (yych == ')') goto yy174; - goto yy228; + if (yych <= ' ') goto yy250; + if (yych == ')') goto yy181; + goto yy248; } } else { if (yych <= '/') { - if (yych <= '-') goto yy352; - if (yych <= '.') goto yy230; - goto yy182; + if (yych <= '-') goto yy383; + if (yych <= '.') goto yy250; + goto yy189; } else { - if (yych <= '9') goto yy230; - if (yych == '_') goto yy182; - goto yy228; + if (yych <= '9') goto yy250; + if (yych == '_') goto yy189; + goto yy248; } } -yy386: - YYDEBUG(386, *YYCURSOR); +yy417: + YYDEBUG(417, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'L') goto yy393; - if (yych <= 'M') goto yy176; - goto yy392; + if (yych == 'L') goto yy424; + if (yych <= 'M') goto yy183; + goto yy423; } } else { if (yych <= 'l') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'k') goto yy176; - goto yy393; + if (yych <= 'k') goto yy183; + goto yy424; } else { - if (yych == 'n') goto yy392; - if (yych <= 'z') goto yy176; + if (yych == 'n') goto yy423; + if (yych <= 'z') goto yy183; goto yy3; } } -yy387: - YYDEBUG(387, *YYCURSOR); +yy418: + YYDEBUG(418, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy176; + if (yych <= 'M') goto yy183; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'n') goto yy388; - if (yych <= 'z') goto yy176; + if (yych <= 'n') goto yy419; + if (yych <= 'z') goto yy183; goto yy3; } } -yy388: - YYDEBUG(388, *YYCURSOR); +yy419: + YYDEBUG(419, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'U') goto yy177; + if (yych != 'U') goto yy184; } } else { if (yych <= 't') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'u') goto yy389; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'u') goto yy420; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy389: - YYDEBUG(389, *YYCURSOR); +yy420: + YYDEBUG(420, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; goto yy3; } else { - if (yych <= 'a') goto yy390; - if (yych <= 'z') goto yy178; + if (yych <= 'a') goto yy421; + if (yych <= 'z') goto yy185; goto yy3; } } -yy390: - YYDEBUG(390, *YYCURSOR); +yy421: + YYDEBUG(421, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy179; + if (yych <= 'Q') goto yy186; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'r') goto yy391; - if (yych <= 'z') goto yy179; + if (yych <= 'r') goto yy422; + if (yych <= 'z') goto yy186; goto yy3; } } -yy391: - YYDEBUG(391, *YYCURSOR); +yy422: + YYDEBUG(422, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'X') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Y') goto yy239; - if (yych == 'y') goto yy239; + if (yych <= 'Y') goto yy259; + if (yych == 'y') goto yy259; goto yy3; } -yy392: - YYDEBUG(392, *YYCURSOR); +yy423: + YYDEBUG(423, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych == 'E') goto yy394; - goto yy177; + if (yych == 'E') goto yy425; + goto yy184; } } else { if (yych <= 'd') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'e') goto yy394; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'e') goto yy425; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy393: - YYDEBUG(393, *YYCURSOR); +yy424: + YYDEBUG(424, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'Y') goto yy177; + if (yych != 'Y') goto yy184; } } else { if (yych <= 'x') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'y') goto yy394; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'y') goto yy425; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy394: - YYDEBUG(394, *YYCURSOR); +yy425: + YYDEBUG(425, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; - goto yy228; + if (yych == '\t') goto yy250; + goto yy248; } else { - if (yych <= ' ') goto yy230; - if (yych == ')') goto yy174; - goto yy228; + if (yych <= ' ') goto yy250; + if (yych == ')') goto yy181; + goto yy248; } } else { if (yych <= '@') { - if (yych == '/') goto yy228; - if (yych <= '9') goto yy230; - goto yy228; + if (yych == '/') goto yy248; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych <= 'Z') goto yy178; - if (yych <= '`') goto yy228; - if (yych <= 'z') goto yy178; - goto yy228; + if (yych <= 'Z') goto yy185; + if (yych <= '`') goto yy248; + if (yych <= 'z') goto yy185; + goto yy248; } } -yy395: - YYDEBUG(395, *YYCURSOR); - yyaccept = 0; +yy426: + YYDEBUG(426, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '@') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } else { - if (yych == 'L') goto yy393; - goto yy176; + if (yych == 'L') goto yy424; + goto yy183; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'N') goto yy392; - goto yy176; + if (yych <= 'N') goto yy423; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'm') { - if (yych == 'l') goto yy402; - goto yy181; + if (yych == 'l') goto yy433; + goto yy188; } else { - if (yych <= 'n') goto yy401; - if (yych <= 'z') goto yy181; + if (yych <= 'n') goto yy432; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy396: - YYDEBUG(396, *YYCURSOR); - yyaccept = 0; +yy427: + YYDEBUG(427, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy388; - if (yych <= 'Z') goto yy176; + if (yych <= 'N') goto yy419; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'n') goto yy397; - if (yych <= 'z') goto yy181; + if (yych <= 'n') goto yy428; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy397: - YYDEBUG(397, *YYCURSOR); +yy428: + YYDEBUG(428, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'T') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'U') goto yy389; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'U') goto yy420; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 't') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'u') goto yy398; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'u') goto yy429; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy398: - YYDEBUG(398, *YYCURSOR); - yyaccept = 0; +yy429: + YYDEBUG(429, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy390; - if (yych <= 'Z') goto yy178; + if (yych <= 'A') goto yy421; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy399; - if (yych <= 'z') goto yy186; + if (yych <= 'a') goto yy430; + if (yych <= 'z') goto yy193; goto yy3; } } -yy399: - YYDEBUG(399, *YYCURSOR); - yyaccept = 0; +yy430: + YYDEBUG(430, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy391; - if (yych <= 'Z') goto yy179; + if (yych <= 'R') goto yy422; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'r') goto yy400; - if (yych <= 'z') goto yy187; + if (yych <= 'r') goto yy431; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy400: - YYDEBUG(400, *YYCURSOR); - yyaccept = 0; +yy431: + YYDEBUG(431, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'Y') goto yy239; - if (yych == '_') goto yy182; + if (yych <= 'Y') goto yy259; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'y') goto yy351; - if (yych <= 'z') goto yy188; + if (yych == 'y') goto yy382; + if (yych <= 'z') goto yy195; goto yy3; } } -yy401: - YYDEBUG(401, *YYCURSOR); +yy432: + YYDEBUG(432, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'D') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'E') goto yy394; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'E') goto yy425; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'd') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'e') goto yy403; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'e') goto yy434; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy402: - YYDEBUG(402, *YYCURSOR); +yy433: + YYDEBUG(433, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'X') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'Y') goto yy394; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'Y') goto yy425; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'x') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'y') goto yy403; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'y') goto yy434; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy403: - YYDEBUG(403, *YYCURSOR); +yy434: + YYDEBUG(434, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; - if (yych <= 0x1F) goto yy228; - goto yy230; + if (yych == '\t') goto yy250; + if (yych <= 0x1F) goto yy248; + goto yy250; } else { if (yych <= ')') { - if (yych <= '(') goto yy228; - goto yy174; + if (yych <= '(') goto yy248; + goto yy181; } else { - if (yych <= ',') goto yy228; - if (yych <= '-') goto yy352; - goto yy230; + if (yych <= ',') goto yy248; + if (yych <= '-') goto yy383; + goto yy250; } } } else { if (yych <= 'Z') { - if (yych <= '/') goto yy182; - if (yych <= '9') goto yy230; - if (yych <= '@') goto yy228; - goto yy178; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy250; + if (yych <= '@') goto yy248; + goto yy185; } else { if (yych <= '_') { - if (yych <= '^') goto yy228; - goto yy182; + if (yych <= '^') goto yy248; + goto yy189; } else { - if (yych <= '`') goto yy228; - if (yych <= 'z') goto yy186; - goto yy228; + if (yych <= '`') goto yy248; + if (yych <= 'z') goto yy193; + goto yy248; } } } -yy404: - YYDEBUG(404, *YYCURSOR); - yyaccept = 0; +yy435: + YYDEBUG(435, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; if (yych <= 0x1F) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy230; + goto yy250; } } else { if (yych <= 'H') { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { if (yych <= 'Z') { - if (yych >= 'J') goto yy176; + if (yych >= 'J') goto yy183; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy176; + if (yych <= 'z') goto yy183; goto yy3; } } } -yy405: - YYDEBUG(405, *YYCURSOR); - yyaccept = 0; +yy436: + YYDEBUG(436, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; goto yy3; } else { - if (yych <= ' ') goto yy230; - if (yych == ')') goto yy174; + if (yych <= ' ') goto yy250; + if (yych == ')') goto yy181; goto yy3; } } else { if (yych <= '@') { if (yych == '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; goto yy3; } else { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy177; + if (yych <= 'z') goto yy184; goto yy3; } } -yy406: - YYDEBUG(406, *YYCURSOR); - yyaccept = 0; +yy437: + YYDEBUG(437, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; if (yych <= 0x1F) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy230; + goto yy250; } } else { if (yych <= 'H') { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { if (yych <= 'Z') { - if (yych >= 'J') goto yy176; + if (yych >= 'J') goto yy183; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy176; + if (yych <= 'z') goto yy183; goto yy3; } } } - YYDEBUG(407, *YYCURSOR); - yyaccept = 0; + YYDEBUG(438, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; if (yych <= 0x1F) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy230; + goto yy250; } } else { if (yych <= 'H') { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } else { if (yych <= 'Z') { - if (yych >= 'J') goto yy177; + if (yych >= 'J') goto yy184; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy177; + if (yych <= 'z') goto yy184; goto yy3; } } } - YYDEBUG(408, *YYCURSOR); - yyaccept = 0; + YYDEBUG(439, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; goto yy3; } else { - if (yych <= ' ') goto yy230; - if (yych == ')') goto yy174; + if (yych <= ' ') goto yy250; + if (yych == ')') goto yy181; goto yy3; } } else { if (yych <= '@') { if (yych == '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; goto yy3; } else { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy178; + if (yych <= 'z') goto yy185; goto yy3; } } -yy409: - YYDEBUG(409, *YYCURSOR); - yyaccept = 0; +yy440: + YYDEBUG(440, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= 0x1F) { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; goto yy3; } else { - if (yych <= ' ') goto yy230; - if (yych == ')') goto yy174; + if (yych <= ' ') goto yy250; + if (yych == ')') goto yy181; goto yy3; } } else { if (yych <= '@') { if (yych == '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; goto yy3; } else { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy176; + if (yych <= 'z') goto yy183; goto yy3; } } -yy410: - YYDEBUG(410, *YYCURSOR); - yyaccept = 0; +yy441: + YYDEBUG(441, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; + if (yych == '\t') goto yy250; if (yych <= 0x1F) goto yy3; - goto yy230; + goto yy250; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy230; + goto yy250; } } else { if (yych <= 'H') { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy230; + if (yych <= '9') goto yy250; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { if (yych <= 'Z') { - if (yych <= 'I') goto yy405; - goto yy176; + if (yych <= 'I') goto yy436; + goto yy183; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy176; + if (yych <= 'z') goto yy183; goto yy3; } } } -yy411: - YYDEBUG(411, *YYCURSOR); - yyaccept = 0; +yy442: + YYDEBUG(442, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'D') { @@ -8082,9 +8317,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= '9') { if (yych <= '/') goto yy3; - goto yy456; + goto yy487; } else { - if (yych <= ':') goto yy197; + if (yych <= ':') goto yy204; if (yych <= 'C') goto yy3; goto yy59; } @@ -8143,9 +8378,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy412: - YYDEBUG(412, *YYCURSOR); - yyaccept = 0; +yy443: + YYDEBUG(443, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { @@ -8159,11 +8394,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } else { if (yych <= '5') { - if (yych <= '4') goto yy456; - goto yy416; + if (yych <= '4') goto yy487; + goto yy447; } else { - if (yych <= '9') goto yy417; - if (yych <= ':') goto yy197; + if (yych <= '9') goto yy448; + if (yych <= ':') goto yy204; goto yy3; } } @@ -8227,9 +8462,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy413: - YYDEBUG(413, *YYCURSOR); - yyaccept = 0; +yy444: + YYDEBUG(444, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { @@ -8240,10 +8475,10 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= '5') { if (yych <= '/') goto yy3; - goto yy416; + goto yy447; } else { - if (yych <= '9') goto yy417; - if (yych <= ':') goto yy197; + if (yych <= '9') goto yy448; + if (yych <= ':') goto yy204; goto yy3; } } @@ -8307,27 +8542,27 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy414: - YYDEBUG(414, *YYCURSOR); +yy445: + YYDEBUG(445, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 24) YYFILL(24); yych = *YYCURSOR; - YYDEBUG(415, *YYCURSOR); + YYDEBUG(446, *YYCURSOR); if (yybm[0+yych] & 2) { goto yy56; } if (yych <= ',') { - if (yych == '+') goto yy414; + if (yych == '+') goto yy445; goto yy55; } else { - if (yych <= '-') goto yy414; + if (yych <= '-') goto yy445; if (yych <= '/') goto yy55; if (yych <= '9') goto yy54; goto yy55; } -yy416: - YYDEBUG(416, *YYCURSOR); - yyaccept = 0; +yy447: + YYDEBUG(447, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { @@ -8338,7 +8573,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= '9') { if (yych <= '/') goto yy3; - goto yy455; + goto yy486; } else { if (yych == 'D') goto yy59; goto yy3; @@ -8394,9 +8629,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy417: - YYDEBUG(417, *YYCURSOR); - yyaccept = 0; +yy448: + YYDEBUG(448, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { @@ -8462,75 +8697,75 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } - YYDEBUG(418, *YYCURSOR); + YYDEBUG(449, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; -yy419: - YYDEBUG(419, *YYCURSOR); +yy450: + YYDEBUG(450, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy421; + if (yych == '-') goto yy452; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; -yy420: - YYDEBUG(420, *YYCURSOR); +yy451: + YYDEBUG(451, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy432; + if (yych <= '9') goto yy463; goto yy59; -yy421: - YYDEBUG(421, *YYCURSOR); +yy452: + YYDEBUG(452, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy422; - if (yych <= '1') goto yy423; + if (yych <= '0') goto yy453; + if (yych <= '1') goto yy454; goto yy55; -yy422: - YYDEBUG(422, *YYCURSOR); +yy453: + YYDEBUG(453, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy424; + if (yych <= '9') goto yy455; goto yy55; -yy423: - YYDEBUG(423, *YYCURSOR); +yy454: + YYDEBUG(454, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; -yy424: - YYDEBUG(424, *YYCURSOR); +yy455: + YYDEBUG(455, *YYCURSOR); yych = *++YYCURSOR; if (yych != '-') goto yy55; - YYDEBUG(425, *YYCURSOR); + YYDEBUG(456, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy426; - if (yych <= '2') goto yy427; - if (yych <= '3') goto yy428; + if (yych <= '0') goto yy457; + if (yych <= '2') goto yy458; + if (yych <= '3') goto yy459; goto yy55; -yy426: - YYDEBUG(426, *YYCURSOR); +yy457: + YYDEBUG(457, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy429; + if (yych <= '9') goto yy460; goto yy55; -yy427: - YYDEBUG(427, *YYCURSOR); +yy458: + YYDEBUG(458, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy429; + if (yych <= '9') goto yy460; goto yy55; -yy428: - YYDEBUG(428, *YYCURSOR); +yy459: + YYDEBUG(459, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '2') goto yy55; -yy429: - YYDEBUG(429, *YYCURSOR); +yy460: + YYDEBUG(460, *YYCURSOR); ++YYCURSOR; -yy430: - YYDEBUG(430, *YYCURSOR); -#line 1376 "ext/date/lib/parse_date.re" +yy461: + YYDEBUG(461, *YYCURSOR); +#line 1419 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); TIMELIB_INIT; @@ -8541,128 +8776,129 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 8543 "" -yy431: - YYDEBUG(431, *YYCURSOR); +#line 8780 "" +yy462: + YYDEBUG(462, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy446; - if (yych <= '1') goto yy447; + if (yych <= '0') goto yy477; + if (yych <= '1') goto yy478; goto yy55; -yy432: - YYDEBUG(432, *YYCURSOR); +yy463: + YYDEBUG(463, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(433, *YYCURSOR); +yy464: + YYDEBUG(464, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(434, *YYCURSOR); + YYDEBUG(465, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(435, *YYCURSOR); + YYDEBUG(466, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(436, *YYCURSOR); + YYDEBUG(467, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(437, *YYCURSOR); + YYDEBUG(468, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(438, *YYCURSOR); + YYDEBUG(469, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(439, *YYCURSOR); + YYDEBUG(470, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(440, *YYCURSOR); + YYDEBUG(471, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(441, *YYCURSOR); + YYDEBUG(472, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(442, *YYCURSOR); + YYDEBUG(473, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(443, *YYCURSOR); + YYDEBUG(474, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(444, *YYCURSOR); + YYDEBUG(475, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(445, *YYCURSOR); + YYDEBUG(476, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy431; + if (yych == '-') goto yy462; goto yy55; -yy446: - YYDEBUG(446, *YYCURSOR); +yy477: + YYDEBUG(477, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy448; + if (yych <= '9') goto yy479; goto yy55; -yy447: - YYDEBUG(447, *YYCURSOR); +yy478: + YYDEBUG(478, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; -yy448: - YYDEBUG(448, *YYCURSOR); +yy479: + YYDEBUG(479, *YYCURSOR); yych = *++YYCURSOR; if (yych != '-') goto yy55; - YYDEBUG(449, *YYCURSOR); + YYDEBUG(480, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy450; - if (yych <= '2') goto yy451; - if (yych <= '3') goto yy452; + if (yych <= '0') goto yy481; + if (yych <= '2') goto yy482; + if (yych <= '3') goto yy483; goto yy55; -yy450: - YYDEBUG(450, *YYCURSOR); +yy481: + YYDEBUG(481, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy453; + if (yych <= '9') goto yy484; goto yy55; -yy451: - YYDEBUG(451, *YYCURSOR); +yy482: + YYDEBUG(482, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy453; + if (yych <= '9') goto yy484; goto yy55; -yy452: - YYDEBUG(452, *YYCURSOR); +yy483: + YYDEBUG(483, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '2') goto yy55; -yy453: - YYDEBUG(453, *YYCURSOR); +yy484: + YYDEBUG(484, *YYCURSOR); ++YYCURSOR; - YYDEBUG(454, *YYCURSOR); -#line 1402 "ext/date/lib/parse_date.re" + YYDEBUG(485, *YYCURSOR); +#line 1445 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601datex"); TIMELIB_INIT; @@ -8673,10 +8909,10 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 8675 "" -yy455: - YYDEBUG(455, *YYCURSOR); - yyaccept = 0; +#line 8913 "" +yy486: + YYDEBUG(486, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { @@ -8687,7 +8923,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= '9') { if (yych <= '/') goto yy3; - goto yy419; + goto yy450; } else { if (yych == 'D') goto yy59; goto yy3; @@ -8743,9 +8979,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy456: - YYDEBUG(456, *YYCURSOR); - yyaccept = 0; +yy487: + YYDEBUG(487, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { @@ -8757,8 +8993,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= '5') { if (yych <= '/') goto yy3; } else { - if (yych <= '9') goto yy455; - if (yych <= ':') goto yy197; + if (yych <= '9') goto yy486; + if (yych <= ':') goto yy208; goto yy3; } } @@ -8822,8 +9058,8 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } - YYDEBUG(457, *YYCURSOR); - yyaccept = 0; + YYDEBUG(488, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { @@ -8889,8 +9125,110 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } - YYDEBUG(458, *YYCURSOR); - yyaccept = 0; + YYDEBUG(489, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'U') { + if (yych <= '9') { + if (yych <= ',') { + if (yych <= '\t') { + if (yych <= 0x08) goto yy3; + goto yy59; + } else { + if (yych == ' ') goto yy59; + goto yy3; + } + } else { + if (yych <= '/') { + if (yych <= '-') goto yy452; + goto yy3; + } else { + if (yych <= '5') goto yy490; + if (yych <= '6') goto yy491; + goto yy451; + } + } + } else { + if (yych <= 'G') { + if (yych <= 'D') { + if (yych <= 'C') goto yy3; + goto yy59; + } else { + if (yych == 'F') goto yy59; + goto yy3; + } + } else { + if (yych <= 'L') { + if (yych <= 'H') goto yy59; + goto yy3; + } else { + if (yych <= 'M') goto yy59; + if (yych <= 'R') goto yy3; + goto yy59; + } + } + } + } else { + if (yych <= 'h') { + if (yych <= 'c') { + if (yych <= 'W') { + if (yych <= 'V') goto yy3; + goto yy59; + } else { + if (yych == 'Y') goto yy59; + goto yy3; + } + } else { + if (yych <= 'e') { + if (yych <= 'd') goto yy59; + goto yy3; + } else { + if (yych == 'g') goto yy3; + goto yy59; + } + } + } else { + if (yych <= 'v') { + if (yych <= 'm') { + if (yych <= 'l') goto yy3; + goto yy59; + } else { + if (yych <= 'r') goto yy3; + if (yych <= 'u') goto yy59; + goto yy3; + } + } else { + if (yych <= 'y') { + if (yych == 'x') goto yy3; + goto yy59; + } else { + if (yych == 0xC2) goto yy59; + goto yy3; + } + } + } + } +yy490: + YYDEBUG(490, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '-') goto yy462; + if (yych <= '/') goto yy59; + if (yych <= '9') goto yy492; + goto yy59; +yy491: + YYDEBUG(491, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') { + if (yych == '-') goto yy462; + goto yy59; + } else { + if (yych <= '0') goto yy492; + if (yych <= '9') goto yy463; + goto yy59; + } +yy492: + YYDEBUG(492, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { @@ -8901,10 +9239,10 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= '-') { if (yych <= ',') goto yy3; - goto yy421; + goto yy462; } else { if (yych <= '/') goto yy3; - if (yych <= '9') goto yy420; + if (yych <= '9') goto yy464; goto yy3; } } @@ -8968,39 +9306,39 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy459: - YYDEBUG(459, *YYCURSOR); +yy493: + YYDEBUG(493, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy461; - if (yych <= '0') goto yy735; - if (yych <= '1') goto yy736; - if (yych <= '9') goto yy737; - goto yy461; -yy460: - YYDEBUG(460, *YYCURSOR); + if (yych <= '/') goto yy495; + if (yych <= '0') goto yy780; + if (yych <= '1') goto yy781; + if (yych <= '9') goto yy782; + goto yy495; +yy494: + YYDEBUG(494, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; -yy461: - YYDEBUG(461, *YYCURSOR); +yy495: + YYDEBUG(495, *YYCURSOR); if (yych <= 'W') { if (yych <= 'G') { if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy460; + if (yych == '\t') goto yy494; goto yy55; } else { - if (yych <= ' ') goto yy460; + if (yych <= ' ') goto yy494; if (yych <= ',') goto yy55; - goto yy576; + goto yy610; } } else { if (yych <= 'C') { - if (yych == 'A') goto yy479; + if (yych == 'A') goto yy513; goto yy55; } else { - if (yych <= 'D') goto yy465; - if (yych == 'F') goto yy466; + if (yych <= 'D') goto yy499; + if (yych == 'F') goto yy500; goto yy55; } } @@ -9008,23 +9346,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'O') { if (yych <= 'J') { if (yych <= 'H') goto yy64; - if (yych <= 'I') goto yy474; - goto yy478; + if (yych <= 'I') goto yy508; + goto yy512; } else { if (yych <= 'L') goto yy55; - if (yych <= 'M') goto yy462; - if (yych <= 'N') goto yy481; - goto yy480; + if (yych <= 'M') goto yy496; + if (yych <= 'N') goto yy515; + goto yy514; } } else { if (yych <= 'S') { - if (yych <= 'P') goto yy483; + if (yych <= 'P') goto yy517; if (yych <= 'R') goto yy55; - goto yy463; + goto yy497; } else { if (yych <= 'T') goto yy69; if (yych <= 'U') goto yy62; - if (yych <= 'V') goto yy476; + if (yych <= 'V') goto yy510; goto yy68; } } @@ -9033,33 +9371,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'm') { if (yych <= 'e') { if (yych <= '`') { - if (yych <= 'X') goto yy477; + if (yych <= 'X') goto yy511; if (yych <= 'Y') goto yy67; goto yy55; } else { - if (yych <= 'a') goto yy479; - if (yych == 'd') goto yy465; + if (yych <= 'a') goto yy513; + if (yych == 'd') goto yy499; goto yy55; } } else { if (yych <= 'h') { - if (yych <= 'f') goto yy466; + if (yych <= 'f') goto yy500; if (yych <= 'g') goto yy55; goto yy64; } else { - if (yych == 'j') goto yy478; + if (yych == 'j') goto yy512; if (yych <= 'l') goto yy55; } } } else { if (yych <= 'u') { if (yych <= 'p') { - if (yych <= 'n') goto yy481; - if (yych <= 'o') goto yy480; - goto yy483; + if (yych <= 'n') goto yy515; + if (yych <= 'o') goto yy514; + goto yy517; } else { if (yych <= 'r') goto yy55; - if (yych <= 's') goto yy463; + if (yych <= 's') goto yy497; if (yych <= 't') goto yy69; goto yy62; } @@ -9075,120 +9413,120 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy462: - YYDEBUG(462, *YYCURSOR); +yy496: + YYDEBUG(496, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'I') { - if (yych == 'A') goto yy591; + if (yych == 'A') goto yy625; if (yych <= 'H') goto yy55; - goto yy148; + goto yy154; } else { - if (yych == 'O') goto yy147; + if (yych == 'O') goto yy153; if (yych <= 'R') goto yy55; - goto yy149; + goto yy155; } } else { if (yych <= 'i') { - if (yych == 'a') goto yy591; + if (yych == 'a') goto yy625; if (yych <= 'h') goto yy55; - goto yy148; + goto yy154; } else { if (yych <= 'o') { if (yych <= 'n') goto yy55; - goto yy147; + goto yy153; } else { - if (yych == 's') goto yy149; + if (yych == 's') goto yy155; goto yy55; } } } -yy463: - YYDEBUG(463, *YYCURSOR); +yy497: + YYDEBUG(497, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { - if (yych == 'A') goto yy129; + if (yych == 'A') goto yy133; goto yy55; } else { - if (yych <= 'E') goto yy1048; + if (yych <= 'E') goto yy1108; if (yych <= 'T') goto yy55; - goto yy128; + goto yy132; } } else { if (yych <= 'd') { - if (yych == 'a') goto yy129; + if (yych == 'a') goto yy133; goto yy55; } else { - if (yych <= 'e') goto yy1048; - if (yych == 'u') goto yy128; + if (yych <= 'e') goto yy1108; + if (yych == 'u') goto yy132; goto yy55; } } -yy464: - YYDEBUG(464, *YYCURSOR); +yy498: + YYDEBUG(498, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '`') { if (yych <= 'D') { - if (yych == 'A') goto yy129; + if (yych == 'A') goto yy133; goto yy55; } else { - if (yych <= 'E') goto yy1048; - if (yych == 'U') goto yy128; + if (yych <= 'E') goto yy1108; + if (yych == 'U') goto yy132; goto yy55; } } else { if (yych <= 'e') { - if (yych <= 'a') goto yy129; + if (yych <= 'a') goto yy133; if (yych <= 'd') goto yy55; - goto yy1048; + goto yy1108; } else { if (yych <= 's') goto yy55; - if (yych <= 't') goto yy728; - if (yych <= 'u') goto yy128; + if (yych <= 't') goto yy773; + if (yych <= 'u') goto yy132; goto yy55; } } -yy465: - YYDEBUG(465, *YYCURSOR); +yy499: + YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { - if (yych == 'A') goto yy125; + if (yych == 'A') goto yy129; if (yych <= 'D') goto yy55; - goto yy578; + goto yy612; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy125; + goto yy129; } else { - if (yych == 'e') goto yy578; + if (yych == 'e') goto yy612; goto yy55; } } -yy466: - YYDEBUG(466, *YYCURSOR); +yy500: + YYDEBUG(500, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= 'N') { - if (yych == 'E') goto yy594; + if (yych == 'E') goto yy628; goto yy55; } else { - if (yych <= 'O') goto yy110; + if (yych <= 'O') goto yy113; if (yych <= 'Q') goto yy55; - goto yy109; + goto yy112; } } else { if (yych <= 'n') { - if (yych == 'e') goto yy594; + if (yych == 'e') goto yy628; goto yy55; } else { - if (yych <= 'o') goto yy110; - if (yych == 'r') goto yy109; + if (yych <= 'o') goto yy113; + if (yych == 'r') goto yy112; goto yy55; } } -yy467: - YYDEBUG(467, *YYCURSOR); +yy501: + YYDEBUG(501, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych == 'H') goto yy81; @@ -9197,73 +9535,73 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= 'h') { if (yych <= 'g') goto yy55; - goto yy1047; + goto yy1107; } else { if (yych == 'u') goto yy82; goto yy55; } } -yy468: - YYDEBUG(468, *YYCURSOR); +yy502: + YYDEBUG(502, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy741; + if (yych == '-') goto yy786; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy740; + if (yych <= '9') goto yy785; goto yy59; -yy469: - YYDEBUG(469, *YYCURSOR); +yy503: + YYDEBUG(503, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'c') { - if (yych == 'O') goto yy529; + if (yych == 'O') goto yy563; goto yy55; } else { - if (yych <= 'd') goto yy728; - if (yych == 'o') goto yy529; + if (yych <= 'd') goto yy773; + if (yych == 'o') goto yy563; goto yy55; } -yy470: - YYDEBUG(470, *YYCURSOR); +yy504: + YYDEBUG(504, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy728; + if (yych == 'd') goto yy773; goto yy55; -yy471: - YYDEBUG(471, *YYCURSOR); +yy505: + YYDEBUG(505, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { case '0': case '1': - case '2': goto yy665; - case '3': goto yy667; + case '2': goto yy699; + case '3': goto yy701; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy668; + case '9': goto yy702; case 'A': - case 'a': goto yy672; + case 'a': goto yy706; case 'D': - case 'd': goto yy676; + case 'd': goto yy710; case 'F': - case 'f': goto yy670; + case 'f': goto yy704; case 'J': - case 'j': goto yy669; + case 'j': goto yy703; case 'M': - case 'm': goto yy671; + case 'm': goto yy705; case 'N': - case 'n': goto yy675; + case 'n': goto yy709; case 'O': - case 'o': goto yy674; + case 'o': goto yy708; case 'S': - case 's': goto yy673; + case 's': goto yy707; default: goto yy55; } -yy472: - YYDEBUG(472, *YYCURSOR); +yy506: + YYDEBUG(506, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { - case '0': goto yy615; - case '1': goto yy616; + case '0': goto yy649; + case '1': goto yy650; case '2': case '3': case '4': @@ -9271,61 +9609,61 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case '6': case '7': case '8': - case '9': goto yy617; + case '9': goto yy651; case 'A': - case 'a': goto yy621; + case 'a': goto yy655; case 'D': - case 'd': goto yy625; + case 'd': goto yy659; case 'F': - case 'f': goto yy619; + case 'f': goto yy653; case 'J': - case 'j': goto yy618; + case 'j': goto yy652; case 'M': - case 'm': goto yy620; + case 'm': goto yy654; case 'N': - case 'n': goto yy624; + case 'n': goto yy658; case 'O': - case 'o': goto yy623; + case 'o': goto yy657; case 'S': - case 's': goto yy622; - default: goto yy577; + case 's': goto yy656; + default: goto yy611; } -yy473: - YYDEBUG(473, *YYCURSOR); +yy507: + YYDEBUG(507, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '1') { - if (yych <= '/') goto yy577; - if (yych <= '0') goto yy567; - goto yy568; + if (yych <= '/') goto yy611; + if (yych <= '0') goto yy601; + goto yy602; } else { - if (yych <= '5') goto yy569; - if (yych <= '9') goto yy570; - goto yy577; + if (yych <= '5') goto yy603; + if (yych <= '9') goto yy604; + goto yy611; } -yy474: - YYDEBUG(474, *YYCURSOR); +yy508: + YYDEBUG(508, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; + if (yych == '\t') goto yy565; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '.') goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '.') goto yy565; } } else { if (yych <= 'U') { - if (yych <= '9') goto yy533; - if (yych == 'I') goto yy566; + if (yych <= '9') goto yy567; + if (yych == 'I') goto yy600; } else { - if (yych == 'W') goto yy475; - if (yych <= 'X') goto yy539; + if (yych == 'W') goto yy509; + if (yych <= 'X') goto yy573; } } -yy475: - YYDEBUG(475, *YYCURSOR); -#line 1525 "ext/date/lib/parse_date.re" +yy509: + YYDEBUG(509, *YYCURSOR); +#line 1568 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; @@ -9336,148 +9674,148 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 9338 "" -yy476: - YYDEBUG(476, *YYCURSOR); +#line 9678 "" +yy510: + YYDEBUG(510, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '9') { - if (yych <= '.') goto yy531; - if (yych <= '/') goto yy475; - goto yy533; + if (yych <= '.') goto yy565; + if (yych <= '/') goto yy509; + goto yy567; } else { - if (yych == 'I') goto yy564; - goto yy475; + if (yych == 'I') goto yy598; + goto yy509; } } -yy477: - YYDEBUG(477, *YYCURSOR); +yy511: + YYDEBUG(511, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '9') { - if (yych <= '.') goto yy531; - if (yych <= '/') goto yy475; - goto yy533; + if (yych <= '.') goto yy565; + if (yych <= '/') goto yy509; + goto yy567; } else { - if (yych == 'I') goto yy563; - goto yy475; + if (yych == 'I') goto yy597; + goto yy509; } } -yy478: - YYDEBUG(478, *YYCURSOR); +yy512: + YYDEBUG(512, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy556; + if (yych == 'A') goto yy590; if (yych <= 'T') goto yy55; - goto yy555; + goto yy589; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy556; + goto yy590; } else { - if (yych == 'u') goto yy555; + if (yych == 'u') goto yy589; goto yy55; } } -yy479: - YYDEBUG(479, *YYCURSOR); +yy513: + YYDEBUG(513, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= 'L') { - if (yych == '.') goto yy484; + if (yych == '.') goto yy518; goto yy55; } else { - if (yych <= 'M') goto yy485; - if (yych == 'P') goto yy549; + if (yych <= 'M') goto yy519; + if (yych == 'P') goto yy583; goto yy55; } } else { if (yych <= 'o') { - if (yych <= 'U') goto yy548; - if (yych == 'm') goto yy485; + if (yych <= 'U') goto yy582; + if (yych == 'm') goto yy519; goto yy55; } else { - if (yych <= 'p') goto yy549; - if (yych == 'u') goto yy548; + if (yych <= 'p') goto yy583; + if (yych == 'u') goto yy582; goto yy55; } } -yy480: - YYDEBUG(480, *YYCURSOR); +yy514: + YYDEBUG(514, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy543; - if (yych == 'c') goto yy543; + if (yych == 'C') goto yy577; + if (yych == 'c') goto yy577; goto yy55; -yy481: - YYDEBUG(481, *YYCURSOR); +yy515: + YYDEBUG(515, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy529; - if (yych == 'o') goto yy529; + if (yych == 'O') goto yy563; + if (yych == 'o') goto yy563; goto yy55; -yy482: - YYDEBUG(482, *YYCURSOR); +yy516: + YYDEBUG(516, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy489; - if (yych <= '9') goto yy491; + if (yych <= '5') goto yy523; + if (yych <= '9') goto yy525; goto yy55; -yy483: - YYDEBUG(483, *YYCURSOR); +yy517: + YYDEBUG(517, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy55; } else { - if (yych <= 'M') goto yy485; - if (yych == 'm') goto yy485; + if (yych <= 'M') goto yy519; + if (yych == 'm') goto yy519; goto yy55; } -yy484: - YYDEBUG(484, *YYCURSOR); +yy518: + YYDEBUG(518, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy485; + if (yych == 'M') goto yy519; if (yych != 'm') goto yy55; -yy485: - YYDEBUG(485, *YYCURSOR); +yy519: + YYDEBUG(519, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy487; - if (yych == '\t') goto yy487; + if (yych <= 0x00) goto yy521; + if (yych == '\t') goto yy521; goto yy55; } else { - if (yych <= ' ') goto yy487; + if (yych <= ' ') goto yy521; if (yych != '.') goto yy55; } - YYDEBUG(486, *YYCURSOR); + YYDEBUG(520, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy487; + if (yych <= 0x00) goto yy521; if (yych <= 0x08) goto yy55; } else { if (yych != ' ') goto yy55; } -yy487: - YYDEBUG(487, *YYCURSOR); +yy521: + YYDEBUG(521, *YYCURSOR); ++YYCURSOR; - YYDEBUG(488, *YYCURSOR); -#line 1231 "ext/date/lib/parse_date.re" + YYDEBUG(522, *YYCURSOR); +#line 1272 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); TIMELIB_INIT; @@ -9493,32 +9831,34 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_TIME12; } -#line 9495 "" -yy489: - YYDEBUG(489, *YYCURSOR); +#line 9835 "" +yy523: + YYDEBUG(523, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy492; + if (yych == '.') goto yy526; } else { - if (yych <= '9') goto yy506; - if (yych <= ':') goto yy492; + if (yych <= '9') goto yy540; + if (yych <= ':') goto yy526; } -yy490: - YYDEBUG(490, *YYCURSOR); -#line 1268 "ext/date/lib/parse_date.re" +yy524: + YYDEBUG(524, *YYCURSOR); +#line 1309 "ext/date/lib/parse_date.re" { int tz_not_found; - DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long"); + DEBUG_OUTPUT("timetiny24 | timeshort24 | timelong24 | iso8601long"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); s->time->h = timelib_get_nr(&ptr, 2); - s->time->i = timelib_get_nr(&ptr, 2); if (*ptr == ':' || *ptr == '.') { - s->time->s = timelib_get_nr(&ptr, 2); + s->time->i = timelib_get_nr(&ptr, 2); + if (*ptr == ':' || *ptr == '.') { + s->time->s = timelib_get_nr(&ptr, 2); - if (*ptr == '.') { - s->time->us = timelib_get_frac_nr(&ptr); + if (*ptr == '.') { + s->time->us = timelib_get_frac_nr(&ptr); + } } } @@ -9531,320 +9871,320 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -#line 9533 "" -yy491: - YYDEBUG(491, *YYCURSOR); +#line 9875 "" +yy525: + YYDEBUG(525, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy492; - if (yych != ':') goto yy490; -yy492: - YYDEBUG(492, *YYCURSOR); + if (yych == '.') goto yy526; + if (yych != ':') goto yy524; +yy526: + YYDEBUG(526, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy493; - if (yych <= '6') goto yy494; - if (yych <= '9') goto yy495; + if (yych <= '5') goto yy527; + if (yych <= '6') goto yy528; + if (yych <= '9') goto yy529; goto yy55; -yy493: - YYDEBUG(493, *YYCURSOR); +yy527: + YYDEBUG(527, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy499; - goto yy490; -yy494: - YYDEBUG(494, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy533; + goto yy524; +yy528: + YYDEBUG(528, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych == '0') goto yy499; - goto yy490; -yy495: - YYDEBUG(495, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych == '0') goto yy533; + goto yy524; +yy529: + YYDEBUG(529, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '.') goto yy490; -yy496: - YYDEBUG(496, *YYCURSOR); + if (yych != '.') goto yy524; +yy530: + YYDEBUG(530, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 128) { - goto yy497; + goto yy531; } goto yy55; -yy497: - YYDEBUG(497, *YYCURSOR); +yy531: + YYDEBUG(531, *YYCURSOR); ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; - YYDEBUG(498, *YYCURSOR); + YYDEBUG(532, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy497; + goto yy531; } - goto yy490; -yy499: - YYDEBUG(499, *YYCURSOR); + goto yy524; +yy533: + YYDEBUG(533, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych != '\t') goto yy490; + if (yych != '\t') goto yy524; } else { - if (yych <= ' ') goto yy500; - if (yych == '.') goto yy496; - goto yy490; + if (yych <= ' ') goto yy534; + if (yych == '.') goto yy530; + goto yy524; } } else { if (yych <= '`') { - if (yych <= 'A') goto yy502; - if (yych == 'P') goto yy502; - goto yy490; + if (yych <= 'A') goto yy536; + if (yych == 'P') goto yy536; + goto yy524; } else { - if (yych <= 'a') goto yy502; - if (yych == 'p') goto yy502; - goto yy490; + if (yych <= 'a') goto yy536; + if (yych == 'p') goto yy536; + goto yy524; } } -yy500: - YYDEBUG(500, *YYCURSOR); +yy534: + YYDEBUG(534, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(501, *YYCURSOR); + YYDEBUG(535, *YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy500; + if (yych == '\t') goto yy534; goto yy55; } else { - if (yych <= ' ') goto yy500; + if (yych <= ' ') goto yy534; if (yych <= '@') goto yy55; } } else { if (yych <= '`') { if (yych != 'P') goto yy55; } else { - if (yych <= 'a') goto yy502; + if (yych <= 'a') goto yy536; if (yych != 'p') goto yy55; } } -yy502: - YYDEBUG(502, *YYCURSOR); +yy536: + YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy55; } else { - if (yych <= 'M') goto yy504; - if (yych == 'm') goto yy504; + if (yych <= 'M') goto yy538; + if (yych == 'm') goto yy538; goto yy55; } - YYDEBUG(503, *YYCURSOR); + YYDEBUG(537, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy504; + if (yych == 'M') goto yy538; if (yych != 'm') goto yy55; -yy504: - YYDEBUG(504, *YYCURSOR); +yy538: + YYDEBUG(538, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy487; - if (yych == '\t') goto yy487; + if (yych <= 0x00) goto yy521; + if (yych == '\t') goto yy521; goto yy55; } else { - if (yych <= ' ') goto yy487; + if (yych <= ' ') goto yy521; if (yych != '.') goto yy55; } - YYDEBUG(505, *YYCURSOR); + YYDEBUG(539, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy487; + if (yych <= 0x00) goto yy521; if (yych <= 0x08) goto yy55; - goto yy487; + goto yy521; } else { - if (yych == ' ') goto yy487; + if (yych == ' ') goto yy521; goto yy55; } -yy506: - YYDEBUG(506, *YYCURSOR); +yy540: + YYDEBUG(540, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy507; - if (yych <= 0x1F) goto yy490; + if (yych == '\t') goto yy541; + if (yych <= 0x1F) goto yy524; } else { - if (yych == '.') goto yy492; - if (yych <= '9') goto yy490; - goto yy510; + if (yych == '.') goto yy526; + if (yych <= '9') goto yy524; + goto yy544; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy509; - if (yych <= 'O') goto yy490; - goto yy509; + if (yych == 'A') goto yy543; + if (yych <= 'O') goto yy524; + goto yy543; } else { if (yych <= 'a') { - if (yych <= '`') goto yy490; - goto yy509; + if (yych <= '`') goto yy524; + goto yy543; } else { - if (yych == 'p') goto yy509; - goto yy490; + if (yych == 'p') goto yy543; + goto yy524; } } } -yy507: - YYDEBUG(507, *YYCURSOR); +yy541: + YYDEBUG(541, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(508, *YYCURSOR); + YYDEBUG(542, *YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy507; + if (yych == '\t') goto yy541; goto yy55; } else { - if (yych <= ' ') goto yy507; + if (yych <= ' ') goto yy541; if (yych <= '@') goto yy55; } } else { if (yych <= '`') { if (yych != 'P') goto yy55; } else { - if (yych <= 'a') goto yy509; + if (yych <= 'a') goto yy543; if (yych != 'p') goto yy55; } } -yy509: - YYDEBUG(509, *YYCURSOR); +yy543: + YYDEBUG(543, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { - if (yych == '.') goto yy526; + if (yych == '.') goto yy560; goto yy55; } else { - if (yych <= 'M') goto yy527; - if (yych == 'm') goto yy527; + if (yych <= 'M') goto yy561; + if (yych == 'm') goto yy561; goto yy55; } -yy510: - YYDEBUG(510, *YYCURSOR); +yy544: + YYDEBUG(544, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy511; - if (yych <= '6') goto yy512; - if (yych <= '9') goto yy495; + if (yych <= '5') goto yy545; + if (yych <= '6') goto yy546; + if (yych <= '9') goto yy529; goto yy55; -yy511: - YYDEBUG(511, *YYCURSOR); +yy545: + YYDEBUG(545, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy513; - goto yy490; -yy512: - YYDEBUG(512, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy547; + goto yy524; +yy546: + YYDEBUG(546, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych != '0') goto yy490; -yy513: - YYDEBUG(513, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych != '0') goto yy524; +yy547: + YYDEBUG(547, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy500; - if (yych <= 0x1F) goto yy490; - goto yy500; + if (yych == '\t') goto yy534; + if (yych <= 0x1F) goto yy524; + goto yy534; } else { - if (yych == '.') goto yy514; - if (yych <= '9') goto yy490; - goto yy515; + if (yych == '.') goto yy548; + if (yych <= '9') goto yy524; + goto yy549; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy502; - if (yych <= 'O') goto yy490; - goto yy502; + if (yych == 'A') goto yy536; + if (yych <= 'O') goto yy524; + goto yy536; } else { if (yych <= 'a') { - if (yych <= '`') goto yy490; - goto yy502; + if (yych <= '`') goto yy524; + goto yy536; } else { - if (yych == 'p') goto yy502; - goto yy490; + if (yych == 'p') goto yy536; + goto yy524; } } } -yy514: - YYDEBUG(514, *YYCURSOR); +yy548: + YYDEBUG(548, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy524; + if (yych <= '9') goto yy558; goto yy55; -yy515: - YYDEBUG(515, *YYCURSOR); +yy549: + YYDEBUG(549, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy516: - YYDEBUG(516, *YYCURSOR); +yy550: + YYDEBUG(550, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(517, *YYCURSOR); + YYDEBUG(551, *YYCURSOR); if (yych <= 'O') { if (yych <= '9') { if (yych <= '/') goto yy55; - goto yy516; + goto yy550; } else { if (yych != 'A') goto yy55; } } else { if (yych <= 'a') { - if (yych <= 'P') goto yy518; + if (yych <= 'P') goto yy552; if (yych <= '`') goto yy55; } else { if (yych != 'p') goto yy55; } } -yy518: - YYDEBUG(518, *YYCURSOR); +yy552: + YYDEBUG(552, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy55; } else { - if (yych <= 'M') goto yy520; - if (yych == 'm') goto yy520; + if (yych <= 'M') goto yy554; + if (yych == 'm') goto yy554; goto yy55; } - YYDEBUG(519, *YYCURSOR); + YYDEBUG(553, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy520; + if (yych == 'M') goto yy554; if (yych != 'm') goto yy55; -yy520: - YYDEBUG(520, *YYCURSOR); +yy554: + YYDEBUG(554, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy522; - if (yych == '\t') goto yy522; + if (yych <= 0x00) goto yy556; + if (yych == '\t') goto yy556; goto yy55; } else { - if (yych <= ' ') goto yy522; + if (yych <= ' ') goto yy556; if (yych != '.') goto yy55; } - YYDEBUG(521, *YYCURSOR); + YYDEBUG(555, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy522; + if (yych <= 0x00) goto yy556; if (yych <= 0x08) goto yy55; } else { if (yych != ' ') goto yy55; } -yy522: - YYDEBUG(522, *YYCURSOR); +yy556: + YYDEBUG(556, *YYCURSOR); ++YYCURSOR; - YYDEBUG(523, *YYCURSOR); -#line 1248 "ext/date/lib/parse_date.re" + YYDEBUG(557, *YYCURSOR); +#line 1289 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("mssqltime"); TIMELIB_INIT; @@ -9863,113 +10203,113 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -#line 9865 "" -yy524: - YYDEBUG(524, *YYCURSOR); +#line 10207 "" +yy558: + YYDEBUG(558, *YYCURSOR); yyaccept = 10; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(525, *YYCURSOR); + YYDEBUG(559, *YYCURSOR); if (yych <= 'O') { if (yych <= '9') { - if (yych <= '/') goto yy490; - goto yy524; + if (yych <= '/') goto yy524; + goto yy558; } else { - if (yych == 'A') goto yy518; - goto yy490; + if (yych == 'A') goto yy552; + goto yy524; } } else { if (yych <= 'a') { - if (yych <= 'P') goto yy518; - if (yych <= '`') goto yy490; - goto yy518; + if (yych <= 'P') goto yy552; + if (yych <= '`') goto yy524; + goto yy552; } else { - if (yych == 'p') goto yy518; - goto yy490; + if (yych == 'p') goto yy552; + goto yy524; } } -yy526: - YYDEBUG(526, *YYCURSOR); +yy560: + YYDEBUG(560, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy527; + if (yych == 'M') goto yy561; if (yych != 'm') goto yy55; -yy527: - YYDEBUG(527, *YYCURSOR); +yy561: + YYDEBUG(561, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy487; - if (yych == '\t') goto yy487; + if (yych <= 0x00) goto yy521; + if (yych == '\t') goto yy521; goto yy55; } else { - if (yych <= ' ') goto yy487; + if (yych <= ' ') goto yy521; if (yych != '.') goto yy55; } - YYDEBUG(528, *YYCURSOR); + YYDEBUG(562, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy487; + if (yych <= 0x00) goto yy521; if (yych <= 0x08) goto yy55; - goto yy487; + goto yy521; } else { - if (yych == ' ') goto yy487; + if (yych == ' ') goto yy521; goto yy55; } -yy529: - YYDEBUG(529, *YYCURSOR); +yy563: + YYDEBUG(563, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'V') goto yy530; + if (yych == 'V') goto yy564; if (yych != 'v') goto yy55; -yy530: - YYDEBUG(530, *YYCURSOR); +yy564: + YYDEBUG(564, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych != '\t') goto yy475; + if (yych != '\t') goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy535; - if (yych == 'e') goto yy535; - goto yy475; + if (yych <= 'E') goto yy569; + if (yych == 'e') goto yy569; + goto yy509; } } -yy531: - YYDEBUG(531, *YYCURSOR); +yy565: + YYDEBUG(565, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; -yy532: - YYDEBUG(532, *YYCURSOR); +yy566: + YYDEBUG(566, *YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy531; + if (yych == '\t') goto yy565; if (yych <= 0x1F) goto yy55; - goto yy531; + goto yy565; } else { if (yych <= '.') { if (yych <= ',') goto yy55; - goto yy531; + goto yy565; } else { if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; } } -yy533: - YYDEBUG(533, *YYCURSOR); +yy567: + YYDEBUG(567, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy534; - if (yych <= '9') goto yy540; -yy534: - YYDEBUG(534, *YYCURSOR); -#line 1442 "ext/date/lib/parse_date.re" + if ((yych = *YYCURSOR) <= '/') goto yy568; + if (yych <= '9') goto yy574; +yy568: + YYDEBUG(568, *YYCURSOR); +#line 1485 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datefull"); @@ -9983,743 +10323,743 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } -#line 9985 "" -yy535: - YYDEBUG(535, *YYCURSOR); +#line 10327 "" +yy569: + YYDEBUG(569, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy536; + if (yych == 'M') goto yy570; if (yych != 'm') goto yy55; -yy536: - YYDEBUG(536, *YYCURSOR); +yy570: + YYDEBUG(570, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy537; + if (yych == 'B') goto yy571; if (yych != 'b') goto yy55; -yy537: - YYDEBUG(537, *YYCURSOR); +yy571: + YYDEBUG(571, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy538; + if (yych == 'E') goto yy572; if (yych != 'e') goto yy55; -yy538: - YYDEBUG(538, *YYCURSOR); +yy572: + YYDEBUG(572, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy539; + if (yych == 'R') goto yy573; if (yych != 'r') goto yy55; -yy539: - YYDEBUG(539, *YYCURSOR); +yy573: + YYDEBUG(573, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy531; - if (yych <= 0x1F) goto yy475; - goto yy531; + if (yych == '\t') goto yy565; + if (yych <= 0x1F) goto yy509; + goto yy565; } else { if (yych <= '.') { - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ',') goto yy509; + goto yy565; } else { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } } -yy540: - YYDEBUG(540, *YYCURSOR); +yy574: + YYDEBUG(574, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych >= ':') goto yy534; -yy541: - YYDEBUG(541, *YYCURSOR); + if (yych <= '/') goto yy568; + if (yych >= ':') goto yy568; +yy575: + YYDEBUG(575, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych >= ':') goto yy534; - YYDEBUG(542, *YYCURSOR); + if (yych <= '/') goto yy568; + if (yych >= ':') goto yy568; + YYDEBUG(576, *YYCURSOR); yych = *++YYCURSOR; - goto yy534; -yy543: - YYDEBUG(543, *YYCURSOR); + goto yy568; +yy577: + YYDEBUG(577, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy544; + if (yych == 'T') goto yy578; if (yych != 't') goto yy55; -yy544: - YYDEBUG(544, *YYCURSOR); +yy578: + YYDEBUG(578, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'N') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'O') goto yy545; - if (yych != 'o') goto yy475; + if (yych <= 'O') goto yy579; + if (yych != 'o') goto yy509; } } -yy545: - YYDEBUG(545, *YYCURSOR); +yy579: + YYDEBUG(579, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy546; + if (yych == 'B') goto yy580; if (yych != 'b') goto yy55; -yy546: - YYDEBUG(546, *YYCURSOR); +yy580: + YYDEBUG(580, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy547; + if (yych == 'E') goto yy581; if (yych != 'e') goto yy55; -yy547: - YYDEBUG(547, *YYCURSOR); +yy581: + YYDEBUG(581, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy539; - if (yych == 'r') goto yy539; + if (yych == 'R') goto yy573; + if (yych == 'r') goto yy573; goto yy55; -yy548: - YYDEBUG(548, *YYCURSOR); +yy582: + YYDEBUG(582, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy552; - if (yych == 'g') goto yy552; + if (yych == 'G') goto yy586; + if (yych == 'g') goto yy586; goto yy55; -yy549: - YYDEBUG(549, *YYCURSOR); +yy583: + YYDEBUG(583, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy550; + if (yych == 'R') goto yy584; if (yych != 'r') goto yy55; -yy550: - YYDEBUG(550, *YYCURSOR); +yy584: + YYDEBUG(584, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'H') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'I') goto yy551; - if (yych != 'i') goto yy475; + if (yych <= 'I') goto yy585; + if (yych != 'i') goto yy509; } } -yy551: - YYDEBUG(551, *YYCURSOR); +yy585: + YYDEBUG(585, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy539; - if (yych == 'l') goto yy539; + if (yych == 'L') goto yy573; + if (yych == 'l') goto yy573; goto yy55; -yy552: - YYDEBUG(552, *YYCURSOR); +yy586: + YYDEBUG(586, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'U') goto yy553; - if (yych != 'u') goto yy475; + if (yych <= 'U') goto yy587; + if (yych != 'u') goto yy509; } } -yy553: - YYDEBUG(553, *YYCURSOR); +yy587: + YYDEBUG(587, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy554; + if (yych == 'S') goto yy588; if (yych != 's') goto yy55; -yy554: - YYDEBUG(554, *YYCURSOR); +yy588: + YYDEBUG(588, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy539; - if (yych == 't') goto yy539; + if (yych == 'T') goto yy573; + if (yych == 't') goto yy573; goto yy55; -yy555: - YYDEBUG(555, *YYCURSOR); +yy589: + YYDEBUG(589, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy562; + if (yych == 'L') goto yy596; if (yych <= 'M') goto yy55; - goto yy561; + goto yy595; } else { if (yych <= 'l') { if (yych <= 'k') goto yy55; - goto yy562; + goto yy596; } else { - if (yych == 'n') goto yy561; + if (yych == 'n') goto yy595; goto yy55; } } -yy556: - YYDEBUG(556, *YYCURSOR); +yy590: + YYDEBUG(590, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy557; + if (yych == 'N') goto yy591; if (yych != 'n') goto yy55; -yy557: - YYDEBUG(557, *YYCURSOR); +yy591: + YYDEBUG(591, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'U') goto yy558; - if (yych != 'u') goto yy475; + if (yych <= 'U') goto yy592; + if (yych != 'u') goto yy509; } } -yy558: - YYDEBUG(558, *YYCURSOR); +yy592: + YYDEBUG(592, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy559; + if (yych == 'A') goto yy593; if (yych != 'a') goto yy55; -yy559: - YYDEBUG(559, *YYCURSOR); +yy593: + YYDEBUG(593, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy560; + if (yych == 'R') goto yy594; if (yych != 'r') goto yy55; -yy560: - YYDEBUG(560, *YYCURSOR); +yy594: + YYDEBUG(594, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy539; - if (yych == 'y') goto yy539; + if (yych == 'Y') goto yy573; + if (yych == 'y') goto yy573; goto yy55; -yy561: - YYDEBUG(561, *YYCURSOR); +yy595: + YYDEBUG(595, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy539; - if (yych == 'e') goto yy539; - goto yy475; + if (yych <= 'E') goto yy573; + if (yych == 'e') goto yy573; + goto yy509; } } -yy562: - YYDEBUG(562, *YYCURSOR); +yy596: + YYDEBUG(596, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'X') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'Y') goto yy539; - if (yych == 'y') goto yy539; - goto yy475; + if (yych <= 'Y') goto yy573; + if (yych == 'y') goto yy573; + goto yy509; } } -yy563: - YYDEBUG(563, *YYCURSOR); +yy597: + YYDEBUG(597, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '9') { - if (yych <= '.') goto yy531; - if (yych <= '/') goto yy475; - goto yy533; + if (yych <= '.') goto yy565; + if (yych <= '/') goto yy509; + goto yy567; } else { - if (yych == 'I') goto yy539; - goto yy475; + if (yych == 'I') goto yy573; + goto yy509; } } -yy564: - YYDEBUG(564, *YYCURSOR); +yy598: + YYDEBUG(598, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '9') { - if (yych <= '.') goto yy531; - if (yych <= '/') goto yy475; - goto yy533; + if (yych <= '.') goto yy565; + if (yych <= '/') goto yy509; + goto yy567; } else { - if (yych != 'I') goto yy475; + if (yych != 'I') goto yy509; } } - YYDEBUG(565, *YYCURSOR); + YYDEBUG(599, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '9') { - if (yych <= '.') goto yy531; - if (yych <= '/') goto yy475; - goto yy533; + if (yych <= '.') goto yy565; + if (yych <= '/') goto yy509; + goto yy567; } else { - if (yych == 'I') goto yy539; - goto yy475; + if (yych == 'I') goto yy573; + goto yy509; } } -yy566: - YYDEBUG(566, *YYCURSOR); +yy600: + YYDEBUG(600, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '9') { - if (yych <= '.') goto yy531; - if (yych <= '/') goto yy475; - goto yy533; + if (yych <= '.') goto yy565; + if (yych <= '/') goto yy509; + goto yy567; } else { - if (yych == 'I') goto yy539; - goto yy475; + if (yych == 'I') goto yy573; + goto yy509; } } -yy567: - YYDEBUG(567, *YYCURSOR); +yy601: + YYDEBUG(601, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - goto yy600; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + goto yy634; } else { - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy614; - if (yych <= ':') goto yy492; - goto yy490; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy648; + if (yych <= ':') goto yy526; + goto yy524; } -yy568: - YYDEBUG(568, *YYCURSOR); +yy602: + YYDEBUG(602, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - if (yych <= '.') goto yy600; - goto yy490; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + if (yych <= '.') goto yy634; + goto yy524; } else { - if (yych <= '2') goto yy614; - if (yych <= '9') goto yy613; - if (yych <= ':') goto yy492; - goto yy490; + if (yych <= '2') goto yy648; + if (yych <= '9') goto yy647; + if (yych <= ':') goto yy526; + goto yy524; } -yy569: - YYDEBUG(569, *YYCURSOR); +yy603: + YYDEBUG(603, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - goto yy600; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + goto yy634; } else { - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy613; - if (yych <= ':') goto yy492; - goto yy490; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy647; + if (yych <= ':') goto yy526; + goto yy524; } -yy570: - YYDEBUG(570, *YYCURSOR); +yy604: + YYDEBUG(604, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - goto yy600; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + goto yy634; } else { - if (yych == ':') goto yy492; - goto yy490; + if (yych == ':') goto yy526; + goto yy524; } -yy571: - YYDEBUG(571, *YYCURSOR); +yy605: + YYDEBUG(605, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy594; - if (yych == 'e') goto yy594; + if (yych == 'E') goto yy628; + if (yych == 'e') goto yy628; goto yy55; -yy572: - YYDEBUG(572, *YYCURSOR); +yy606: + YYDEBUG(606, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy591; - if (yych == 'a') goto yy591; + if (yych == 'A') goto yy625; + if (yych == 'a') goto yy625; goto yy55; -yy573: - YYDEBUG(573, *YYCURSOR); +yy607: + YYDEBUG(607, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy549; + if (yych == 'P') goto yy583; if (yych <= 'T') goto yy55; - goto yy548; + goto yy582; } else { if (yych <= 'p') { if (yych <= 'o') goto yy55; - goto yy549; + goto yy583; } else { - if (yych == 'u') goto yy548; + if (yych == 'u') goto yy582; goto yy55; } } -yy574: - YYDEBUG(574, *YYCURSOR); +yy608: + YYDEBUG(608, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy584; - if (yych == 'e') goto yy584; + if (yych == 'E') goto yy618; + if (yych == 'e') goto yy618; goto yy55; -yy575: - YYDEBUG(575, *YYCURSOR); +yy609: + YYDEBUG(609, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy578; - if (yych == 'e') goto yy578; + if (yych == 'E') goto yy612; + if (yych == 'e') goto yy612; goto yy55; -yy576: - YYDEBUG(576, *YYCURSOR); +yy610: + YYDEBUG(610, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; -yy577: - YYDEBUG(577, *YYCURSOR); +yy611: + YYDEBUG(611, *YYCURSOR); switch (yych) { case '\t': case ' ': case '-': - case '.': goto yy576; + case '.': goto yy610; case 'A': - case 'a': goto yy573; + case 'a': goto yy607; case 'D': - case 'd': goto yy575; + case 'd': goto yy609; case 'F': - case 'f': goto yy571; - case 'I': goto yy474; + case 'f': goto yy605; + case 'I': goto yy508; case 'J': - case 'j': goto yy478; + case 'j': goto yy512; case 'M': - case 'm': goto yy572; + case 'm': goto yy606; case 'N': - case 'n': goto yy481; + case 'n': goto yy515; case 'O': - case 'o': goto yy480; + case 'o': goto yy514; case 'S': - case 's': goto yy574; - case 'V': goto yy476; - case 'X': goto yy477; + case 's': goto yy608; + case 'V': goto yy510; + case 'X': goto yy511; default: goto yy55; } -yy578: - YYDEBUG(578, *YYCURSOR); +yy612: + YYDEBUG(612, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy579; + if (yych == 'C') goto yy613; if (yych != 'c') goto yy55; -yy579: - YYDEBUG(579, *YYCURSOR); +yy613: + YYDEBUG(613, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy580; - if (yych != 'e') goto yy475; + if (yych <= 'E') goto yy614; + if (yych != 'e') goto yy509; } } -yy580: - YYDEBUG(580, *YYCURSOR); +yy614: + YYDEBUG(614, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy581; + if (yych == 'M') goto yy615; if (yych != 'm') goto yy55; -yy581: - YYDEBUG(581, *YYCURSOR); +yy615: + YYDEBUG(615, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy582; + if (yych == 'B') goto yy616; if (yych != 'b') goto yy55; -yy582: - YYDEBUG(582, *YYCURSOR); +yy616: + YYDEBUG(616, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy583; + if (yych == 'E') goto yy617; if (yych != 'e') goto yy55; -yy583: - YYDEBUG(583, *YYCURSOR); +yy617: + YYDEBUG(617, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy539; - if (yych == 'r') goto yy539; + if (yych == 'R') goto yy573; + if (yych == 'r') goto yy573; goto yy55; -yy584: - YYDEBUG(584, *YYCURSOR); +yy618: + YYDEBUG(618, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy585; + if (yych == 'P') goto yy619; if (yych != 'p') goto yy55; -yy585: - YYDEBUG(585, *YYCURSOR); +yy619: + YYDEBUG(619, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'S') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'T') goto yy586; - if (yych != 't') goto yy475; + if (yych <= 'T') goto yy620; + if (yych != 't') goto yy509; } } -yy586: - YYDEBUG(586, *YYCURSOR); +yy620: + YYDEBUG(620, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy587; - if (yych != 'e') goto yy475; + if (yych <= 'E') goto yy621; + if (yych != 'e') goto yy509; } } -yy587: - YYDEBUG(587, *YYCURSOR); +yy621: + YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy588; + if (yych == 'M') goto yy622; if (yych != 'm') goto yy55; -yy588: - YYDEBUG(588, *YYCURSOR); +yy622: + YYDEBUG(622, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy589; + if (yych == 'B') goto yy623; if (yych != 'b') goto yy55; -yy589: - YYDEBUG(589, *YYCURSOR); +yy623: + YYDEBUG(623, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy590; + if (yych == 'E') goto yy624; if (yych != 'e') goto yy55; -yy590: - YYDEBUG(590, *YYCURSOR); +yy624: + YYDEBUG(624, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy539; - if (yych == 'r') goto yy539; + if (yych == 'R') goto yy573; + if (yych == 'r') goto yy573; goto yy55; -yy591: - YYDEBUG(591, *YYCURSOR); +yy625: + YYDEBUG(625, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy592; + if (yych == 'R') goto yy626; if (yych <= 'X') goto yy55; - goto yy539; + goto yy573; } else { if (yych <= 'r') { if (yych <= 'q') goto yy55; } else { - if (yych == 'y') goto yy539; + if (yych == 'y') goto yy573; goto yy55; } } -yy592: - YYDEBUG(592, *YYCURSOR); +yy626: + YYDEBUG(626, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'B') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'C') goto yy593; - if (yych != 'c') goto yy475; + if (yych <= 'C') goto yy627; + if (yych != 'c') goto yy509; } } -yy593: - YYDEBUG(593, *YYCURSOR); +yy627: + YYDEBUG(627, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy539; - if (yych == 'h') goto yy539; + if (yych == 'H') goto yy573; + if (yych == 'h') goto yy573; goto yy55; -yy594: - YYDEBUG(594, *YYCURSOR); +yy628: + YYDEBUG(628, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy595; + if (yych == 'B') goto yy629; if (yych != 'b') goto yy55; -yy595: - YYDEBUG(595, *YYCURSOR); +yy629: + YYDEBUG(629, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + goto yy565; } } else { if (yych <= 'Q') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'R') goto yy596; - if (yych != 'r') goto yy475; + if (yych <= 'R') goto yy630; + if (yych != 'r') goto yy509; } } -yy596: - YYDEBUG(596, *YYCURSOR); +yy630: + YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy597; + if (yych == 'U') goto yy631; if (yych != 'u') goto yy55; -yy597: - YYDEBUG(597, *YYCURSOR); +yy631: + YYDEBUG(631, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy598; + if (yych == 'A') goto yy632; if (yych != 'a') goto yy55; -yy598: - YYDEBUG(598, *YYCURSOR); +yy632: + YYDEBUG(632, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy599; + if (yych == 'R') goto yy633; if (yych != 'r') goto yy55; -yy599: - YYDEBUG(599, *YYCURSOR); +yy633: + YYDEBUG(633, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy539; - if (yych == 'y') goto yy539; + if (yych == 'Y') goto yy573; + if (yych == 'y') goto yy573; goto yy55; -yy600: - YYDEBUG(600, *YYCURSOR); +yy634: + YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy607; - if (yych <= '6') goto yy608; - if (yych <= '9') goto yy609; + if (yych <= '5') goto yy641; + if (yych <= '6') goto yy642; + if (yych <= '9') goto yy643; goto yy55; -yy601: - YYDEBUG(601, *YYCURSOR); +yy635: + YYDEBUG(635, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(602, *YYCURSOR); + YYDEBUG(636, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy603: - YYDEBUG(603, *YYCURSOR); +yy637: + YYDEBUG(637, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy604: - YYDEBUG(604, *YYCURSOR); +yy638: + YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(605, *YYCURSOR); + YYDEBUG(639, *YYCURSOR); ++YYCURSOR; - YYDEBUG(606, *YYCURSOR); -#line 1457 "ext/date/lib/parse_date.re" + YYDEBUG(640, *YYCURSOR); +#line 1500 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pointed date YYYY"); TIMELIB_INIT; @@ -10730,43 +11070,43 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 10732 "" -yy607: - YYDEBUG(607, *YYCURSOR); +#line 11074 "" +yy641: + YYDEBUG(641, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy612; - goto yy490; -yy608: - YYDEBUG(608, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy646; + goto yy524; +yy642: + YYDEBUG(642, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy496; - goto yy490; + if (yych == '.') goto yy530; + goto yy524; } else { - if (yych <= '0') goto yy612; - if (yych <= '9') goto yy610; - goto yy490; + if (yych <= '0') goto yy646; + if (yych <= '9') goto yy644; + goto yy524; } -yy609: - YYDEBUG(609, *YYCURSOR); +yy643: + YYDEBUG(643, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych >= ':') goto yy490; -yy610: - YYDEBUG(610, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych >= ':') goto yy524; +yy644: + YYDEBUG(644, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy611; - if (yych <= '9') goto yy604; -yy611: - YYDEBUG(611, *YYCURSOR); -#line 1469 "ext/date/lib/parse_date.re" + if (yych <= '/') goto yy645; + if (yych <= '9') goto yy638; +yy645: + YYDEBUG(645, *YYCURSOR); +#line 1512 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pointed date YY"); @@ -10779,648 +11119,648 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 10781 "" -yy612: - YYDEBUG(612, *YYCURSOR); +#line 11123 "" +yy646: + YYDEBUG(646, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= ' ') { - if (yych == '\t') goto yy500; - if (yych <= 0x1F) goto yy490; - goto yy500; + if (yych == '\t') goto yy534; + if (yych <= 0x1F) goto yy524; + goto yy534; } else { - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - goto yy604; + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + goto yy638; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy502; - if (yych <= 'O') goto yy490; - goto yy502; + if (yych == 'A') goto yy536; + if (yych <= 'O') goto yy524; + goto yy536; } else { if (yych <= 'a') { - if (yych <= '`') goto yy490; - goto yy502; + if (yych <= '`') goto yy524; + goto yy536; } else { - if (yych == 'p') goto yy502; - goto yy490; + if (yych == 'p') goto yy536; + goto yy524; } } } -yy613: - YYDEBUG(613, *YYCURSOR); +yy647: + YYDEBUG(647, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy507; - if (yych <= 0x1F) goto yy490; - goto yy507; + if (yych == '\t') goto yy541; + if (yych <= 0x1F) goto yy524; + goto yy541; } else { - if (yych == '.') goto yy492; - if (yych <= '9') goto yy490; - goto yy492; + if (yych == '.') goto yy526; + if (yych <= '9') goto yy524; + goto yy526; } } else { if (yych <= 'P') { - if (yych == 'A') goto yy509; - if (yych <= 'O') goto yy490; - goto yy509; + if (yych == 'A') goto yy543; + if (yych <= 'O') goto yy524; + goto yy543; } else { if (yych <= 'a') { - if (yych <= '`') goto yy490; - goto yy509; + if (yych <= '`') goto yy524; + goto yy543; } else { - if (yych == 'p') goto yy509; - goto yy490; + if (yych == 'p') goto yy543; + goto yy524; } } } -yy614: - YYDEBUG(614, *YYCURSOR); +yy648: + YYDEBUG(648, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ':') { if (yych <= ' ') { - if (yych == '\t') goto yy507; - if (yych <= 0x1F) goto yy490; - goto yy507; + if (yych == '\t') goto yy541; + if (yych <= 0x1F) goto yy524; + goto yy541; } else { if (yych <= '-') { - if (yych <= ',') goto yy490; - goto yy601; + if (yych <= ',') goto yy524; + goto yy635; } else { - if (yych <= '.') goto yy600; - if (yych <= '9') goto yy490; - goto yy492; + if (yych <= '.') goto yy634; + if (yych <= '9') goto yy524; + goto yy526; } } } else { if (yych <= 'P') { - if (yych == 'A') goto yy509; - if (yych <= 'O') goto yy490; - goto yy509; + if (yych == 'A') goto yy543; + if (yych <= 'O') goto yy524; + goto yy543; } else { if (yych <= 'a') { - if (yych <= '`') goto yy490; - goto yy509; + if (yych <= '`') goto yy524; + goto yy543; } else { - if (yych == 'p') goto yy509; - goto yy490; + if (yych == 'p') goto yy543; + goto yy524; } } } -yy615: - YYDEBUG(615, *YYCURSOR); +yy649: + YYDEBUG(649, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy55; - if (yych <= '-') goto yy654; - goto yy601; + if (yych <= '-') goto yy688; + goto yy635; } else { if (yych <= '/') goto yy55; - if (yych <= '9') goto yy617; + if (yych <= '9') goto yy651; goto yy55; } -yy616: - YYDEBUG(616, *YYCURSOR); +yy650: + YYDEBUG(650, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy55; - if (yych <= '-') goto yy654; - goto yy601; + if (yych <= '-') goto yy688; + goto yy635; } else { if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; } -yy617: - YYDEBUG(617, *YYCURSOR); +yy651: + YYDEBUG(651, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') goto yy55; - if (yych <= '-') goto yy654; - if (yych <= '.') goto yy601; + if (yych <= '-') goto yy688; + if (yych <= '.') goto yy635; goto yy55; -yy618: - YYDEBUG(618, *YYCURSOR); +yy652: + YYDEBUG(652, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy650; + if (yych == 'A') goto yy684; if (yych <= 'T') goto yy55; - goto yy649; + goto yy683; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy650; + goto yy684; } else { - if (yych == 'u') goto yy649; + if (yych == 'u') goto yy683; goto yy55; } } -yy619: - YYDEBUG(619, *YYCURSOR); +yy653: + YYDEBUG(653, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy647; - if (yych == 'e') goto yy647; + if (yych == 'E') goto yy681; + if (yych == 'e') goto yy681; goto yy55; -yy620: - YYDEBUG(620, *YYCURSOR); +yy654: + YYDEBUG(654, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy644; - if (yych == 'a') goto yy644; + if (yych == 'A') goto yy678; + if (yych == 'a') goto yy678; goto yy55; -yy621: - YYDEBUG(621, *YYCURSOR); +yy655: + YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy641; + if (yych == 'P') goto yy675; if (yych <= 'T') goto yy55; - goto yy640; + goto yy674; } else { if (yych <= 'p') { if (yych <= 'o') goto yy55; - goto yy641; + goto yy675; } else { - if (yych == 'u') goto yy640; + if (yych == 'u') goto yy674; goto yy55; } } -yy622: - YYDEBUG(622, *YYCURSOR); +yy656: + YYDEBUG(656, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy637; - if (yych == 'e') goto yy637; + if (yych == 'E') goto yy671; + if (yych == 'e') goto yy671; goto yy55; -yy623: - YYDEBUG(623, *YYCURSOR); +yy657: + YYDEBUG(657, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy635; - if (yych == 'c') goto yy635; + if (yych == 'C') goto yy669; + if (yych == 'c') goto yy669; goto yy55; -yy624: - YYDEBUG(624, *YYCURSOR); +yy658: + YYDEBUG(658, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy633; - if (yych == 'o') goto yy633; + if (yych == 'O') goto yy667; + if (yych == 'o') goto yy667; goto yy55; -yy625: - YYDEBUG(625, *YYCURSOR); +yy659: + YYDEBUG(659, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy626; + if (yych == 'E') goto yy660; if (yych != 'e') goto yy55; -yy626: - YYDEBUG(626, *YYCURSOR); +yy660: + YYDEBUG(660, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy627; + if (yych == 'C') goto yy661; if (yych != 'c') goto yy55; -yy627: - YYDEBUG(627, *YYCURSOR); +yy661: + YYDEBUG(661, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych >= '.') goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych >= '.') goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy580; - if (yych == 'e') goto yy580; - goto yy475; + if (yych <= 'E') goto yy614; + if (yych == 'e') goto yy614; + goto yy509; } } -yy628: - YYDEBUG(628, *YYCURSOR); +yy662: + YYDEBUG(662, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy532; - if (yych <= '0') goto yy629; - if (yych <= '2') goto yy630; - if (yych <= '3') goto yy631; - goto yy532; -yy629: - YYDEBUG(629, *YYCURSOR); + if (yych <= '/') goto yy566; + if (yych <= '0') goto yy663; + if (yych <= '2') goto yy664; + if (yych <= '3') goto yy665; + goto yy566; +yy663: + YYDEBUG(663, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych <= '9') goto yy632; - goto yy534; -yy630: - YYDEBUG(630, *YYCURSOR); + if (yych <= '/') goto yy568; + if (yych <= '9') goto yy666; + goto yy568; +yy664: + YYDEBUG(664, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych <= '9') goto yy632; - goto yy534; -yy631: - YYDEBUG(631, *YYCURSOR); + if (yych <= '/') goto yy568; + if (yych <= '9') goto yy666; + goto yy568; +yy665: + YYDEBUG(665, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych <= '1') goto yy632; - if (yych <= '9') goto yy540; - goto yy534; -yy632: - YYDEBUG(632, *YYCURSOR); + if (yych <= '/') goto yy568; + if (yych <= '1') goto yy666; + if (yych <= '9') goto yy574; + goto yy568; +yy666: + YYDEBUG(666, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych <= '9') goto yy541; - goto yy534; -yy633: - YYDEBUG(633, *YYCURSOR); + if (yych <= '/') goto yy568; + if (yych <= '9') goto yy575; + goto yy568; +yy667: + YYDEBUG(667, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'V') goto yy634; + if (yych == 'V') goto yy668; if (yych != 'v') goto yy55; -yy634: - YYDEBUG(634, *YYCURSOR); +yy668: + YYDEBUG(668, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy535; - if (yych == 'e') goto yy535; - goto yy475; + if (yych <= 'E') goto yy569; + if (yych == 'e') goto yy569; + goto yy509; } } -yy635: - YYDEBUG(635, *YYCURSOR); +yy669: + YYDEBUG(669, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy636; + if (yych == 'T') goto yy670; if (yych != 't') goto yy55; -yy636: - YYDEBUG(636, *YYCURSOR); +yy670: + YYDEBUG(670, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'N') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'O') goto yy545; - if (yych == 'o') goto yy545; - goto yy475; + if (yych <= 'O') goto yy579; + if (yych == 'o') goto yy579; + goto yy509; } } -yy637: - YYDEBUG(637, *YYCURSOR); +yy671: + YYDEBUG(671, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy638; + if (yych == 'P') goto yy672; if (yych != 'p') goto yy55; -yy638: - YYDEBUG(638, *YYCURSOR); +yy672: + YYDEBUG(672, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'S') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'T') goto yy639; - if (yych != 't') goto yy475; + if (yych <= 'T') goto yy673; + if (yych != 't') goto yy509; } } -yy639: - YYDEBUG(639, *YYCURSOR); +yy673: + YYDEBUG(673, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy587; - if (yych == 'e') goto yy587; - goto yy475; + if (yych <= 'E') goto yy621; + if (yych == 'e') goto yy621; + goto yy509; } } -yy640: - YYDEBUG(640, *YYCURSOR); +yy674: + YYDEBUG(674, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy643; - if (yych == 'g') goto yy643; + if (yych == 'G') goto yy677; + if (yych == 'g') goto yy677; goto yy55; -yy641: - YYDEBUG(641, *YYCURSOR); +yy675: + YYDEBUG(675, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy642; + if (yych == 'R') goto yy676; if (yych != 'r') goto yy55; -yy642: - YYDEBUG(642, *YYCURSOR); +yy676: + YYDEBUG(676, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'H') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'I') goto yy551; - if (yych == 'i') goto yy551; - goto yy475; + if (yych <= 'I') goto yy585; + if (yych == 'i') goto yy585; + goto yy509; } } -yy643: - YYDEBUG(643, *YYCURSOR); +yy677: + YYDEBUG(677, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'U') goto yy553; - if (yych == 'u') goto yy553; - goto yy475; + if (yych <= 'U') goto yy587; + if (yych == 'u') goto yy587; + goto yy509; } } -yy644: - YYDEBUG(644, *YYCURSOR); +yy678: + YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy645; + if (yych == 'R') goto yy679; if (yych <= 'X') goto yy55; - goto yy646; + goto yy680; } else { if (yych <= 'r') { if (yych <= 'q') goto yy55; } else { - if (yych == 'y') goto yy646; + if (yych == 'y') goto yy680; goto yy55; } } -yy645: - YYDEBUG(645, *YYCURSOR); +yy679: + YYDEBUG(679, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'B') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'C') goto yy593; - if (yych == 'c') goto yy593; - goto yy475; + if (yych <= 'C') goto yy627; + if (yych == 'c') goto yy627; + goto yy509; } } -yy646: - YYDEBUG(646, *YYCURSOR); +yy680: + YYDEBUG(680, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { - if (yych <= 0x08) goto yy475; - goto yy531; + if (yych <= 0x08) goto yy509; + goto yy565; } else { - if (yych == ' ') goto yy531; - goto yy475; + if (yych == ' ') goto yy565; + goto yy509; } } else { if (yych <= '.') { - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= '-') goto yy662; + goto yy565; } else { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } } -yy647: - YYDEBUG(647, *YYCURSOR); +yy681: + YYDEBUG(681, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy648; + if (yych == 'B') goto yy682; if (yych != 'b') goto yy55; -yy648: - YYDEBUG(648, *YYCURSOR); +yy682: + YYDEBUG(682, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'Q') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'R') goto yy596; - if (yych == 'r') goto yy596; - goto yy475; + if (yych <= 'R') goto yy630; + if (yych == 'r') goto yy630; + goto yy509; } } -yy649: - YYDEBUG(649, *YYCURSOR); +yy683: + YYDEBUG(683, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy653; + if (yych == 'L') goto yy687; if (yych <= 'M') goto yy55; - goto yy652; + goto yy686; } else { if (yych <= 'l') { if (yych <= 'k') goto yy55; - goto yy653; + goto yy687; } else { - if (yych == 'n') goto yy652; + if (yych == 'n') goto yy686; goto yy55; } } -yy650: - YYDEBUG(650, *YYCURSOR); +yy684: + YYDEBUG(684, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy651; + if (yych == 'N') goto yy685; if (yych != 'n') goto yy55; -yy651: - YYDEBUG(651, *YYCURSOR); +yy685: + YYDEBUG(685, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'T') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'U') goto yy558; - if (yych == 'u') goto yy558; - goto yy475; + if (yych <= 'U') goto yy592; + if (yych == 'u') goto yy592; + goto yy509; } } -yy652: - YYDEBUG(652, *YYCURSOR); +yy686: + YYDEBUG(686, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'D') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'E') goto yy539; - if (yych == 'e') goto yy539; - goto yy475; + if (yych <= 'E') goto yy573; + if (yych == 'e') goto yy573; + goto yy509; } } -yy653: - YYDEBUG(653, *YYCURSOR); +yy687: + YYDEBUG(687, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy531; - goto yy475; + if (yych == '\t') goto yy565; + goto yy509; } else { - if (yych <= ' ') goto yy531; - if (yych <= ',') goto yy475; - if (yych <= '-') goto yy628; - goto yy531; + if (yych <= ' ') goto yy565; + if (yych <= ',') goto yy509; + if (yych <= '-') goto yy662; + goto yy565; } } else { if (yych <= 'X') { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy509; + if (yych <= '9') goto yy567; + goto yy509; } else { - if (yych <= 'Y') goto yy539; - if (yych == 'y') goto yy539; - goto yy475; + if (yych <= 'Y') goto yy573; + if (yych == 'y') goto yy573; + goto yy509; } } -yy654: - YYDEBUG(654, *YYCURSOR); +yy688: + YYDEBUG(688, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '2') goto yy655; - if (yych <= '3') goto yy657; - if (yych <= '9') goto yy658; + if (yych <= '2') goto yy689; + if (yych <= '3') goto yy691; + if (yych <= '9') goto yy692; goto yy55; -yy655: - YYDEBUG(655, *YYCURSOR); +yy689: + YYDEBUG(689, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy664; - if (yych >= 'n') goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy698; + if (yych >= 'n') goto yy694; } else { if (yych <= 'r') { - if (yych >= 'r') goto yy661; + if (yych >= 'r') goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; } } -yy656: - YYDEBUG(656, *YYCURSOR); -#line 1428 "ext/date/lib/parse_date.re" +yy690: + YYDEBUG(690, *YYCURSOR); +#line 1471 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshort"); @@ -11433,113 +11773,113 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 11435 "" -yy657: - YYDEBUG(657, *YYCURSOR); +#line 11777 "" +yy691: + YYDEBUG(691, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '1') { - if (yych <= '/') goto yy656; - goto yy664; + if (yych <= '/') goto yy690; + goto yy698; } else { - if (yych <= '9') goto yy603; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '9') goto yy637; + if (yych <= 'm') goto yy690; + goto yy694; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy658: - YYDEBUG(658, *YYCURSOR); +yy692: + YYDEBUG(692, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy603; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy637; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy659: - YYDEBUG(659, *YYCURSOR); +yy693: + YYDEBUG(693, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 't') goto yy663; + if (yych == 't') goto yy697; goto yy55; -yy660: - YYDEBUG(660, *YYCURSOR); +yy694: + YYDEBUG(694, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy663; + if (yych == 'd') goto yy697; goto yy55; -yy661: - YYDEBUG(661, *YYCURSOR); +yy695: + YYDEBUG(695, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy663; + if (yych == 'd') goto yy697; goto yy55; -yy662: - YYDEBUG(662, *YYCURSOR); +yy696: + YYDEBUG(696, *YYCURSOR); yych = *++YYCURSOR; if (yych != 'h') goto yy55; -yy663: - YYDEBUG(663, *YYCURSOR); +yy697: + YYDEBUG(697, *YYCURSOR); yych = *++YYCURSOR; - goto yy656; -yy664: - YYDEBUG(664, *YYCURSOR); + goto yy690; +yy698: + YYDEBUG(698, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy604; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy638; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy665: - YYDEBUG(665, *YYCURSOR); +yy699: + YYDEBUG(699, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '/') { - if (yych >= '/') goto yy722; + if (yych >= '/') goto yy767; } else { - if (yych <= '9') goto yy668; - if (yych >= 'n') goto yy719; + if (yych <= '9') goto yy702; + if (yych >= 'n') goto yy764; } } else { if (yych <= 'r') { - if (yych >= 'r') goto yy720; + if (yych >= 'r') goto yy765; } else { - if (yych <= 's') goto yy718; - if (yych <= 't') goto yy721; + if (yych <= 's') goto yy763; + if (yych <= 't') goto yy766; } } -yy666: - YYDEBUG(666, *YYCURSOR); -#line 1360 "ext/date/lib/parse_date.re" +yy700: + YYDEBUG(700, *YYCURSOR); +#line 1403 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("americanshort | american"); @@ -11554,240 +11894,241 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_AMERICAN; } -#line 11556 "" -yy667: - YYDEBUG(667, *YYCURSOR); +#line 11898 "" +yy701: + YYDEBUG(701, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '/') { - if (yych <= '.') goto yy666; - goto yy722; + if (yych <= '.') goto yy700; + goto yy767; } else { - if (yych <= '1') goto yy668; - if (yych <= 'm') goto yy666; - goto yy719; + if (yych <= '1') goto yy702; + if (yych <= 'm') goto yy700; + goto yy764; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy666; - goto yy720; + if (yych <= 'q') goto yy700; + goto yy765; } else { - if (yych <= 's') goto yy718; - if (yych <= 't') goto yy721; - goto yy666; + if (yych <= 's') goto yy763; + if (yych <= 't') goto yy766; + goto yy700; } } -yy668: - YYDEBUG(668, *YYCURSOR); +yy702: + YYDEBUG(702, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == '/') goto yy722; - if (yych <= 'm') goto yy666; - goto yy719; + if (yych == '/') goto yy767; + if (yych <= 'm') goto yy700; + goto yy764; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy666; - goto yy720; + if (yych <= 'q') goto yy700; + goto yy765; } else { - if (yych <= 's') goto yy718; - if (yych <= 't') goto yy721; - goto yy666; + if (yych <= 's') goto yy763; + if (yych <= 't') goto yy766; + goto yy700; } } -yy669: - YYDEBUG(669, *YYCURSOR); +yy703: + YYDEBUG(703, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy717; + if (yych == 'A') goto yy762; if (yych <= 'T') goto yy55; - goto yy716; + goto yy761; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy717; + goto yy762; } else { - if (yych == 'u') goto yy716; + if (yych == 'u') goto yy761; goto yy55; } } -yy670: - YYDEBUG(670, *YYCURSOR); +yy704: + YYDEBUG(704, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy715; - if (yych == 'e') goto yy715; + if (yych == 'E') goto yy760; + if (yych == 'e') goto yy760; goto yy55; -yy671: - YYDEBUG(671, *YYCURSOR); +yy705: + YYDEBUG(705, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy714; - if (yych == 'a') goto yy714; + if (yych == 'A') goto yy759; + if (yych == 'a') goto yy759; goto yy55; -yy672: - YYDEBUG(672, *YYCURSOR); +yy706: + YYDEBUG(706, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy713; + if (yych == 'P') goto yy758; if (yych <= 'T') goto yy55; - goto yy712; + goto yy757; } else { if (yych <= 'p') { if (yych <= 'o') goto yy55; - goto yy713; + goto yy758; } else { - if (yych == 'u') goto yy712; + if (yych == 'u') goto yy757; goto yy55; } } -yy673: - YYDEBUG(673, *YYCURSOR); +yy707: + YYDEBUG(707, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy710; - if (yych == 'e') goto yy710; + if (yych == 'E') goto yy755; + if (yych == 'e') goto yy755; goto yy55; -yy674: - YYDEBUG(674, *YYCURSOR); +yy708: + YYDEBUG(708, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy709; - if (yych == 'c') goto yy709; + if (yych == 'C') goto yy754; + if (yych == 'c') goto yy754; goto yy55; -yy675: - YYDEBUG(675, *YYCURSOR); +yy709: + YYDEBUG(709, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy708; - if (yych == 'o') goto yy708; + if (yych == 'O') goto yy753; + if (yych == 'o') goto yy753; goto yy55; -yy676: - YYDEBUG(676, *YYCURSOR); +yy710: + YYDEBUG(710, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy677; + if (yych == 'E') goto yy711; if (yych != 'e') goto yy55; -yy677: - YYDEBUG(677, *YYCURSOR); +yy711: + YYDEBUG(711, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy678; + if (yych == 'C') goto yy712; if (yych != 'c') goto yy55; -yy678: - YYDEBUG(678, *YYCURSOR); +yy712: + YYDEBUG(712, *YYCURSOR); yych = *++YYCURSOR; if (yych != '/') goto yy55; -yy679: - YYDEBUG(679, *YYCURSOR); +yy713: + YYDEBUG(713, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(680, *YYCURSOR); + YYDEBUG(714, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(681, *YYCURSOR); + YYDEBUG(715, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(682, *YYCURSOR); + YYDEBUG(716, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(683, *YYCURSOR); + YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(684, *YYCURSOR); + YYDEBUG(718, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy685; - if (yych <= '2') goto yy686; + if (yych <= '1') goto yy719; + if (yych <= '2') goto yy720; goto yy55; -yy685: - YYDEBUG(685, *YYCURSOR); +yy719: + YYDEBUG(719, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy687; + if (yych <= '9') goto yy721; goto yy55; -yy686: - YYDEBUG(686, *YYCURSOR); +yy720: + YYDEBUG(720, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '5') goto yy55; -yy687: - YYDEBUG(687, *YYCURSOR); +yy721: + YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(688, *YYCURSOR); + YYDEBUG(722, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '6') goto yy55; - YYDEBUG(689, *YYCURSOR); + YYDEBUG(723, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(690, *YYCURSOR); + YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(691, *YYCURSOR); + YYDEBUG(725, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy692; - if (yych <= '6') goto yy693; + if (yych <= '5') goto yy726; + if (yych <= '6') goto yy727; goto yy55; -yy692: - YYDEBUG(692, *YYCURSOR); +yy726: + YYDEBUG(726, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy694; + if (yych <= '9') goto yy728; goto yy55; -yy693: - YYDEBUG(693, *YYCURSOR); +yy727: + YYDEBUG(727, *YYCURSOR); yych = *++YYCURSOR; if (yych != '0') goto yy55; -yy694: - YYDEBUG(694, *YYCURSOR); +yy728: + YYDEBUG(728, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\t') goto yy695; + if (yych == '\t') goto yy729; if (yych != ' ') goto yy55; -yy695: - YYDEBUG(695, *YYCURSOR); +yy729: + YYDEBUG(729, *YYCURSOR); ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); + if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; - YYDEBUG(696, *YYCURSOR); + YYDEBUG(730, *YYCURSOR); if (yych <= '*') { if (yych <= '\t') { if (yych <= 0x08) goto yy55; - goto yy695; + goto yy729; } else { - if (yych == ' ') goto yy695; + if (yych == ' ') goto yy729; goto yy55; } } else { if (yych <= '-') { if (yych == ',') goto yy55; - goto yy698; + goto yy732; } else { if (yych != 'G') goto yy55; } } - YYDEBUG(697, *YYCURSOR); + YYDEBUG(731, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy706; + if (yych == 'M') goto yy751; goto yy55; -yy698: - YYDEBUG(698, *YYCURSOR); +yy732: + YYDEBUG(732, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy699; - if (yych <= '2') goto yy701; - if (yych <= '9') goto yy702; + if (yych <= '1') goto yy733; + if (yych <= '2') goto yy735; + if (yych <= '9') goto yy736; goto yy55; -yy699: - YYDEBUG(699, *YYCURSOR); - ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy700; - if (yych <= '9') goto yy702; - if (yych <= ':') goto yy703; -yy700: - YYDEBUG(700, *YYCURSOR); -#line 1655 "ext/date/lib/parse_date.re" +yy733: + YYDEBUG(733, *YYCURSOR); + yyaccept = 14; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy734; + if (yych <= '9') goto yy740; + if (yych <= ':') goto yy737; +yy734: + YYDEBUG(734, *YYCURSOR); +#line 1698 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("clf"); @@ -11807,302 +12148,372 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 11809 "" -yy701: - YYDEBUG(701, *YYCURSOR); - yych = *++YYCURSOR; +#line 12152 "" +yy735: + YYDEBUG(735, *YYCURSOR); + yyaccept = 14; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '5') { - if (yych <= '/') goto yy700; - if (yych >= '5') goto yy704; + if (yych <= '/') goto yy734; + if (yych <= '4') goto yy740; + goto yy738; } else { - if (yych <= '9') goto yy705; - if (yych <= ':') goto yy703; - goto yy700; + if (yych <= '9') goto yy739; + if (yych <= ':') goto yy737; + goto yy734; } -yy702: - YYDEBUG(702, *YYCURSOR); +yy736: + YYDEBUG(736, *YYCURSOR); + yyaccept = 14; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy734; + if (yych <= '5') goto yy738; + if (yych <= '9') goto yy739; + if (yych >= ';') goto yy734; +yy737: + YYDEBUG(737, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy700; - if (yych <= '5') goto yy704; - if (yych <= '9') goto yy705; - if (yych >= ';') goto yy700; -yy703: - YYDEBUG(703, *YYCURSOR); + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy738; + if (yych <= '9') goto yy739; + goto yy55; +yy738: + YYDEBUG(738, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy700; - if (yych <= '5') goto yy704; - if (yych <= '9') goto yy705; - goto yy700; -yy704: - YYDEBUG(704, *YYCURSOR); + if (yych <= '/') goto yy734; + if (yych >= ':') goto yy734; +yy739: + YYDEBUG(739, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy700; - if (yych >= ':') goto yy700; -yy705: - YYDEBUG(705, *YYCURSOR); + goto yy734; +yy740: + YYDEBUG(740, *YYCURSOR); + yyaccept = 14; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy734; + if (yych <= '5') goto yy741; + if (yych <= '9') goto yy739; + if (yych <= ':') goto yy742; + goto yy734; +yy741: + YYDEBUG(741, *YYCURSOR); yych = *++YYCURSOR; - goto yy700; -yy706: - YYDEBUG(706, *YYCURSOR); + if (yych <= '/') goto yy734; + if (yych <= '9') goto yy748; + goto yy734; +yy742: + YYDEBUG(742, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy743; + if (yych <= '9') goto yy739; + goto yy55; +yy743: + YYDEBUG(743, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy734; + if (yych >= ':') goto yy734; + YYDEBUG(744, *YYCURSOR); + yyaccept = 14; + yych = *(YYMARKER = ++YYCURSOR); + if (yych != ':') goto yy734; + YYDEBUG(745, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy746; + if (yych <= '6') goto yy747; + goto yy55; +yy746: + YYDEBUG(746, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy739; + goto yy55; +yy747: + YYDEBUG(747, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy739; + goto yy55; +yy748: + YYDEBUG(748, *YYCURSOR); + yyaccept = 14; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy734; + if (yych <= '5') goto yy749; + if (yych <= '6') goto yy750; + goto yy734; +yy749: + YYDEBUG(749, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy739; + goto yy55; +yy750: + YYDEBUG(750, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy739; + goto yy55; +yy751: + YYDEBUG(751, *YYCURSOR); yych = *++YYCURSOR; if (yych != 'T') goto yy55; - YYDEBUG(707, *YYCURSOR); + YYDEBUG(752, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '+') goto yy698; - if (yych == '-') goto yy698; + if (yych == '+') goto yy732; + if (yych == '-') goto yy732; goto yy55; -yy708: - YYDEBUG(708, *YYCURSOR); +yy753: + YYDEBUG(753, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'V') goto yy678; - if (yych == 'v') goto yy678; + if (yych == 'V') goto yy712; + if (yych == 'v') goto yy712; goto yy55; -yy709: - YYDEBUG(709, *YYCURSOR); +yy754: + YYDEBUG(754, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy678; - if (yych == 't') goto yy678; + if (yych == 'T') goto yy712; + if (yych == 't') goto yy712; goto yy55; -yy710: - YYDEBUG(710, *YYCURSOR); +yy755: + YYDEBUG(755, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy711; + if (yych == 'P') goto yy756; if (yych != 'p') goto yy55; -yy711: - YYDEBUG(711, *YYCURSOR); +yy756: + YYDEBUG(756, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == '/') goto yy679; + if (yych == '/') goto yy713; goto yy55; } else { - if (yych <= 'T') goto yy678; - if (yych == 't') goto yy678; + if (yych <= 'T') goto yy712; + if (yych == 't') goto yy712; goto yy55; } -yy712: - YYDEBUG(712, *YYCURSOR); +yy757: + YYDEBUG(757, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy678; - if (yych == 'g') goto yy678; + if (yych == 'G') goto yy712; + if (yych == 'g') goto yy712; goto yy55; -yy713: - YYDEBUG(713, *YYCURSOR); +yy758: + YYDEBUG(758, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy678; - if (yych == 'r') goto yy678; + if (yych == 'R') goto yy712; + if (yych == 'r') goto yy712; goto yy55; -yy714: - YYDEBUG(714, *YYCURSOR); +yy759: + YYDEBUG(759, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy678; + if (yych == 'R') goto yy712; if (yych <= 'X') goto yy55; - goto yy678; + goto yy712; } else { if (yych <= 'r') { if (yych <= 'q') goto yy55; - goto yy678; + goto yy712; } else { - if (yych == 'y') goto yy678; + if (yych == 'y') goto yy712; goto yy55; } } -yy715: - YYDEBUG(715, *YYCURSOR); +yy760: + YYDEBUG(760, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy678; - if (yych == 'b') goto yy678; + if (yych == 'B') goto yy712; + if (yych == 'b') goto yy712; goto yy55; -yy716: - YYDEBUG(716, *YYCURSOR); +yy761: + YYDEBUG(761, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy678; + if (yych == 'L') goto yy712; if (yych <= 'M') goto yy55; - goto yy678; + goto yy712; } else { if (yych <= 'l') { if (yych <= 'k') goto yy55; - goto yy678; + goto yy712; } else { - if (yych == 'n') goto yy678; + if (yych == 'n') goto yy712; goto yy55; } } -yy717: - YYDEBUG(717, *YYCURSOR); +yy762: + YYDEBUG(762, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy678; - if (yych == 'n') goto yy678; + if (yych == 'N') goto yy712; + if (yych == 'n') goto yy712; goto yy55; -yy718: - YYDEBUG(718, *YYCURSOR); +yy763: + YYDEBUG(763, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 't') goto yy727; + if (yych == 't') goto yy772; goto yy55; -yy719: - YYDEBUG(719, *YYCURSOR); +yy764: + YYDEBUG(764, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy727; + if (yych == 'd') goto yy772; goto yy55; -yy720: - YYDEBUG(720, *YYCURSOR); +yy765: + YYDEBUG(765, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy727; + if (yych == 'd') goto yy772; goto yy55; -yy721: - YYDEBUG(721, *YYCURSOR); +yy766: + YYDEBUG(766, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'h') goto yy727; + if (yych == 'h') goto yy772; goto yy55; -yy722: - YYDEBUG(722, *YYCURSOR); +yy767: + YYDEBUG(767, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(723, *YYCURSOR); + YYDEBUG(768, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy666; - if (yych >= ':') goto yy666; - YYDEBUG(724, *YYCURSOR); + if (yych <= '/') goto yy700; + if (yych >= ':') goto yy700; + YYDEBUG(769, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy666; - if (yych >= ':') goto yy666; - YYDEBUG(725, *YYCURSOR); + if (yych <= '/') goto yy700; + if (yych >= ':') goto yy700; + YYDEBUG(770, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy666; - if (yych >= ':') goto yy666; - YYDEBUG(726, *YYCURSOR); + if (yych <= '/') goto yy700; + if (yych >= ':') goto yy700; + YYDEBUG(771, *YYCURSOR); yych = *++YYCURSOR; - goto yy666; -yy727: - YYDEBUG(727, *YYCURSOR); + goto yy700; +yy772: + YYDEBUG(772, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '/') goto yy722; - goto yy666; -yy728: - YYDEBUG(728, *YYCURSOR); + if (yych == '/') goto yy767; + goto yy700; +yy773: + YYDEBUG(773, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') { - if (yych == '\t') goto yy730; - goto yy577; + if (yych == '\t') goto yy775; + goto yy611; } else { - if (yych <= '-') goto yy731; - if (yych <= '.') goto yy730; - if (yych >= '0') goto yy577; + if (yych <= '-') goto yy776; + if (yych <= '.') goto yy775; + if (yych >= '0') goto yy611; } -yy729: - YYDEBUG(729, *YYCURSOR); +yy774: + YYDEBUG(774, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { case 'A': - case 'a': goto yy672; + case 'a': goto yy706; case 'D': - case 'd': goto yy676; + case 'd': goto yy710; case 'F': - case 'f': goto yy670; + case 'f': goto yy704; case 'J': - case 'j': goto yy669; + case 'j': goto yy703; case 'M': - case 'm': goto yy671; + case 'm': goto yy705; case 'N': - case 'n': goto yy675; + case 'n': goto yy709; case 'O': - case 'o': goto yy674; + case 'o': goto yy708; case 'S': - case 's': goto yy673; + case 's': goto yy707; default: goto yy55; } -yy730: - YYDEBUG(730, *YYCURSOR); +yy775: + YYDEBUG(775, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy577; - if (yych <= '0') goto yy735; - if (yych <= '1') goto yy736; - if (yych <= '9') goto yy737; - goto yy577; -yy731: - YYDEBUG(731, *YYCURSOR); + if (yych <= '/') goto yy611; + if (yych <= '0') goto yy780; + if (yych <= '1') goto yy781; + if (yych <= '9') goto yy782; + goto yy611; +yy776: + YYDEBUG(776, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy577; - if (yych <= '0') goto yy732; - if (yych <= '1') goto yy733; - if (yych <= '9') goto yy734; - goto yy577; -yy732: - YYDEBUG(732, *YYCURSOR); + if (yych <= '/') goto yy611; + if (yych <= '0') goto yy777; + if (yych <= '1') goto yy778; + if (yych <= '9') goto yy779; + goto yy611; +yy777: + YYDEBUG(777, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') goto yy55; - if (yych <= '.') goto yy601; + if (yych <= '.') goto yy635; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy734; + if (yych <= '9') goto yy779; goto yy55; -yy733: - YYDEBUG(733, *YYCURSOR); +yy778: + YYDEBUG(778, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') goto yy55; - if (yych <= '.') goto yy601; + if (yych <= '.') goto yy635; if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; -yy734: - YYDEBUG(734, *YYCURSOR); +yy779: + YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') goto yy55; - if (yych <= '.') goto yy601; + if (yych <= '.') goto yy635; goto yy55; -yy735: - YYDEBUG(735, *YYCURSOR); +yy780: + YYDEBUG(780, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy55; - if (yych <= '-') goto yy601; - goto yy738; + if (yych <= '-') goto yy635; + goto yy783; } else { if (yych <= '/') goto yy55; - if (yych <= '9') goto yy737; + if (yych <= '9') goto yy782; goto yy55; } -yy736: - YYDEBUG(736, *YYCURSOR); +yy781: + YYDEBUG(781, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy55; - if (yych <= '-') goto yy601; - goto yy738; + if (yych <= '-') goto yy635; + goto yy783; } else { if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; } -yy737: - YYDEBUG(737, *YYCURSOR); +yy782: + YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') goto yy55; - if (yych <= '-') goto yy601; + if (yych <= '-') goto yy635; if (yych >= '/') goto yy55; -yy738: - YYDEBUG(738, *YYCURSOR); +yy783: + YYDEBUG(783, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(739, *YYCURSOR); + YYDEBUG(784, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy610; + if (yych <= '9') goto yy644; goto yy55; -yy740: - YYDEBUG(740, *YYCURSOR); +yy785: + YYDEBUG(785, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy784; + if (yych == '-') goto yy829; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy782; + if (yych <= '9') goto yy827; goto yy59; -yy741: - YYDEBUG(741, *YYCURSOR); +yy786: + YYDEBUG(786, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { - case '0': goto yy750; - case '1': goto yy751; + case '0': goto yy795; + case '1': goto yy796; case '2': case '3': case '4': @@ -12110,254 +12521,254 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case '6': case '7': case '8': - case '9': goto yy752; + case '9': goto yy797; case 'A': - case 'a': goto yy745; + case 'a': goto yy790; case 'D': - case 'd': goto yy749; + case 'd': goto yy794; case 'F': - case 'f': goto yy743; + case 'f': goto yy788; case 'J': - case 'j': goto yy742; + case 'j': goto yy787; case 'M': - case 'm': goto yy744; + case 'm': goto yy789; case 'N': - case 'n': goto yy748; + case 'n': goto yy793; case 'O': - case 'o': goto yy747; + case 'o': goto yy792; case 'S': - case 's': goto yy746; + case 's': goto yy791; default: goto yy55; } -yy742: - YYDEBUG(742, *YYCURSOR); +yy787: + YYDEBUG(787, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy781; + if (yych == 'A') goto yy826; if (yych <= 'T') goto yy55; - goto yy780; + goto yy825; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy781; + goto yy826; } else { - if (yych == 'u') goto yy780; + if (yych == 'u') goto yy825; goto yy55; } } -yy743: - YYDEBUG(743, *YYCURSOR); +yy788: + YYDEBUG(788, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy779; - if (yych == 'e') goto yy779; + if (yych == 'E') goto yy824; + if (yych == 'e') goto yy824; goto yy55; -yy744: - YYDEBUG(744, *YYCURSOR); +yy789: + YYDEBUG(789, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy778; - if (yych == 'a') goto yy778; + if (yych == 'A') goto yy823; + if (yych == 'a') goto yy823; goto yy55; -yy745: - YYDEBUG(745, *YYCURSOR); +yy790: + YYDEBUG(790, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy777; + if (yych == 'P') goto yy822; if (yych <= 'T') goto yy55; - goto yy776; + goto yy821; } else { if (yych <= 'p') { if (yych <= 'o') goto yy55; - goto yy777; + goto yy822; } else { - if (yych == 'u') goto yy776; + if (yych == 'u') goto yy821; goto yy55; } } -yy746: - YYDEBUG(746, *YYCURSOR); +yy791: + YYDEBUG(791, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy774; - if (yych == 'e') goto yy774; + if (yych == 'E') goto yy819; + if (yych == 'e') goto yy819; goto yy55; -yy747: - YYDEBUG(747, *YYCURSOR); +yy792: + YYDEBUG(792, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy773; - if (yych == 'c') goto yy773; + if (yych == 'C') goto yy818; + if (yych == 'c') goto yy818; goto yy55; -yy748: - YYDEBUG(748, *YYCURSOR); +yy793: + YYDEBUG(793, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy772; - if (yych == 'o') goto yy772; + if (yych == 'O') goto yy817; + if (yych == 'o') goto yy817; goto yy55; -yy749: - YYDEBUG(749, *YYCURSOR); +yy794: + YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy764; - if (yych == 'e') goto yy764; + if (yych == 'E') goto yy809; + if (yych == 'e') goto yy809; goto yy55; -yy750: - YYDEBUG(750, *YYCURSOR); +yy795: + YYDEBUG(795, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy753; + if (yych == '-') goto yy798; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy757; + if (yych <= '9') goto yy802; goto yy55; -yy751: - YYDEBUG(751, *YYCURSOR); +yy796: + YYDEBUG(796, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy753; + if (yych == '-') goto yy798; if (yych <= '/') goto yy55; - if (yych <= '2') goto yy757; + if (yych <= '2') goto yy802; goto yy55; -yy752: - YYDEBUG(752, *YYCURSOR); +yy797: + YYDEBUG(797, *YYCURSOR); yych = *++YYCURSOR; if (yych != '-') goto yy55; -yy753: - YYDEBUG(753, *YYCURSOR); +yy798: + YYDEBUG(798, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '2') goto yy754; - if (yych <= '3') goto yy755; - if (yych <= '9') goto yy756; + if (yych <= '2') goto yy799; + if (yych <= '3') goto yy800; + if (yych <= '9') goto yy801; goto yy55; -yy754: - YYDEBUG(754, *YYCURSOR); +yy799: + YYDEBUG(799, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy756; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy801; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy755: - YYDEBUG(755, *YYCURSOR); +yy800: + YYDEBUG(800, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '1') goto yy756; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '1') goto yy801; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy756: - YYDEBUG(756, *YYCURSOR); +yy801: + YYDEBUG(801, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy660; - goto yy656; + if (yych == 'n') goto yy694; + goto yy690; } else { - if (yych <= 'r') goto yy661; - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 'r') goto yy695; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } -yy757: - YYDEBUG(757, *YYCURSOR); +yy802: + YYDEBUG(802, *YYCURSOR); yych = *++YYCURSOR; if (yych != '-') goto yy55; - YYDEBUG(758, *YYCURSOR); + YYDEBUG(803, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy55; - if (yych >= '1') goto yy760; + if (yych >= '1') goto yy805; } else { - if (yych <= '3') goto yy761; - if (yych <= '9') goto yy756; + if (yych <= '3') goto yy806; + if (yych <= '9') goto yy801; goto yy55; } - YYDEBUG(759, *YYCURSOR); + YYDEBUG(804, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy762; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy807; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy760: - YYDEBUG(760, *YYCURSOR); +yy805: + YYDEBUG(805, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy762; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy807; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy761: - YYDEBUG(761, *YYCURSOR); +yy806: + YYDEBUG(806, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '1') goto yy762; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '1') goto yy807; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy762: - YYDEBUG(762, *YYCURSOR); - yyaccept = 14; +yy807: + YYDEBUG(807, *YYCURSOR); + yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy660; + if (yych == 'n') goto yy694; } else { - if (yych <= 'r') goto yy661; - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; + if (yych <= 'r') goto yy695; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; } -yy763: - YYDEBUG(763, *YYCURSOR); -#line 1388 "ext/date/lib/parse_date.re" +yy808: + YYDEBUG(808, *YYCURSOR); +#line 1431 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("iso8601date2"); @@ -12370,46 +12781,46 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 12372 "" -yy764: - YYDEBUG(764, *YYCURSOR); +#line 12785 "" +yy809: + YYDEBUG(809, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy765; + if (yych == 'C') goto yy810; if (yych != 'c') goto yy55; -yy765: - YYDEBUG(765, *YYCURSOR); +yy810: + YYDEBUG(810, *YYCURSOR); yych = *++YYCURSOR; if (yych != '-') goto yy55; -yy766: - YYDEBUG(766, *YYCURSOR); +yy811: + YYDEBUG(811, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy767; - if (yych <= '2') goto yy768; - if (yych <= '3') goto yy769; + if (yych <= '0') goto yy812; + if (yych <= '2') goto yy813; + if (yych <= '3') goto yy814; goto yy55; -yy767: - YYDEBUG(767, *YYCURSOR); +yy812: + YYDEBUG(812, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy770; + if (yych <= '9') goto yy815; goto yy55; -yy768: - YYDEBUG(768, *YYCURSOR); +yy813: + YYDEBUG(813, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy770; + if (yych <= '9') goto yy815; goto yy55; -yy769: - YYDEBUG(769, *YYCURSOR); +yy814: + YYDEBUG(814, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '2') goto yy55; -yy770: - YYDEBUG(770, *YYCURSOR); +yy815: + YYDEBUG(815, *YYCURSOR); ++YYCURSOR; - YYDEBUG(771, *YYCURSOR); -#line 1641 "ext/date/lib/parse_date.re" + YYDEBUG(816, *YYCURSOR); +#line 1684 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextreverse"); @@ -12422,130 +12833,130 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 12424 "" -yy772: - YYDEBUG(772, *YYCURSOR); +#line 12837 "" +yy817: + YYDEBUG(817, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'V') goto yy765; - if (yych == 'v') goto yy765; + if (yych == 'V') goto yy810; + if (yych == 'v') goto yy810; goto yy55; -yy773: - YYDEBUG(773, *YYCURSOR); +yy818: + YYDEBUG(818, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy765; - if (yych == 't') goto yy765; + if (yych == 'T') goto yy810; + if (yych == 't') goto yy810; goto yy55; -yy774: - YYDEBUG(774, *YYCURSOR); +yy819: + YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy775; + if (yych == 'P') goto yy820; if (yych != 'p') goto yy55; -yy775: - YYDEBUG(775, *YYCURSOR); +yy820: + YYDEBUG(820, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == '-') goto yy766; + if (yych == '-') goto yy811; goto yy55; } else { - if (yych <= 'T') goto yy765; - if (yych == 't') goto yy765; + if (yych <= 'T') goto yy810; + if (yych == 't') goto yy810; goto yy55; } -yy776: - YYDEBUG(776, *YYCURSOR); +yy821: + YYDEBUG(821, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy765; - if (yych == 'g') goto yy765; + if (yych == 'G') goto yy810; + if (yych == 'g') goto yy810; goto yy55; -yy777: - YYDEBUG(777, *YYCURSOR); +yy822: + YYDEBUG(822, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy765; - if (yych == 'r') goto yy765; + if (yych == 'R') goto yy810; + if (yych == 'r') goto yy810; goto yy55; -yy778: - YYDEBUG(778, *YYCURSOR); +yy823: + YYDEBUG(823, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy765; + if (yych == 'R') goto yy810; if (yych <= 'X') goto yy55; - goto yy765; + goto yy810; } else { if (yych <= 'r') { if (yych <= 'q') goto yy55; - goto yy765; + goto yy810; } else { - if (yych == 'y') goto yy765; + if (yych == 'y') goto yy810; goto yy55; } } -yy779: - YYDEBUG(779, *YYCURSOR); +yy824: + YYDEBUG(824, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy765; - if (yych == 'b') goto yy765; + if (yych == 'B') goto yy810; + if (yych == 'b') goto yy810; goto yy55; -yy780: - YYDEBUG(780, *YYCURSOR); +yy825: + YYDEBUG(825, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy765; + if (yych == 'L') goto yy810; if (yych <= 'M') goto yy55; - goto yy765; + goto yy810; } else { if (yych <= 'l') { if (yych <= 'k') goto yy55; - goto yy765; + goto yy810; } else { - if (yych == 'n') goto yy765; + if (yych == 'n') goto yy810; goto yy55; } } -yy781: - YYDEBUG(781, *YYCURSOR); +yy826: + YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy765; - if (yych == 'n') goto yy765; + if (yych == 'N') goto yy810; + if (yych == 'n') goto yy810; goto yy55; -yy782: - YYDEBUG(782, *YYCURSOR); - yyaccept = 15; +yy827: + YYDEBUG(827, *YYCURSOR); + yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'O') { if (yych <= '3') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy790; + if (yych == '\t') goto yy835; } else { - if (yych <= ' ') goto yy790; - if (yych >= '-') goto yy787; + if (yych <= ' ') goto yy835; + if (yych >= '-') goto yy832; } } else { if (yych <= '0') { - if (yych <= '.') goto yy791; - if (yych <= '/') goto yy788; - goto yy804; + if (yych <= '.') goto yy836; + if (yych <= '/') goto yy833; + goto yy849; } else { - if (yych <= '1') goto yy805; - if (yych <= '2') goto yy807; - goto yy808; + if (yych <= '1') goto yy850; + if (yych <= '2') goto yy852; + goto yy853; } } } else { if (yych <= 'D') { if (yych <= '@') { if (yych <= '9') goto yy73; - if (yych <= ':') goto yy806; + if (yych <= ':') goto yy851; } else { - if (yych <= 'A') goto yy790; - if (yych >= 'D') goto yy790; + if (yych <= 'A') goto yy835; + if (yych >= 'D') goto yy835; } } else { if (yych <= 'G') { - if (yych == 'F') goto yy790; + if (yych == 'F') goto yy835; } else { - if (yych <= 'J') goto yy790; - if (yych >= 'M') goto yy790; + if (yych <= 'J') goto yy835; + if (yych >= 'M') goto yy835; } } } @@ -12553,41 +12964,41 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'h') { if (yych <= 'a') { if (yych <= 'W') { - if (yych <= 'R') goto yy783; - if (yych <= 'V') goto yy790; - goto yy809; + if (yych <= 'R') goto yy828; + if (yych <= 'V') goto yy835; + goto yy854; } else { - if (yych <= 'Y') goto yy790; - if (yych >= 'a') goto yy790; + if (yych <= 'Y') goto yy835; + if (yych >= 'a') goto yy835; } } else { if (yych <= 'e') { - if (yych == 'd') goto yy790; + if (yych == 'd') goto yy835; } else { - if (yych != 'g') goto yy790; + if (yych != 'g') goto yy835; } } } else { if (yych <= 'u') { if (yych <= 'l') { - if (yych == 'j') goto yy790; + if (yych == 'j') goto yy835; } else { - if (yych <= 'o') goto yy790; - if (yych >= 's') goto yy790; + if (yych <= 'o') goto yy835; + if (yych >= 's') goto yy835; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy790; + if (yych == 'w') goto yy835; } else { - if (yych <= 'y') goto yy790; - if (yych == 0xC2) goto yy790; + if (yych <= 'y') goto yy835; + if (yych == 0xC2) goto yy835; } } } } -yy783: - YYDEBUG(783, *YYCURSOR); -#line 1676 "ext/date/lib/parse_date.re" +yy828: + YYDEBUG(828, *YYCURSOR); +#line 1719 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("year4"); TIMELIB_INIT; @@ -12595,13 +13006,13 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 12597 "" -yy784: - YYDEBUG(784, *YYCURSOR); +#line 13010 "" +yy829: + YYDEBUG(829, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { - case '0': goto yy785; - case '1': goto yy786; + case '0': goto yy830; + case '1': goto yy831; case '2': case '3': case '4': @@ -12609,105 +13020,105 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case '6': case '7': case '8': - case '9': goto yy752; + case '9': goto yy797; case 'A': - case 'a': goto yy745; + case 'a': goto yy790; case 'D': - case 'd': goto yy749; + case 'd': goto yy794; case 'F': - case 'f': goto yy743; + case 'f': goto yy788; case 'J': - case 'j': goto yy742; + case 'j': goto yy787; case 'M': - case 'm': goto yy744; + case 'm': goto yy789; case 'N': - case 'n': goto yy748; + case 'n': goto yy793; case 'O': - case 'o': goto yy747; + case 'o': goto yy792; case 'S': - case 's': goto yy746; + case 's': goto yy791; default: goto yy55; } -yy785: - YYDEBUG(785, *YYCURSOR); +yy830: + YYDEBUG(830, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy753; + if (yych == '-') goto yy798; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy752; + if (yych <= '9') goto yy797; goto yy55; -yy786: - YYDEBUG(786, *YYCURSOR); +yy831: + YYDEBUG(831, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy753; + if (yych == '-') goto yy798; if (yych <= '/') goto yy55; - if (yych <= '2') goto yy752; + if (yych <= '2') goto yy797; goto yy55; -yy787: - YYDEBUG(787, *YYCURSOR); +yy832: + YYDEBUG(832, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { - case '0': goto yy972; - case '1': goto yy974; - case '2': - case '3': + case '0': goto yy1017; + case '1': goto yy1019; + case '2': goto yy1020; + case '3': goto yy1021; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy975; + case '9': goto yy1022; case 'A': - case 'a': goto yy966; + case 'a': goto yy1011; case 'D': - case 'd': goto yy970; + case 'd': goto yy1015; case 'F': - case 'f': goto yy964; + case 'f': goto yy1009; case 'J': - case 'j': goto yy963; + case 'j': goto yy1008; case 'M': - case 'm': goto yy965; + case 'm': goto yy1010; case 'N': - case 'n': goto yy969; + case 'n': goto yy1014; case 'O': - case 'o': goto yy968; + case 'o': goto yy1013; case 'S': - case 's': goto yy967; - case 'W': goto yy971; - default: goto yy938; + case 's': goto yy1012; + case 'W': goto yy1016; + default: goto yy983; } -yy788: - YYDEBUG(788, *YYCURSOR); +yy833: + YYDEBUG(833, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy946; - if (yych <= '1') goto yy947; - if (yych <= '9') goto yy948; + if (yych <= '0') goto yy991; + if (yych <= '1') goto yy992; + if (yych <= '9') goto yy993; goto yy55; -yy789: - YYDEBUG(789, *YYCURSOR); +yy834: + YYDEBUG(834, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy790: - YYDEBUG(790, *YYCURSOR); +yy835: + YYDEBUG(835, *YYCURSOR); if (yych <= 'W') { if (yych <= 'G') { if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy789; + if (yych == '\t') goto yy834; goto yy55; } else { - if (yych <= ' ') goto yy789; + if (yych <= ' ') goto yy834; if (yych <= ',') goto yy55; - goto yy937; + goto yy982; } } else { if (yych <= 'C') { - if (yych == 'A') goto yy799; + if (yych == 'A') goto yy844; goto yy55; } else { - if (yych <= 'D') goto yy803; - if (yych == 'F') goto yy797; + if (yych <= 'D') goto yy848; + if (yych == 'F') goto yy842; goto yy55; } } @@ -12715,22 +13126,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'N') { if (yych <= 'J') { if (yych <= 'H') goto yy64; - if (yych <= 'I') goto yy792; - goto yy796; + if (yych <= 'I') goto yy837; + goto yy841; } else { if (yych <= 'L') goto yy55; - if (yych <= 'M') goto yy798; - goto yy802; + if (yych <= 'M') goto yy843; + goto yy847; } } else { if (yych <= 'S') { - if (yych <= 'O') goto yy801; + if (yych <= 'O') goto yy846; if (yych <= 'R') goto yy55; - goto yy800; + goto yy845; } else { if (yych <= 'T') goto yy69; if (yych <= 'U') goto yy62; - if (yych <= 'V') goto yy794; + if (yych <= 'V') goto yy839; goto yy68; } } @@ -12739,33 +13150,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych <= '`') { - if (yych <= 'X') goto yy795; + if (yych <= 'X') goto yy840; if (yych <= 'Y') goto yy67; goto yy55; } else { - if (yych <= 'a') goto yy799; + if (yych <= 'a') goto yy844; if (yych <= 'c') goto yy55; - goto yy803; + goto yy848; } } else { if (yych <= 'g') { - if (yych == 'f') goto yy797; + if (yych == 'f') goto yy842; goto yy55; } else { if (yych <= 'h') goto yy64; - if (yych == 'j') goto yy796; + if (yych == 'j') goto yy841; goto yy55; } } } else { if (yych <= 'u') { if (yych <= 'o') { - if (yych <= 'm') goto yy798; - if (yych <= 'n') goto yy802; - goto yy801; + if (yych <= 'm') goto yy843; + if (yych <= 'n') goto yy847; + goto yy846; } else { if (yych <= 'r') goto yy55; - if (yych <= 's') goto yy800; + if (yych <= 's') goto yy845; if (yych <= 't') goto yy69; goto yy62; } @@ -12781,26 +13192,26 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy791: - YYDEBUG(791, *YYCURSOR); +yy836: + YYDEBUG(836, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy938; - if (yych <= '0') goto yy930; - if (yych <= '2') goto yy931; - if (yych <= '3') goto yy932; - goto yy938; -yy792: - YYDEBUG(792, *YYCURSOR); + if (yych <= '/') goto yy983; + if (yych <= '0') goto yy975; + if (yych <= '2') goto yy976; + if (yych <= '3') goto yy977; + goto yy983; +yy837: + YYDEBUG(837, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= 'U') { - if (yych == 'I') goto yy929; + if (yych == 'I') goto yy974; } else { - if (yych == 'W') goto yy793; - if (yych <= 'X') goto yy883; + if (yych == 'W') goto yy838; + if (yych <= 'X') goto yy928; } -yy793: - YYDEBUG(793, *YYCURSOR); -#line 1497 "ext/date/lib/parse_date.re" +yy838: + YYDEBUG(838, *YYCURSOR); +#line 1540 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenodayrev"); @@ -12813,228 +13224,228 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 12815 "" -yy794: - YYDEBUG(794, *YYCURSOR); +#line 13228 "" +yy839: + YYDEBUG(839, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy927; - goto yy793; -yy795: - YYDEBUG(795, *YYCURSOR); + if (yych == 'I') goto yy972; + goto yy838; +yy840: + YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy926; - goto yy793; -yy796: - YYDEBUG(796, *YYCURSOR); + if (yych == 'I') goto yy971; + goto yy838; +yy841: + YYDEBUG(841, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy919; + if (yych == 'A') goto yy964; if (yych <= 'T') goto yy55; - goto yy918; + goto yy963; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy919; + goto yy964; } else { - if (yych == 'u') goto yy918; + if (yych == 'u') goto yy963; goto yy55; } } -yy797: - YYDEBUG(797, *YYCURSOR); +yy842: + YYDEBUG(842, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= 'N') { - if (yych == 'E') goto yy912; + if (yych == 'E') goto yy957; goto yy55; } else { - if (yych <= 'O') goto yy110; + if (yych <= 'O') goto yy113; if (yych <= 'Q') goto yy55; - goto yy109; + goto yy112; } } else { if (yych <= 'n') { - if (yych == 'e') goto yy912; + if (yych == 'e') goto yy957; goto yy55; } else { - if (yych <= 'o') goto yy110; - if (yych == 'r') goto yy109; + if (yych <= 'o') goto yy113; + if (yych == 'r') goto yy112; goto yy55; } } -yy798: - YYDEBUG(798, *YYCURSOR); +yy843: + YYDEBUG(843, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'I') { - if (yych == 'A') goto yy909; + if (yych == 'A') goto yy954; if (yych <= 'H') goto yy55; - goto yy148; + goto yy154; } else { - if (yych == 'O') goto yy147; + if (yych == 'O') goto yy153; if (yych <= 'R') goto yy55; - goto yy149; + goto yy155; } } else { if (yych <= 'i') { - if (yych == 'a') goto yy909; + if (yych == 'a') goto yy954; if (yych <= 'h') goto yy55; - goto yy148; + goto yy154; } else { if (yych <= 'o') { if (yych <= 'n') goto yy55; - goto yy147; + goto yy153; } else { - if (yych == 's') goto yy149; + if (yych == 's') goto yy155; goto yy55; } } } -yy799: - YYDEBUG(799, *YYCURSOR); +yy844: + YYDEBUG(844, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy903; + if (yych == 'P') goto yy948; if (yych <= 'T') goto yy55; - goto yy902; + goto yy947; } else { if (yych <= 'p') { if (yych <= 'o') goto yy55; - goto yy903; + goto yy948; } else { - if (yych == 'u') goto yy902; + if (yych == 'u') goto yy947; goto yy55; } } -yy800: - YYDEBUG(800, *YYCURSOR); +yy845: + YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { - if (yych == 'A') goto yy129; + if (yych == 'A') goto yy133; goto yy55; } else { - if (yych <= 'E') goto yy895; + if (yych <= 'E') goto yy940; if (yych <= 'T') goto yy55; - goto yy128; + goto yy132; } } else { if (yych <= 'd') { - if (yych == 'a') goto yy129; + if (yych == 'a') goto yy133; goto yy55; } else { - if (yych <= 'e') goto yy895; - if (yych == 'u') goto yy128; + if (yych <= 'e') goto yy940; + if (yych == 'u') goto yy132; goto yy55; } } -yy801: - YYDEBUG(801, *YYCURSOR); +yy846: + YYDEBUG(846, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy890; - if (yych == 'c') goto yy890; + if (yych == 'C') goto yy935; + if (yych == 'c') goto yy935; goto yy55; -yy802: - YYDEBUG(802, *YYCURSOR); +yy847: + YYDEBUG(847, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy884; - if (yych == 'o') goto yy884; + if (yych == 'O') goto yy929; + if (yych == 'o') goto yy929; goto yy55; -yy803: - YYDEBUG(803, *YYCURSOR); +yy848: + YYDEBUG(848, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { - if (yych == 'A') goto yy125; + if (yych == 'A') goto yy129; if (yych <= 'D') goto yy55; - goto yy877; + goto yy922; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy125; + goto yy129; } else { - if (yych == 'e') goto yy877; + if (yych == 'e') goto yy922; goto yy55; } } -yy804: - YYDEBUG(804, *YYCURSOR); +yy849: + YYDEBUG(849, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '0') goto yy874; - if (yych <= '9') goto yy875; + if (yych <= '0') goto yy919; + if (yych <= '9') goto yy920; goto yy59; -yy805: - YYDEBUG(805, *YYCURSOR); +yy850: + YYDEBUG(850, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '2') goto yy843; - if (yych <= '9') goto yy822; + if (yych <= '2') goto yy888; + if (yych <= '9') goto yy867; goto yy59; -yy806: - YYDEBUG(806, *YYCURSOR); +yy851: + YYDEBUG(851, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy823; - if (yych <= '1') goto yy824; + if (yych <= '0') goto yy868; + if (yych <= '1') goto yy869; goto yy55; -yy807: - YYDEBUG(807, *YYCURSOR); +yy852: + YYDEBUG(852, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy822; + if (yych <= '9') goto yy867; goto yy59; -yy808: - YYDEBUG(808, *YYCURSOR); +yy853: + YYDEBUG(853, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '5') goto yy818; - if (yych <= '6') goto yy819; + if (yych <= '5') goto yy863; + if (yych <= '6') goto yy864; if (yych <= '9') goto yy74; goto yy59; -yy809: - YYDEBUG(809, *YYCURSOR); +yy854: + YYDEBUG(854, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '5') { if (yych <= '/') goto yy55; - if (yych <= '0') goto yy810; - if (yych <= '4') goto yy811; - goto yy812; + if (yych <= '0') goto yy855; + if (yych <= '4') goto yy856; + goto yy857; } else { if (yych <= 'E') { if (yych <= 'D') goto yy55; - goto yy94; + goto yy96; } else { - if (yych == 'e') goto yy94; + if (yych == 'e') goto yy96; goto yy55; } } -yy810: - YYDEBUG(810, *YYCURSOR); +yy855: + YYDEBUG(855, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '0') goto yy55; - if (yych <= '9') goto yy813; + if (yych <= '9') goto yy858; goto yy55; -yy811: - YYDEBUG(811, *YYCURSOR); +yy856: + YYDEBUG(856, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy813; + if (yych <= '9') goto yy858; goto yy55; -yy812: - YYDEBUG(812, *YYCURSOR); +yy857: + YYDEBUG(857, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '4') goto yy55; -yy813: - YYDEBUG(813, *YYCURSOR); - yyaccept = 16; +yy858: + YYDEBUG(858, *YYCURSOR); + yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy815; - if (yych <= '/') goto yy814; - if (yych <= '7') goto yy816; -yy814: - YYDEBUG(814, *YYCURSOR); -#line 1608 "ext/date/lib/parse_date.re" + if (yych == '-') goto yy860; + if (yych <= '/') goto yy859; + if (yych <= '7') goto yy861; +yy859: + YYDEBUG(859, *YYCURSOR); +#line 1651 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweek"); @@ -13052,17 +13463,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 13054 "" -yy815: - YYDEBUG(815, *YYCURSOR); +#line 13467 "" +yy860: + YYDEBUG(860, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '8') goto yy55; -yy816: - YYDEBUG(816, *YYCURSOR); +yy861: + YYDEBUG(861, *YYCURSOR); ++YYCURSOR; - YYDEBUG(817, *YYCURSOR); -#line 1589 "ext/date/lib/parse_date.re" + YYDEBUG(862, *YYCURSOR); +#line 1632 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweekday"); @@ -13080,23 +13491,23 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 13082 "" -yy818: - YYDEBUG(818, *YYCURSOR); +#line 13495 "" +yy863: + YYDEBUG(863, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy820; + if (yych <= '9') goto yy865; goto yy59; -yy819: - YYDEBUG(819, *YYCURSOR); +yy864: + YYDEBUG(864, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '6') goto yy820; + if (yych <= '6') goto yy865; if (yych <= '9') goto yy75; goto yy59; -yy820: - YYDEBUG(820, *YYCURSOR); - yyaccept = 17; +yy865: + YYDEBUG(865, *YYCURSOR); + yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { @@ -13112,7 +13523,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } else { if (yych <= 'L') { - if (yych == 'G') goto yy821; + if (yych == 'G') goto yy866; if (yych <= 'H') goto yy59; } else { if (yych <= 'R') { @@ -13150,9 +13561,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy821: - YYDEBUG(821, *YYCURSOR); -#line 1575 "ext/date/lib/parse_date.re" +yy866: + YYDEBUG(866, *YYCURSOR); +#line 1618 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgydotd"); @@ -13165,110 +13576,110 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 13167 "" -yy822: - YYDEBUG(822, *YYCURSOR); +#line 13580 "" +yy867: + YYDEBUG(867, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy820; + if (yych <= '9') goto yy865; goto yy59; -yy823: - YYDEBUG(823, *YYCURSOR); +yy868: + YYDEBUG(868, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy825; + if (yych <= '9') goto yy870; goto yy55; -yy824: - YYDEBUG(824, *YYCURSOR); +yy869: + YYDEBUG(869, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; -yy825: - YYDEBUG(825, *YYCURSOR); +yy870: + YYDEBUG(870, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(826, *YYCURSOR); + YYDEBUG(871, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy827; - if (yych <= '2') goto yy828; - if (yych <= '3') goto yy829; + if (yych <= '0') goto yy872; + if (yych <= '2') goto yy873; + if (yych <= '3') goto yy874; goto yy55; -yy827: - YYDEBUG(827, *YYCURSOR); +yy872: + YYDEBUG(872, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy830; + if (yych <= '9') goto yy875; goto yy55; -yy828: - YYDEBUG(828, *YYCURSOR); +yy873: + YYDEBUG(873, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy830; + if (yych <= '9') goto yy875; goto yy55; -yy829: - YYDEBUG(829, *YYCURSOR); +yy874: + YYDEBUG(874, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '2') goto yy55; -yy830: - YYDEBUG(830, *YYCURSOR); +yy875: + YYDEBUG(875, *YYCURSOR); yych = *++YYCURSOR; if (yych != ' ') goto yy55; - YYDEBUG(831, *YYCURSOR); + YYDEBUG(876, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy832; - if (yych <= '2') goto yy833; + if (yych <= '1') goto yy877; + if (yych <= '2') goto yy878; goto yy55; -yy832: - YYDEBUG(832, *YYCURSOR); +yy877: + YYDEBUG(877, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy834; + if (yych <= '9') goto yy879; goto yy55; -yy833: - YYDEBUG(833, *YYCURSOR); +yy878: + YYDEBUG(878, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '5') goto yy55; -yy834: - YYDEBUG(834, *YYCURSOR); +yy879: + YYDEBUG(879, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(835, *YYCURSOR); + YYDEBUG(880, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '6') goto yy55; - YYDEBUG(836, *YYCURSOR); + YYDEBUG(881, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(837, *YYCURSOR); + YYDEBUG(882, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(838, *YYCURSOR); + YYDEBUG(883, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy839; - if (yych <= '6') goto yy840; + if (yych <= '5') goto yy884; + if (yych <= '6') goto yy885; goto yy55; -yy839: - YYDEBUG(839, *YYCURSOR); +yy884: + YYDEBUG(884, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy841; + if (yych <= '9') goto yy886; goto yy55; -yy840: - YYDEBUG(840, *YYCURSOR); +yy885: + YYDEBUG(885, *YYCURSOR); yych = *++YYCURSOR; if (yych != '0') goto yy55; -yy841: - YYDEBUG(841, *YYCURSOR); +yy886: + YYDEBUG(886, *YYCURSOR); ++YYCURSOR; -yy842: - YYDEBUG(842, *YYCURSOR); -#line 1549 "ext/date/lib/parse_date.re" +yy887: + YYDEBUG(887, *YYCURSOR); +#line 1592 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif"); @@ -13293,48 +13704,48 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 13295 "" -yy843: - YYDEBUG(843, *YYCURSOR); +#line 13708 "" +yy888: + YYDEBUG(888, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy59; - if (yych >= '1') goto yy845; + if (yych >= '1') goto yy890; } else { - if (yych <= '3') goto yy846; - if (yych <= '9') goto yy820; + if (yych <= '3') goto yy891; + if (yych <= '9') goto yy865; goto yy59; } -yy844: - YYDEBUG(844, *YYCURSOR); - yyaccept = 17; +yy889: + YYDEBUG(889, *YYCURSOR); + yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy59; - if (yych <= 0x1F) goto yy821; + if (yych <= 0x1F) goto yy866; goto yy59; } else { if (yych <= '9') { - if (yych <= '/') goto yy821; - goto yy847; + if (yych <= '/') goto yy866; + goto yy892; } else { if (yych == 'D') goto yy59; - goto yy821; + goto yy866; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy821; + if (yych == 'G') goto yy866; if (yych <= 'H') goto yy59; - goto yy821; + goto yy866; } else { if (yych <= 'R') { if (yych <= 'M') goto yy59; - goto yy821; + goto yy866; } else { - if (yych == 'V') goto yy821; + if (yych == 'V') goto yy866; goto yy59; } } @@ -13343,67 +13754,67 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy59; - if (yych <= 'c') goto yy821; + if (yych <= 'c') goto yy866; goto yy59; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy821; + if (yych <= 'e') goto yy866; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy821; + goto yy866; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy821; + goto yy866; } else { - if (yych == 'v') goto yy821; + if (yych == 'v') goto yy866; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy821; + if (yych <= 'x') goto yy866; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy821; + goto yy866; } } } } -yy845: - YYDEBUG(845, *YYCURSOR); - yyaccept = 17; +yy890: + YYDEBUG(890, *YYCURSOR); + yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy59; - if (yych <= 0x1F) goto yy821; + if (yych <= 0x1F) goto yy866; goto yy59; } else { if (yych <= '9') { - if (yych <= '/') goto yy821; - goto yy847; + if (yych <= '/') goto yy866; + goto yy892; } else { if (yych == 'D') goto yy59; - goto yy821; + goto yy866; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy821; + if (yych == 'G') goto yy866; if (yych <= 'H') goto yy59; - goto yy821; + goto yy866; } else { if (yych <= 'R') { if (yych <= 'M') goto yy59; - goto yy821; + goto yy866; } else { - if (yych == 'V') goto yy821; + if (yych == 'V') goto yy866; goto yy59; } } @@ -13412,71 +13823,71 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy59; - if (yych <= 'c') goto yy821; + if (yych <= 'c') goto yy866; goto yy59; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy821; + if (yych <= 'e') goto yy866; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy821; + goto yy866; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy821; + goto yy866; } else { - if (yych == 'v') goto yy821; + if (yych == 'v') goto yy866; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy821; + if (yych <= 'x') goto yy866; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy821; + goto yy866; } } } } -yy846: - YYDEBUG(846, *YYCURSOR); - yyaccept = 17; +yy891: + YYDEBUG(891, *YYCURSOR); + yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'D') { if (yych <= ' ') { if (yych == '\t') goto yy59; - if (yych <= 0x1F) goto yy821; + if (yych <= 0x1F) goto yy866; goto yy59; } else { if (yych <= '1') { - if (yych <= '/') goto yy821; + if (yych <= '/') goto yy866; } else { if (yych <= '9') goto yy76; - if (yych <= 'C') goto yy821; + if (yych <= 'C') goto yy866; goto yy59; } } } else { if (yych <= 'L') { if (yych <= 'F') { - if (yych <= 'E') goto yy821; + if (yych <= 'E') goto yy866; goto yy59; } else { if (yych == 'H') goto yy59; - goto yy821; + goto yy866; } } else { if (yych <= 'R') { if (yych <= 'M') goto yy59; - goto yy821; + goto yy866; } else { - if (yych == 'V') goto yy821; + if (yych == 'V') goto yy866; goto yy59; } } @@ -13485,40 +13896,40 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy59; - if (yych <= 'c') goto yy821; + if (yych <= 'c') goto yy866; goto yy59; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy821; + if (yych <= 'e') goto yy866; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy821; + goto yy866; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy821; + goto yy866; } else { - if (yych == 'v') goto yy821; + if (yych == 'v') goto yy866; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy821; + if (yych <= 'x') goto yy866; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy821; + goto yy866; } } } } -yy847: - YYDEBUG(847, *YYCURSOR); - yyaccept = 18; +yy892: + YYDEBUG(892, *YYCURSOR); + yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'F') { @@ -13546,7 +13957,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= 'T') { if (yych <= 'S') goto yy63; - goto yy849; + goto yy894; } else { if (yych <= 'U') goto yy62; if (yych >= 'W') goto yy68; @@ -13574,7 +13985,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 's') { if (yych >= 's') goto yy63; } else { - if (yych <= 't') goto yy850; + if (yych <= 't') goto yy895; if (yych <= 'u') goto yy62; } } else { @@ -13587,9 +13998,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy848: - YYDEBUG(848, *YYCURSOR); -#line 1537 "ext/date/lib/parse_date.re" +yy893: + YYDEBUG(893, *YYCURSOR); +#line 1580 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; @@ -13600,17 +14011,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 13602 "" -yy849: - YYDEBUG(849, *YYCURSOR); +#line 14015 "" +yy894: + YYDEBUG(894, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= '2') { if (yych <= '/') goto yy55; - if (yych <= '1') goto yy864; - goto yy865; + if (yych <= '1') goto yy909; + goto yy910; } else { - if (yych <= '9') goto yy866; + if (yych <= '9') goto yy911; if (yych <= 'G') goto yy55; goto yy81; } @@ -13624,15 +14035,15 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) goto yy55; } } -yy850: - YYDEBUG(850, *YYCURSOR); +yy895: + YYDEBUG(895, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= '2') { if (yych <= '/') goto yy55; - if (yych >= '2') goto yy852; + if (yych >= '2') goto yy897; } else { - if (yych <= '9') goto yy853; + if (yych <= '9') goto yy898; if (yych <= 'G') goto yy55; goto yy81; } @@ -13646,880 +14057,883 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) goto yy55; } } - YYDEBUG(851, *YYCURSOR); + YYDEBUG(896, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy858; - if (yych <= '9') goto yy853; + if (yych <= '5') goto yy903; + if (yych <= '9') goto yy898; goto yy55; -yy852: - YYDEBUG(852, *YYCURSOR); +yy897: + YYDEBUG(897, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '4') goto yy858; - if (yych <= '5') goto yy854; + if (yych <= '4') goto yy903; + if (yych <= '5') goto yy899; goto yy55; -yy853: - YYDEBUG(853, *YYCURSOR); +yy898: + YYDEBUG(898, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '6') goto yy55; -yy854: - YYDEBUG(854, *YYCURSOR); +yy899: + YYDEBUG(899, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy855: - YYDEBUG(855, *YYCURSOR); +yy900: + YYDEBUG(900, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy856; - if (yych <= '6') goto yy857; + if (yych <= '5') goto yy901; + if (yych <= '6') goto yy902; goto yy55; -yy856: - YYDEBUG(856, *YYCURSOR); +yy901: + YYDEBUG(901, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy841; + if (yych <= '9') goto yy886; goto yy55; -yy857: - YYDEBUG(857, *YYCURSOR); +yy902: + YYDEBUG(902, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '0') goto yy841; + if (yych == '0') goto yy886; goto yy55; -yy858: - YYDEBUG(858, *YYCURSOR); +yy903: + YYDEBUG(903, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy859; - if (yych <= '9') goto yy855; + if (yych <= '5') goto yy904; + if (yych <= '9') goto yy900; goto yy55; -yy859: - YYDEBUG(859, *YYCURSOR); +yy904: + YYDEBUG(904, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy860; - if (yych <= '6') goto yy861; - if (yych <= '9') goto yy855; + if (yych <= '5') goto yy905; + if (yych <= '6') goto yy906; + if (yych <= '9') goto yy900; goto yy55; -yy860: - YYDEBUG(860, *YYCURSOR); +yy905: + YYDEBUG(905, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy862; - if (yych <= '6') goto yy863; - if (yych <= '9') goto yy841; + if (yych <= '5') goto yy907; + if (yych <= '6') goto yy908; + if (yych <= '9') goto yy886; goto yy55; -yy861: - YYDEBUG(861, *YYCURSOR); +yy906: + YYDEBUG(906, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy862; - if (yych <= '5') goto yy856; - if (yych <= '6') goto yy857; + if (yych <= '0') goto yy907; + if (yych <= '5') goto yy901; + if (yych <= '6') goto yy902; goto yy55; -yy862: - YYDEBUG(862, *YYCURSOR); +yy907: + YYDEBUG(907, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '9') goto yy841; - goto yy842; -yy863: - YYDEBUG(863, *YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '9') goto yy886; + goto yy887; +yy908: + YYDEBUG(908, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '0') goto yy841; - goto yy842; -yy864: - YYDEBUG(864, *YYCURSOR); + if (yych == '0') goto yy886; + goto yy887; +yy909: + YYDEBUG(909, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy873; - if (yych <= '9') goto yy866; - if (yych <= ':') goto yy867; + if (yych <= '5') goto yy918; + if (yych <= '9') goto yy911; + if (yych <= ':') goto yy912; goto yy55; -yy865: - YYDEBUG(865, *YYCURSOR); +yy910: + YYDEBUG(910, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '5') { if (yych <= '/') goto yy55; - if (yych <= '4') goto yy873; - goto yy854; + if (yych <= '4') goto yy918; + goto yy899; } else { - if (yych == ':') goto yy867; + if (yych == ':') goto yy912; goto yy55; } -yy866: - YYDEBUG(866, *YYCURSOR); +yy911: + YYDEBUG(911, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy854; + if (yych <= '5') goto yy899; if (yych != ':') goto yy55; -yy867: - YYDEBUG(867, *YYCURSOR); +yy912: + YYDEBUG(912, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= '6') goto yy55; - YYDEBUG(868, *YYCURSOR); + YYDEBUG(913, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(869, *YYCURSOR); + YYDEBUG(914, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(870, *YYCURSOR); + YYDEBUG(915, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy871; - if (yych <= '6') goto yy872; + if (yych <= '5') goto yy916; + if (yych <= '6') goto yy917; goto yy55; -yy871: - YYDEBUG(871, *YYCURSOR); +yy916: + YYDEBUG(916, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy841; + if (yych <= '9') goto yy886; goto yy55; -yy872: - YYDEBUG(872, *YYCURSOR); +yy917: + YYDEBUG(917, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '0') goto yy841; + if (yych == '0') goto yy886; goto yy55; -yy873: - YYDEBUG(873, *YYCURSOR); +yy918: + YYDEBUG(918, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy859; - if (yych <= '9') goto yy855; - if (yych <= ':') goto yy867; + if (yych <= '5') goto yy904; + if (yych <= '9') goto yy900; + if (yych <= ':') goto yy912; goto yy55; -yy874: - YYDEBUG(874, *YYCURSOR); +yy919: + YYDEBUG(919, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy59; - if (yych <= '0') goto yy876; - goto yy845; + if (yych <= '0') goto yy921; + goto yy890; } else { - if (yych <= '3') goto yy846; - if (yych <= '9') goto yy820; + if (yych <= '3') goto yy891; + if (yych <= '9') goto yy865; goto yy59; } -yy875: - YYDEBUG(875, *YYCURSOR); +yy920: + YYDEBUG(920, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy59; - if (yych <= '0') goto yy844; - goto yy845; + if (yych <= '0') goto yy889; + goto yy890; } else { - if (yych <= '3') goto yy846; - if (yych <= '9') goto yy820; + if (yych <= '3') goto yy891; + if (yych <= '9') goto yy865; goto yy59; } -yy876: - YYDEBUG(876, *YYCURSOR); +yy921: + YYDEBUG(921, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy847; + if (yych <= '9') goto yy892; goto yy59; -yy877: - YYDEBUG(877, *YYCURSOR); +yy922: + YYDEBUG(922, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy878; + if (yych == 'C') goto yy923; if (yych != 'c') goto yy55; -yy878: - YYDEBUG(878, *YYCURSOR); - yyaccept = 19; +yy923: + YYDEBUG(923, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy879; - if (yych != 'e') goto yy793; -yy879: - YYDEBUG(879, *YYCURSOR); + if (yych == 'E') goto yy924; + if (yych != 'e') goto yy838; +yy924: + YYDEBUG(924, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy880; + if (yych == 'M') goto yy925; if (yych != 'm') goto yy55; -yy880: - YYDEBUG(880, *YYCURSOR); +yy925: + YYDEBUG(925, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy881; + if (yych == 'B') goto yy926; if (yych != 'b') goto yy55; -yy881: - YYDEBUG(881, *YYCURSOR); +yy926: + YYDEBUG(926, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy882; + if (yych == 'E') goto yy927; if (yych != 'e') goto yy55; -yy882: - YYDEBUG(882, *YYCURSOR); +yy927: + YYDEBUG(927, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy883; + if (yych == 'R') goto yy928; if (yych != 'r') goto yy55; -yy883: - YYDEBUG(883, *YYCURSOR); +yy928: + YYDEBUG(928, *YYCURSOR); yych = *++YYCURSOR; - goto yy793; -yy884: - YYDEBUG(884, *YYCURSOR); + goto yy838; +yy929: + YYDEBUG(929, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'V') goto yy885; + if (yych == 'V') goto yy930; if (yych != 'v') goto yy55; -yy885: - YYDEBUG(885, *YYCURSOR); - yyaccept = 19; +yy930: + YYDEBUG(930, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy886; - if (yych != 'e') goto yy793; -yy886: - YYDEBUG(886, *YYCURSOR); + if (yych == 'E') goto yy931; + if (yych != 'e') goto yy838; +yy931: + YYDEBUG(931, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy887; + if (yych == 'M') goto yy932; if (yych != 'm') goto yy55; -yy887: - YYDEBUG(887, *YYCURSOR); +yy932: + YYDEBUG(932, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy888; + if (yych == 'B') goto yy933; if (yych != 'b') goto yy55; -yy888: - YYDEBUG(888, *YYCURSOR); +yy933: + YYDEBUG(933, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy889; + if (yych == 'E') goto yy934; if (yych != 'e') goto yy55; -yy889: - YYDEBUG(889, *YYCURSOR); +yy934: + YYDEBUG(934, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy883; - if (yych == 'r') goto yy883; + if (yych == 'R') goto yy928; + if (yych == 'r') goto yy928; goto yy55; -yy890: - YYDEBUG(890, *YYCURSOR); +yy935: + YYDEBUG(935, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy891; + if (yych == 'T') goto yy936; if (yych != 't') goto yy55; -yy891: - YYDEBUG(891, *YYCURSOR); - yyaccept = 19; +yy936: + YYDEBUG(936, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'O') goto yy892; - if (yych != 'o') goto yy793; -yy892: - YYDEBUG(892, *YYCURSOR); + if (yych == 'O') goto yy937; + if (yych != 'o') goto yy838; +yy937: + YYDEBUG(937, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy893; + if (yych == 'B') goto yy938; if (yych != 'b') goto yy55; -yy893: - YYDEBUG(893, *YYCURSOR); +yy938: + YYDEBUG(938, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy894; + if (yych == 'E') goto yy939; if (yych != 'e') goto yy55; -yy894: - YYDEBUG(894, *YYCURSOR); +yy939: + YYDEBUG(939, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy883; - if (yych == 'r') goto yy883; + if (yych == 'R') goto yy928; + if (yych == 'r') goto yy928; goto yy55; -yy895: - YYDEBUG(895, *YYCURSOR); +yy940: + YYDEBUG(940, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'P') { - if (yych == 'C') goto yy131; + if (yych == 'C') goto yy135; if (yych <= 'O') goto yy55; } else { if (yych <= 'c') { if (yych <= 'b') goto yy55; - goto yy131; + goto yy135; } else { if (yych != 'p') goto yy55; } } -yy896: - YYDEBUG(896, *YYCURSOR); +yy941: + YYDEBUG(941, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy897; - if (yych != 't') goto yy793; -yy897: - YYDEBUG(897, *YYCURSOR); - yyaccept = 19; + if (yych == 'T') goto yy942; + if (yych != 't') goto yy838; +yy942: + YYDEBUG(942, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy898; - if (yych != 'e') goto yy793; -yy898: - YYDEBUG(898, *YYCURSOR); + if (yych == 'E') goto yy943; + if (yych != 'e') goto yy838; +yy943: + YYDEBUG(943, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy899; + if (yych == 'M') goto yy944; if (yych != 'm') goto yy55; -yy899: - YYDEBUG(899, *YYCURSOR); +yy944: + YYDEBUG(944, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy900; + if (yych == 'B') goto yy945; if (yych != 'b') goto yy55; -yy900: - YYDEBUG(900, *YYCURSOR); +yy945: + YYDEBUG(945, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy901; + if (yych == 'E') goto yy946; if (yych != 'e') goto yy55; -yy901: - YYDEBUG(901, *YYCURSOR); +yy946: + YYDEBUG(946, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy883; - if (yych == 'r') goto yy883; + if (yych == 'R') goto yy928; + if (yych == 'r') goto yy928; goto yy55; -yy902: - YYDEBUG(902, *YYCURSOR); +yy947: + YYDEBUG(947, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy906; - if (yych == 'g') goto yy906; + if (yych == 'G') goto yy951; + if (yych == 'g') goto yy951; goto yy55; -yy903: - YYDEBUG(903, *YYCURSOR); +yy948: + YYDEBUG(948, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy904; + if (yych == 'R') goto yy949; if (yych != 'r') goto yy55; -yy904: - YYDEBUG(904, *YYCURSOR); - yyaccept = 19; +yy949: + YYDEBUG(949, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'I') goto yy905; - if (yych != 'i') goto yy793; -yy905: - YYDEBUG(905, *YYCURSOR); + if (yych == 'I') goto yy950; + if (yych != 'i') goto yy838; +yy950: + YYDEBUG(950, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy883; - if (yych == 'l') goto yy883; + if (yych == 'L') goto yy928; + if (yych == 'l') goto yy928; goto yy55; -yy906: - YYDEBUG(906, *YYCURSOR); - yyaccept = 19; +yy951: + YYDEBUG(951, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'U') goto yy907; - if (yych != 'u') goto yy793; -yy907: - YYDEBUG(907, *YYCURSOR); + if (yych == 'U') goto yy952; + if (yych != 'u') goto yy838; +yy952: + YYDEBUG(952, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy908; + if (yych == 'S') goto yy953; if (yych != 's') goto yy55; -yy908: - YYDEBUG(908, *YYCURSOR); +yy953: + YYDEBUG(953, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy883; - if (yych == 't') goto yy883; + if (yych == 'T') goto yy928; + if (yych == 't') goto yy928; goto yy55; -yy909: - YYDEBUG(909, *YYCURSOR); +yy954: + YYDEBUG(954, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy910; + if (yych == 'R') goto yy955; if (yych <= 'X') goto yy55; - goto yy883; + goto yy928; } else { if (yych <= 'r') { if (yych <= 'q') goto yy55; } else { - if (yych == 'y') goto yy883; + if (yych == 'y') goto yy928; goto yy55; } } -yy910: - YYDEBUG(910, *YYCURSOR); - yyaccept = 19; +yy955: + YYDEBUG(955, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'C') goto yy911; - if (yych != 'c') goto yy793; -yy911: - YYDEBUG(911, *YYCURSOR); + if (yych == 'C') goto yy956; + if (yych != 'c') goto yy838; +yy956: + YYDEBUG(956, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy883; - if (yych == 'h') goto yy883; + if (yych == 'H') goto yy928; + if (yych == 'h') goto yy928; goto yy55; -yy912: - YYDEBUG(912, *YYCURSOR); +yy957: + YYDEBUG(957, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy913; + if (yych == 'B') goto yy958; if (yych != 'b') goto yy55; -yy913: - YYDEBUG(913, *YYCURSOR); - yyaccept = 19; +yy958: + YYDEBUG(958, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'R') goto yy914; - if (yych != 'r') goto yy793; -yy914: - YYDEBUG(914, *YYCURSOR); + if (yych == 'R') goto yy959; + if (yych != 'r') goto yy838; +yy959: + YYDEBUG(959, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy915; + if (yych == 'U') goto yy960; if (yych != 'u') goto yy55; -yy915: - YYDEBUG(915, *YYCURSOR); +yy960: + YYDEBUG(960, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy916; + if (yych == 'A') goto yy961; if (yych != 'a') goto yy55; -yy916: - YYDEBUG(916, *YYCURSOR); +yy961: + YYDEBUG(961, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy917; + if (yych == 'R') goto yy962; if (yych != 'r') goto yy55; -yy917: - YYDEBUG(917, *YYCURSOR); +yy962: + YYDEBUG(962, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy883; - if (yych == 'y') goto yy883; + if (yych == 'Y') goto yy928; + if (yych == 'y') goto yy928; goto yy55; -yy918: - YYDEBUG(918, *YYCURSOR); +yy963: + YYDEBUG(963, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy925; + if (yych == 'L') goto yy970; if (yych <= 'M') goto yy55; - goto yy924; + goto yy969; } else { if (yych <= 'l') { if (yych <= 'k') goto yy55; - goto yy925; + goto yy970; } else { - if (yych == 'n') goto yy924; + if (yych == 'n') goto yy969; goto yy55; } } -yy919: - YYDEBUG(919, *YYCURSOR); +yy964: + YYDEBUG(964, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy920; + if (yych == 'N') goto yy965; if (yych != 'n') goto yy55; -yy920: - YYDEBUG(920, *YYCURSOR); - yyaccept = 19; +yy965: + YYDEBUG(965, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'U') goto yy921; - if (yych != 'u') goto yy793; -yy921: - YYDEBUG(921, *YYCURSOR); + if (yych == 'U') goto yy966; + if (yych != 'u') goto yy838; +yy966: + YYDEBUG(966, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy922; + if (yych == 'A') goto yy967; if (yych != 'a') goto yy55; -yy922: - YYDEBUG(922, *YYCURSOR); +yy967: + YYDEBUG(967, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy923; + if (yych == 'R') goto yy968; if (yych != 'r') goto yy55; -yy923: - YYDEBUG(923, *YYCURSOR); +yy968: + YYDEBUG(968, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy883; - if (yych == 'y') goto yy883; + if (yych == 'Y') goto yy928; + if (yych == 'y') goto yy928; goto yy55; -yy924: - YYDEBUG(924, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy883; - if (yych == 'e') goto yy883; - goto yy793; -yy925: - YYDEBUG(925, *YYCURSOR); +yy969: + YYDEBUG(969, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy883; - if (yych == 'y') goto yy883; - goto yy793; -yy926: - YYDEBUG(926, *YYCURSOR); + if (yych == 'E') goto yy928; + if (yych == 'e') goto yy928; + goto yy838; +yy970: + YYDEBUG(970, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy883; - goto yy793; -yy927: - YYDEBUG(927, *YYCURSOR); + if (yych == 'Y') goto yy928; + if (yych == 'y') goto yy928; + goto yy838; +yy971: + YYDEBUG(971, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'I') goto yy793; - YYDEBUG(928, *YYCURSOR); + if (yych == 'I') goto yy928; + goto yy838; +yy972: + YYDEBUG(972, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy883; - goto yy793; -yy929: - YYDEBUG(929, *YYCURSOR); + if (yych != 'I') goto yy838; + YYDEBUG(973, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy883; - goto yy793; -yy930: - YYDEBUG(930, *YYCURSOR); + if (yych == 'I') goto yy928; + goto yy838; +yy974: + YYDEBUG(974, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'I') goto yy928; + goto yy838; +yy975: + YYDEBUG(975, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy945; - if (yych <= '9') goto yy944; + if (yych <= '0') goto yy990; + if (yych <= '9') goto yy989; goto yy55; -yy931: - YYDEBUG(931, *YYCURSOR); +yy976: + YYDEBUG(976, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy943; + if (yych <= '9') goto yy988; goto yy55; -yy932: - YYDEBUG(932, *YYCURSOR); +yy977: + YYDEBUG(977, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy941; - if (yych <= '6') goto yy940; + if (yych <= '5') goto yy986; + if (yych <= '6') goto yy985; goto yy55; -yy933: - YYDEBUG(933, *YYCURSOR); +yy978: + YYDEBUG(978, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy912; - if (yych == 'e') goto yy912; + if (yych == 'E') goto yy957; + if (yych == 'e') goto yy957; goto yy55; -yy934: - YYDEBUG(934, *YYCURSOR); +yy979: + YYDEBUG(979, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy909; - if (yych == 'a') goto yy909; + if (yych == 'A') goto yy954; + if (yych == 'a') goto yy954; goto yy55; -yy935: - YYDEBUG(935, *YYCURSOR); +yy980: + YYDEBUG(980, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy939; - if (yych == 'e') goto yy939; + if (yych == 'E') goto yy984; + if (yych == 'e') goto yy984; goto yy55; -yy936: - YYDEBUG(936, *YYCURSOR); +yy981: + YYDEBUG(981, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy877; - if (yych == 'e') goto yy877; + if (yych == 'E') goto yy922; + if (yych == 'e') goto yy922; goto yy55; -yy937: - YYDEBUG(937, *YYCURSOR); +yy982: + YYDEBUG(982, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; -yy938: - YYDEBUG(938, *YYCURSOR); +yy983: + YYDEBUG(983, *YYCURSOR); switch (yych) { case '\t': case ' ': case '-': - case '.': goto yy937; + case '.': goto yy982; case 'A': - case 'a': goto yy799; + case 'a': goto yy844; case 'D': - case 'd': goto yy936; + case 'd': goto yy981; case 'F': - case 'f': goto yy933; - case 'I': goto yy792; + case 'f': goto yy978; + case 'I': goto yy837; case 'J': - case 'j': goto yy796; + case 'j': goto yy841; case 'M': - case 'm': goto yy934; + case 'm': goto yy979; case 'N': - case 'n': goto yy802; + case 'n': goto yy847; case 'O': - case 'o': goto yy801; + case 'o': goto yy846; case 'S': - case 's': goto yy935; - case 'V': goto yy794; - case 'X': goto yy795; + case 's': goto yy980; + case 'V': goto yy839; + case 'X': goto yy840; default: goto yy55; } -yy939: - YYDEBUG(939, *YYCURSOR); +yy984: + YYDEBUG(984, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy896; - if (yych == 'p') goto yy896; + if (yych == 'P') goto yy941; + if (yych == 'p') goto yy941; goto yy55; -yy940: - YYDEBUG(940, *YYCURSOR); +yy985: + YYDEBUG(985, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '6') goto yy942; + if (yych <= '6') goto yy987; goto yy55; -yy941: - YYDEBUG(941, *YYCURSOR); +yy986: + YYDEBUG(986, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy942: - YYDEBUG(942, *YYCURSOR); +yy987: + YYDEBUG(987, *YYCURSOR); yych = *++YYCURSOR; - goto yy821; -yy943: - YYDEBUG(943, *YYCURSOR); + goto yy866; +yy988: + YYDEBUG(988, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy942; + if (yych <= '9') goto yy987; goto yy55; -yy944: - YYDEBUG(944, *YYCURSOR); +yy989: + YYDEBUG(989, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy942; + if (yych <= '9') goto yy987; goto yy55; -yy945: - YYDEBUG(945, *YYCURSOR); +yy990: + YYDEBUG(990, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '0') goto yy55; - if (yych <= '9') goto yy942; + if (yych <= '9') goto yy987; goto yy55; -yy946: - YYDEBUG(946, *YYCURSOR); +yy991: + YYDEBUG(991, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') goto yy55; - if (yych <= '/') goto yy949; - if (yych <= '9') goto yy957; + if (yych <= '/') goto yy994; + if (yych <= '9') goto yy1002; goto yy55; -yy947: - YYDEBUG(947, *YYCURSOR); +yy992: + YYDEBUG(992, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') goto yy55; - if (yych <= '/') goto yy949; - if (yych <= '2') goto yy957; + if (yych <= '/') goto yy994; + if (yych <= '2') goto yy1002; goto yy55; -yy948: - YYDEBUG(948, *YYCURSOR); +yy993: + YYDEBUG(993, *YYCURSOR); yych = *++YYCURSOR; if (yych != '/') goto yy55; -yy949: - YYDEBUG(949, *YYCURSOR); +yy994: + YYDEBUG(994, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '2') goto yy950; - if (yych <= '3') goto yy951; - if (yych <= '9') goto yy952; + if (yych <= '2') goto yy995; + if (yych <= '3') goto yy996; + if (yych <= '9') goto yy997; goto yy55; -yy950: - YYDEBUG(950, *YYCURSOR); - yyaccept = 20; +yy995: + YYDEBUG(995, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy430; - if (yych <= '9') goto yy952; - if (yych <= 'm') goto yy430; - goto yy954; + if (yych <= '/') goto yy461; + if (yych <= '9') goto yy997; + if (yych <= 'm') goto yy461; + goto yy999; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy955; + if (yych <= 'q') goto yy461; + goto yy1000; } else { - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } } -yy951: - YYDEBUG(951, *YYCURSOR); - yyaccept = 20; +yy996: + YYDEBUG(996, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy430; - if (yych <= '1') goto yy952; - if (yych <= 'm') goto yy430; - goto yy954; + if (yych <= '/') goto yy461; + if (yych <= '1') goto yy997; + if (yych <= 'm') goto yy461; + goto yy999; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy955; + if (yych <= 'q') goto yy461; + goto yy1000; } else { - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } } -yy952: - YYDEBUG(952, *YYCURSOR); - yyaccept = 20; +yy997: + YYDEBUG(997, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy954; - goto yy430; + if (yych == 'n') goto yy999; + goto yy461; } else { - if (yych <= 'r') goto yy955; - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 'r') goto yy1000; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } -yy953: - YYDEBUG(953, *YYCURSOR); +yy998: + YYDEBUG(998, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 't') goto yy429; + if (yych == 't') goto yy460; goto yy55; -yy954: - YYDEBUG(954, *YYCURSOR); +yy999: + YYDEBUG(999, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy429; + if (yych == 'd') goto yy460; goto yy55; -yy955: - YYDEBUG(955, *YYCURSOR); +yy1000: + YYDEBUG(1000, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy429; + if (yych == 'd') goto yy460; goto yy55; -yy956: - YYDEBUG(956, *YYCURSOR); +yy1001: + YYDEBUG(1001, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'h') goto yy429; + if (yych == 'h') goto yy460; goto yy55; -yy957: - YYDEBUG(957, *YYCURSOR); +yy1002: + YYDEBUG(1002, *YYCURSOR); yych = *++YYCURSOR; if (yych != '/') goto yy55; - YYDEBUG(958, *YYCURSOR); + YYDEBUG(1003, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy55; - if (yych >= '1') goto yy960; + if (yych >= '1') goto yy1005; } else { - if (yych <= '3') goto yy961; - if (yych <= '9') goto yy952; + if (yych <= '3') goto yy1006; + if (yych <= '9') goto yy997; goto yy55; } - YYDEBUG(959, *YYCURSOR); - yyaccept = 20; + YYDEBUG(1004, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy430; - if (yych <= '9') goto yy962; - if (yych <= 'm') goto yy430; - goto yy954; + if (yych <= '/') goto yy461; + if (yych <= '9') goto yy1007; + if (yych <= 'm') goto yy461; + goto yy999; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy955; + if (yych <= 'q') goto yy461; + goto yy1000; } else { - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } } -yy960: - YYDEBUG(960, *YYCURSOR); - yyaccept = 20; +yy1005: + YYDEBUG(1005, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy430; - if (yych <= '9') goto yy962; - if (yych <= 'm') goto yy430; - goto yy954; + if (yych <= '/') goto yy461; + if (yych <= '9') goto yy1007; + if (yych <= 'm') goto yy461; + goto yy999; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy955; + if (yych <= 'q') goto yy461; + goto yy1000; } else { - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } } -yy961: - YYDEBUG(961, *YYCURSOR); - yyaccept = 20; +yy1006: + YYDEBUG(1006, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy430; - if (yych <= '1') goto yy962; - if (yych <= 'm') goto yy430; - goto yy954; + if (yych <= '/') goto yy461; + if (yych <= '1') goto yy1007; + if (yych <= 'm') goto yy461; + goto yy999; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy955; + if (yych <= 'q') goto yy461; + goto yy1000; } else { - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } } -yy962: - YYDEBUG(962, *YYCURSOR); - yyaccept = 20; +yy1007: + YYDEBUG(1007, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == '/') goto yy429; - if (yych <= 'm') goto yy430; - goto yy954; + if (yych == '/') goto yy460; + if (yych <= 'm') goto yy461; + goto yy999; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy955; + if (yych <= 'q') goto yy461; + goto yy1000; } else { - if (yych <= 's') goto yy953; - if (yych <= 't') goto yy956; - goto yy430; + if (yych <= 's') goto yy998; + if (yych <= 't') goto yy1001; + goto yy461; } } -yy963: - YYDEBUG(963, *YYCURSOR); +yy1008: + YYDEBUG(1008, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy1043; + if (yych == 'A') goto yy1103; if (yych <= 'T') goto yy55; - goto yy1042; + goto yy1102; } else { if (yych <= 'a') { if (yych <= '`') goto yy55; - goto yy1043; + goto yy1103; } else { - if (yych == 'u') goto yy1042; + if (yych == 'u') goto yy1102; goto yy55; } } -yy964: - YYDEBUG(964, *YYCURSOR); +yy1009: + YYDEBUG(1009, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1040; - if (yych == 'e') goto yy1040; + if (yych == 'E') goto yy1100; + if (yych == 'e') goto yy1100; goto yy55; -yy965: - YYDEBUG(965, *YYCURSOR); +yy1010: + YYDEBUG(1010, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1037; - if (yych == 'a') goto yy1037; + if (yych == 'A') goto yy1097; + if (yych == 'a') goto yy1097; goto yy55; -yy966: - YYDEBUG(966, *YYCURSOR); +yy1011: + YYDEBUG(1011, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'P') goto yy1034; + if (yych == 'P') goto yy1094; if (yych <= 'T') goto yy55; - goto yy1033; + goto yy1093; } else { if (yych <= 'p') { if (yych <= 'o') goto yy55; - goto yy1034; + goto yy1094; } else { - if (yych == 'u') goto yy1033; + if (yych == 'u') goto yy1093; goto yy55; } } -yy967: - YYDEBUG(967, *YYCURSOR); +yy1012: + YYDEBUG(1012, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1030; - if (yych == 'e') goto yy1030; + if (yych == 'E') goto yy1090; + if (yych == 'e') goto yy1090; goto yy55; -yy968: - YYDEBUG(968, *YYCURSOR); +yy1013: + YYDEBUG(1013, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1028; - if (yych == 'c') goto yy1028; + if (yych == 'C') goto yy1088; + if (yych == 'c') goto yy1088; goto yy55; -yy969: - YYDEBUG(969, *YYCURSOR); +yy1014: + YYDEBUG(1014, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1026; - if (yych == 'o') goto yy1026; + if (yych == 'O') goto yy1086; + if (yych == 'o') goto yy1086; goto yy55; -yy970: - YYDEBUG(970, *YYCURSOR); +yy1015: + YYDEBUG(1015, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1024; - if (yych == 'e') goto yy1024; + if (yych == 'E') goto yy1084; + if (yych == 'e') goto yy1084; goto yy55; -yy971: - YYDEBUG(971, *YYCURSOR); +yy1016: + YYDEBUG(1016, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '0') goto yy810; - if (yych <= '4') goto yy811; - if (yych <= '5') goto yy812; + if (yych <= '0') goto yy855; + if (yych <= '4') goto yy856; + if (yych <= '5') goto yy857; goto yy55; -yy972: - YYDEBUG(972, *YYCURSOR); - yyaccept = 21; +yy1017: + YYDEBUG(1017, *YYCURSOR); + yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy976; - if (yych <= '/') goto yy973; - if (yych <= '9') goto yy995; -yy973: - YYDEBUG(973, *YYCURSOR); -#line 1414 "ext/date/lib/parse_date.re" + if (yych <= '/') { + if (yych == '-') goto yy1023; + } else { + if (yych <= '0') goto yy1082; + if (yych <= '9') goto yy1083; + } +yy1018: + YYDEBUG(1018, *YYCURSOR); +#line 1457 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshorter"); @@ -14532,716 +14946,831 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 14534 "" -yy974: - YYDEBUG(974, *YYCURSOR); - yyaccept = 21; +#line 14950 "" +yy1019: + YYDEBUG(1019, *YYCURSOR); + yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy976; - if (yych <= '/') goto yy973; - if (yych <= '2') goto yy995; - goto yy973; -yy975: - YYDEBUG(975, *YYCURSOR); - yyaccept = 21; + if (yych <= '/') { + if (yych == '-') goto yy1023; + goto yy1018; + } else { + if (yych <= '2') goto yy1042; + if (yych <= '9') goto yy988; + goto yy1018; + } +yy1020: + YYDEBUG(1020, *YYCURSOR); + yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '-') goto yy973; -yy976: - YYDEBUG(976, *YYCURSOR); + if (yych == '-') goto yy1023; + if (yych <= '/') goto yy1018; + if (yych <= '9') goto yy988; + goto yy1018; +yy1021: + YYDEBUG(1021, *YYCURSOR); + yyaccept = 22; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') { + if (yych == '-') goto yy1023; + goto yy1018; + } else { + if (yych <= '5') goto yy986; + if (yych <= '6') goto yy985; + goto yy1018; + } +yy1022: + YYDEBUG(1022, *YYCURSOR); + yyaccept = 22; + yych = *(YYMARKER = ++YYCURSOR); + if (yych != '-') goto yy1018; +yy1023: + YYDEBUG(1023, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '2') goto yy977; - if (yych <= '3') goto yy978; - if (yych <= '9') goto yy979; + if (yych <= '2') goto yy1024; + if (yych <= '3') goto yy1025; + if (yych <= '9') goto yy1026; goto yy55; -yy977: - YYDEBUG(977, *YYCURSOR); +yy1024: + YYDEBUG(1024, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { - if (yych <= '/') goto yy656; - goto yy979; + if (yych <= '/') goto yy690; + goto yy1026; } else { - if (yych == 'T') goto yy984; - goto yy656; + if (yych == 'T') goto yy1031; + goto yy690; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy981; - if (yych <= 'q') goto yy656; - goto yy982; + if (yych <= 'n') goto yy1028; + if (yych <= 'q') goto yy690; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy656; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy690; } } -yy978: - YYDEBUG(978, *YYCURSOR); - yyaccept = 12; +yy1025: + YYDEBUG(1025, *YYCURSOR); + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '1') { - if (yych <= '/') goto yy656; + if (yych <= '/') goto yy690; } else { - if (yych == 'T') goto yy984; - goto yy656; + if (yych == 'T') goto yy1031; + goto yy690; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy981; - if (yych <= 'q') goto yy656; - goto yy982; + if (yych <= 'n') goto yy1028; + if (yych <= 'q') goto yy690; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy656; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy690; } } -yy979: - YYDEBUG(979, *YYCURSOR); +yy1026: + YYDEBUG(1026, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == 'T') goto yy984; - if (yych <= 'm') goto yy656; - goto yy981; + if (yych == 'T') goto yy1031; + if (yych <= 'm') goto yy690; + goto yy1028; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy982; + if (yych <= 'q') goto yy690; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy656; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy690; } } -yy980: - YYDEBUG(980, *YYCURSOR); +yy1027: + YYDEBUG(1027, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 't') goto yy994; + if (yych == 't') goto yy1041; goto yy55; -yy981: - YYDEBUG(981, *YYCURSOR); +yy1028: + YYDEBUG(1028, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy994; + if (yych == 'd') goto yy1041; goto yy55; -yy982: - YYDEBUG(982, *YYCURSOR); +yy1029: + YYDEBUG(1029, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'd') goto yy994; + if (yych == 'd') goto yy1041; goto yy55; -yy983: - YYDEBUG(983, *YYCURSOR); +yy1030: + YYDEBUG(1030, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'h') goto yy994; + if (yych == 'h') goto yy1041; goto yy55; -yy984: - YYDEBUG(984, *YYCURSOR); +yy1031: + YYDEBUG(1031, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy985; - if (yych <= '2') goto yy986; - if (yych <= '9') goto yy987; + if (yych <= '1') goto yy1032; + if (yych <= '2') goto yy1033; + if (yych <= '9') goto yy1034; goto yy55; -yy985: - YYDEBUG(985, *YYCURSOR); +yy1032: + YYDEBUG(1032, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy987; - if (yych <= ':') goto yy988; + if (yych <= '9') goto yy1034; + if (yych <= ':') goto yy1035; goto yy55; -yy986: - YYDEBUG(986, *YYCURSOR); +yy1033: + YYDEBUG(1033, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '4') goto yy987; - if (yych == ':') goto yy988; + if (yych <= '4') goto yy1034; + if (yych == ':') goto yy1035; goto yy55; -yy987: - YYDEBUG(987, *YYCURSOR); +yy1034: + YYDEBUG(1034, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; -yy988: - YYDEBUG(988, *YYCURSOR); +yy1035: + YYDEBUG(1035, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy989; - if (yych <= '9') goto yy990; + if (yych <= '5') goto yy1036; + if (yych <= '9') goto yy1037; goto yy55; -yy989: - YYDEBUG(989, *YYCURSOR); +yy1036: + YYDEBUG(1036, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy990; - if (yych <= ':') goto yy991; + if (yych <= '9') goto yy1037; + if (yych <= ':') goto yy1038; goto yy55; -yy990: - YYDEBUG(990, *YYCURSOR); +yy1037: + YYDEBUG(1037, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; -yy991: - YYDEBUG(991, *YYCURSOR); +yy1038: + YYDEBUG(1038, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy992; - if (yych <= '6') goto yy993; - if (yych <= '9') goto yy841; + if (yych <= '5') goto yy1039; + if (yych <= '6') goto yy1040; + if (yych <= '9') goto yy886; goto yy55; -yy992: - YYDEBUG(992, *YYCURSOR); +yy1039: + YYDEBUG(1039, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '9') goto yy841; - goto yy842; -yy993: - YYDEBUG(993, *YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '9') goto yy886; + goto yy887; +yy1040: + YYDEBUG(1040, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '0') goto yy841; - goto yy842; -yy994: - YYDEBUG(994, *YYCURSOR); + if (yych == '0') goto yy886; + goto yy887; +yy1041: + YYDEBUG(1041, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'T') goto yy984; - goto yy656; -yy995: - YYDEBUG(995, *YYCURSOR); - yyaccept = 21; + if (yych == 'T') goto yy1031; + goto yy690; +yy1042: + YYDEBUG(1042, *YYCURSOR); + yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '-') goto yy973; - YYDEBUG(996, *YYCURSOR); + if (yych == '-') goto yy1043; + if (yych <= '/') goto yy1018; + if (yych <= '9') goto yy987; + goto yy1018; +yy1043: + YYDEBUG(1043, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy55; - if (yych >= '1') goto yy998; + if (yych >= '1') goto yy1045; } else { - if (yych <= '3') goto yy999; - if (yych <= '9') goto yy979; + if (yych <= '3') goto yy1046; + if (yych <= '9') goto yy1026; goto yy55; } - YYDEBUG(997, *YYCURSOR); + YYDEBUG(1044, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { - if (yych <= '/') goto yy656; - goto yy1000; + if (yych <= '/') goto yy690; + goto yy1047; } else { - if (yych == 'T') goto yy984; - goto yy656; + if (yych == 'T') goto yy1031; + goto yy690; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy981; - if (yych <= 'q') goto yy656; - goto yy982; + if (yych <= 'n') goto yy1028; + if (yych <= 'q') goto yy690; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy656; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy690; } } -yy998: - YYDEBUG(998, *YYCURSOR); +yy1045: + YYDEBUG(1045, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { - if (yych <= '/') goto yy656; - goto yy1000; + if (yych <= '/') goto yy690; + goto yy1047; } else { - if (yych == 'T') goto yy984; - goto yy656; + if (yych == 'T') goto yy1031; + goto yy690; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy981; - if (yych <= 'q') goto yy656; - goto yy982; + if (yych <= 'n') goto yy1028; + if (yych <= 'q') goto yy690; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy656; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy690; } } -yy999: - YYDEBUG(999, *YYCURSOR); +yy1046: + YYDEBUG(1046, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '1') { - if (yych <= '/') goto yy656; + if (yych <= '/') goto yy690; } else { - if (yych == 'T') goto yy984; - goto yy656; + if (yych == 'T') goto yy1031; + goto yy690; } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy981; - if (yych <= 'q') goto yy656; - goto yy982; + if (yych <= 'n') goto yy1028; + if (yych <= 'q') goto yy690; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy656; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy690; } } -yy1000: - YYDEBUG(1000, *YYCURSOR); - yyaccept = 20; +yy1047: + YYDEBUG(1047, *YYCURSOR); + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych == 'T') goto yy1001; - if (yych <= 'm') goto yy430; - goto yy981; + if (yych == 'T') goto yy1048; + if (yych <= 'm') goto yy461; + goto yy1028; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy430; - goto yy982; + if (yych <= 'q') goto yy461; + goto yy1029; } else { - if (yych <= 's') goto yy980; - if (yych <= 't') goto yy983; - goto yy430; + if (yych <= 's') goto yy1027; + if (yych <= 't') goto yy1030; + goto yy461; } } -yy1001: - YYDEBUG(1001, *YYCURSOR); +yy1048: + YYDEBUG(1048, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy1002; - if (yych <= '2') goto yy1003; - if (yych <= '9') goto yy987; + if (yych <= '1') goto yy1049; + if (yych <= '2') goto yy1050; + if (yych <= '9') goto yy1034; goto yy55; -yy1002: - YYDEBUG(1002, *YYCURSOR); +yy1049: + YYDEBUG(1049, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy1004; - if (yych <= ':') goto yy988; + if (yych <= '9') goto yy1051; + if (yych <= ':') goto yy1035; goto yy55; -yy1003: - YYDEBUG(1003, *YYCURSOR); +yy1050: + YYDEBUG(1050, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '4') goto yy1004; - if (yych == ':') goto yy988; + if (yych <= '4') goto yy1051; + if (yych == ':') goto yy1035; goto yy55; -yy1004: - YYDEBUG(1004, *YYCURSOR); +yy1051: + YYDEBUG(1051, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(1005, *YYCURSOR); + YYDEBUG(1052, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy1006; - if (yych <= '9') goto yy990; + if (yych <= '5') goto yy1053; + if (yych <= '9') goto yy1037; goto yy55; -yy1006: - YYDEBUG(1006, *YYCURSOR); +yy1053: + YYDEBUG(1053, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy1007; - if (yych <= ':') goto yy991; + if (yych <= '9') goto yy1054; + if (yych <= ':') goto yy1038; goto yy55; -yy1007: - YYDEBUG(1007, *YYCURSOR); +yy1054: + YYDEBUG(1054, *YYCURSOR); yych = *++YYCURSOR; if (yych != ':') goto yy55; - YYDEBUG(1008, *YYCURSOR); + YYDEBUG(1055, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy1009; - if (yych <= '6') goto yy1010; - if (yych <= '9') goto yy841; + if (yych <= '5') goto yy1056; + if (yych <= '6') goto yy1057; + if (yych <= '9') goto yy886; goto yy55; -yy1009: - YYDEBUG(1009, *YYCURSOR); +yy1056: + YYDEBUG(1056, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '9') goto yy1011; - goto yy842; -yy1010: - YYDEBUG(1010, *YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '9') goto yy1058; + goto yy887; +yy1057: + YYDEBUG(1057, *YYCURSOR); yych = *++YYCURSOR; - if (yych != '0') goto yy842; -yy1011: - YYDEBUG(1011, *YYCURSOR); - yyaccept = 22; + if (yych != '0') goto yy887; +yy1058: + YYDEBUG(1058, *YYCURSOR); + yyaccept = 23; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '.') goto yy842; - YYDEBUG(1012, *YYCURSOR); + if (yych != '.') goto yy887; + YYDEBUG(1059, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy1013: - YYDEBUG(1013, *YYCURSOR); - yyaccept = 22; +yy1060: + YYDEBUG(1060, *YYCURSOR); + yyaccept = 23; YYMARKER = ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); + if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; - YYDEBUG(1014, *YYCURSOR); + YYDEBUG(1061, *YYCURSOR); if (yych <= '-') { - if (yych == '+') goto yy1016; - if (yych <= ',') goto yy842; - goto yy1016; + if (yych == '+') goto yy1063; + if (yych <= ',') goto yy887; + goto yy1063; } else { if (yych <= '9') { - if (yych <= '/') goto yy842; - goto yy1013; + if (yych <= '/') goto yy887; + goto yy1060; } else { - if (yych != 'G') goto yy842; + if (yych != 'G') goto yy887; } } - YYDEBUG(1015, *YYCURSOR); + YYDEBUG(1062, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy1022; + if (yych == 'M') goto yy1080; goto yy55; -yy1016: - YYDEBUG(1016, *YYCURSOR); +yy1063: + YYDEBUG(1063, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy1017; - if (yych <= '2') goto yy1018; - if (yych <= '9') goto yy1019; + if (yych <= '1') goto yy1064; + if (yych <= '2') goto yy1065; + if (yych <= '9') goto yy1066; goto yy55; -yy1017: - YYDEBUG(1017, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '9') goto yy1019; - if (yych <= ':') goto yy1020; - goto yy842; -yy1018: - YYDEBUG(1018, *YYCURSOR); - yych = *++YYCURSOR; +yy1064: + YYDEBUG(1064, *YYCURSOR); + yyaccept = 23; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '9') goto yy1069; + if (yych <= ':') goto yy1067; + goto yy887; +yy1065: + YYDEBUG(1065, *YYCURSOR); + yyaccept = 23; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '5') { - if (yych <= '/') goto yy842; - if (yych >= '5') goto yy1021; + if (yych <= '/') goto yy887; + if (yych <= '4') goto yy1069; + goto yy1068; } else { - if (yych <= '9') goto yy841; - if (yych <= ':') goto yy1020; - goto yy842; + if (yych <= '9') goto yy886; + if (yych <= ':') goto yy1067; + goto yy887; } -yy1019: - YYDEBUG(1019, *YYCURSOR); +yy1066: + YYDEBUG(1066, *YYCURSOR); + yyaccept = 23; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '5') goto yy1068; + if (yych <= '9') goto yy886; + if (yych >= ';') goto yy887; +yy1067: + YYDEBUG(1067, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '5') goto yy1021; - if (yych <= '9') goto yy841; - if (yych >= ';') goto yy842; -yy1020: - YYDEBUG(1020, *YYCURSOR); + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy1068; + if (yych <= '9') goto yy886; + goto yy55; +yy1068: + YYDEBUG(1068, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '5') goto yy1021; - if (yych <= '9') goto yy841; - goto yy842; -yy1021: - YYDEBUG(1021, *YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '9') goto yy886; + goto yy887; +yy1069: + YYDEBUG(1069, *YYCURSOR); + yyaccept = 23; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '5') goto yy1070; + if (yych <= '9') goto yy886; + if (yych <= ':') goto yy1071; + goto yy887; +yy1070: + YYDEBUG(1070, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy842; - if (yych <= '9') goto yy841; - goto yy842; -yy1022: - YYDEBUG(1022, *YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '9') goto yy1077; + goto yy887; +yy1071: + YYDEBUG(1071, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy1072; + if (yych <= '9') goto yy886; + goto yy55; +yy1072: + YYDEBUG(1072, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy887; + if (yych >= ':') goto yy887; + YYDEBUG(1073, *YYCURSOR); + yyaccept = 23; + yych = *(YYMARKER = ++YYCURSOR); + if (yych != ':') goto yy887; + YYDEBUG(1074, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '5') goto yy1075; + if (yych <= '6') goto yy1076; + goto yy55; +yy1075: + YYDEBUG(1075, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy886; + goto yy55; +yy1076: + YYDEBUG(1076, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy886; + goto yy55; +yy1077: + YYDEBUG(1077, *YYCURSOR); + yyaccept = 23; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= '/') goto yy887; + if (yych <= '5') goto yy1078; + if (yych <= '6') goto yy1079; + goto yy887; +yy1078: + YYDEBUG(1078, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy55; + if (yych <= '9') goto yy886; + goto yy55; +yy1079: + YYDEBUG(1079, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == '0') goto yy886; + goto yy55; +yy1080: + YYDEBUG(1080, *YYCURSOR); yych = *++YYCURSOR; if (yych != 'T') goto yy55; - YYDEBUG(1023, *YYCURSOR); + YYDEBUG(1081, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '+') goto yy1016; - if (yych == '-') goto yy1016; + if (yych == '+') goto yy1063; + if (yych == '-') goto yy1063; goto yy55; -yy1024: - YYDEBUG(1024, *YYCURSOR); +yy1082: + YYDEBUG(1082, *YYCURSOR); + yyaccept = 22; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '-') goto yy1043; + if (yych <= '0') goto yy1018; + if (yych <= '9') goto yy987; + goto yy1018; +yy1083: + YYDEBUG(1083, *YYCURSOR); + yyaccept = 22; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '-') goto yy1043; + if (yych <= '/') goto yy1018; + if (yych <= '9') goto yy987; + goto yy1018; +yy1084: + YYDEBUG(1084, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1025; + if (yych == 'C') goto yy1085; if (yych != 'c') goto yy55; -yy1025: - YYDEBUG(1025, *YYCURSOR); - yyaccept = 19; +yy1085: + YYDEBUG(1085, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'E') goto yy879; - if (yych == 'e') goto yy879; - goto yy793; + if (yych <= 'E') goto yy924; + if (yych == 'e') goto yy924; + goto yy838; } -yy1026: - YYDEBUG(1026, *YYCURSOR); +yy1086: + YYDEBUG(1086, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'V') goto yy1027; + if (yych == 'V') goto yy1087; if (yych != 'v') goto yy55; -yy1027: - YYDEBUG(1027, *YYCURSOR); - yyaccept = 19; +yy1087: + YYDEBUG(1087, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'E') goto yy886; - if (yych == 'e') goto yy886; - goto yy793; + if (yych <= 'E') goto yy931; + if (yych == 'e') goto yy931; + goto yy838; } -yy1028: - YYDEBUG(1028, *YYCURSOR); +yy1088: + YYDEBUG(1088, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1029; + if (yych == 'T') goto yy1089; if (yych != 't') goto yy55; -yy1029: - YYDEBUG(1029, *YYCURSOR); - yyaccept = 19; +yy1089: + YYDEBUG(1089, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'O') goto yy892; - if (yych == 'o') goto yy892; - goto yy793; + if (yych <= 'O') goto yy937; + if (yych == 'o') goto yy937; + goto yy838; } -yy1030: - YYDEBUG(1030, *YYCURSOR); +yy1090: + YYDEBUG(1090, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'P') goto yy1031; + if (yych == 'P') goto yy1091; if (yych != 'p') goto yy55; -yy1031: - YYDEBUG(1031, *YYCURSOR); - yyaccept = 19; +yy1091: + YYDEBUG(1091, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'T') goto yy1032; - if (yych != 't') goto yy793; + if (yych <= 'T') goto yy1092; + if (yych != 't') goto yy838; } -yy1032: - YYDEBUG(1032, *YYCURSOR); - yyaccept = 19; +yy1092: + YYDEBUG(1092, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'E') goto yy898; - if (yych == 'e') goto yy898; - goto yy793; + if (yych <= 'E') goto yy943; + if (yych == 'e') goto yy943; + goto yy838; } -yy1033: - YYDEBUG(1033, *YYCURSOR); +yy1093: + YYDEBUG(1093, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy1036; - if (yych == 'g') goto yy1036; + if (yych == 'G') goto yy1096; + if (yych == 'g') goto yy1096; goto yy55; -yy1034: - YYDEBUG(1034, *YYCURSOR); +yy1094: + YYDEBUG(1094, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy1035; + if (yych == 'R') goto yy1095; if (yych != 'r') goto yy55; -yy1035: - YYDEBUG(1035, *YYCURSOR); - yyaccept = 19; +yy1095: + YYDEBUG(1095, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'H') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'I') goto yy905; - if (yych == 'i') goto yy905; - goto yy793; + if (yych <= 'I') goto yy950; + if (yych == 'i') goto yy950; + goto yy838; } -yy1036: - YYDEBUG(1036, *YYCURSOR); - yyaccept = 19; +yy1096: + YYDEBUG(1096, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'U') goto yy907; - if (yych == 'u') goto yy907; - goto yy793; + if (yych <= 'U') goto yy952; + if (yych == 'u') goto yy952; + goto yy838; } -yy1037: - YYDEBUG(1037, *YYCURSOR); +yy1097: + YYDEBUG(1097, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy1038; + if (yych == 'R') goto yy1098; if (yych <= 'X') goto yy55; - goto yy1039; + goto yy1099; } else { if (yych <= 'r') { if (yych <= 'q') goto yy55; } else { - if (yych == 'y') goto yy1039; + if (yych == 'y') goto yy1099; goto yy55; } } -yy1038: - YYDEBUG(1038, *YYCURSOR); - yyaccept = 19; +yy1098: + YYDEBUG(1098, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'C') goto yy911; - if (yych == 'c') goto yy911; - goto yy793; + if (yych <= 'C') goto yy956; + if (yych == 'c') goto yy956; + goto yy838; } -yy1039: - YYDEBUG(1039, *YYCURSOR); - yyaccept = 19; +yy1099: + YYDEBUG(1099, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy766; - goto yy793; -yy1040: - YYDEBUG(1040, *YYCURSOR); + if (yych == '-') goto yy811; + goto yy838; +yy1100: + YYDEBUG(1100, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'B') goto yy1041; + if (yych == 'B') goto yy1101; if (yych != 'b') goto yy55; -yy1041: - YYDEBUG(1041, *YYCURSOR); - yyaccept = 19; +yy1101: + YYDEBUG(1101, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'R') goto yy914; - if (yych == 'r') goto yy914; - goto yy793; + if (yych <= 'R') goto yy959; + if (yych == 'r') goto yy959; + goto yy838; } -yy1042: - YYDEBUG(1042, *YYCURSOR); +yy1102: + YYDEBUG(1102, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'L') goto yy1046; + if (yych == 'L') goto yy1106; if (yych <= 'M') goto yy55; - goto yy1045; + goto yy1105; } else { if (yych <= 'l') { if (yych <= 'k') goto yy55; - goto yy1046; + goto yy1106; } else { - if (yych == 'n') goto yy1045; + if (yych == 'n') goto yy1105; goto yy55; } } -yy1043: - YYDEBUG(1043, *YYCURSOR); +yy1103: + YYDEBUG(1103, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1044; + if (yych == 'N') goto yy1104; if (yych != 'n') goto yy55; -yy1044: - YYDEBUG(1044, *YYCURSOR); - yyaccept = 19; +yy1104: + YYDEBUG(1104, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'U') goto yy921; - if (yych == 'u') goto yy921; - goto yy793; + if (yych <= 'U') goto yy966; + if (yych == 'u') goto yy966; + goto yy838; } -yy1045: - YYDEBUG(1045, *YYCURSOR); - yyaccept = 19; +yy1105: + YYDEBUG(1105, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'E') goto yy883; - if (yych == 'e') goto yy883; - goto yy793; + if (yych <= 'E') goto yy928; + if (yych == 'e') goto yy928; + goto yy838; } -yy1046: - YYDEBUG(1046, *YYCURSOR); - yyaccept = 19; +yy1106: + YYDEBUG(1106, *YYCURSOR); + yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { - if (yych == '-') goto yy766; - goto yy793; + if (yych == '-') goto yy811; + goto yy838; } else { - if (yych <= 'Y') goto yy883; - if (yych == 'y') goto yy883; - goto yy793; + if (yych <= 'Y') goto yy928; + if (yych == 'y') goto yy928; + goto yy838; } -yy1047: - YYDEBUG(1047, *YYCURSOR); +yy1107: + YYDEBUG(1107, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= '\t') { - if (yych <= 0x08) goto yy577; - goto yy730; + if (yych <= 0x08) goto yy611; + goto yy775; } else { - if (yych <= ',') goto yy577; - if (yych <= '-') goto yy731; - goto yy730; + if (yych <= ',') goto yy611; + if (yych <= '-') goto yy776; + goto yy775; } } else { if (yych <= 'U') { - if (yych <= '/') goto yy729; - if (yych <= 'T') goto yy577; - goto yy89; + if (yych <= '/') goto yy774; + if (yych <= 'T') goto yy611; + goto yy90; } else { - if (yych == 'u') goto yy89; - goto yy577; + if (yych == 'u') goto yy90; + goto yy611; } } -yy1048: - YYDEBUG(1048, *YYCURSOR); +yy1108: + YYDEBUG(1108, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'P') { - if (yych == 'C') goto yy131; + if (yych == 'C') goto yy135; if (yych <= 'O') goto yy55; - goto yy585; + goto yy619; } else { if (yych <= 'c') { if (yych <= 'b') goto yy55; - goto yy131; + goto yy135; } else { - if (yych == 'p') goto yy585; + if (yych == 'p') goto yy619; goto yy55; } } -yy1049: - YYDEBUG(1049, *YYCURSOR); +yy1109: + YYDEBUG(1109, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= ',') { - if (yych == '\t') goto yy1051; - goto yy1053; + if (yych == '\t') goto yy1111; + goto yy1113; } else { - if (yych <= '-') goto yy1050; - if (yych <= '.') goto yy730; - if (yych <= '/') goto yy729; - goto yy740; + if (yych <= '-') goto yy1110; + if (yych <= '.') goto yy775; + if (yych <= '/') goto yy774; + goto yy785; } } else { if (yych <= 'q') { - if (yych == 'n') goto yy469; - goto yy1053; + if (yych == 'n') goto yy503; + goto yy1113; } else { - if (yych <= 'r') goto yy470; - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy1053; + if (yych <= 'r') goto yy504; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy1113; } } -yy1050: - YYDEBUG(1050, *YYCURSOR); +yy1110: + YYDEBUG(1110, *YYCURSOR); yych = *++YYCURSOR; switch (yych) { - case '0': goto yy1054; - case '1': goto yy1055; + case '0': goto yy1114; + case '1': goto yy1115; case '2': case '3': case '4': @@ -15249,58 +15778,58 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) case '6': case '7': case '8': - case '9': goto yy617; + case '9': goto yy651; case 'A': - case 'a': goto yy621; + case 'a': goto yy655; case 'D': - case 'd': goto yy625; + case 'd': goto yy659; case 'F': - case 'f': goto yy619; + case 'f': goto yy653; case 'J': - case 'j': goto yy618; + case 'j': goto yy652; case 'M': - case 'm': goto yy620; + case 'm': goto yy654; case 'N': - case 'n': goto yy624; + case 'n': goto yy658; case 'O': - case 'o': goto yy623; + case 'o': goto yy657; case 'S': - case 's': goto yy622; - default: goto yy577; + case 's': goto yy656; + default: goto yy611; } -yy1051: - YYDEBUG(1051, *YYCURSOR); +yy1111: + YYDEBUG(1111, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy1053; - if (yych <= '0') goto yy735; - if (yych <= '1') goto yy736; - if (yych <= '9') goto yy737; - goto yy1053; -yy1052: - YYDEBUG(1052, *YYCURSOR); + if (yych <= '/') goto yy1113; + if (yych <= '0') goto yy780; + if (yych <= '1') goto yy781; + if (yych <= '9') goto yy782; + goto yy1113; +yy1112: + YYDEBUG(1112, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; -yy1053: - YYDEBUG(1053, *YYCURSOR); +yy1113: + YYDEBUG(1113, *YYCURSOR); if (yych <= 'W') { if (yych <= 'G') { if (yych <= '.') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1052; + if (yych == '\t') goto yy1112; goto yy55; } else { - if (yych <= ' ') goto yy1052; + if (yych <= ' ') goto yy1112; if (yych <= ',') goto yy55; - goto yy576; + goto yy610; } } else { if (yych <= 'C') { - if (yych == 'A') goto yy573; + if (yych == 'A') goto yy607; goto yy55; } else { - if (yych <= 'D') goto yy465; - if (yych == 'F') goto yy466; + if (yych <= 'D') goto yy499; + if (yych == 'F') goto yy500; goto yy55; } } @@ -15308,22 +15837,22 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'N') { if (yych <= 'J') { if (yych <= 'H') goto yy64; - if (yych <= 'I') goto yy474; - goto yy478; + if (yych <= 'I') goto yy508; + goto yy512; } else { if (yych <= 'L') goto yy55; - if (yych <= 'M') goto yy462; - goto yy481; + if (yych <= 'M') goto yy496; + goto yy515; } } else { if (yych <= 'S') { - if (yych <= 'O') goto yy480; + if (yych <= 'O') goto yy514; if (yych <= 'R') goto yy55; - goto yy463; + goto yy497; } else { if (yych <= 'T') goto yy69; if (yych <= 'U') goto yy62; - if (yych <= 'V') goto yy476; + if (yych <= 'V') goto yy510; goto yy68; } } @@ -15332,33 +15861,33 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych <= '`') { - if (yych <= 'X') goto yy477; + if (yych <= 'X') goto yy511; if (yych <= 'Y') goto yy67; goto yy55; } else { - if (yych <= 'a') goto yy573; + if (yych <= 'a') goto yy607; if (yych <= 'c') goto yy55; - goto yy465; + goto yy499; } } else { if (yych <= 'g') { - if (yych == 'f') goto yy466; + if (yych == 'f') goto yy500; goto yy55; } else { if (yych <= 'h') goto yy64; - if (yych == 'j') goto yy478; + if (yych == 'j') goto yy512; goto yy55; } } } else { if (yych <= 'u') { if (yych <= 'o') { - if (yych <= 'm') goto yy462; - if (yych <= 'n') goto yy481; - goto yy480; + if (yych <= 'm') goto yy496; + if (yych <= 'n') goto yy515; + goto yy514; } else { if (yych <= 'r') goto yy55; - if (yych <= 's') goto yy463; + if (yych <= 's') goto yy497; if (yych <= 't') goto yy69; goto yy62; } @@ -15374,215 +15903,215 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy1054: - YYDEBUG(1054, *YYCURSOR); +yy1114: + YYDEBUG(1114, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy55; - if (yych <= '-') goto yy654; - goto yy601; + if (yych <= '-') goto yy688; + goto yy635; } else { if (yych <= '/') goto yy55; - if (yych <= '9') goto yy1056; + if (yych <= '9') goto yy1116; goto yy55; } -yy1055: - YYDEBUG(1055, *YYCURSOR); +yy1115: + YYDEBUG(1115, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '.') { if (yych <= ',') goto yy55; - if (yych <= '-') goto yy654; - goto yy601; + if (yych <= '-') goto yy688; + goto yy635; } else { if (yych <= '/') goto yy55; if (yych >= '3') goto yy55; } -yy1056: - YYDEBUG(1056, *YYCURSOR); +yy1116: + YYDEBUG(1116, *YYCURSOR); yych = *++YYCURSOR; if (yych <= ',') goto yy55; - if (yych <= '-') goto yy1057; - if (yych <= '.') goto yy601; + if (yych <= '-') goto yy1117; + if (yych <= '.') goto yy635; goto yy55; -yy1057: - YYDEBUG(1057, *YYCURSOR); +yy1117: + YYDEBUG(1117, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy55; - if (yych >= '1') goto yy1059; + if (yych >= '1') goto yy1119; } else { - if (yych <= '3') goto yy1060; - if (yych <= '9') goto yy658; + if (yych <= '3') goto yy1120; + if (yych <= '9') goto yy692; goto yy55; } - YYDEBUG(1058, *YYCURSOR); + YYDEBUG(1118, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy1061; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy1121; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy1059: - YYDEBUG(1059, *YYCURSOR); +yy1119: + YYDEBUG(1119, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy656; - if (yych <= '9') goto yy1061; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '/') goto yy690; + if (yych <= '9') goto yy1121; + if (yych <= 'm') goto yy690; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy1060: - YYDEBUG(1060, *YYCURSOR); +yy1120: + YYDEBUG(1120, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '1') { - if (yych <= '/') goto yy656; + if (yych <= '/') goto yy690; } else { - if (yych <= '9') goto yy603; - if (yych <= 'm') goto yy656; - goto yy660; + if (yych <= '9') goto yy637; + if (yych <= 'm') goto yy690; + goto yy694; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy656; - goto yy661; + if (yych <= 'q') goto yy690; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy656; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy690; } } -yy1061: - YYDEBUG(1061, *YYCURSOR); - yyaccept = 14; +yy1121: + YYDEBUG(1121, *YYCURSOR); + yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy763; - if (yych <= '9') goto yy604; - if (yych <= 'm') goto yy763; - goto yy660; + if (yych <= '/') goto yy808; + if (yych <= '9') goto yy638; + if (yych <= 'm') goto yy808; + goto yy694; } else { if (yych <= 'r') { - if (yych <= 'q') goto yy763; - goto yy661; + if (yych <= 'q') goto yy808; + goto yy695; } else { - if (yych <= 's') goto yy659; - if (yych <= 't') goto yy662; - goto yy763; + if (yych <= 's') goto yy693; + if (yych <= 't') goto yy696; + goto yy808; } } -yy1062: - YYDEBUG(1062, *YYCURSOR); +yy1122: + YYDEBUG(1122, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= '-') { - if (yych == '\t') goto yy1051; - if (yych <= ',') goto yy1053; - goto yy1050; + if (yych == '\t') goto yy1111; + if (yych <= ',') goto yy1113; + goto yy1110; } else { - if (yych <= '.') goto yy1063; - if (yych <= '/') goto yy729; - if (yych <= '5') goto yy1065; - goto yy740; + if (yych <= '.') goto yy1123; + if (yych <= '/') goto yy774; + if (yych <= '5') goto yy1125; + goto yy785; } } else { if (yych <= 'q') { - if (yych <= ':') goto yy1064; - if (yych == 'n') goto yy469; - goto yy1053; + if (yych <= ':') goto yy1124; + if (yych == 'n') goto yy503; + goto yy1113; } else { - if (yych <= 'r') goto yy470; - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy1053; + if (yych <= 'r') goto yy504; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy1113; } } -yy1063: - YYDEBUG(1063, *YYCURSOR); +yy1123: + YYDEBUG(1123, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '1') { - if (yych <= '/') goto yy577; - if (yych <= '0') goto yy1087; - goto yy1088; + if (yych <= '/') goto yy611; + if (yych <= '0') goto yy1147; + goto yy1148; } else { - if (yych <= '5') goto yy1089; - if (yych <= '9') goto yy1090; - goto yy577; + if (yych <= '5') goto yy1149; + if (yych <= '9') goto yy1150; + goto yy611; } -yy1064: - YYDEBUG(1064, *YYCURSOR); +yy1124: + YYDEBUG(1124, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy1082; - if (yych <= '9') goto yy1083; + if (yych <= '5') goto yy1142; + if (yych <= '9') goto yy1143; goto yy55; -yy1065: - YYDEBUG(1065, *YYCURSOR); +yy1125: + YYDEBUG(1125, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '-') goto yy784; + if (yych == '-') goto yy829; if (yych <= '/') goto yy59; if (yych >= ':') goto yy59; - YYDEBUG(1066, *YYCURSOR); - yyaccept = 23; + YYDEBUG(1126, *YYCURSOR); + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '3') { if (yych <= '-') { if (yych <= 0x1F) { - if (yych == '\t') goto yy790; + if (yych == '\t') goto yy835; } else { - if (yych <= ' ') goto yy790; - if (yych >= '-') goto yy787; + if (yych <= ' ') goto yy835; + if (yych >= '-') goto yy832; } } else { if (yych <= '0') { - if (yych <= '.') goto yy791; - if (yych <= '/') goto yy788; - goto yy1068; + if (yych <= '.') goto yy836; + if (yych <= '/') goto yy833; + goto yy1128; } else { - if (yych <= '1') goto yy1069; - if (yych <= '2') goto yy1070; - goto yy1071; + if (yych <= '1') goto yy1129; + if (yych <= '2') goto yy1130; + goto yy1131; } } } else { if (yych <= 'A') { if (yych <= '9') { - if (yych <= '5') goto yy1072; - if (yych <= '6') goto yy1073; + if (yych <= '5') goto yy1132; + if (yych <= '6') goto yy1133; goto yy73; } else { - if (yych <= ':') goto yy806; - if (yych >= 'A') goto yy790; + if (yych <= ':') goto yy851; + if (yych >= 'A') goto yy835; } } else { if (yych <= 'E') { - if (yych == 'D') goto yy790; + if (yych == 'D') goto yy835; } else { - if (yych == 'G') goto yy1067; - if (yych <= 'J') goto yy790; + if (yych == 'G') goto yy1127; + if (yych <= 'J') goto yy835; } } } @@ -15590,42 +16119,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'h') { if (yych <= '`') { if (yych <= 'V') { - if (yych <= 'O') goto yy790; - if (yych >= 'S') goto yy790; + if (yych <= 'O') goto yy835; + if (yych >= 'S') goto yy835; } else { - if (yych <= 'W') goto yy809; - if (yych <= 'Y') goto yy790; + if (yych <= 'W') goto yy854; + if (yych <= 'Y') goto yy835; } } else { if (yych <= 'd') { - if (yych <= 'a') goto yy790; - if (yych >= 'd') goto yy790; + if (yych <= 'a') goto yy835; + if (yych >= 'd') goto yy835; } else { - if (yych == 'f') goto yy790; - if (yych >= 'h') goto yy790; + if (yych == 'f') goto yy835; + if (yych >= 'h') goto yy835; } } } else { if (yych <= 'u') { if (yych <= 'l') { - if (yych == 'j') goto yy790; + if (yych == 'j') goto yy835; } else { - if (yych <= 'o') goto yy790; - if (yych >= 's') goto yy790; + if (yych <= 'o') goto yy835; + if (yych >= 's') goto yy835; } } else { if (yych <= 'x') { - if (yych == 'w') goto yy790; + if (yych == 'w') goto yy835; } else { - if (yych <= 'y') goto yy790; - if (yych == 0xC2) goto yy790; + if (yych <= 'y') goto yy835; + if (yych == 0xC2) goto yy835; } } } } -yy1067: - YYDEBUG(1067, *YYCURSOR); -#line 1294 "ext/date/lib/parse_date.re" +yy1127: + YYDEBUG(1127, *YYCURSOR); +#line 1337 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnunocolon"); TIMELIB_INIT; @@ -15647,51 +16176,51 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } -#line 15649 "" -yy1068: - YYDEBUG(1068, *YYCURSOR); +#line 16180 "" +yy1128: + YYDEBUG(1128, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '0') goto yy1080; - if (yych <= '9') goto yy1081; + if (yych <= '0') goto yy1140; + if (yych <= '9') goto yy1141; goto yy59; -yy1069: - YYDEBUG(1069, *YYCURSOR); +yy1129: + YYDEBUG(1129, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '2') goto yy1079; - if (yych <= '9') goto yy1078; + if (yych <= '2') goto yy1139; + if (yych <= '9') goto yy1138; goto yy59; -yy1070: - YYDEBUG(1070, *YYCURSOR); +yy1130: + YYDEBUG(1130, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy1078; + if (yych <= '9') goto yy1138; goto yy59; -yy1071: - YYDEBUG(1071, *YYCURSOR); +yy1131: + YYDEBUG(1131, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '5') goto yy1076; - if (yych <= '6') goto yy1077; - if (yych <= '9') goto yy1074; + if (yych <= '5') goto yy1136; + if (yych <= '6') goto yy1137; + if (yych <= '9') goto yy1134; goto yy59; -yy1072: - YYDEBUG(1072, *YYCURSOR); +yy1132: + YYDEBUG(1132, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '9') goto yy1074; + if (yych <= '9') goto yy1134; goto yy59; -yy1073: - YYDEBUG(1073, *YYCURSOR); +yy1133: + YYDEBUG(1133, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy59; - if (yych <= '0') goto yy1074; + if (yych <= '0') goto yy1134; if (yych <= '9') goto yy74; goto yy59; -yy1074: - YYDEBUG(1074, *YYCURSOR); - yyaccept = 24; +yy1134: + YYDEBUG(1134, *YYCURSOR); + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { @@ -15707,7 +16236,7 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } else { if (yych <= 'L') { - if (yych == 'G') goto yy1075; + if (yych == 'G') goto yy1135; if (yych <= 'H') goto yy59; } else { if (yych <= 'R') { @@ -15745,9 +16274,9 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } } } -yy1075: - YYDEBUG(1075, *YYCURSOR); -#line 1340 "ext/date/lib/parse_date.re" +yy1135: + YYDEBUG(1135, *YYCURSOR); +#line 1383 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("iso8601nocolon"); @@ -15766,37 +16295,37 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 15768 "" -yy1076: - YYDEBUG(1076, *YYCURSOR); - yyaccept = 24; +#line 16299 "" +yy1136: + YYDEBUG(1136, *YYCURSOR); + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy59; - if (yych <= 0x1F) goto yy1075; + if (yych <= 0x1F) goto yy1135; goto yy59; } else { if (yych <= '9') { - if (yych <= '/') goto yy1075; - goto yy820; + if (yych <= '/') goto yy1135; + goto yy865; } else { if (yych == 'D') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy1075; + if (yych == 'G') goto yy1135; if (yych <= 'H') goto yy59; - goto yy1075; + goto yy1135; } else { if (yych <= 'R') { if (yych <= 'M') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'V') goto yy1075; + if (yych == 'V') goto yy1135; goto yy59; } } @@ -15805,72 +16334,72 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy59; - if (yych <= 'c') goto yy1075; + if (yych <= 'c') goto yy1135; goto yy59; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1075; + if (yych <= 'e') goto yy1135; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'v') goto yy1075; + if (yych == 'v') goto yy1135; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1075; + if (yych <= 'x') goto yy1135; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy1075; + goto yy1135; } } } } -yy1077: - YYDEBUG(1077, *YYCURSOR); - yyaccept = 24; +yy1137: + YYDEBUG(1137, *YYCURSOR); + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'D') { if (yych <= ' ') { if (yych == '\t') goto yy59; - if (yych <= 0x1F) goto yy1075; + if (yych <= 0x1F) goto yy1135; goto yy59; } else { if (yych <= '6') { - if (yych <= '/') goto yy1075; - goto yy820; + if (yych <= '/') goto yy1135; + goto yy865; } else { if (yych <= '9') goto yy75; - if (yych <= 'C') goto yy1075; + if (yych <= 'C') goto yy1135; goto yy59; } } } else { if (yych <= 'L') { if (yych <= 'F') { - if (yych <= 'E') goto yy1075; + if (yych <= 'E') goto yy1135; goto yy59; } else { if (yych == 'H') goto yy59; - goto yy1075; + goto yy1135; } } else { if (yych <= 'R') { if (yych <= 'M') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'V') goto yy1075; + if (yych == 'V') goto yy1135; goto yy59; } } @@ -15879,67 +16408,67 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy59; - if (yych <= 'c') goto yy1075; + if (yych <= 'c') goto yy1135; goto yy59; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1075; + if (yych <= 'e') goto yy1135; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'v') goto yy1075; + if (yych == 'v') goto yy1135; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1075; + if (yych <= 'x') goto yy1135; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy1075; + goto yy1135; } } } } -yy1078: - YYDEBUG(1078, *YYCURSOR); - yyaccept = 24; +yy1138: + YYDEBUG(1138, *YYCURSOR); + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= 'E') { if (yych <= ' ') { if (yych == '\t') goto yy59; - if (yych <= 0x1F) goto yy1075; + if (yych <= 0x1F) goto yy1135; goto yy59; } else { if (yych <= '9') { - if (yych <= '/') goto yy1075; - goto yy820; + if (yych <= '/') goto yy1135; + goto yy865; } else { if (yych == 'D') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'L') { - if (yych == 'G') goto yy1075; + if (yych == 'G') goto yy1135; if (yych <= 'H') goto yy59; - goto yy1075; + goto yy1135; } else { if (yych <= 'R') { if (yych <= 'M') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'V') goto yy1075; + if (yych == 'V') goto yy1135; goto yy59; } } @@ -15948,78 +16477,78 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'l') { if (yych <= 'd') { if (yych == 'Y') goto yy59; - if (yych <= 'c') goto yy1075; + if (yych <= 'c') goto yy1135; goto yy59; } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1075; + if (yych <= 'e') goto yy1135; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'v') goto yy1075; + if (yych == 'v') goto yy1135; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1075; + if (yych <= 'x') goto yy1135; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy1075; + goto yy1135; } } } } -yy1079: - YYDEBUG(1079, *YYCURSOR); - yyaccept = 24; +yy1139: + YYDEBUG(1139, *YYCURSOR); + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { if (yych <= '/') { if (yych <= '\t') { - if (yych <= 0x08) goto yy1075; + if (yych <= 0x08) goto yy1135; goto yy59; } else { if (yych == ' ') goto yy59; - goto yy1075; + goto yy1135; } } else { if (yych <= '2') { - if (yych <= '0') goto yy844; - goto yy845; + if (yych <= '0') goto yy889; + goto yy890; } else { - if (yych <= '3') goto yy846; - if (yych <= '9') goto yy820; - goto yy1075; + if (yych <= '3') goto yy891; + if (yych <= '9') goto yy865; + goto yy1135; } } } else { if (yych <= 'H') { if (yych <= 'E') { if (yych <= 'D') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'G') goto yy1075; + if (yych == 'G') goto yy1135; goto yy59; } } else { if (yych <= 'M') { - if (yych <= 'L') goto yy1075; + if (yych <= 'L') goto yy1135; goto yy59; } else { - if (yych <= 'R') goto yy1075; + if (yych <= 'R') goto yy1135; if (yych <= 'U') goto yy59; - goto yy1075; + goto yy1135; } } } @@ -16028,82 +16557,82 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'd') { if (yych <= 'X') { if (yych <= 'W') goto yy59; - goto yy1075; + goto yy1135; } else { if (yych <= 'Y') goto yy59; - if (yych <= 'c') goto yy1075; + if (yych <= 'c') goto yy1135; goto yy59; } } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1075; + if (yych <= 'e') goto yy1135; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'v') goto yy1075; + if (yych == 'v') goto yy1135; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1075; + if (yych <= 'x') goto yy1135; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy1075; + goto yy1135; } } } } -yy1080: - YYDEBUG(1080, *YYCURSOR); - yyaccept = 24; +yy1140: + YYDEBUG(1140, *YYCURSOR); + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'C') { if (yych <= '/') { if (yych <= '\t') { - if (yych <= 0x08) goto yy1075; + if (yych <= 0x08) goto yy1135; goto yy59; } else { if (yych == ' ') goto yy59; - goto yy1075; + goto yy1135; } } else { if (yych <= '2') { - if (yych <= '0') goto yy876; - goto yy845; + if (yych <= '0') goto yy921; + goto yy890; } else { - if (yych <= '3') goto yy846; - if (yych <= '9') goto yy820; - goto yy1075; + if (yych <= '3') goto yy891; + if (yych <= '9') goto yy865; + goto yy1135; } } } else { if (yych <= 'H') { if (yych <= 'E') { if (yych <= 'D') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'G') goto yy1075; + if (yych == 'G') goto yy1135; goto yy59; } } else { if (yych <= 'M') { - if (yych <= 'L') goto yy1075; + if (yych <= 'L') goto yy1135; goto yy59; } else { - if (yych <= 'R') goto yy1075; + if (yych <= 'R') goto yy1135; if (yych <= 'U') goto yy59; - goto yy1075; + goto yy1135; } } } @@ -16112,82 +16641,82 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'd') { if (yych <= 'X') { if (yych <= 'W') goto yy59; - goto yy1075; + goto yy1135; } else { if (yych <= 'Y') goto yy59; - if (yych <= 'c') goto yy1075; + if (yych <= 'c') goto yy1135; goto yy59; } } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1075; + if (yych <= 'e') goto yy1135; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'v') goto yy1075; + if (yych == 'v') goto yy1135; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1075; + if (yych <= 'x') goto yy1135; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy1075; + goto yy1135; } } } } -yy1081: - YYDEBUG(1081, *YYCURSOR); - yyaccept = 24; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'V') { +yy1141: + YYDEBUG(1141, *YYCURSOR); + yyaccept = 25; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'V') { if (yych <= 'C') { if (yych <= '/') { if (yych <= '\t') { - if (yych <= 0x08) goto yy1075; + if (yych <= 0x08) goto yy1135; goto yy59; } else { if (yych == ' ') goto yy59; - goto yy1075; + goto yy1135; } } else { if (yych <= '2') { - if (yych <= '0') goto yy844; - goto yy845; + if (yych <= '0') goto yy889; + goto yy890; } else { - if (yych <= '3') goto yy846; - if (yych <= '9') goto yy820; - goto yy1075; + if (yych <= '3') goto yy891; + if (yych <= '9') goto yy865; + goto yy1135; } } } else { if (yych <= 'H') { if (yych <= 'E') { if (yych <= 'D') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'G') goto yy1075; + if (yych == 'G') goto yy1135; goto yy59; } } else { if (yych <= 'M') { - if (yych <= 'L') goto yy1075; + if (yych <= 'L') goto yy1135; goto yy59; } else { - if (yych <= 'R') goto yy1075; + if (yych <= 'R') goto yy1135; if (yych <= 'U') goto yy59; - goto yy1075; + goto yy1135; } } } @@ -16196,371 +16725,371 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'd') { if (yych <= 'X') { if (yych <= 'W') goto yy59; - goto yy1075; + goto yy1135; } else { if (yych <= 'Y') goto yy59; - if (yych <= 'c') goto yy1075; + if (yych <= 'c') goto yy1135; goto yy59; } } else { if (yych <= 'f') { - if (yych <= 'e') goto yy1075; + if (yych <= 'e') goto yy1135; goto yy59; } else { if (yych == 'h') goto yy59; - goto yy1075; + goto yy1135; } } } else { if (yych <= 'w') { if (yych <= 'r') { if (yych <= 'm') goto yy59; - goto yy1075; + goto yy1135; } else { - if (yych == 'v') goto yy1075; + if (yych == 'v') goto yy1135; goto yy59; } } else { if (yych <= 'y') { - if (yych <= 'x') goto yy1075; + if (yych <= 'x') goto yy1135; goto yy59; } else { if (yych == 0xC2) goto yy59; - goto yy1075; + goto yy1135; } } } } -yy1082: - YYDEBUG(1082, *YYCURSOR); +yy1142: + YYDEBUG(1142, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy1084; - goto yy490; + if (yych == '.') goto yy1144; + goto yy524; } else { - if (yych <= '9') goto yy1083; - if (yych <= ':') goto yy1084; - goto yy490; + if (yych <= '9') goto yy1143; + if (yych <= ':') goto yy1144; + goto yy524; } -yy1083: - YYDEBUG(1083, *YYCURSOR); +yy1143: + YYDEBUG(1143, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy1084; - if (yych != ':') goto yy490; -yy1084: - YYDEBUG(1084, *YYCURSOR); + if (yych == '.') goto yy1144; + if (yych != ':') goto yy524; +yy1144: + YYDEBUG(1144, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy1085; - if (yych <= '6') goto yy1086; - if (yych <= '9') goto yy495; + if (yych <= '5') goto yy1145; + if (yych <= '6') goto yy1146; + if (yych <= '9') goto yy529; goto yy55; -yy1085: - YYDEBUG(1085, *YYCURSOR); +yy1145: + YYDEBUG(1145, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy495; - goto yy490; -yy1086: - YYDEBUG(1086, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy529; + goto yy524; +yy1146: + YYDEBUG(1146, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych == '0') goto yy495; - goto yy490; -yy1087: - YYDEBUG(1087, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych == '0') goto yy529; + goto yy524; +yy1147: + YYDEBUG(1147, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - goto yy1091; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + goto yy1151; } else { - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy1090; - if (yych <= ':') goto yy1084; - goto yy490; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy1150; + if (yych <= ':') goto yy1144; + goto yy524; } -yy1088: - YYDEBUG(1088, *YYCURSOR); +yy1148: + YYDEBUG(1148, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - if (yych <= '.') goto yy1091; - goto yy490; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + if (yych <= '.') goto yy1151; + goto yy524; } else { - if (yych <= '2') goto yy1090; - if (yych <= '9') goto yy1083; - if (yych <= ':') goto yy1084; - goto yy490; + if (yych <= '2') goto yy1150; + if (yych <= '9') goto yy1143; + if (yych <= ':') goto yy1144; + goto yy524; } -yy1089: - YYDEBUG(1089, *YYCURSOR); +yy1149: + YYDEBUG(1149, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; - goto yy1091; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; + goto yy1151; } else { - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy1083; - if (yych <= ':') goto yy1084; - goto yy490; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy1143; + if (yych <= ':') goto yy1144; + goto yy524; } -yy1090: - YYDEBUG(1090, *YYCURSOR); +yy1150: + YYDEBUG(1150, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { - if (yych <= ',') goto yy490; - if (yych <= '-') goto yy601; + if (yych <= ',') goto yy524; + if (yych <= '-') goto yy635; } else { - if (yych == ':') goto yy1084; - goto yy490; + if (yych == ':') goto yy1144; + goto yy524; } -yy1091: - YYDEBUG(1091, *YYCURSOR); +yy1151: + YYDEBUG(1151, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '5') goto yy1092; - if (yych <= '6') goto yy1093; - if (yych <= '9') goto yy609; + if (yych <= '5') goto yy1152; + if (yych <= '6') goto yy1153; + if (yych <= '9') goto yy643; goto yy55; -yy1092: - YYDEBUG(1092, *YYCURSOR); +yy1152: + YYDEBUG(1152, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy1094; - goto yy490; -yy1093: - YYDEBUG(1093, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy1154; + goto yy524; +yy1153: + YYDEBUG(1153, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy496; - goto yy490; + if (yych == '.') goto yy530; + goto yy524; } else { - if (yych <= '0') goto yy1094; - if (yych <= '9') goto yy610; - goto yy490; + if (yych <= '0') goto yy1154; + if (yych <= '9') goto yy644; + goto yy524; } -yy1094: - YYDEBUG(1094, *YYCURSOR); +yy1154: + YYDEBUG(1154, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy604; - goto yy490; -yy1095: - YYDEBUG(1095, *YYCURSOR); + if (yych == '.') goto yy530; + if (yych <= '/') goto yy524; + if (yych <= '9') goto yy638; + goto yy524; +yy1155: + YYDEBUG(1155, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= '-') { - if (yych == '\t') goto yy459; - if (yych <= ',') goto yy461; - goto yy1050; + if (yych == '\t') goto yy493; + if (yych <= ',') goto yy495; + goto yy1110; } else { - if (yych <= '.') goto yy473; - if (yych <= '/') goto yy471; - if (yych <= '5') goto yy1065; - goto yy740; + if (yych <= '.') goto yy507; + if (yych <= '/') goto yy505; + if (yych <= '5') goto yy1125; + goto yy785; } } else { if (yych <= 'q') { - if (yych <= ':') goto yy482; - if (yych == 'n') goto yy469; - goto yy461; + if (yych <= ':') goto yy516; + if (yych == 'n') goto yy503; + goto yy495; } else { - if (yych <= 'r') goto yy470; - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy461; + if (yych <= 'r') goto yy504; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy495; } } -yy1096: - YYDEBUG(1096, *YYCURSOR); +yy1156: + YYDEBUG(1156, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '9') { if (yych <= '-') { - if (yych == '\t') goto yy1051; - if (yych <= ',') goto yy1053; - goto yy1050; + if (yych == '\t') goto yy1111; + if (yych <= ',') goto yy1113; + goto yy1110; } else { - if (yych <= '.') goto yy1063; - if (yych <= '/') goto yy471; - if (yych <= '5') goto yy1065; - goto yy740; + if (yych <= '.') goto yy1123; + if (yych <= '/') goto yy505; + if (yych <= '5') goto yy1125; + goto yy785; } } else { if (yych <= 'q') { - if (yych <= ':') goto yy1064; - if (yych == 'n') goto yy469; - goto yy1053; + if (yych <= ':') goto yy1124; + if (yych == 'n') goto yy503; + goto yy1113; } else { - if (yych <= 'r') goto yy470; - if (yych <= 's') goto yy464; - if (yych <= 't') goto yy467; - goto yy1053; + if (yych <= 'r') goto yy504; + if (yych <= 's') goto yy498; + if (yych <= 't') goto yy501; + goto yy1113; } } -yy1097: - YYDEBUG(1097, *YYCURSOR); +yy1157: + YYDEBUG(1157, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy176; + if (yych <= 'D') goto yy183; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'e') goto yy1098; - if (yych <= 'z') goto yy176; + if (yych <= 'e') goto yy1158; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1098: - YYDEBUG(1098, *YYCURSOR); +yy1158: + YYDEBUG(1158, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'V') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'U') goto yy177; + if (yych <= 'U') goto yy184; } } else { if (yych <= 'u') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'v') goto yy1099; - if (yych <= 'z') goto yy177; + if (yych <= 'v') goto yy1159; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1099: - YYDEBUG(1099, *YYCURSOR); +yy1159: + YYDEBUG(1159, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'I') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'H') goto yy178; + if (yych <= 'H') goto yy185; } } else { if (yych <= 'h') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'i') goto yy1100; - if (yych <= 'z') goto yy178; + if (yych <= 'i') goto yy1160; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1100: - YYDEBUG(1100, *YYCURSOR); +yy1160: + YYDEBUG(1160, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'N') goto yy179; + if (yych <= 'N') goto yy186; } } else { if (yych <= 'n') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'o') goto yy1101; - if (yych <= 'z') goto yy179; + if (yych <= 'o') goto yy1161; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1101: - YYDEBUG(1101, *YYCURSOR); - yyaccept = 0; +yy1161: + YYDEBUG(1161, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'U') goto yy1102; + if (yych <= 'U') goto yy1162; if (yych != 'u') goto yy3; } -yy1102: - YYDEBUG(1102, *YYCURSOR); +yy1162: + YYDEBUG(1162, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1103; + if (yych == 'S') goto yy1163; if (yych != 's') goto yy55; -yy1103: - YYDEBUG(1103, *YYCURSOR); +yy1163: + YYDEBUG(1163, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\t') goto yy1104; + if (yych == '\t') goto yy1164; if (yych != ' ') goto yy55; -yy1104: - YYDEBUG(1104, *YYCURSOR); +yy1164: + YYDEBUG(1164, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy1105: - YYDEBUG(1105, *YYCURSOR); +yy1165: + YYDEBUG(1165, *YYCURSOR); if (yych <= 'X') { if (yych <= 'G') { if (yych <= ' ') { - if (yych == '\t') goto yy1104; + if (yych == '\t') goto yy1164; if (yych <= 0x1F) goto yy55; - goto yy1104; + goto yy1164; } else { if (yych <= 'D') { if (yych <= 'C') goto yy55; - goto yy1111; + goto yy1171; } else { - if (yych == 'F') goto yy1112; + if (yych == 'F') goto yy1172; goto yy55; } } } else { if (yych <= 'S') { if (yych <= 'L') { - if (yych <= 'H') goto yy1110; + if (yych <= 'H') goto yy1170; goto yy55; } else { - if (yych <= 'M') goto yy1106; + if (yych <= 'M') goto yy1166; if (yych <= 'R') goto yy55; - goto yy1109; + goto yy1169; } } else { if (yych <= 'U') { - if (yych <= 'T') goto yy1115; - goto yy1108; + if (yych <= 'T') goto yy1175; + goto yy1168; } else { - if (yych == 'W') goto yy1114; + if (yych == 'W') goto yy1174; goto yy55; } } @@ -16569,17 +17098,17 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'r') { if (yych <= 'f') { if (yych <= 'c') { - if (yych <= 'Y') goto yy1113; + if (yych <= 'Y') goto yy1173; goto yy55; } else { - if (yych <= 'd') goto yy1111; + if (yych <= 'd') goto yy1171; if (yych <= 'e') goto yy55; - goto yy1112; + goto yy1172; } } else { if (yych <= 'h') { if (yych <= 'g') goto yy55; - goto yy1110; + goto yy1170; } else { if (yych != 'm') goto yy55; } @@ -16587,162 +17116,162 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) } else { if (yych <= 'w') { if (yych <= 't') { - if (yych <= 's') goto yy1109; - goto yy1115; + if (yych <= 's') goto yy1169; + goto yy1175; } else { - if (yych <= 'u') goto yy1108; + if (yych <= 'u') goto yy1168; if (yych <= 'v') goto yy55; - goto yy1114; + goto yy1174; } } else { if (yych <= 'y') { if (yych <= 'x') goto yy55; - goto yy1113; + goto yy1173; } else { - if (yych == 0xC2) goto yy1107; + if (yych == 0xC2) goto yy1167; goto yy55; } } } } -yy1106: - YYDEBUG(1106, *YYCURSOR); +yy1166: + YYDEBUG(1166, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= 'N') { - if (yych == 'I') goto yy1190; + if (yych == 'I') goto yy1256; goto yy55; } else { - if (yych <= 'O') goto yy1189; + if (yych <= 'O') goto yy1255; if (yych <= 'R') goto yy55; - goto yy1191; + goto yy1257; } } else { if (yych <= 'n') { - if (yych == 'i') goto yy1190; + if (yych == 'i') goto yy1256; goto yy55; } else { - if (yych <= 'o') goto yy1189; - if (yych == 's') goto yy1191; + if (yych <= 'o') goto yy1255; + if (yych == 's') goto yy1257; goto yy55; } } -yy1107: - YYDEBUG(1107, *YYCURSOR); +yy1167: + YYDEBUG(1167, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 0xB5) goto yy1186; + if (yych == 0xB5) goto yy1252; goto yy55; -yy1108: - YYDEBUG(1108, *YYCURSOR); +yy1168: + YYDEBUG(1168, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1184; - if (yych == 's') goto yy1184; + if (yych == 'S') goto yy1250; + if (yych == 's') goto yy1250; goto yy55; -yy1109: - YYDEBUG(1109, *YYCURSOR); +yy1169: + YYDEBUG(1169, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= 'D') { - if (yych == 'A') goto yy1171; + if (yych == 'A') goto yy1235; goto yy55; } else { - if (yych <= 'E') goto yy1172; + if (yych <= 'E') goto yy1236; if (yych <= 'T') goto yy55; - goto yy1170; + goto yy1234; } } else { if (yych <= 'd') { - if (yych == 'a') goto yy1171; + if (yych == 'a') goto yy1235; goto yy55; } else { - if (yych <= 'e') goto yy1172; - if (yych == 'u') goto yy1170; + if (yych <= 'e') goto yy1236; + if (yych == 'u') goto yy1234; goto yy55; } } -yy1110: - YYDEBUG(1110, *YYCURSOR); +yy1170: + YYDEBUG(1170, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1168; - if (yych == 'o') goto yy1168; + if (yych == 'O') goto yy1232; + if (yych == 'o') goto yy1232; goto yy55; -yy1111: - YYDEBUG(1111, *YYCURSOR); +yy1171: + YYDEBUG(1171, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1167; - if (yych == 'a') goto yy1167; + if (yych == 'A') goto yy1231; + if (yych == 'a') goto yy1231; goto yy55; -yy1112: - YYDEBUG(1112, *YYCURSOR); +yy1172: + YYDEBUG(1172, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { - if (yych == 'O') goto yy1152; + if (yych == 'O') goto yy1215; if (yych <= 'Q') goto yy55; - goto yy1151; + goto yy1214; } else { if (yych <= 'o') { if (yych <= 'n') goto yy55; - goto yy1152; + goto yy1215; } else { - if (yych == 'r') goto yy1151; + if (yych == 'r') goto yy1214; goto yy55; } } -yy1113: - YYDEBUG(1113, *YYCURSOR); +yy1173: + YYDEBUG(1173, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1148; - if (yych == 'e') goto yy1148; + if (yych == 'E') goto yy1211; + if (yych == 'e') goto yy1211; goto yy55; -yy1114: - YYDEBUG(1114, *YYCURSOR); +yy1174: + YYDEBUG(1174, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1134; - if (yych == 'e') goto yy1134; + if (yych == 'E') goto yy1196; + if (yych == 'e') goto yy1196; goto yy55; -yy1115: - YYDEBUG(1115, *YYCURSOR); +yy1175: + YYDEBUG(1175, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'H') goto yy1116; + if (yych == 'H') goto yy1176; if (yych <= 'T') goto yy55; - goto yy1117; + goto yy1177; } else { if (yych <= 'h') { if (yych <= 'g') goto yy55; } else { - if (yych == 'u') goto yy1117; + if (yych == 'u') goto yy1177; goto yy55; } } -yy1116: - YYDEBUG(1116, *YYCURSOR); +yy1176: + YYDEBUG(1176, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy1129; - if (yych == 'u') goto yy1129; + if (yych == 'U') goto yy1190; + if (yych == 'u') goto yy1190; goto yy55; -yy1117: - YYDEBUG(1117, *YYCURSOR); +yy1177: + YYDEBUG(1177, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1118; + if (yych == 'E') goto yy1178; if (yych != 'e') goto yy55; -yy1118: - YYDEBUG(1118, *YYCURSOR); - yyaccept = 25; +yy1178: + YYDEBUG(1178, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; - if (yych >= ' ') goto yy1120; + if (yych == '\t') goto yy1180; + if (yych >= ' ') goto yy1180; } else { if (yych <= 'S') { - if (yych >= 'S') goto yy1122; + if (yych >= 'S') goto yy1182; } else { - if (yych == 's') goto yy1122; + if (yych == 's') goto yy1182; } } -yy1119: - YYDEBUG(1119, *YYCURSOR); -#line 1748 "ext/date/lib/parse_date.re" +yy1179: + YYDEBUG(1179, *YYCURSOR); +#line 1791 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@ -16758,58 +17287,73 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 16760 "" -yy1120: - YYDEBUG(1120, *YYCURSOR); +#line 17291 "" +yy1180: + YYDEBUG(1180, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; - YYDEBUG(1121, *YYCURSOR); + YYDEBUG(1181, *YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; + if (yych == '\t') goto yy1180; if (yych <= 0x1F) goto yy55; - goto yy1120; + goto yy1180; } else { if (yych <= 'O') { if (yych <= 'N') goto yy55; - goto yy1126; + goto yy1187; } else { - if (yych == 'o') goto yy1126; + if (yych == 'o') goto yy1187; goto yy55; } } -yy1122: - YYDEBUG(1122, *YYCURSOR); +yy1182: + YYDEBUG(1182, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1123; + if (yych == 'D') goto yy1183; if (yych != 'd') goto yy55; -yy1123: - YYDEBUG(1123, *YYCURSOR); +yy1183: + YYDEBUG(1183, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1124; + if (yych == 'A') goto yy1184; if (yych != 'a') goto yy55; -yy1124: - YYDEBUG(1124, *YYCURSOR); +yy1184: + YYDEBUG(1184, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; + if (yych == 'Y') goto yy1185; if (yych != 'y') goto yy55; -yy1125: - YYDEBUG(1125, *YYCURSOR); - yyaccept = 25; +yy1185: + YYDEBUG(1185, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '\t') goto yy1120; - if (yych == ' ') goto yy1120; - goto yy1119; -yy1126: - YYDEBUG(1126, *YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + } else { + if (yych != 's') goto yy1179; + } + } +yy1186: + YYDEBUG(1186, *YYCURSOR); + yyaccept = 26; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '\t') goto yy1180; + if (yych == ' ') goto yy1180; + goto yy1179; +yy1187: + YYDEBUG(1187, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy1127; + if (yych == 'F') goto yy1188; if (yych != 'f') goto yy55; -yy1127: - YYDEBUG(1127, *YYCURSOR); +yy1188: + YYDEBUG(1188, *YYCURSOR); ++YYCURSOR; - YYDEBUG(1128, *YYCURSOR); -#line 1209 "ext/date/lib/parse_date.re" + YYDEBUG(1189, *YYCURSOR); +#line 1250 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@ -16830,115 +17374,147 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } -#line 16832 "" -yy1129: - YYDEBUG(1129, *YYCURSOR); - yyaccept = 25; +#line 17378 "" +yy1190: + YYDEBUG(1190, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; - if (yych <= 0x1F) goto yy1119; - goto yy1120; + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; } else { if (yych <= 'R') { - if (yych <= 'Q') goto yy1119; + if (yych <= 'Q') goto yy1179; } else { - if (yych != 'r') goto yy1119; + if (yych != 'r') goto yy1179; } } - YYDEBUG(1130, *YYCURSOR); + YYDEBUG(1191, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1131; + if (yych == 'S') goto yy1192; if (yych != 's') goto yy55; -yy1131: - YYDEBUG(1131, *YYCURSOR); +yy1192: + YYDEBUG(1192, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1132; + if (yych == 'D') goto yy1193; if (yych != 'd') goto yy55; -yy1132: - YYDEBUG(1132, *YYCURSOR); +yy1193: + YYDEBUG(1193, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1133; + if (yych == 'A') goto yy1194; if (yych != 'a') goto yy55; -yy1133: - YYDEBUG(1133, *YYCURSOR); +yy1194: + YYDEBUG(1194, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; - if (yych == 'y') goto yy1125; - goto yy55; -yy1134: - YYDEBUG(1134, *YYCURSOR); + if (yych == 'Y') goto yy1195; + if (yych != 'y') goto yy55; +yy1195: + YYDEBUG(1195, *YYCURSOR); + yyaccept = 26; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + goto yy1186; + } else { + if (yych == 's') goto yy1186; + goto yy1179; + } + } +yy1196: + YYDEBUG(1196, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= 'C') goto yy55; - if (yych <= 'D') goto yy1136; + if (yych <= 'D') goto yy1198; } else { if (yych <= 'c') goto yy55; - if (yych <= 'd') goto yy1136; + if (yych <= 'd') goto yy1198; if (yych >= 'f') goto yy55; } - YYDEBUG(1135, *YYCURSOR); + YYDEBUG(1197, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'K') goto yy1142; - if (yych == 'k') goto yy1142; + if (yych == 'K') goto yy1205; + if (yych == 'k') goto yy1205; goto yy55; -yy1136: - YYDEBUG(1136, *YYCURSOR); - yyaccept = 25; +yy1198: + YYDEBUG(1198, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; - if (yych <= 0x1F) goto yy1119; - goto yy1120; + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; } else { if (yych <= 'N') { - if (yych <= 'M') goto yy1119; + if (yych <= 'M') goto yy1179; } else { - if (yych != 'n') goto yy1119; + if (yych != 'n') goto yy1179; } } - YYDEBUG(1137, *YYCURSOR); + YYDEBUG(1199, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1138; + if (yych == 'E') goto yy1200; if (yych != 'e') goto yy55; -yy1138: - YYDEBUG(1138, *YYCURSOR); +yy1200: + YYDEBUG(1200, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1139; + if (yych == 'S') goto yy1201; if (yych != 's') goto yy55; -yy1139: - YYDEBUG(1139, *YYCURSOR); +yy1201: + YYDEBUG(1201, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1140; + if (yych == 'D') goto yy1202; if (yych != 'd') goto yy55; -yy1140: - YYDEBUG(1140, *YYCURSOR); +yy1202: + YYDEBUG(1202, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1141; + if (yych == 'A') goto yy1203; if (yych != 'a') goto yy55; -yy1141: - YYDEBUG(1141, *YYCURSOR); +yy1203: + YYDEBUG(1203, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; - if (yych == 'y') goto yy1125; - goto yy55; -yy1142: - YYDEBUG(1142, *YYCURSOR); + if (yych == 'Y') goto yy1204; + if (yych != 'y') goto yy55; +yy1204: + YYDEBUG(1204, *YYCURSOR); yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + goto yy1186; + } else { + if (yych == 's') goto yy1186; + goto yy1179; + } + } +yy1205: + YYDEBUG(1205, *YYCURSOR); + yyaccept = 27; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == 'D') goto yy1145; - if (yych >= 'S') goto yy1144; + if (yych == 'D') goto yy1208; + if (yych >= 'S') goto yy1207; } else { if (yych <= 'd') { - if (yych >= 'd') goto yy1145; + if (yych >= 'd') goto yy1208; } else { - if (yych == 's') goto yy1144; + if (yych == 's') goto yy1207; } } -yy1143: - YYDEBUG(1143, *YYCURSOR); -#line 1724 "ext/date/lib/parse_date.re" +yy1206: + YYDEBUG(1206, *YYCURSOR); +#line 1767 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@ -16961,826 +17537,890 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 16963 "" -yy1144: - YYDEBUG(1144, *YYCURSOR); +#line 17541 "" +yy1207: + YYDEBUG(1207, *YYCURSOR); yych = *++YYCURSOR; - goto yy1119; -yy1145: - YYDEBUG(1145, *YYCURSOR); + goto yy1179; +yy1208: + YYDEBUG(1208, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1146; + if (yych == 'A') goto yy1209; if (yych != 'a') goto yy55; -yy1146: - YYDEBUG(1146, *YYCURSOR); +yy1209: + YYDEBUG(1209, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1147; + if (yych == 'Y') goto yy1210; if (yych != 'y') goto yy55; -yy1147: - YYDEBUG(1147, *YYCURSOR); +yy1210: + YYDEBUG(1210, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1144; - if (yych == 's') goto yy1144; - goto yy1119; -yy1148: - YYDEBUG(1148, *YYCURSOR); + if (yych == 'S') goto yy1207; + if (yych == 's') goto yy1207; + goto yy1179; +yy1211: + YYDEBUG(1211, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1149; + if (yych == 'A') goto yy1212; if (yych != 'a') goto yy55; -yy1149: - YYDEBUG(1149, *YYCURSOR); +yy1212: + YYDEBUG(1212, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy1150; + if (yych == 'R') goto yy1213; if (yych != 'r') goto yy55; -yy1150: - YYDEBUG(1150, *YYCURSOR); +yy1213: + YYDEBUG(1213, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1144; - if (yych == 's') goto yy1144; - goto yy1119; -yy1151: - YYDEBUG(1151, *YYCURSOR); + if (yych == 'S') goto yy1207; + if (yych == 's') goto yy1207; + goto yy1179; +yy1214: + YYDEBUG(1214, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy1164; - if (yych == 'i') goto yy1164; + if (yych == 'I') goto yy1227; + if (yych == 'i') goto yy1227; goto yy55; -yy1152: - YYDEBUG(1152, *YYCURSOR); +yy1215: + YYDEBUG(1215, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy1153; + if (yych == 'R') goto yy1216; if (yych != 'r') goto yy55; -yy1153: - YYDEBUG(1153, *YYCURSOR); +yy1216: + YYDEBUG(1216, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1154; + if (yych == 'T') goto yy1217; if (yych != 't') goto yy55; -yy1154: - YYDEBUG(1154, *YYCURSOR); +yy1217: + YYDEBUG(1217, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'H') goto yy1156; + if (yych == 'H') goto yy1219; if (yych <= 'M') goto yy55; } else { if (yych <= 'h') { if (yych <= 'g') goto yy55; - goto yy1156; + goto yy1219; } else { if (yych != 'n') goto yy55; } } - YYDEBUG(1155, *YYCURSOR); + YYDEBUG(1218, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy1161; - if (yych == 'i') goto yy1161; + if (yych == 'I') goto yy1224; + if (yych == 'i') goto yy1224; goto yy55; -yy1156: - YYDEBUG(1156, *YYCURSOR); +yy1219: + YYDEBUG(1219, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1157; + if (yych == 'N') goto yy1220; if (yych != 'n') goto yy55; -yy1157: - YYDEBUG(1157, *YYCURSOR); +yy1220: + YYDEBUG(1220, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy1158; + if (yych == 'I') goto yy1221; if (yych != 'i') goto yy55; -yy1158: - YYDEBUG(1158, *YYCURSOR); +yy1221: + YYDEBUG(1221, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy1159; + if (yych == 'G') goto yy1222; if (yych != 'g') goto yy55; -yy1159: - YYDEBUG(1159, *YYCURSOR); +yy1222: + YYDEBUG(1222, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy1160; + if (yych == 'H') goto yy1223; if (yych != 'h') goto yy55; -yy1160: - YYDEBUG(1160, *YYCURSOR); +yy1223: + YYDEBUG(1223, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1150; - if (yych == 't') goto yy1150; + if (yych == 'T') goto yy1213; + if (yych == 't') goto yy1213; goto yy55; -yy1161: - YYDEBUG(1161, *YYCURSOR); +yy1224: + YYDEBUG(1224, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'G') goto yy1162; + if (yych == 'G') goto yy1225; if (yych != 'g') goto yy55; -yy1162: - YYDEBUG(1162, *YYCURSOR); +yy1225: + YYDEBUG(1225, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy1163; + if (yych == 'H') goto yy1226; if (yych != 'h') goto yy55; -yy1163: - YYDEBUG(1163, *YYCURSOR); +yy1226: + YYDEBUG(1226, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1150; - if (yych == 't') goto yy1150; + if (yych == 'T') goto yy1213; + if (yych == 't') goto yy1213; goto yy55; -yy1164: - YYDEBUG(1164, *YYCURSOR); - yyaccept = 25; +yy1227: + YYDEBUG(1227, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; - if (yych <= 0x1F) goto yy1119; - goto yy1120; + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; } else { if (yych <= 'D') { - if (yych <= 'C') goto yy1119; + if (yych <= 'C') goto yy1179; } else { - if (yych != 'd') goto yy1119; + if (yych != 'd') goto yy1179; } } - YYDEBUG(1165, *YYCURSOR); + YYDEBUG(1228, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1166; + if (yych == 'A') goto yy1229; if (yych != 'a') goto yy55; -yy1166: - YYDEBUG(1166, *YYCURSOR); +yy1229: + YYDEBUG(1229, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; - if (yych == 'y') goto yy1125; - goto yy55; -yy1167: - YYDEBUG(1167, *YYCURSOR); + if (yych == 'Y') goto yy1230; + if (yych != 'y') goto yy55; +yy1230: + YYDEBUG(1230, *YYCURSOR); + yyaccept = 26; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + goto yy1186; + } else { + if (yych == 's') goto yy1186; + goto yy1179; + } + } +yy1231: + YYDEBUG(1231, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1150; - if (yych == 'y') goto yy1150; + if (yych == 'Y') goto yy1213; + if (yych == 'y') goto yy1213; goto yy55; -yy1168: - YYDEBUG(1168, *YYCURSOR); +yy1232: + YYDEBUG(1232, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy1169; + if (yych == 'U') goto yy1233; if (yych != 'u') goto yy55; -yy1169: - YYDEBUG(1169, *YYCURSOR); +yy1233: + YYDEBUG(1233, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy1150; - if (yych == 'r') goto yy1150; + if (yych == 'R') goto yy1213; + if (yych == 'r') goto yy1213; goto yy55; -yy1170: - YYDEBUG(1170, *YYCURSOR); +yy1234: + YYDEBUG(1234, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1181; - if (yych == 'n') goto yy1181; + if (yych == 'N') goto yy1246; + if (yych == 'n') goto yy1246; goto yy55; -yy1171: - YYDEBUG(1171, *YYCURSOR); +yy1235: + YYDEBUG(1235, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1176; - if (yych == 't') goto yy1176; + if (yych == 'T') goto yy1240; + if (yych == 't') goto yy1240; goto yy55; -yy1172: - YYDEBUG(1172, *YYCURSOR); +yy1236: + YYDEBUG(1236, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1173; + if (yych == 'C') goto yy1237; if (yych != 'c') goto yy55; -yy1173: - YYDEBUG(1173, *YYCURSOR); - yyaccept = 25; +yy1237: + YYDEBUG(1237, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == 'O') goto yy1174; - if (yych <= 'R') goto yy1119; - goto yy1144; + if (yych == 'O') goto yy1238; + if (yych <= 'R') goto yy1179; + goto yy1207; } else { if (yych <= 'o') { - if (yych <= 'n') goto yy1119; + if (yych <= 'n') goto yy1179; } else { - if (yych == 's') goto yy1144; - goto yy1119; + if (yych == 's') goto yy1207; + goto yy1179; } } -yy1174: - YYDEBUG(1174, *YYCURSOR); +yy1238: + YYDEBUG(1238, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1175; + if (yych == 'N') goto yy1239; if (yych != 'n') goto yy55; -yy1175: - YYDEBUG(1175, *YYCURSOR); +yy1239: + YYDEBUG(1239, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1150; - if (yych == 'd') goto yy1150; + if (yych == 'D') goto yy1213; + if (yych == 'd') goto yy1213; goto yy55; -yy1176: - YYDEBUG(1176, *YYCURSOR); - yyaccept = 25; +yy1240: + YYDEBUG(1240, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; - if (yych <= 0x1F) goto yy1119; - goto yy1120; + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; } else { if (yych <= 'U') { - if (yych <= 'T') goto yy1119; + if (yych <= 'T') goto yy1179; } else { - if (yych != 'u') goto yy1119; + if (yych != 'u') goto yy1179; } } - YYDEBUG(1177, *YYCURSOR); + YYDEBUG(1241, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy1178; + if (yych == 'R') goto yy1242; if (yych != 'r') goto yy55; -yy1178: - YYDEBUG(1178, *YYCURSOR); +yy1242: + YYDEBUG(1242, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1179; + if (yych == 'D') goto yy1243; if (yych != 'd') goto yy55; -yy1179: - YYDEBUG(1179, *YYCURSOR); +yy1243: + YYDEBUG(1243, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1180; + if (yych == 'A') goto yy1244; if (yych != 'a') goto yy55; -yy1180: - YYDEBUG(1180, *YYCURSOR); +yy1244: + YYDEBUG(1244, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; - if (yych == 'y') goto yy1125; - goto yy55; -yy1181: - YYDEBUG(1181, *YYCURSOR); - yyaccept = 25; + if (yych == 'Y') goto yy1245; + if (yych != 'y') goto yy55; +yy1245: + YYDEBUG(1245, *YYCURSOR); + yyaccept = 26; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + goto yy1186; + } else { + if (yych == 's') goto yy1186; + goto yy1179; + } + } +yy1246: + YYDEBUG(1246, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1120; - if (yych <= 0x1F) goto yy1119; - goto yy1120; + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; } else { if (yych <= 'D') { - if (yych <= 'C') goto yy1119; + if (yych <= 'C') goto yy1179; } else { - if (yych != 'd') goto yy1119; + if (yych != 'd') goto yy1179; } } - YYDEBUG(1182, *YYCURSOR); + YYDEBUG(1247, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1183; + if (yych == 'A') goto yy1248; if (yych != 'a') goto yy55; -yy1183: - YYDEBUG(1183, *YYCURSOR); +yy1248: + YYDEBUG(1248, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; - if (yych == 'y') goto yy1125; - goto yy55; -yy1184: - YYDEBUG(1184, *YYCURSOR); + if (yych == 'Y') goto yy1249; + if (yych != 'y') goto yy55; +yy1249: + YYDEBUG(1249, *YYCURSOR); + yyaccept = 26; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + goto yy1186; + } else { + if (yych == 's') goto yy1186; + goto yy1179; + } + } +yy1250: + YYDEBUG(1250, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1185; + if (yych == 'E') goto yy1251; if (yych != 'e') goto yy55; -yy1185: - YYDEBUG(1185, *YYCURSOR); +yy1251: + YYDEBUG(1251, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1150; - if (yych == 'c') goto yy1150; + if (yych == 'C') goto yy1213; + if (yych == 'c') goto yy1213; goto yy55; -yy1186: - YYDEBUG(1186, *YYCURSOR); +yy1252: + YYDEBUG(1252, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1187; + if (yych == 'S') goto yy1253; if (yych != 's') goto yy55; -yy1187: - YYDEBUG(1187, *YYCURSOR); - yyaccept = 25; +yy1253: + YYDEBUG(1253, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy1188; - if (yych != 'e') goto yy1119; -yy1188: - YYDEBUG(1188, *YYCURSOR); + if (yych == 'E') goto yy1254; + if (yych != 'e') goto yy1179; +yy1254: + YYDEBUG(1254, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1150; - if (yych == 'c') goto yy1150; + if (yych == 'C') goto yy1213; + if (yych == 'c') goto yy1213; goto yy55; -yy1189: - YYDEBUG(1189, *YYCURSOR); +yy1255: + YYDEBUG(1255, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1212; - if (yych == 'n') goto yy1212; + if (yych == 'N') goto yy1278; + if (yych == 'n') goto yy1278; goto yy55; -yy1190: - YYDEBUG(1190, *YYCURSOR); +yy1256: + YYDEBUG(1256, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= 'K') { - if (yych == 'C') goto yy1194; + if (yych == 'C') goto yy1260; goto yy55; } else { - if (yych <= 'L') goto yy1193; + if (yych <= 'L') goto yy1259; if (yych <= 'M') goto yy55; - goto yy1195; + goto yy1261; } } else { if (yych <= 'k') { - if (yych == 'c') goto yy1194; + if (yych == 'c') goto yy1260; goto yy55; } else { - if (yych <= 'l') goto yy1193; - if (yych == 'n') goto yy1195; + if (yych <= 'l') goto yy1259; + if (yych == 'n') goto yy1261; goto yy55; } } -yy1191: - YYDEBUG(1191, *YYCURSOR); - yyaccept = 25; +yy1257: + YYDEBUG(1257, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'E') goto yy1192; - if (yych != 'e') goto yy1119; -yy1192: - YYDEBUG(1192, *YYCURSOR); + if (yych == 'E') goto yy1258; + if (yych != 'e') goto yy1179; +yy1258: + YYDEBUG(1258, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1150; - if (yych == 'c') goto yy1150; + if (yych == 'C') goto yy1213; + if (yych == 'c') goto yy1213; goto yy55; -yy1193: - YYDEBUG(1193, *YYCURSOR); +yy1259: + YYDEBUG(1259, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'L') goto yy1205; - if (yych == 'l') goto yy1205; + if (yych == 'L') goto yy1271; + if (yych == 'l') goto yy1271; goto yy55; -yy1194: - YYDEBUG(1194, *YYCURSOR); +yy1260: + YYDEBUG(1260, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy1198; - if (yych == 'r') goto yy1198; + if (yych == 'R') goto yy1264; + if (yych == 'r') goto yy1264; goto yy55; -yy1195: - YYDEBUG(1195, *YYCURSOR); - yyaccept = 25; +yy1261: + YYDEBUG(1261, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { - if (yych == 'S') goto yy1144; - if (yych <= 'T') goto yy1119; + if (yych == 'S') goto yy1207; + if (yych <= 'T') goto yy1179; } else { if (yych <= 's') { - if (yych <= 'r') goto yy1119; - goto yy1144; + if (yych <= 'r') goto yy1179; + goto yy1207; } else { - if (yych != 'u') goto yy1119; + if (yych != 'u') goto yy1179; } } - YYDEBUG(1196, *YYCURSOR); + YYDEBUG(1262, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1197; + if (yych == 'T') goto yy1263; if (yych != 't') goto yy55; -yy1197: - YYDEBUG(1197, *YYCURSOR); +yy1263: + YYDEBUG(1263, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1150; - if (yych == 'e') goto yy1150; + if (yych == 'E') goto yy1213; + if (yych == 'e') goto yy1213; goto yy55; -yy1198: - YYDEBUG(1198, *YYCURSOR); +yy1264: + YYDEBUG(1264, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1199; + if (yych == 'O') goto yy1265; if (yych != 'o') goto yy55; -yy1199: - YYDEBUG(1199, *YYCURSOR); +yy1265: + YYDEBUG(1265, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1200; + if (yych == 'S') goto yy1266; if (yych != 's') goto yy55; -yy1200: - YYDEBUG(1200, *YYCURSOR); +yy1266: + YYDEBUG(1266, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1201; + if (yych == 'E') goto yy1267; if (yych != 'e') goto yy55; -yy1201: - YYDEBUG(1201, *YYCURSOR); +yy1267: + YYDEBUG(1267, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1202; + if (yych == 'C') goto yy1268; if (yych != 'c') goto yy55; -yy1202: - YYDEBUG(1202, *YYCURSOR); +yy1268: + YYDEBUG(1268, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1203; + if (yych == 'O') goto yy1269; if (yych != 'o') goto yy55; -yy1203: - YYDEBUG(1203, *YYCURSOR); +yy1269: + YYDEBUG(1269, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1204; + if (yych == 'N') goto yy1270; if (yych != 'n') goto yy55; -yy1204: - YYDEBUG(1204, *YYCURSOR); +yy1270: + YYDEBUG(1270, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1150; - if (yych == 'd') goto yy1150; + if (yych == 'D') goto yy1213; + if (yych == 'd') goto yy1213; goto yy55; -yy1205: - YYDEBUG(1205, *YYCURSOR); +yy1271: + YYDEBUG(1271, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy1206; + if (yych == 'I') goto yy1272; if (yych != 'i') goto yy55; -yy1206: - YYDEBUG(1206, *YYCURSOR); +yy1272: + YYDEBUG(1272, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1207; + if (yych == 'S') goto yy1273; if (yych != 's') goto yy55; -yy1207: - YYDEBUG(1207, *YYCURSOR); +yy1273: + YYDEBUG(1273, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1208; + if (yych == 'E') goto yy1274; if (yych != 'e') goto yy55; -yy1208: - YYDEBUG(1208, *YYCURSOR); +yy1274: + YYDEBUG(1274, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'C') goto yy1209; + if (yych == 'C') goto yy1275; if (yych != 'c') goto yy55; -yy1209: - YYDEBUG(1209, *YYCURSOR); +yy1275: + YYDEBUG(1275, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1210; + if (yych == 'O') goto yy1276; if (yych != 'o') goto yy55; -yy1210: - YYDEBUG(1210, *YYCURSOR); +yy1276: + YYDEBUG(1276, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'N') goto yy1211; + if (yych == 'N') goto yy1277; if (yych != 'n') goto yy55; -yy1211: - YYDEBUG(1211, *YYCURSOR); +yy1277: + YYDEBUG(1277, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1150; - if (yych == 'd') goto yy1150; + if (yych == 'D') goto yy1213; + if (yych == 'd') goto yy1213; goto yy55; -yy1212: - YYDEBUG(1212, *YYCURSOR); - yyaccept = 25; +yy1278: + YYDEBUG(1278, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1120; - goto yy1119; + if (yych == '\t') goto yy1180; + goto yy1179; } else { - if (yych <= ' ') goto yy1120; - if (yych <= 'C') goto yy1119; + if (yych <= ' ') goto yy1180; + if (yych <= 'C') goto yy1179; } } else { if (yych <= 'c') { - if (yych == 'T') goto yy1214; - goto yy1119; + if (yych == 'T') goto yy1280; + goto yy1179; } else { - if (yych <= 'd') goto yy1213; - if (yych == 't') goto yy1214; - goto yy1119; + if (yych <= 'd') goto yy1279; + if (yych == 't') goto yy1280; + goto yy1179; } } -yy1213: - YYDEBUG(1213, *YYCURSOR); +yy1279: + YYDEBUG(1279, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1215; - if (yych == 'a') goto yy1215; + if (yych == 'A') goto yy1281; + if (yych == 'a') goto yy1281; goto yy55; -yy1214: - YYDEBUG(1214, *YYCURSOR); +yy1280: + YYDEBUG(1280, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy1150; - if (yych == 'h') goto yy1150; + if (yych == 'H') goto yy1213; + if (yych == 'h') goto yy1213; goto yy55; -yy1215: - YYDEBUG(1215, *YYCURSOR); +yy1281: + YYDEBUG(1281, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1125; - if (yych == 'y') goto yy1125; - goto yy55; -yy1216: - YYDEBUG(1216, *YYCURSOR); - yyaccept = 0; + if (yych == 'Y') goto yy1282; + if (yych != 'y') goto yy55; +yy1282: + YYDEBUG(1282, *YYCURSOR); + yyaccept = 26; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ' ') { + if (yych == '\t') goto yy1180; + if (yych <= 0x1F) goto yy1179; + goto yy1180; + } else { + if (yych <= 'S') { + if (yych <= 'R') goto yy1179; + goto yy1186; + } else { + if (yych == 's') goto yy1186; + goto yy1179; + } + } +yy1283: + YYDEBUG(1283, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1098; - if (yych <= 'Z') goto yy176; + if (yych <= 'E') goto yy1158; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'e') goto yy1217; - if (yych <= 'z') goto yy181; + if (yych <= 'e') goto yy1284; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1217: - YYDEBUG(1217, *YYCURSOR); - yyaccept = 0; +yy1284: + YYDEBUG(1284, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'V') goto yy1099; - if (yych <= 'Z') goto yy177; + if (yych <= 'V') goto yy1159; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'u') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'v') goto yy1218; - if (yych <= 'z') goto yy185; + if (yych <= 'v') goto yy1285; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1218: - YYDEBUG(1218, *YYCURSOR); - yyaccept = 0; +yy1285: + YYDEBUG(1285, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'H') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'I') goto yy1100; - if (yych <= 'Z') goto yy178; + if (yych <= 'I') goto yy1160; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'h') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'i') goto yy1219; - if (yych <= 'z') goto yy186; + if (yych <= 'i') goto yy1286; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1219: - YYDEBUG(1219, *YYCURSOR); - yyaccept = 0; +yy1286: + YYDEBUG(1286, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'O') goto yy1101; - if (yych <= 'Z') goto yy179; + if (yych <= 'O') goto yy1161; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'n') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'o') goto yy1220; - if (yych <= 'z') goto yy187; + if (yych <= 'o') goto yy1287; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1220: - YYDEBUG(1220, *YYCURSOR); - yyaccept = 0; +yy1287: + YYDEBUG(1287, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'U') goto yy1102; - if (yych == '_') goto yy182; + if (yych <= 'U') goto yy1162; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'u') goto yy1221; - if (yych <= 'z') goto yy188; + if (yych == 'u') goto yy1288; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1221: - YYDEBUG(1221, *YYCURSOR); +yy1288: + YYDEBUG(1288, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'S') goto yy1103; - if (yych != 's') goto yy189; - YYDEBUG(1222, *YYCURSOR); + if (yych == 'S') goto yy1163; + if (yych != 's') goto yy196; + YYDEBUG(1289, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= ',') { if (yych <= '\t') { if (yych <= 0x08) goto yy55; - goto yy1104; + goto yy1164; } else { - if (yych == ' ') goto yy1104; + if (yych == ' ') goto yy1164; goto yy55; } } else { if (yych <= '/') { if (yych == '.') goto yy55; - goto yy182; + goto yy189; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy55; } } -yy1223: - YYDEBUG(1223, *YYCURSOR); +yy1290: + YYDEBUG(1290, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'G') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'F') goto yy176; - goto yy1237; + if (yych <= 'F') goto yy183; + goto yy1304; } } else { if (yych <= 'f') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'g') goto yy1237; - if (yych <= 'z') goto yy176; + if (yych <= 'g') goto yy1304; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1224: - YYDEBUG(1224, *YYCURSOR); +yy1291: + YYDEBUG(1291, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy176; + if (yych <= 'D') goto yy183; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'e') goto yy1225; - if (yych <= 'z') goto yy176; + if (yych <= 'e') goto yy1292; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1225: - YYDEBUG(1225, *YYCURSOR); +yy1292: + YYDEBUG(1292, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'V') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'U') goto yy177; + if (yych <= 'U') goto yy184; } } else { if (yych <= 'u') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'v') goto yy1226; - if (yych <= 'z') goto yy177; + if (yych <= 'v') goto yy1293; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1226: - YYDEBUG(1226, *YYCURSOR); +yy1293: + YYDEBUG(1293, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy178; + if (yych <= 'D') goto yy185; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'e') goto yy1227; - if (yych <= 'z') goto yy178; + if (yych <= 'e') goto yy1294; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1227: - YYDEBUG(1227, *YYCURSOR); +yy1294: + YYDEBUG(1294, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy179; + if (yych <= 'M') goto yy186; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'n') goto yy1228; - if (yych <= 'z') goto yy179; + if (yych <= 'n') goto yy1295; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1228: - YYDEBUG(1228, *YYCURSOR); - yyaccept = 0; +yy1295: + YYDEBUG(1295, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'T') goto yy1229; + if (yych <= 'T') goto yy1296; if (yych != 't') goto yy3; } -yy1229: - YYDEBUG(1229, *YYCURSOR); +yy1296: + YYDEBUG(1296, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy1230; + if (yych == 'H') goto yy1297; if (yych != 'h') goto yy55; -yy1230: - YYDEBUG(1230, *YYCURSOR); +yy1297: + YYDEBUG(1297, *YYCURSOR); yych = *++YYCURSOR; - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; if (yych != ' ') goto yy55; -yy1231: - YYDEBUG(1231, *YYCURSOR); +yy1298: + YYDEBUG(1298, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12); yych = *YYCURSOR; -yy1232: - YYDEBUG(1232, *YYCURSOR); +yy1299: + YYDEBUG(1299, *YYCURSOR); if (yych <= 'X') { if (yych <= 'G') { if (yych <= ' ') { - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; if (yych <= 0x1F) goto yy55; - goto yy1231; + goto yy1298; } else { if (yych <= 'D') { if (yych <= 'C') goto yy55; - goto yy1111; + goto yy1171; } else { - if (yych == 'F') goto yy1112; + if (yych == 'F') goto yy1172; goto yy55; } } } else { if (yych <= 'S') { if (yych <= 'L') { - if (yych <= 'H') goto yy1110; + if (yych <= 'H') goto yy1170; goto yy55; } else { - if (yych <= 'M') goto yy1106; + if (yych <= 'M') goto yy1166; if (yych <= 'R') goto yy55; - goto yy1109; + goto yy1169; } } else { if (yych <= 'U') { - if (yych <= 'T') goto yy1115; - goto yy1108; + if (yych <= 'T') goto yy1175; + goto yy1168; } else { if (yych != 'W') goto yy55; } @@ -17790,2027 +18430,2063 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) if (yych <= 'r') { if (yych <= 'f') { if (yych <= 'c') { - if (yych <= 'Y') goto yy1113; + if (yych <= 'Y') goto yy1173; goto yy55; } else { - if (yych <= 'd') goto yy1111; + if (yych <= 'd') goto yy1171; if (yych <= 'e') goto yy55; - goto yy1112; + goto yy1172; } } else { if (yych <= 'h') { if (yych <= 'g') goto yy55; - goto yy1110; + goto yy1170; } else { - if (yych == 'm') goto yy1106; + if (yych == 'm') goto yy1166; goto yy55; } } } else { if (yych <= 'w') { if (yych <= 't') { - if (yych <= 's') goto yy1109; - goto yy1115; + if (yych <= 's') goto yy1169; + goto yy1175; } else { - if (yych <= 'u') goto yy1108; + if (yych <= 'u') goto yy1168; if (yych <= 'v') goto yy55; } } else { if (yych <= 'y') { if (yych <= 'x') goto yy55; - goto yy1113; + goto yy1173; } else { - if (yych == 0xC2) goto yy1107; + if (yych == 0xC2) goto yy1167; goto yy55; } } } } - YYDEBUG(1233, *YYCURSOR); + YYDEBUG(1300, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1234; + if (yych == 'E') goto yy1301; if (yych != 'e') goto yy55; -yy1234: - YYDEBUG(1234, *YYCURSOR); +yy1301: + YYDEBUG(1301, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= 'C') goto yy55; - if (yych <= 'D') goto yy1136; + if (yych <= 'D') goto yy1198; } else { if (yych <= 'c') goto yy55; - if (yych <= 'd') goto yy1136; + if (yych <= 'd') goto yy1198; if (yych >= 'f') goto yy55; } - YYDEBUG(1235, *YYCURSOR); + YYDEBUG(1302, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'K') goto yy1236; + if (yych == 'K') goto yy1303; if (yych != 'k') goto yy55; -yy1236: - YYDEBUG(1236, *YYCURSOR); +yy1303: + YYDEBUG(1303, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == 'D') goto yy1145; + if (yych == 'D') goto yy1208; if (yych <= 'R') goto yy55; - goto yy1144; + goto yy1207; } else { if (yych <= 'd') { if (yych <= 'c') goto yy55; - goto yy1145; + goto yy1208; } else { - if (yych == 's') goto yy1144; + if (yych == 's') goto yy1207; goto yy55; } } -yy1237: - YYDEBUG(1237, *YYCURSOR); +yy1304: + YYDEBUG(1304, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy177; + if (yych <= 'G') goto yy184; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'h') goto yy1238; - if (yych <= 'z') goto yy177; + if (yych <= 'h') goto yy1305; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1238: - YYDEBUG(1238, *YYCURSOR); +yy1305: + YYDEBUG(1305, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy178; + if (yych <= 'S') goto yy185; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 't') goto yy1239; - if (yych <= 'z') goto yy178; + if (yych <= 't') goto yy1306; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1239: - YYDEBUG(1239, *YYCURSOR); - yyaccept = 0; +yy1306: + YYDEBUG(1306, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; goto yy3; } else { - if (yych <= ' ') goto yy1231; - if (yych == ')') goto yy174; + if (yych <= ' ') goto yy1298; + if (yych == ')') goto yy181; goto yy3; } } else { if (yych <= '`') { - if (yych == 'H') goto yy1240; - if (yych <= 'Z') goto yy179; + if (yych == 'H') goto yy1307; + if (yych <= 'Z') goto yy186; goto yy3; } else { - if (yych == 'h') goto yy1240; - if (yych <= 'z') goto yy179; + if (yych == 'h') goto yy1307; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1240: - YYDEBUG(1240, *YYCURSOR); - yyaccept = 0; +yy1307: + YYDEBUG(1307, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; goto yy3; } else { - if (yych <= ' ') goto yy1231; - if (yych == ')') goto yy174; + if (yych <= ' ') goto yy1298; + if (yych == ')') goto yy181; goto yy3; } -yy1241: - YYDEBUG(1241, *YYCURSOR); - yyaccept = 0; +yy1308: + YYDEBUG(1308, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'F') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'G') goto yy1237; - if (yych <= 'Z') goto yy176; + if (yych <= 'G') goto yy1304; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'f') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'g') goto yy1249; - if (yych <= 'z') goto yy181; + if (yych <= 'g') goto yy1316; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1242: - YYDEBUG(1242, *YYCURSOR); - yyaccept = 0; +yy1309: + YYDEBUG(1309, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1225; - if (yych <= 'Z') goto yy176; + if (yych <= 'E') goto yy1292; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'e') goto yy1243; - if (yych <= 'z') goto yy181; + if (yych <= 'e') goto yy1310; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1243: - YYDEBUG(1243, *YYCURSOR); - yyaccept = 0; +yy1310: + YYDEBUG(1310, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'V') goto yy1226; - if (yych <= 'Z') goto yy177; + if (yych <= 'V') goto yy1293; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'u') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'v') goto yy1244; - if (yych <= 'z') goto yy185; + if (yych <= 'v') goto yy1311; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1244: - YYDEBUG(1244, *YYCURSOR); - yyaccept = 0; +yy1311: + YYDEBUG(1311, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1227; - if (yych <= 'Z') goto yy178; + if (yych <= 'E') goto yy1294; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'e') goto yy1245; - if (yych <= 'z') goto yy186; + if (yych <= 'e') goto yy1312; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1245: - YYDEBUG(1245, *YYCURSOR); - yyaccept = 0; +yy1312: + YYDEBUG(1312, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1228; - if (yych <= 'Z') goto yy179; + if (yych <= 'N') goto yy1295; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'n') goto yy1246; - if (yych <= 'z') goto yy187; + if (yych <= 'n') goto yy1313; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1246: - YYDEBUG(1246, *YYCURSOR); - yyaccept = 0; +yy1313: + YYDEBUG(1313, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'T') goto yy1229; - if (yych == '_') goto yy182; + if (yych <= 'T') goto yy1296; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 't') goto yy1247; - if (yych <= 'z') goto yy188; + if (yych == 't') goto yy1314; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1247: - YYDEBUG(1247, *YYCURSOR); +yy1314: + YYDEBUG(1314, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy1230; - if (yych != 'h') goto yy189; -yy1248: - YYDEBUG(1248, *YYCURSOR); + if (yych == 'H') goto yy1297; + if (yych != 'h') goto yy196; +yy1315: + YYDEBUG(1315, *YYCURSOR); yych = *++YYCURSOR; if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= ',') { if (yych <= '\t') { if (yych <= 0x08) goto yy55; - goto yy1231; + goto yy1298; } else { - if (yych == ' ') goto yy1231; + if (yych == ' ') goto yy1298; goto yy55; } } else { if (yych <= '/') { if (yych == '.') goto yy55; - goto yy182; + goto yy189; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy55; } } -yy1249: - YYDEBUG(1249, *YYCURSOR); - yyaccept = 0; +yy1316: + YYDEBUG(1316, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1238; - if (yych <= 'Z') goto yy177; + if (yych <= 'H') goto yy1305; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'h') goto yy1250; - if (yych <= 'z') goto yy185; + if (yych <= 'h') goto yy1317; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1250: - YYDEBUG(1250, *YYCURSOR); - yyaccept = 0; +yy1317: + YYDEBUG(1317, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1239; - if (yych <= 'Z') goto yy178; + if (yych <= 'T') goto yy1306; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 't') goto yy1251; - if (yych <= 'z') goto yy186; + if (yych <= 't') goto yy1318; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1251: - YYDEBUG(1251, *YYCURSOR); - yyaccept = 0; +yy1318: + YYDEBUG(1318, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1231; + goto yy1298; } else { - if (yych == ' ') goto yy1231; + if (yych == ' ') goto yy1298; goto yy3; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - goto yy182; + goto yy189; } } } else { if (yych <= '^') { if (yych <= 'G') { if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'H') goto yy1240; - if (yych <= 'Z') goto yy179; + if (yych <= 'H') goto yy1307; + if (yych <= 'Z') goto yy186; goto yy3; } } else { if (yych <= 'g') { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'h') goto yy1252; - if (yych <= 'z') goto yy187; + if (yych <= 'h') goto yy1319; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1252: - YYDEBUG(1252, *YYCURSOR); - yyaccept = 0; +yy1319: + YYDEBUG(1319, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= ')') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; goto yy3; } else { - if (yych <= ' ') goto yy1231; + if (yych <= ' ') goto yy1298; if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } } else { if (yych <= '.') { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; goto yy3; } } -yy1253: - YYDEBUG(1253, *YYCURSOR); +yy1320: + YYDEBUG(1320, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'V') { if (yych <= 'B') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { if (yych <= 'O') { - if (yych <= 'C') goto yy1269; - goto yy176; + if (yych <= 'C') goto yy1337; + goto yy183; } else { - if (yych <= 'P') goto yy1271; - if (yych <= 'U') goto yy176; - goto yy1270; + if (yych <= 'P') goto yy1339; + if (yych <= 'U') goto yy183; + goto yy1338; } } } else { if (yych <= 'o') { if (yych <= '`') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; goto yy3; } else { - if (yych == 'c') goto yy1269; - goto yy176; + if (yych == 'c') goto yy1337; + goto yy183; } } else { if (yych <= 'u') { - if (yych <= 'p') goto yy1271; - goto yy176; + if (yych <= 'p') goto yy1339; + goto yy183; } else { - if (yych <= 'v') goto yy1270; - if (yych <= 'z') goto yy176; + if (yych <= 'v') goto yy1338; + if (yych <= 'z') goto yy183; goto yy3; } } } -yy1254: - YYDEBUG(1254, *YYCURSOR); +yy1321: + YYDEBUG(1321, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy176; - goto yy1264; + if (yych <= 'S') goto yy183; + goto yy1331; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 't') goto yy1264; - if (yych <= 'z') goto yy176; + if (yych <= 't') goto yy1331; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1255: - YYDEBUG(1255, *YYCURSOR); +yy1322: + YYDEBUG(1322, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'X') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'W') goto yy176; - goto yy1261; + if (yych <= 'W') goto yy183; + goto yy1328; } } else { if (yych <= 'w') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'x') goto yy1261; - if (yych <= 'z') goto yy176; + if (yych <= 'x') goto yy1328; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1256: - YYDEBUG(1256, *YYCURSOR); +yy1323: + YYDEBUG(1323, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy176; + if (yych <= 'M') goto yy183; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'n') goto yy1257; - if (yych <= 'z') goto yy176; + if (yych <= 'n') goto yy1324; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1257: - YYDEBUG(1257, *YYCURSOR); +yy1324: + YYDEBUG(1324, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { - if (yych <= '(') goto yy201; - goto yy174; + if (yych <= '(') goto yy219; + goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'C') goto yy177; + if (yych <= '@') goto yy219; + if (yych <= 'C') goto yy184; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy201; - goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy219; + goto yy184; } else { - if (yych <= 'd') goto yy1258; - if (yych <= 'z') goto yy177; - goto yy201; + if (yych <= 'd') goto yy1325; + if (yych <= 'z') goto yy184; + goto yy219; } } -yy1258: - YYDEBUG(1258, *YYCURSOR); +yy1325: + YYDEBUG(1325, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; goto yy3; } else { - if (yych <= 'a') goto yy1259; - if (yych <= 'z') goto yy178; + if (yych <= 'a') goto yy1326; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1259: - YYDEBUG(1259, *YYCURSOR); +yy1326: + YYDEBUG(1326, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'X') goto yy179; + if (yych <= 'X') goto yy186; } } else { if (yych <= 'x') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'y') goto yy1260; - if (yych <= 'z') goto yy179; + if (yych <= 'y') goto yy1327; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1260: - YYDEBUG(1260, *YYCURSOR); +yy1327: + YYDEBUG(1327, *YYCURSOR); yych = *++YYCURSOR; - if (yych == ')') goto yy174; - goto yy201; -yy1261: - YYDEBUG(1261, *YYCURSOR); + if (yych <= 'R') { + if (yych == ')') goto yy181; + goto yy219; + } else { + if (yych <= 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; + } +yy1328: + YYDEBUG(1328, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; + if (yych <= 'S') goto yy184; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1262; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1329; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1262: - YYDEBUG(1262, *YYCURSOR); +yy1329: + YYDEBUG(1329, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy178; + if (yych <= 'G') goto yy185; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'h') goto yy1263; - if (yych <= 'z') goto yy178; + if (yych <= 'h') goto yy1330; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1263: - YYDEBUG(1263, *YYCURSOR); - yyaccept = 0; +yy1330: + YYDEBUG(1330, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1231; + goto yy1298; } else { - if (yych == ' ') goto yy1231; + if (yych == ' ') goto yy1298; goto yy3; } } else { if (yych <= 'Z') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy179; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1264: - YYDEBUG(1264, *YYCURSOR); +yy1331: + YYDEBUG(1331, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= ')') { - if (yych <= '(') goto yy201; - goto yy174; + if (yych <= '(') goto yy219; + goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'T') goto yy177; + if (yych <= '@') goto yy219; + if (yych <= 'T') goto yy184; } } else { if (yych <= 't') { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy201; - goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy219; + goto yy184; } else { - if (yych <= 'u') goto yy1265; - if (yych <= 'z') goto yy177; - goto yy201; + if (yych <= 'u') goto yy1332; + if (yych <= 'z') goto yy184; + goto yy219; } } -yy1265: - YYDEBUG(1265, *YYCURSOR); +yy1332: + YYDEBUG(1332, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy178; + if (yych <= 'Q') goto yy185; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'r') goto yy1266; - if (yych <= 'z') goto yy178; + if (yych <= 'r') goto yy1333; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1266: - YYDEBUG(1266, *YYCURSOR); +yy1333: + YYDEBUG(1333, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy179; + if (yych <= 'C') goto yy186; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'd') goto yy1267; - if (yych <= 'z') goto yy179; + if (yych <= 'd') goto yy1334; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1267: - YYDEBUG(1267, *YYCURSOR); - yyaccept = 0; +yy1334: + YYDEBUG(1334, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'A') goto yy1268; + if (yych <= 'A') goto yy1335; if (yych != 'a') goto yy3; } -yy1268: - YYDEBUG(1268, *YYCURSOR); +yy1335: + YYDEBUG(1335, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy207; - if (yych == 'y') goto yy207; - goto yy55; -yy1269: - YYDEBUG(1269, *YYCURSOR); + if (yych == 'Y') goto yy1336; + if (yych != 'y') goto yy55; +yy1336: + YYDEBUG(1336, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; +yy1337: + YYDEBUG(1337, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'N') goto yy177; - goto yy1280; + if (yych <= 'N') goto yy184; + goto yy1348; } } else { if (yych <= 'n') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'o') goto yy1280; - if (yych <= 'z') goto yy177; + if (yych <= 'o') goto yy1348; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1270: - YYDEBUG(1270, *YYCURSOR); +yy1338: + YYDEBUG(1338, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy177; - goto yy1277; + if (yych <= 'D') goto yy184; + goto yy1345; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'e') goto yy1277; - if (yych <= 'z') goto yy177; + if (yych <= 'e') goto yy1345; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1271: - YYDEBUG(1271, *YYCURSOR); +yy1339: + YYDEBUG(1339, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'T') goto yy177; + if (yych != 'T') goto yy184; } } else { if (yych <= 's') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 't') goto yy1272; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 't') goto yy1340; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy1272: - YYDEBUG(1272, *YYCURSOR); +yy1340: + YYDEBUG(1340, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'E') goto yy178; + if (yych != 'E') goto yy185; } } else { if (yych <= 'd') { - if (yych <= '`') goto yy228; - goto yy178; + if (yych <= '`') goto yy248; + goto yy185; } else { - if (yych <= 'e') goto yy1273; - if (yych <= 'z') goto yy178; - goto yy228; + if (yych <= 'e') goto yy1341; + if (yych <= 'z') goto yy185; + goto yy248; } } } -yy1273: - YYDEBUG(1273, *YYCURSOR); +yy1341: + YYDEBUG(1341, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'L') goto yy179; + if (yych <= 'L') goto yy186; } } else { if (yych <= 'l') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'm') goto yy1274; - if (yych <= 'z') goto yy179; + if (yych <= 'm') goto yy1342; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1274: - YYDEBUG(1274, *YYCURSOR); - yyaccept = 0; +yy1342: + YYDEBUG(1342, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'B') goto yy1275; + if (yych <= 'B') goto yy1343; if (yych != 'b') goto yy3; } -yy1275: - YYDEBUG(1275, *YYCURSOR); +yy1343: + YYDEBUG(1343, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1276; + if (yych == 'E') goto yy1344; if (yych != 'e') goto yy55; -yy1276: - YYDEBUG(1276, *YYCURSOR); +yy1344: + YYDEBUG(1344, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy239; - if (yych == 'r') goto yy239; + if (yych == 'R') goto yy259; + if (yych == 'r') goto yy259; goto yy55; -yy1277: - YYDEBUG(1277, *YYCURSOR); +yy1345: + YYDEBUG(1345, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy178; + if (yych <= 'M') goto yy185; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'n') goto yy1278; - if (yych <= 'z') goto yy178; + if (yych <= 'n') goto yy1346; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1278: - YYDEBUG(1278, *YYCURSOR); +yy1346: + YYDEBUG(1346, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy179; + if (yych <= 'S') goto yy186; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 't') goto yy1279; - if (yych <= 'z') goto yy179; + if (yych <= 't') goto yy1347; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1279: - YYDEBUG(1279, *YYCURSOR); - yyaccept = 0; +yy1347: + YYDEBUG(1347, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'H') goto yy1230; - if (yych == 'h') goto yy1230; + if (yych <= 'H') goto yy1297; + if (yych == 'h') goto yy1297; goto yy3; } -yy1280: - YYDEBUG(1280, *YYCURSOR); +yy1348: + YYDEBUG(1348, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy178; + if (yych <= 'M') goto yy185; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'n') goto yy1281; - if (yych <= 'z') goto yy178; + if (yych <= 'n') goto yy1349; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1281: - YYDEBUG(1281, *YYCURSOR); +yy1349: + YYDEBUG(1349, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy179; - goto yy1240; + if (yych <= 'C') goto yy186; + goto yy1307; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'd') goto yy1240; - if (yych <= 'z') goto yy179; + if (yych <= 'd') goto yy1307; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1282: - YYDEBUG(1282, *YYCURSOR); - yyaccept = 0; +yy1350: + YYDEBUG(1350, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'U') { if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= 'C') { if (yych <= '@') goto yy3; - if (yych <= 'B') goto yy176; - goto yy1269; + if (yych <= 'B') goto yy183; + goto yy1337; } else { - if (yych == 'P') goto yy1271; - goto yy176; + if (yych == 'P') goto yy1339; + goto yy183; } } } else { if (yych <= 'b') { if (yych <= '^') { - if (yych <= 'V') goto yy1270; - if (yych <= 'Z') goto yy176; + if (yych <= 'V') goto yy1338; + if (yych <= 'Z') goto yy183; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } } else { if (yych <= 'p') { - if (yych <= 'c') goto yy1298; - if (yych <= 'o') goto yy181; - goto yy1300; + if (yych <= 'c') goto yy1367; + if (yych <= 'o') goto yy188; + goto yy1369; } else { - if (yych == 'v') goto yy1299; - if (yych <= 'z') goto yy181; + if (yych == 'v') goto yy1368; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1283: - YYDEBUG(1283, *YYCURSOR); - yyaccept = 0; +yy1351: + YYDEBUG(1351, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1264; - if (yych <= 'Z') goto yy176; + if (yych <= 'T') goto yy1331; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 't') goto yy1293; - if (yych <= 'z') goto yy181; + if (yych <= 't') goto yy1361; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1284: - YYDEBUG(1284, *YYCURSOR); - yyaccept = 0; +yy1352: + YYDEBUG(1352, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'X') goto yy1261; - if (yych <= 'Z') goto yy176; + if (yych <= 'X') goto yy1328; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'w') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'x') goto yy1290; - if (yych <= 'z') goto yy181; + if (yych <= 'x') goto yy1358; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1285: - YYDEBUG(1285, *YYCURSOR); - yyaccept = 0; +yy1353: + YYDEBUG(1353, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1257; - if (yych <= 'Z') goto yy176; + if (yych <= 'N') goto yy1324; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'n') goto yy1286; - if (yych <= 'z') goto yy181; + if (yych <= 'n') goto yy1354; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1286: - YYDEBUG(1286, *YYCURSOR); +yy1354: + YYDEBUG(1354, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1258; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'D') goto yy1325; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 'c') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 'd') goto yy1287; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 'd') goto yy1355; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy1287: - YYDEBUG(1287, *YYCURSOR); - yyaccept = 0; +yy1355: + YYDEBUG(1355, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1259; - if (yych <= 'Z') goto yy178; + if (yych <= 'A') goto yy1326; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1288; - if (yych <= 'z') goto yy186; + if (yych <= 'a') goto yy1356; + if (yych <= 'z') goto yy193; goto yy3; } } -yy1288: - YYDEBUG(1288, *YYCURSOR); - yyaccept = 0; +yy1356: + YYDEBUG(1356, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1260; - if (yych <= 'Z') goto yy179; + if (yych <= 'Y') goto yy1327; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'x') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'y') goto yy1289; - if (yych <= 'z') goto yy187; + if (yych <= 'y') goto yy1357; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1289: - YYDEBUG(1289, *YYCURSOR); +yy1357: + YYDEBUG(1357, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); - if (yybm[0+yych] & 8) { - goto yy188; - } - if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych <= 'R') { + if (yych <= ',') { + if (yych == ')') goto yy181; + goto yy219; + } else { + if (yych == '.') goto yy219; + if (yych <= '/') goto yy189; + goto yy219; + } } else { - if (yych <= '/') { - if (yych <= '.') goto yy201; - goto yy182; + if (yych <= '`') { + if (yych <= 'S') goto yy225; + if (yych == '_') goto yy189; + goto yy219; } else { - if (yych == '_') goto yy182; - goto yy201; + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; } } -yy1290: - YYDEBUG(1290, *YYCURSOR); - yyaccept = 0; +yy1358: + YYDEBUG(1358, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1262; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1329; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1291; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1359; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1291: - YYDEBUG(1291, *YYCURSOR); - yyaccept = 0; +yy1359: + YYDEBUG(1359, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1263; - if (yych <= 'Z') goto yy178; + if (yych <= 'H') goto yy1330; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'h') goto yy1292; - if (yych <= 'z') goto yy186; + if (yych <= 'h') goto yy1360; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1292: - YYDEBUG(1292, *YYCURSOR); - yyaccept = 0; +yy1360: + YYDEBUG(1360, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; if (yych <= 0x1F) goto yy3; - goto yy1231; + goto yy1298; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= 'Z') { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } else { if (yych <= '_') { if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy187; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1293: - YYDEBUG(1293, *YYCURSOR); +yy1361: + YYDEBUG(1361, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'U') goto yy1265; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'U') goto yy1332; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 't') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 'u') goto yy1294; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 'u') goto yy1362; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy1294: - YYDEBUG(1294, *YYCURSOR); - yyaccept = 0; +yy1362: + YYDEBUG(1362, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1266; - if (yych <= 'Z') goto yy178; + if (yych <= 'R') goto yy1333; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'r') goto yy1295; - if (yych <= 'z') goto yy186; + if (yych <= 'r') goto yy1363; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1295: - YYDEBUG(1295, *YYCURSOR); - yyaccept = 0; +yy1363: + YYDEBUG(1363, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1267; - if (yych <= 'Z') goto yy179; + if (yych <= 'D') goto yy1334; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'd') goto yy1296; - if (yych <= 'z') goto yy187; + if (yych <= 'd') goto yy1364; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1296: - YYDEBUG(1296, *YYCURSOR); - yyaccept = 0; +yy1364: + YYDEBUG(1364, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; + goto yy3; + } else { + if (yych == '.') goto yy3; + if (yych <= '/') goto yy189; + goto yy3; + } + } else { + if (yych <= '_') { + if (yych <= 'A') goto yy1335; + if (yych <= '^') goto yy3; + goto yy189; + } else { + if (yych <= '`') goto yy3; + if (yych <= 'a') goto yy1365; + if (yych <= 'z') goto yy195; goto yy3; + } + } +yy1365: + YYDEBUG(1365, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'Y') goto yy1336; + if (yych != 'y') goto yy196; + YYDEBUG(1366, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'S') { + if (yych <= '.') { + if (yych == '-') goto yy189; + goto yy219; } else { - if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; - goto yy3; + if (yych <= '/') goto yy189; + if (yych <= 'R') goto yy219; + goto yy225; } } else { - if (yych <= '_') { - if (yych <= 'A') goto yy1268; - if (yych <= '^') goto yy3; - goto yy182; + if (yych <= '`') { + if (yych == '_') goto yy189; + goto yy219; } else { - if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1297; - if (yych <= 'z') goto yy188; - goto yy3; + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; } } -yy1297: - YYDEBUG(1297, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'Y') goto yy207; - if (yych == 'y') goto yy220; - goto yy189; -yy1298: - YYDEBUG(1298, *YYCURSOR); - yyaccept = 0; +yy1367: + YYDEBUG(1367, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'O') goto yy1280; - if (yych <= 'Z') goto yy177; + if (yych <= 'O') goto yy1348; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'n') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'o') goto yy1309; - if (yych <= 'z') goto yy185; + if (yych <= 'o') goto yy1378; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1299: - YYDEBUG(1299, *YYCURSOR); - yyaccept = 0; +yy1368: + YYDEBUG(1368, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1277; - if (yych <= 'Z') goto yy177; + if (yych <= 'E') goto yy1345; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'e') goto yy1306; - if (yych <= 'z') goto yy185; + if (yych <= 'e') goto yy1375; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1300: - YYDEBUG(1300, *YYCURSOR); +yy1369: + YYDEBUG(1369, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'S') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'T') goto yy1272; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'T') goto yy1340; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 's') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 't') goto yy1301; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 't') goto yy1370; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy1301: - YYDEBUG(1301, *YYCURSOR); +yy1370: + YYDEBUG(1370, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'D') { - if (yych <= '@') goto yy228; - goto yy178; + if (yych <= '@') goto yy248; + goto yy185; } else { - if (yych <= 'E') goto yy1273; - if (yych <= 'Z') goto yy178; - goto yy228; + if (yych <= 'E') goto yy1341; + if (yych <= 'Z') goto yy185; + goto yy248; } } else { if (yych <= 'd') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy186; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy193; } else { - if (yych <= 'e') goto yy1302; - if (yych <= 'z') goto yy186; - goto yy228; + if (yych <= 'e') goto yy1371; + if (yych <= 'z') goto yy193; + goto yy248; } } } -yy1302: - YYDEBUG(1302, *YYCURSOR); - yyaccept = 0; +yy1371: + YYDEBUG(1371, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'M') goto yy1274; - if (yych <= 'Z') goto yy179; + if (yych <= 'M') goto yy1342; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'l') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'm') goto yy1303; - if (yych <= 'z') goto yy187; + if (yych <= 'm') goto yy1372; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1303: - YYDEBUG(1303, *YYCURSOR); - yyaccept = 0; +yy1372: + YYDEBUG(1372, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'B') goto yy1275; - if (yych == '_') goto yy182; + if (yych <= 'B') goto yy1343; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'b') goto yy1304; - if (yych <= 'z') goto yy188; + if (yych == 'b') goto yy1373; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1304: - YYDEBUG(1304, *YYCURSOR); +yy1373: + YYDEBUG(1373, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1276; - if (yych != 'e') goto yy189; - YYDEBUG(1305, *YYCURSOR); + if (yych == 'E') goto yy1344; + if (yych != 'e') goto yy196; + YYDEBUG(1374, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy239; - if (yych == 'r') goto yy351; - goto yy189; -yy1306: - YYDEBUG(1306, *YYCURSOR); - yyaccept = 0; + if (yych == 'R') goto yy259; + if (yych == 'r') goto yy382; + goto yy196; +yy1375: + YYDEBUG(1375, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1278; - if (yych <= 'Z') goto yy178; + if (yych <= 'N') goto yy1346; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'n') goto yy1307; - if (yych <= 'z') goto yy186; + if (yych <= 'n') goto yy1376; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1307: - YYDEBUG(1307, *YYCURSOR); - yyaccept = 0; +yy1376: + YYDEBUG(1376, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1279; - if (yych <= 'Z') goto yy179; + if (yych <= 'T') goto yy1347; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 't') goto yy1308; - if (yych <= 'z') goto yy187; + if (yych <= 't') goto yy1377; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1308: - YYDEBUG(1308, *YYCURSOR); - yyaccept = 0; +yy1377: + YYDEBUG(1377, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'H') goto yy1230; - if (yych == '_') goto yy182; + if (yych <= 'H') goto yy1297; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'h') goto yy1248; - if (yych <= 'z') goto yy188; + if (yych == 'h') goto yy1315; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1309: - YYDEBUG(1309, *YYCURSOR); - yyaccept = 0; +yy1378: + YYDEBUG(1378, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1281; - if (yych <= 'Z') goto yy178; + if (yych <= 'N') goto yy1349; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'n') goto yy1310; - if (yych <= 'z') goto yy186; + if (yych <= 'n') goto yy1379; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1310: - YYDEBUG(1310, *YYCURSOR); - yyaccept = 0; +yy1379: + YYDEBUG(1379, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1240; - if (yych <= 'Z') goto yy179; + if (yych <= 'D') goto yy1307; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'd') goto yy1252; - if (yych <= 'z') goto yy187; + if (yych <= 'd') goto yy1319; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1311: - YYDEBUG(1311, *YYCURSOR); +yy1380: + YYDEBUG(1380, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'C') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'B') goto yy176; + if (yych <= 'B') goto yy183; } } else { if (yych <= 'b') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'c') goto yy1312; - if (yych <= 'z') goto yy176; + if (yych <= 'c') goto yy1381; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1312: - YYDEBUG(1312, *YYCURSOR); +yy1381: + YYDEBUG(1381, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'K') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'J') goto yy177; + if (yych <= 'J') goto yy184; } } else { if (yych <= 'j') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'k') goto yy1313; - if (yych <= 'z') goto yy177; + if (yych <= 'k') goto yy1382; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1313: - YYDEBUG(1313, *YYCURSOR); - yyaccept = 0; +yy1382: + YYDEBUG(1382, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ')') { - if (yych == ' ') goto yy1314; + if (yych == ' ') goto yy1383; if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= 'Z') { if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy178; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1314: - YYDEBUG(1314, *YYCURSOR); +yy1383: + YYDEBUG(1383, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1315; + if (yych == 'O') goto yy1384; if (yych != 'o') goto yy55; -yy1315: - YYDEBUG(1315, *YYCURSOR); +yy1384: + YYDEBUG(1384, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy1316; + if (yych == 'F') goto yy1385; if (yych != 'f') goto yy55; -yy1316: - YYDEBUG(1316, *YYCURSOR); +yy1385: + YYDEBUG(1385, *YYCURSOR); yych = *++YYCURSOR; if (yych != ' ') goto yy55; - YYDEBUG(1317, *YYCURSOR); + YYDEBUG(1386, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy1318; - if (yych <= '2') goto yy1320; - if (yych <= '9') goto yy1321; + if (yych <= '1') goto yy1387; + if (yych <= '2') goto yy1389; + if (yych <= '9') goto yy1390; goto yy55; -yy1318: - YYDEBUG(1318, *YYCURSOR); - yyaccept = 27; +yy1387: + YYDEBUG(1387, *YYCURSOR); + yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1322; + if (yych == '\t') goto yy1391; } else { - if (yych <= ' ') goto yy1322; - if (yych <= '/') goto yy1319; - if (yych <= '9') goto yy1321; + if (yych <= ' ') goto yy1391; + if (yych <= '/') goto yy1388; + if (yych <= '9') goto yy1390; } } else { if (yych <= '`') { - if (yych <= 'A') goto yy1324; - if (yych == 'P') goto yy1324; + if (yych <= 'A') goto yy1393; + if (yych == 'P') goto yy1393; } else { - if (yych <= 'a') goto yy1324; - if (yych == 'p') goto yy1324; + if (yych <= 'a') goto yy1393; + if (yych == 'p') goto yy1393; } } -yy1319: - YYDEBUG(1319, *YYCURSOR); -#line 1186 "ext/date/lib/parse_date.re" +yy1388: + YYDEBUG(1388, *YYCURSOR); +#line 1227 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("backof | frontof"); TIMELIB_INIT; @@ -19832,306 +20508,306 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -#line 19834 "" -yy1320: - YYDEBUG(1320, *YYCURSOR); - yyaccept = 27; +#line 20512 "" +yy1389: + YYDEBUG(1389, *YYCURSOR); + yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1322; - goto yy1319; + if (yych == '\t') goto yy1391; + goto yy1388; } else { - if (yych <= ' ') goto yy1322; - if (yych <= '/') goto yy1319; - if (yych >= '5') goto yy1319; + if (yych <= ' ') goto yy1391; + if (yych <= '/') goto yy1388; + if (yych >= '5') goto yy1388; } } else { if (yych <= '`') { - if (yych <= 'A') goto yy1324; - if (yych == 'P') goto yy1324; - goto yy1319; + if (yych <= 'A') goto yy1393; + if (yych == 'P') goto yy1393; + goto yy1388; } else { - if (yych <= 'a') goto yy1324; - if (yych == 'p') goto yy1324; - goto yy1319; + if (yych <= 'a') goto yy1393; + if (yych == 'p') goto yy1393; + goto yy1388; } } -yy1321: - YYDEBUG(1321, *YYCURSOR); - yyaccept = 27; +yy1390: + YYDEBUG(1390, *YYCURSOR); + yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych != '\t') goto yy1319; + if (yych != '\t') goto yy1388; } else { - if (yych <= ' ') goto yy1322; - if (yych <= '@') goto yy1319; - goto yy1324; + if (yych <= ' ') goto yy1391; + if (yych <= '@') goto yy1388; + goto yy1393; } } else { if (yych <= '`') { - if (yych == 'P') goto yy1324; - goto yy1319; + if (yych == 'P') goto yy1393; + goto yy1388; } else { - if (yych <= 'a') goto yy1324; - if (yych == 'p') goto yy1324; - goto yy1319; + if (yych <= 'a') goto yy1393; + if (yych == 'p') goto yy1393; + goto yy1388; } } -yy1322: - YYDEBUG(1322, *YYCURSOR); +yy1391: + YYDEBUG(1391, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(1323, *YYCURSOR); + YYDEBUG(1392, *YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1322; + if (yych == '\t') goto yy1391; goto yy55; } else { - if (yych <= ' ') goto yy1322; + if (yych <= ' ') goto yy1391; if (yych <= '@') goto yy55; } } else { if (yych <= '`') { if (yych != 'P') goto yy55; } else { - if (yych <= 'a') goto yy1324; + if (yych <= 'a') goto yy1393; if (yych != 'p') goto yy55; } } -yy1324: - YYDEBUG(1324, *YYCURSOR); +yy1393: + YYDEBUG(1393, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy55; } else { - if (yych <= 'M') goto yy1326; - if (yych == 'm') goto yy1326; + if (yych <= 'M') goto yy1395; + if (yych == 'm') goto yy1395; goto yy55; } - YYDEBUG(1325, *YYCURSOR); + YYDEBUG(1394, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy1326; + if (yych == 'M') goto yy1395; if (yych != 'm') goto yy55; -yy1326: - YYDEBUG(1326, *YYCURSOR); +yy1395: + YYDEBUG(1395, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy1328; - if (yych == '\t') goto yy1328; + if (yych <= 0x00) goto yy1397; + if (yych == '\t') goto yy1397; goto yy55; } else { - if (yych <= ' ') goto yy1328; + if (yych <= ' ') goto yy1397; if (yych != '.') goto yy55; } - YYDEBUG(1327, *YYCURSOR); + YYDEBUG(1396, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy1328; + if (yych <= 0x00) goto yy1397; if (yych <= 0x08) goto yy55; } else { if (yych != ' ') goto yy55; } -yy1328: - YYDEBUG(1328, *YYCURSOR); +yy1397: + YYDEBUG(1397, *YYCURSOR); yych = *++YYCURSOR; - goto yy1319; -yy1329: - YYDEBUG(1329, *YYCURSOR); - yyaccept = 0; + goto yy1388; +yy1398: + YYDEBUG(1398, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'C') goto yy1312; - if (yych <= 'Z') goto yy176; + if (yych <= 'C') goto yy1381; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'b') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'c') goto yy1330; - if (yych <= 'z') goto yy181; + if (yych <= 'c') goto yy1399; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1330: - YYDEBUG(1330, *YYCURSOR); - yyaccept = 0; +yy1399: + YYDEBUG(1399, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'J') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'K') goto yy1313; - if (yych <= 'Z') goto yy177; + if (yych <= 'K') goto yy1382; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'j') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'k') goto yy1331; - if (yych <= 'z') goto yy185; + if (yych <= 'k') goto yy1400; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1331: - YYDEBUG(1331, *YYCURSOR); - yyaccept = 0; +yy1400: + YYDEBUG(1400, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= '(') { - if (yych == ' ') goto yy1314; + if (yych == ' ') goto yy1383; goto yy3; } else { - if (yych <= ')') goto yy174; - if (yych == '-') goto yy182; + if (yych <= ')') goto yy181; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '^') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; if (yych <= '@') goto yy3; - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy186; + if (yych <= 'z') goto yy193; goto yy3; } } -yy1332: - YYDEBUG(1332, *YYCURSOR); +yy1401: + YYDEBUG(1401, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy176; + if (yych <= 'R') goto yy183; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 's') goto yy1333; - if (yych <= 'z') goto yy176; + if (yych <= 's') goto yy1402; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1333: - YYDEBUG(1333, *YYCURSOR); +yy1402: + YYDEBUG(1402, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; + if (yych <= 'S') goto yy184; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1334; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1403; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1334: - YYDEBUG(1334, *YYCURSOR); - yyaccept = 0; +yy1403: + YYDEBUG(1403, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1104; + goto yy1164; } else { if (yych != ' ') goto yy3; } } else { if (yych <= 'Z') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy178; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1335: - YYDEBUG(1335, *YYCURSOR); +yy1404: + YYDEBUG(1404, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1336; - if (yych != 'd') goto yy1105; -yy1336: - YYDEBUG(1336, *YYCURSOR); + if (yych == 'D') goto yy1405; + if (yych != 'd') goto yy1165; +yy1405: + YYDEBUG(1405, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1337; + if (yych == 'A') goto yy1406; if (yych != 'a') goto yy55; -yy1337: - YYDEBUG(1337, *YYCURSOR); +yy1406: + YYDEBUG(1406, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1338; + if (yych == 'Y') goto yy1407; if (yych != 'y') goto yy55; -yy1338: - YYDEBUG(1338, *YYCURSOR); - yyaccept = 25; +yy1407: + YYDEBUG(1407, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { - if (yych != ' ') goto yy1119; + if (yych != ' ') goto yy1179; } else { - if (yych <= 'S') goto yy1144; - if (yych == 's') goto yy1144; - goto yy1119; + if (yych <= 'S') goto yy1207; + if (yych == 's') goto yy1207; + goto yy1179; } - YYDEBUG(1339, *YYCURSOR); + YYDEBUG(1408, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1340; + if (yych == 'O') goto yy1409; if (yych != 'o') goto yy55; -yy1340: - YYDEBUG(1340, *YYCURSOR); +yy1409: + YYDEBUG(1409, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy1341; + if (yych == 'F') goto yy1410; if (yych != 'f') goto yy55; -yy1341: - YYDEBUG(1341, *YYCURSOR); +yy1410: + YYDEBUG(1410, *YYCURSOR); ++YYCURSOR; - YYDEBUG(1342, *YYCURSOR); -#line 1169 "ext/date/lib/parse_date.re" + YYDEBUG(1411, *YYCURSOR); +#line 1210 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("firstdayof | lastdayof"); TIMELIB_INIT; @@ -20147,1495 +20823,1529 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -#line 20149 "" -yy1343: - YYDEBUG(1343, *YYCURSOR); - yyaccept = 0; +#line 20827 "" +yy1412: + YYDEBUG(1412, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1333; - if (yych <= 'Z') goto yy176; + if (yych <= 'S') goto yy1402; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'r') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 's') goto yy1344; - if (yych <= 'z') goto yy181; + if (yych <= 's') goto yy1413; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1344: - YYDEBUG(1344, *YYCURSOR); - yyaccept = 0; +yy1413: + YYDEBUG(1413, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1334; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1403; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1345; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1414; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1345: - YYDEBUG(1345, *YYCURSOR); - yyaccept = 0; +yy1414: + YYDEBUG(1414, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1104; + if (yych == '\t') goto yy1164; if (yych <= 0x1F) goto yy3; - goto yy1335; + goto yy1404; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= 'Z') { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } else { if (yych <= '_') { if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy186; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1346: - YYDEBUG(1346, *YYCURSOR); +yy1415: + YYDEBUG(1415, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy176; - goto yy1383; + if (yych <= 'A') goto yy183; + goto yy1453; } } else { if (yych <= 'a') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'b') goto yy1383; - if (yych <= 'z') goto yy176; + if (yych <= 'b') goto yy1453; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1347: - YYDEBUG(1347, *YYCURSOR); +yy1416: + YYDEBUG(1416, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'F') goto yy1373; - if (yych <= 'Q') goto yy176; - goto yy1372; + if (yych == 'F') goto yy1443; + if (yych <= 'Q') goto yy183; + goto yy1442; } } else { if (yych <= 'f') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'e') goto yy176; - goto yy1373; + if (yych <= 'e') goto yy183; + goto yy1443; } else { - if (yych == 'r') goto yy1372; - if (yych <= 'z') goto yy176; + if (yych == 'r') goto yy1442; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1348: - YYDEBUG(1348, *YYCURSOR); +yy1417: + YYDEBUG(1417, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'T') goto yy176; - goto yy1369; + if (yych <= 'T') goto yy183; + goto yy1439; } } else { if (yych <= 't') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'u') goto yy1369; - if (yych <= 'z') goto yy176; + if (yych <= 'u') goto yy1439; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1349: - YYDEBUG(1349, *YYCURSOR); +yy1418: + YYDEBUG(1418, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'I') goto yy1351; - if (yych <= 'N') goto yy176; + if (yych == 'I') goto yy1420; + if (yych <= 'N') goto yy183; } } else { if (yych <= 'i') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'h') goto yy176; - goto yy1351; + if (yych <= 'h') goto yy183; + goto yy1420; } else { - if (yych == 'o') goto yy1350; - if (yych <= 'z') goto yy176; + if (yych == 'o') goto yy1419; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1350: - YYDEBUG(1350, *YYCURSOR); +yy1419: + YYDEBUG(1419, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy177; - goto yy1354; + if (yych <= 'M') goto yy184; + goto yy1424; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'n') goto yy1354; - if (yych <= 'z') goto yy177; + if (yych <= 'n') goto yy1424; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1351: - YYDEBUG(1351, *YYCURSOR); +yy1420: + YYDEBUG(1420, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { - if (yych <= '(') goto yy201; - goto yy174; + if (yych <= '(') goto yy219; + goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'C') goto yy177; + if (yych <= '@') goto yy219; + if (yych <= 'C') goto yy184; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy201; - goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy219; + goto yy184; } else { - if (yych <= 'd') goto yy1352; - if (yych <= 'z') goto yy177; - goto yy201; + if (yych <= 'd') goto yy1421; + if (yych <= 'z') goto yy184; + goto yy219; } } -yy1352: - YYDEBUG(1352, *YYCURSOR); +yy1421: + YYDEBUG(1421, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; goto yy3; } else { - if (yych <= 'a') goto yy1353; - if (yych <= 'z') goto yy178; + if (yych <= 'a') goto yy1422; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1353: - YYDEBUG(1353, *YYCURSOR); +yy1422: + YYDEBUG(1422, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'X') goto yy179; - goto yy1260; + if (yych <= 'X') goto yy186; } } else { if (yych <= 'x') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'y') goto yy1260; - if (yych <= 'z') goto yy179; + if (yych <= 'y') goto yy1423; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1354: - YYDEBUG(1354, *YYCURSOR); +yy1423: + YYDEBUG(1423, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'R') { + if (yych == ')') goto yy181; + goto yy219; + } else { + if (yych <= 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; + } +yy1424: + YYDEBUG(1424, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy178; + if (yych <= 'S') goto yy185; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 't') goto yy1355; - if (yych <= 'z') goto yy178; + if (yych <= 't') goto yy1425; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1355: - YYDEBUG(1355, *YYCURSOR); - yyaccept = 0; +yy1425: + YYDEBUG(1425, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ')') { - if (yych == ' ') goto yy1356; + if (yych == ' ') goto yy1426; if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= 'Z') { if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy179; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1356: - YYDEBUG(1356, *YYCURSOR); +yy1426: + YYDEBUG(1426, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1357; + if (yych == 'O') goto yy1427; if (yych != 'o') goto yy55; -yy1357: - YYDEBUG(1357, *YYCURSOR); +yy1427: + YYDEBUG(1427, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy1358; + if (yych == 'F') goto yy1428; if (yych != 'f') goto yy55; -yy1358: - YYDEBUG(1358, *YYCURSOR); +yy1428: + YYDEBUG(1428, *YYCURSOR); yych = *++YYCURSOR; if (yych != ' ') goto yy55; - YYDEBUG(1359, *YYCURSOR); + YYDEBUG(1429, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '1') goto yy1360; - if (yych <= '2') goto yy1361; - if (yych <= '9') goto yy1362; + if (yych <= '1') goto yy1430; + if (yych <= '2') goto yy1431; + if (yych <= '9') goto yy1432; goto yy55; -yy1360: - YYDEBUG(1360, *YYCURSOR); - yyaccept = 27; +yy1430: + YYDEBUG(1430, *YYCURSOR); + yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1363; - goto yy1319; + if (yych == '\t') goto yy1433; + goto yy1388; } else { - if (yych <= ' ') goto yy1363; - if (yych <= '/') goto yy1319; - if (yych <= '9') goto yy1362; - goto yy1319; + if (yych <= ' ') goto yy1433; + if (yych <= '/') goto yy1388; + if (yych <= '9') goto yy1432; + goto yy1388; } } else { if (yych <= '`') { - if (yych <= 'A') goto yy1365; - if (yych == 'P') goto yy1365; - goto yy1319; + if (yych <= 'A') goto yy1435; + if (yych == 'P') goto yy1435; + goto yy1388; } else { - if (yych <= 'a') goto yy1365; - if (yych == 'p') goto yy1365; - goto yy1319; + if (yych <= 'a') goto yy1435; + if (yych == 'p') goto yy1435; + goto yy1388; } } -yy1361: - YYDEBUG(1361, *YYCURSOR); - yyaccept = 27; +yy1431: + YYDEBUG(1431, *YYCURSOR); + yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1363; - goto yy1319; + if (yych == '\t') goto yy1433; + goto yy1388; } else { - if (yych <= ' ') goto yy1363; - if (yych <= '/') goto yy1319; - if (yych >= '5') goto yy1319; + if (yych <= ' ') goto yy1433; + if (yych <= '/') goto yy1388; + if (yych >= '5') goto yy1388; } } else { if (yych <= '`') { - if (yych <= 'A') goto yy1365; - if (yych == 'P') goto yy1365; - goto yy1319; + if (yych <= 'A') goto yy1435; + if (yych == 'P') goto yy1435; + goto yy1388; } else { - if (yych <= 'a') goto yy1365; - if (yych == 'p') goto yy1365; - goto yy1319; + if (yych <= 'a') goto yy1435; + if (yych == 'p') goto yy1435; + goto yy1388; } } -yy1362: - YYDEBUG(1362, *YYCURSOR); - yyaccept = 27; +yy1432: + YYDEBUG(1432, *YYCURSOR); + yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych != '\t') goto yy1319; + if (yych != '\t') goto yy1388; } else { - if (yych <= ' ') goto yy1363; - if (yych <= '@') goto yy1319; - goto yy1365; + if (yych <= ' ') goto yy1433; + if (yych <= '@') goto yy1388; + goto yy1435; } } else { if (yych <= '`') { - if (yych == 'P') goto yy1365; - goto yy1319; + if (yych == 'P') goto yy1435; + goto yy1388; } else { - if (yych <= 'a') goto yy1365; - if (yych == 'p') goto yy1365; - goto yy1319; + if (yych <= 'a') goto yy1435; + if (yych == 'p') goto yy1435; + goto yy1388; } } -yy1363: - YYDEBUG(1363, *YYCURSOR); +yy1433: + YYDEBUG(1433, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; - YYDEBUG(1364, *YYCURSOR); + YYDEBUG(1434, *YYCURSOR); if (yych <= 'A') { if (yych <= 0x1F) { - if (yych == '\t') goto yy1363; + if (yych == '\t') goto yy1433; goto yy55; } else { - if (yych <= ' ') goto yy1363; + if (yych <= ' ') goto yy1433; if (yych <= '@') goto yy55; } } else { if (yych <= '`') { if (yych != 'P') goto yy55; } else { - if (yych <= 'a') goto yy1365; + if (yych <= 'a') goto yy1435; if (yych != 'p') goto yy55; } } -yy1365: - YYDEBUG(1365, *YYCURSOR); +yy1435: + YYDEBUG(1435, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych != '.') goto yy55; } else { - if (yych <= 'M') goto yy1367; - if (yych == 'm') goto yy1367; + if (yych <= 'M') goto yy1437; + if (yych == 'm') goto yy1437; goto yy55; } - YYDEBUG(1366, *YYCURSOR); + YYDEBUG(1436, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy1367; + if (yych == 'M') goto yy1437; if (yych != 'm') goto yy55; -yy1367: - YYDEBUG(1367, *YYCURSOR); +yy1437: + YYDEBUG(1437, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy1328; - if (yych == '\t') goto yy1328; + if (yych <= 0x00) goto yy1397; + if (yych == '\t') goto yy1397; goto yy55; } else { - if (yych <= ' ') goto yy1328; + if (yych <= ' ') goto yy1397; if (yych != '.') goto yy55; } - YYDEBUG(1368, *YYCURSOR); + YYDEBUG(1438, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy1328; + if (yych <= 0x00) goto yy1397; if (yych <= 0x08) goto yy55; - goto yy1328; + goto yy1397; } else { - if (yych == ' ') goto yy1328; + if (yych == ' ') goto yy1397; goto yy55; } -yy1369: - YYDEBUG(1369, *YYCURSOR); +yy1439: + YYDEBUG(1439, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy177; + if (yych <= 'Q') goto yy184; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'r') goto yy1370; - if (yych <= 'z') goto yy177; + if (yych <= 'r') goto yy1440; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1370: - YYDEBUG(1370, *YYCURSOR); +yy1440: + YYDEBUG(1440, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy178; + if (yych <= 'S') goto yy185; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 't') goto yy1371; - if (yych <= 'z') goto yy178; + if (yych <= 't') goto yy1441; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1371: - YYDEBUG(1371, *YYCURSOR); +yy1441: + YYDEBUG(1441, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy179; - goto yy1240; + if (yych <= 'G') goto yy186; + goto yy1307; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'h') goto yy1240; - if (yych <= 'z') goto yy179; + if (yych <= 'h') goto yy1307; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1372: - YYDEBUG(1372, *YYCURSOR); +yy1442: + YYDEBUG(1442, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy177; - goto yy1375; + if (yych <= 'R') goto yy184; + goto yy1445; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 's') goto yy1375; - if (yych <= 'z') goto yy177; + if (yych <= 's') goto yy1445; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1373: - YYDEBUG(1373, *YYCURSOR); +yy1443: + YYDEBUG(1443, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; + if (yych <= 'S') goto yy184; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1374; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1444; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1374: - YYDEBUG(1374, *YYCURSOR); +yy1444: + YYDEBUG(1444, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy178; - goto yy1263; + if (yych <= 'G') goto yy185; + goto yy1330; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'h') goto yy1263; - if (yych <= 'z') goto yy178; + if (yych <= 'h') goto yy1330; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1375: - YYDEBUG(1375, *YYCURSOR); +yy1445: + YYDEBUG(1445, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy178; + if (yych <= 'S') goto yy185; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 't') goto yy1376; - if (yych <= 'z') goto yy178; + if (yych <= 't') goto yy1446; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1376: - YYDEBUG(1376, *YYCURSOR); - yyaccept = 0; +yy1446: + YYDEBUG(1446, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1231; + goto yy1298; } else { if (yych != ' ') goto yy3; } } else { if (yych <= 'Z') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy179; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1377: - YYDEBUG(1377, *YYCURSOR); +yy1447: + YYDEBUG(1447, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy1378; - if (yych != 'd') goto yy1232; -yy1378: - YYDEBUG(1378, *YYCURSOR); + if (yych == 'D') goto yy1448; + if (yych != 'd') goto yy1299; +yy1448: + YYDEBUG(1448, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1379; + if (yych == 'A') goto yy1449; if (yych != 'a') goto yy55; -yy1379: - YYDEBUG(1379, *YYCURSOR); +yy1449: + YYDEBUG(1449, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1380; + if (yych == 'Y') goto yy1450; if (yych != 'y') goto yy55; -yy1380: - YYDEBUG(1380, *YYCURSOR); - yyaccept = 25; +yy1450: + YYDEBUG(1450, *YYCURSOR); + yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { - if (yych != ' ') goto yy1119; + if (yych != ' ') goto yy1179; } else { - if (yych <= 'S') goto yy1144; - if (yych == 's') goto yy1144; - goto yy1119; + if (yych <= 'S') goto yy1207; + if (yych == 's') goto yy1207; + goto yy1179; } - YYDEBUG(1381, *YYCURSOR); + YYDEBUG(1451, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1382; + if (yych == 'O') goto yy1452; if (yych != 'o') goto yy55; -yy1382: - YYDEBUG(1382, *YYCURSOR); +yy1452: + YYDEBUG(1452, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy1341; - if (yych == 'f') goto yy1341; + if (yych == 'F') goto yy1410; + if (yych == 'f') goto yy1410; goto yy55; -yy1383: - YYDEBUG(1383, *YYCURSOR); +yy1453: + YYDEBUG(1453, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'R') goto yy177; + if (yych != 'R') goto yy184; } } else { if (yych <= 'q') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'r') goto yy1384; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'r') goto yy1454; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy1384: - YYDEBUG(1384, *YYCURSOR); +yy1454: + YYDEBUG(1454, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'T') goto yy178; + if (yych <= 'T') goto yy185; } } else { if (yych <= 't') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'u') goto yy1385; - if (yych <= 'z') goto yy178; + if (yych <= 'u') goto yy1455; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1385: - YYDEBUG(1385, *YYCURSOR); +yy1455: + YYDEBUG(1455, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; goto yy3; } else { - if (yych <= 'a') goto yy1386; - if (yych <= 'z') goto yy179; + if (yych <= 'a') goto yy1456; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1386: - YYDEBUG(1386, *YYCURSOR); - yyaccept = 0; +yy1456: + YYDEBUG(1456, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'R') goto yy1387; + if (yych <= 'R') goto yy1457; if (yych != 'r') goto yy3; } -yy1387: - YYDEBUG(1387, *YYCURSOR); +yy1457: + YYDEBUG(1457, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy239; - if (yych == 'y') goto yy239; + if (yych == 'Y') goto yy259; + if (yych == 'y') goto yy259; goto yy55; -yy1388: - YYDEBUG(1388, *YYCURSOR); - yyaccept = 0; +yy1458: + YYDEBUG(1458, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'B') goto yy1383; - if (yych <= 'Z') goto yy176; + if (yych <= 'B') goto yy1453; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'a') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'b') goto yy1406; - if (yych <= 'z') goto yy181; + if (yych <= 'b') goto yy1477; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1389: - YYDEBUG(1389, *YYCURSOR); - yyaccept = 0; +yy1459: + YYDEBUG(1459, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '@') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } else { - if (yych == 'F') goto yy1373; - goto yy176; + if (yych == 'F') goto yy1443; + goto yy183; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'R') goto yy1372; - goto yy176; + if (yych <= 'R') goto yy1442; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'q') { - if (yych == 'f') goto yy1402; - goto yy181; + if (yych == 'f') goto yy1473; + goto yy188; } else { - if (yych <= 'r') goto yy1401; - if (yych <= 'z') goto yy181; + if (yych <= 'r') goto yy1472; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1390: - YYDEBUG(1390, *YYCURSOR); - yyaccept = 0; +yy1460: + YYDEBUG(1460, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'U') goto yy1369; - if (yych <= 'Z') goto yy176; + if (yych <= 'U') goto yy1439; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 't') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'u') goto yy1398; - if (yych <= 'z') goto yy181; + if (yych <= 'u') goto yy1469; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1391: - YYDEBUG(1391, *YYCURSOR); - yyaccept = 0; +yy1461: + YYDEBUG(1461, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '@') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } else { - if (yych == 'I') goto yy1351; - goto yy176; + if (yych == 'I') goto yy1420; + goto yy183; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'O') goto yy1350; - goto yy176; + if (yych <= 'O') goto yy1419; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'n') { - if (yych == 'i') goto yy1393; - goto yy181; + if (yych == 'i') goto yy1463; + goto yy188; } else { - if (yych <= 'o') goto yy1392; - if (yych <= 'z') goto yy181; + if (yych <= 'o') goto yy1462; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1392: - YYDEBUG(1392, *YYCURSOR); - yyaccept = 0; +yy1462: + YYDEBUG(1462, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1354; - if (yych <= 'Z') goto yy177; + if (yych <= 'N') goto yy1424; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'n') goto yy1396; - if (yych <= 'z') goto yy185; + if (yych <= 'n') goto yy1467; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1393: - YYDEBUG(1393, *YYCURSOR); +yy1463: + YYDEBUG(1463, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1352; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'D') goto yy1421; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 'c') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 'd') goto yy1394; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 'd') goto yy1464; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy1394: - YYDEBUG(1394, *YYCURSOR); - yyaccept = 0; +yy1464: + YYDEBUG(1464, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1353; - if (yych <= 'Z') goto yy178; + if (yych <= 'A') goto yy1422; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1395; - if (yych <= 'z') goto yy186; + if (yych <= 'a') goto yy1465; + if (yych <= 'z') goto yy193; goto yy3; } } -yy1395: - YYDEBUG(1395, *YYCURSOR); - yyaccept = 0; +yy1465: + YYDEBUG(1465, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1260; - if (yych <= 'Z') goto yy179; + if (yych <= 'Y') goto yy1423; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'x') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'y') goto yy1289; - if (yych <= 'z') goto yy187; + if (yych <= 'y') goto yy1466; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1396: - YYDEBUG(1396, *YYCURSOR); - yyaccept = 0; +yy1466: + YYDEBUG(1466, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'R') { + if (yych <= ',') { + if (yych == ')') goto yy181; + goto yy219; + } else { + if (yych == '.') goto yy219; + if (yych <= '/') goto yy189; + goto yy219; + } + } else { + if (yych <= '`') { + if (yych <= 'S') goto yy225; + if (yych == '_') goto yy189; + goto yy219; + } else { + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; + } + } +yy1467: + YYDEBUG(1467, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1355; - if (yych <= 'Z') goto yy178; + if (yych <= 'T') goto yy1425; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 't') goto yy1397; - if (yych <= 'z') goto yy186; + if (yych <= 't') goto yy1468; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1397: - YYDEBUG(1397, *YYCURSOR); - yyaccept = 0; +yy1468: + YYDEBUG(1468, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= '(') { - if (yych == ' ') goto yy1356; + if (yych == ' ') goto yy1426; goto yy3; } else { - if (yych <= ')') goto yy174; - if (yych == '-') goto yy182; + if (yych <= ')') goto yy181; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '^') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; if (yych <= '@') goto yy3; - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy187; + if (yych <= 'z') goto yy194; goto yy3; } } -yy1398: - YYDEBUG(1398, *YYCURSOR); - yyaccept = 0; +yy1469: + YYDEBUG(1469, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1370; - if (yych <= 'Z') goto yy177; + if (yych <= 'R') goto yy1440; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'r') goto yy1399; - if (yych <= 'z') goto yy185; + if (yych <= 'r') goto yy1470; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1399: - YYDEBUG(1399, *YYCURSOR); - yyaccept = 0; +yy1470: + YYDEBUG(1470, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1371; - if (yych <= 'Z') goto yy178; + if (yych <= 'T') goto yy1441; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 't') goto yy1400; - if (yych <= 'z') goto yy186; + if (yych <= 't') goto yy1471; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1400: - YYDEBUG(1400, *YYCURSOR); - yyaccept = 0; +yy1471: + YYDEBUG(1471, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1240; - if (yych <= 'Z') goto yy179; + if (yych <= 'H') goto yy1307; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'h') goto yy1252; - if (yych <= 'z') goto yy187; + if (yych <= 'h') goto yy1319; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1401: - YYDEBUG(1401, *YYCURSOR); - yyaccept = 0; +yy1472: + YYDEBUG(1472, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1375; - if (yych <= 'Z') goto yy177; + if (yych <= 'S') goto yy1445; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'r') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 's') goto yy1404; - if (yych <= 'z') goto yy185; + if (yych <= 's') goto yy1475; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1402: - YYDEBUG(1402, *YYCURSOR); - yyaccept = 0; +yy1473: + YYDEBUG(1473, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1374; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1444; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1403; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1474; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1403: - YYDEBUG(1403, *YYCURSOR); - yyaccept = 0; +yy1474: + YYDEBUG(1474, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1263; - if (yych <= 'Z') goto yy178; + if (yych <= 'H') goto yy1330; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'h') goto yy1292; - if (yych <= 'z') goto yy186; + if (yych <= 'h') goto yy1360; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1404: - YYDEBUG(1404, *YYCURSOR); - yyaccept = 0; +yy1475: + YYDEBUG(1475, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1376; - if (yych <= 'Z') goto yy178; + if (yych <= 'T') goto yy1446; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 't') goto yy1405; - if (yych <= 'z') goto yy186; + if (yych <= 't') goto yy1476; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1405: - YYDEBUG(1405, *YYCURSOR); - yyaccept = 0; +yy1476: + YYDEBUG(1476, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1231; + if (yych == '\t') goto yy1298; if (yych <= 0x1F) goto yy3; - goto yy1377; + goto yy1447; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= 'Z') { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } else { if (yych <= '_') { if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy187; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1406: - YYDEBUG(1406, *YYCURSOR); +yy1477: + YYDEBUG(1477, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'Q') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'R') goto yy1384; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'R') goto yy1454; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'q') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'r') goto yy1407; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'r') goto yy1478; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy1407: - YYDEBUG(1407, *YYCURSOR); - yyaccept = 0; +yy1478: + YYDEBUG(1478, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'U') goto yy1385; - if (yych <= 'Z') goto yy178; + if (yych <= 'U') goto yy1455; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 't') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'u') goto yy1408; - if (yych <= 'z') goto yy186; + if (yych <= 'u') goto yy1479; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1408: - YYDEBUG(1408, *YYCURSOR); - yyaccept = 0; +yy1479: + YYDEBUG(1479, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1386; - if (yych <= 'Z') goto yy179; + if (yych <= 'A') goto yy1456; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1409; - if (yych <= 'z') goto yy187; + if (yych <= 'a') goto yy1480; + if (yych <= 'z') goto yy194; goto yy3; } } -yy1409: - YYDEBUG(1409, *YYCURSOR); - yyaccept = 0; +yy1480: + YYDEBUG(1480, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'R') goto yy1387; - if (yych == '_') goto yy182; + if (yych <= 'R') goto yy1457; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'r') goto yy1410; - if (yych <= 'z') goto yy188; + if (yych == 'r') goto yy1481; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1410: - YYDEBUG(1410, *YYCURSOR); +yy1481: + YYDEBUG(1481, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy239; - if (yych == 'y') goto yy351; - goto yy189; -yy1411: - YYDEBUG(1411, *YYCURSOR); + if (yych == 'Y') goto yy259; + if (yych == 'y') goto yy382; + goto yy196; +yy1482: + YYDEBUG(1482, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; -yy1412: - YYDEBUG(1412, *YYCURSOR); +yy1483: + YYDEBUG(1483, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; - YYDEBUG(1413, *YYCURSOR); - if (yych == '.') goto yy1415; - if (yych <= '/') goto yy1414; - if (yych <= '9') goto yy1412; -yy1414: - YYDEBUG(1414, *YYCURSOR); -#line 1110 "ext/date/lib/parse_date.re" + YYDEBUG(1484, *YYCURSOR); + if (yych == '.') goto yy1486; + if (yych <= '/') goto yy1485; + if (yych <= '9') goto yy1483; +yy1485: + YYDEBUG(1485, *YYCURSOR); +#line 1144 "ext/date/lib/parse_date.re" { timelib_ull i; @@ -21660,18 +22370,20 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 21662 "" -yy1415: - YYDEBUG(1415, *YYCURSOR); +#line 22374 "" +yy1486: + YYDEBUG(1486, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy1416; - if (yych <= '9') goto yy1417; -yy1416: - YYDEBUG(1416, *YYCURSOR); -#line 1136 "ext/date/lib/parse_date.re" + if ((yych = *YYCURSOR) <= '/') goto yy1487; + if (yych <= '9') goto yy1488; +yy1487: + YYDEBUG(1487, *YYCURSOR); +#line 1170 "ext/date/lib/parse_date.re" { - timelib_ull i, us; + timelib_sll i; + timelib_ull us; const char *ptr_before; + bool is_negative; TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -21679,11 +22391,16 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_UNHAVE_TIME(); TIMELIB_HAVE_TZ(); + is_negative = *(ptr + 1) == '-'; + i = timelib_get_signed_nr(s, &ptr, 24); ptr_before = ptr; us = timelib_get_signed_nr(s, &ptr, 6); us = us * pow(10, 7 - (ptr - ptr_before)); + if (is_negative) { + us *= -1; + } s->time->y = 1970; s->time->m = 1; @@ -21700,467 +22417,476 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 21702 "" -yy1417: - YYDEBUG(1417, *YYCURSOR); +#line 22421 "" +yy1488: + YYDEBUG(1488, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy1416; - if (yych >= ':') goto yy1416; - YYDEBUG(1418, *YYCURSOR); + if (yych <= '/') goto yy1487; + if (yych >= ':') goto yy1487; + YYDEBUG(1489, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy1416; - if (yych >= ':') goto yy1416; - YYDEBUG(1419, *YYCURSOR); + if (yych <= '/') goto yy1487; + if (yych >= ':') goto yy1487; + YYDEBUG(1490, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy1416; - if (yych >= ':') goto yy1416; - YYDEBUG(1420, *YYCURSOR); + if (yych <= '/') goto yy1487; + if (yych >= ':') goto yy1487; + YYDEBUG(1491, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy1416; - if (yych >= ':') goto yy1416; - YYDEBUG(1421, *YYCURSOR); + if (yych <= '/') goto yy1487; + if (yych >= ':') goto yy1487; + YYDEBUG(1492, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy1416; - if (yych >= ':') goto yy1416; - YYDEBUG(1422, *YYCURSOR); + if (yych <= '/') goto yy1487; + if (yych >= ':') goto yy1487; + YYDEBUG(1493, *YYCURSOR); yych = *++YYCURSOR; - goto yy1416; -yy1423: - YYDEBUG(1423, *YYCURSOR); + goto yy1487; +yy1494: + YYDEBUG(1494, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy176; - goto yy1464; + if (yych <= 'M') goto yy183; + goto yy1537; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'n') goto yy1464; - if (yych <= 'z') goto yy176; + if (yych <= 'n') goto yy1537; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1424: - YYDEBUG(1424, *YYCURSOR); +yy1495: + YYDEBUG(1495, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'U') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'I') goto yy1456; - if (yych <= 'T') goto yy176; - goto yy1457; + if (yych == 'I') goto yy1528; + if (yych <= 'T') goto yy183; + goto yy1529; } } else { if (yych <= 'i') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'h') goto yy176; - goto yy1456; + if (yych <= 'h') goto yy183; + goto yy1528; } else { - if (yych == 'u') goto yy1457; - if (yych <= 'z') goto yy176; + if (yych == 'u') goto yy1529; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1425: - YYDEBUG(1425, *YYCURSOR); +yy1496: + YYDEBUG(1496, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'D') goto yy1445; - if (yych <= 'L') goto yy176; - goto yy1446; + if (yych == 'D') goto yy1517; + if (yych <= 'L') goto yy183; + goto yy1518; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'c') goto yy176; - goto yy1445; + if (yych <= 'c') goto yy183; + goto yy1517; } else { - if (yych == 'm') goto yy1446; - if (yych <= 'z') goto yy176; + if (yych == 'm') goto yy1518; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1426: - YYDEBUG(1426, *YYCURSOR); +yy1497: + YYDEBUG(1497, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy176; - goto yy1441; + if (yych <= 'D') goto yy183; + goto yy1512; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'e') goto yy1441; - if (yych <= 'z') goto yy176; + if (yych <= 'e') goto yy1512; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1427: - YYDEBUG(1427, *YYCURSOR); +yy1498: + YYDEBUG(1498, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy176; - goto yy1437; + if (yych <= 'D') goto yy183; + goto yy1508; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'e') goto yy1437; - if (yych <= 'z') goto yy176; + if (yych <= 'e') goto yy1508; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1428: - YYDEBUG(1428, *YYCURSOR); - yych = *++YYCURSOR; +yy1499: + YYDEBUG(1499, *YYCURSOR); + yyaccept = 10; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy1064; - goto yy55; + if (yych == '.') goto yy1124; + goto yy524; } else { - if (yych <= '9') goto yy1431; - if (yych <= ':') goto yy1064; - goto yy55; + if (yych <= '9') goto yy1502; + if (yych <= ':') goto yy1124; + goto yy524; } -yy1429: - YYDEBUG(1429, *YYCURSOR); - yych = *++YYCURSOR; +yy1500: + YYDEBUG(1500, *YYCURSOR); + yyaccept = 10; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy1064; - goto yy55; + if (yych == '.') goto yy1124; + goto yy524; } else { - if (yych <= '4') goto yy1431; - if (yych == ':') goto yy1064; - goto yy55; + if (yych <= '4') goto yy1502; + if (yych == ':') goto yy1124; + goto yy524; } -yy1430: - YYDEBUG(1430, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == '.') goto yy1064; - if (yych == ':') goto yy1064; - goto yy55; -yy1431: - YYDEBUG(1431, *YYCURSOR); - yych = *++YYCURSOR; +yy1501: + YYDEBUG(1501, *YYCURSOR); + yyaccept = 10; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '.') goto yy1124; + if (yych == ':') goto yy1124; + goto yy524; +yy1502: + YYDEBUG(1502, *YYCURSOR); + yyaccept = 10; + yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy1064; - goto yy55; + if (yych == '.') goto yy1124; + goto yy524; } else { - if (yych <= '5') goto yy1432; - if (yych == ':') goto yy1064; - goto yy55; + if (yych <= '5') goto yy1503; + if (yych == ':') goto yy1124; + goto yy524; } -yy1432: - YYDEBUG(1432, *YYCURSOR); +yy1503: + YYDEBUG(1503, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; if (yych >= ':') goto yy55; - YYDEBUG(1433, *YYCURSOR); - yyaccept = 23; + YYDEBUG(1504, *YYCURSOR); + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1067; - if (yych <= '5') goto yy1434; - if (yych <= '6') goto yy1435; - goto yy1067; -yy1434: - YYDEBUG(1434, *YYCURSOR); + if (yych <= '/') goto yy1127; + if (yych <= '5') goto yy1505; + if (yych <= '6') goto yy1506; + goto yy1127; +yy1505: + YYDEBUG(1505, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') goto yy55; - if (yych <= '9') goto yy1436; + if (yych <= '9') goto yy1507; goto yy55; -yy1435: - YYDEBUG(1435, *YYCURSOR); +yy1506: + YYDEBUG(1506, *YYCURSOR); yych = *++YYCURSOR; if (yych != '0') goto yy55; -yy1436: - YYDEBUG(1436, *YYCURSOR); +yy1507: + YYDEBUG(1507, *YYCURSOR); yych = *++YYCURSOR; - goto yy1075; -yy1437: - YYDEBUG(1437, *YYCURSOR); + goto yy1135; +yy1508: + YYDEBUG(1508, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'K') goto yy177; + if (yych <= 'K') goto yy184; } } else { if (yych <= 'k') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'l') goto yy1438; - if (yych <= 'z') goto yy177; + if (yych <= 'l') goto yy1509; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1438: - YYDEBUG(1438, *YYCURSOR); +yy1509: + YYDEBUG(1509, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'F') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'E') goto yy178; + if (yych <= 'E') goto yy185; } } else { if (yych <= 'e') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'f') goto yy1439; - if (yych <= 'z') goto yy178; + if (yych <= 'f') goto yy1510; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1439: - YYDEBUG(1439, *YYCURSOR); +yy1510: + YYDEBUG(1510, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy179; + if (yych <= 'S') goto yy186; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 't') goto yy1440; - if (yych <= 'z') goto yy179; + if (yych <= 't') goto yy1511; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1440: - YYDEBUG(1440, *YYCURSOR); - yyaccept = 0; +yy1511: + YYDEBUG(1511, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'H') goto yy1230; - if (yych == 'h') goto yy1230; + if (yych <= 'H') goto yy1297; + if (yych == 'h') goto yy1297; goto yy3; } -yy1441: - YYDEBUG(1441, *YYCURSOR); +yy1512: + YYDEBUG(1512, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { - if (yych <= '(') goto yy201; - goto yy174; + if (yych <= '(') goto yy219; + goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'R') goto yy177; + if (yych <= '@') goto yy219; + if (yych <= 'R') goto yy184; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy201; - goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy219; + goto yy184; } else { - if (yych <= 's') goto yy1442; - if (yych <= 'z') goto yy177; - goto yy201; + if (yych <= 's') goto yy1513; + if (yych <= 'z') goto yy184; + goto yy219; } } -yy1442: - YYDEBUG(1442, *YYCURSOR); +yy1513: + YYDEBUG(1513, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy178; + if (yych <= 'C') goto yy185; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'd') goto yy1443; - if (yych <= 'z') goto yy178; + if (yych <= 'd') goto yy1514; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1443: - YYDEBUG(1443, *YYCURSOR); +yy1514: + YYDEBUG(1514, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; goto yy3; } else { - if (yych <= 'a') goto yy1444; - if (yych <= 'z') goto yy179; + if (yych <= 'a') goto yy1515; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1444: - YYDEBUG(1444, *YYCURSOR); +yy1515: + YYDEBUG(1515, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'X') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Y') goto yy207; - if (yych == 'y') goto yy207; - goto yy3; + if (yych <= 'Y') goto yy1516; + if (yych != 'y') goto yy3; } -yy1445: - YYDEBUG(1445, *YYCURSOR); +yy1516: + YYDEBUG(1516, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; +yy1517: + YYDEBUG(1517, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy1453; + goto yy1525; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; goto yy3; } else { - if (yych <= 'a') goto yy1453; - if (yych <= 'z') goto yy177; + if (yych <= 'a') goto yy1525; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1446: - YYDEBUG(1446, *YYCURSOR); +yy1518: + YYDEBUG(1518, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'O') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'N') goto yy177; + if (yych <= 'N') goto yy184; } } else { if (yych <= 'n') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'o') goto yy1447; - if (yych <= 'z') goto yy177; + if (yych <= 'o') goto yy1519; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1447: - YYDEBUG(1447, *YYCURSOR); +yy1519: + YYDEBUG(1519, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy178; + if (yych <= 'Q') goto yy185; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'r') goto yy1448; - if (yych <= 'z') goto yy178; + if (yych <= 'r') goto yy1520; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1448: - YYDEBUG(1448, *YYCURSOR); +yy1520: + YYDEBUG(1520, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy179; + if (yych <= 'Q') goto yy186; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'r') goto yy1449; - if (yych <= 'z') goto yy179; + if (yych <= 'r') goto yy1521; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1449: - YYDEBUG(1449, *YYCURSOR); - yyaccept = 0; +yy1521: + YYDEBUG(1521, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'O') goto yy1450; + if (yych <= 'O') goto yy1522; if (yych != 'o') goto yy3; } -yy1450: - YYDEBUG(1450, *YYCURSOR); +yy1522: + YYDEBUG(1522, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy1451; + if (yych == 'W') goto yy1523; if (yych != 'w') goto yy55; -yy1451: - YYDEBUG(1451, *YYCURSOR); +yy1523: + YYDEBUG(1523, *YYCURSOR); ++YYCURSOR; -yy1452: - YYDEBUG(1452, *YYCURSOR); -#line 1098 "ext/date/lib/parse_date.re" +yy1524: + YYDEBUG(1524, *YYCURSOR); +#line 1132 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("tomorrow"); TIMELIB_INIT; @@ -22171,42 +22897,42 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 22173 "" -yy1453: - YYDEBUG(1453, *YYCURSOR); +#line 22901 "" +yy1525: + YYDEBUG(1525, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'X') goto yy178; + if (yych <= 'X') goto yy185; } } else { if (yych <= 'x') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'y') goto yy1454; - if (yych <= 'z') goto yy178; + if (yych <= 'y') goto yy1526; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1454: - YYDEBUG(1454, *YYCURSOR); +yy1526: + YYDEBUG(1526, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; } else { - if (yych <= 'Z') goto yy179; - if (yych <= '`') goto yy1455; - if (yych <= 'z') goto yy179; + if (yych <= 'Z') goto yy186; + if (yych <= '`') goto yy1527; + if (yych <= 'z') goto yy186; } -yy1455: - YYDEBUG(1455, *YYCURSOR); -#line 1088 "ext/date/lib/parse_date.re" +yy1527: + YYDEBUG(1527, *YYCURSOR); +#line 1122 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("midnight | today"); TIMELIB_INIT; @@ -22215,2019 +22941,2102 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 22217 "" -yy1456: - YYDEBUG(1456, *YYCURSOR); +#line 22945 "" +yy1528: + YYDEBUG(1528, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'Q') goto yy177; - if (yych <= 'R') goto yy1462; - goto yy1463; + if (yych <= 'Q') goto yy184; + if (yych <= 'R') goto yy1535; + goto yy1536; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'r') goto yy1462; - if (yych <= 's') goto yy1463; - if (yych <= 'z') goto yy177; + if (yych <= 'r') goto yy1535; + if (yych <= 's') goto yy1536; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1457: - YYDEBUG(1457, *YYCURSOR); +yy1529: + YYDEBUG(1529, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { - if (yych <= '(') goto yy201; - goto yy174; + if (yych <= '(') goto yy219; + goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'Q') goto yy177; + if (yych <= '@') goto yy219; + if (yych <= 'Q') goto yy184; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy201; - goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy219; + goto yy184; } else { - if (yych <= 'r') goto yy1458; - if (yych <= 'z') goto yy177; - goto yy201; + if (yych <= 'r') goto yy1530; + if (yych <= 'z') goto yy184; + goto yy219; } } -yy1458: - YYDEBUG(1458, *YYCURSOR); +yy1530: + YYDEBUG(1530, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy178; + if (yych <= 'R') goto yy185; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 's') goto yy1459; - if (yych <= 'z') goto yy178; + if (yych <= 's') goto yy1531; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1459: - YYDEBUG(1459, *YYCURSOR); +yy1531: + YYDEBUG(1531, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy179; + if (yych <= 'C') goto yy186; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'd') goto yy1460; - if (yych <= 'z') goto yy179; + if (yych <= 'd') goto yy1532; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1460: - YYDEBUG(1460, *YYCURSOR); - yyaccept = 0; +yy1532: + YYDEBUG(1532, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'A') goto yy1461; + if (yych <= 'A') goto yy1533; if (yych != 'a') goto yy3; } -yy1461: - YYDEBUG(1461, *YYCURSOR); +yy1533: + YYDEBUG(1533, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy207; - if (yych == 'y') goto yy207; - goto yy55; -yy1462: - YYDEBUG(1462, *YYCURSOR); + if (yych == 'Y') goto yy1534; + if (yych != 'y') goto yy55; +yy1534: + YYDEBUG(1534, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; +yy1535: + YYDEBUG(1535, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy178; - goto yy1263; + if (yych <= 'C') goto yy185; + goto yy1330; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'd') goto yy1263; - if (yych <= 'z') goto yy178; + if (yych <= 'd') goto yy1330; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1463: - YYDEBUG(1463, *YYCURSOR); - yyaccept = 0; +yy1536: + YYDEBUG(1536, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '(') { if (yych <= '\t') { if (yych <= 0x08) goto yy3; - goto yy1104; + goto yy1164; } else { - if (yych == ' ') goto yy1104; + if (yych == ' ') goto yy1164; goto yy3; } } else { if (yych <= 'Z') { - if (yych <= ')') goto yy174; + if (yych <= ')') goto yy181; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy178; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1464: - YYDEBUG(1464, *YYCURSOR); +yy1537: + YYDEBUG(1537, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; + if (yych <= 'S') goto yy184; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1465; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1538; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1465: - YYDEBUG(1465, *YYCURSOR); +yy1538: + YYDEBUG(1538, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy178; - goto yy1263; + if (yych <= 'G') goto yy185; + goto yy1330; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'h') goto yy1263; - if (yych <= 'z') goto yy178; + if (yych <= 'h') goto yy1330; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1466: - YYDEBUG(1466, *YYCURSOR); - yyaccept = 0; +yy1539: + YYDEBUG(1539, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1464; - if (yych <= 'Z') goto yy176; + if (yych <= 'N') goto yy1537; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'n') goto yy1496; - if (yych <= 'z') goto yy181; + if (yych <= 'n') goto yy1571; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1467: - YYDEBUG(1467, *YYCURSOR); - yyaccept = 0; +yy1540: + YYDEBUG(1540, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'T') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '@') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } else { - if (yych == 'I') goto yy1456; - goto yy176; + if (yych == 'I') goto yy1528; + goto yy183; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'U') goto yy1457; - goto yy176; + if (yych <= 'U') goto yy1529; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 't') { - if (yych == 'i') goto yy1488; - goto yy181; + if (yych == 'i') goto yy1562; + goto yy188; } else { - if (yych <= 'u') goto yy1489; - if (yych <= 'z') goto yy181; + if (yych <= 'u') goto yy1563; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1468: - YYDEBUG(1468, *YYCURSOR); - yyaccept = 0; +yy1541: + YYDEBUG(1541, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '@') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } else { - if (yych == 'D') goto yy1445; - goto yy176; + if (yych == 'D') goto yy1517; + goto yy183; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'M') goto yy1446; - goto yy176; + if (yych <= 'M') goto yy1518; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'l') { - if (yych == 'd') goto yy1479; - goto yy181; + if (yych == 'd') goto yy1553; + goto yy188; } else { - if (yych <= 'm') goto yy1480; - if (yych <= 'z') goto yy181; + if (yych <= 'm') goto yy1554; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1469: - YYDEBUG(1469, *YYCURSOR); - yyaccept = 0; +yy1542: + YYDEBUG(1542, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1441; - if (yych <= 'Z') goto yy176; + if (yych <= 'E') goto yy1512; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'e') goto yy1475; - if (yych <= 'z') goto yy181; + if (yych <= 'e') goto yy1548; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1470: - YYDEBUG(1470, *YYCURSOR); - yyaccept = 0; +yy1543: + YYDEBUG(1543, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1437; - if (yych <= 'Z') goto yy176; + if (yych <= 'E') goto yy1508; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'e') goto yy1471; - if (yych <= 'z') goto yy181; + if (yych <= 'e') goto yy1544; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1471: - YYDEBUG(1471, *YYCURSOR); - yyaccept = 0; +yy1544: + YYDEBUG(1544, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'K') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'L') goto yy1438; - if (yych <= 'Z') goto yy177; + if (yych <= 'L') goto yy1509; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'k') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'l') goto yy1472; - if (yych <= 'z') goto yy185; + if (yych <= 'l') goto yy1545; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1472: - YYDEBUG(1472, *YYCURSOR); - yyaccept = 0; +yy1545: + YYDEBUG(1545, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'E') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'F') goto yy1439; - if (yych <= 'Z') goto yy178; + if (yych <= 'F') goto yy1510; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'e') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'f') goto yy1473; - if (yych <= 'z') goto yy186; + if (yych <= 'f') goto yy1546; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1473: - YYDEBUG(1473, *YYCURSOR); - yyaccept = 0; +yy1546: + YYDEBUG(1546, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1440; - if (yych <= 'Z') goto yy179; + if (yych <= 'T') goto yy1511; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 't') goto yy1474; - if (yych <= 'z') goto yy187; + if (yych <= 't') goto yy1547; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1474: - YYDEBUG(1474, *YYCURSOR); - yyaccept = 0; +yy1547: + YYDEBUG(1547, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'H') goto yy1230; - if (yych == '_') goto yy182; + if (yych <= 'H') goto yy1297; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'h') goto yy1248; - if (yych <= 'z') goto yy188; + if (yych == 'h') goto yy1315; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1475: - YYDEBUG(1475, *YYCURSOR); +yy1548: + YYDEBUG(1548, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1442; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'S') goto yy1513; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 'r') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 's') goto yy1476; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 's') goto yy1549; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy1476: - YYDEBUG(1476, *YYCURSOR); - yyaccept = 0; +yy1549: + YYDEBUG(1549, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1443; - if (yych <= 'Z') goto yy178; + if (yych <= 'D') goto yy1514; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'd') goto yy1477; - if (yych <= 'z') goto yy186; + if (yych <= 'd') goto yy1550; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1477: - YYDEBUG(1477, *YYCURSOR); - yyaccept = 0; +yy1550: + YYDEBUG(1550, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1444; - if (yych <= 'Z') goto yy179; + if (yych <= 'A') goto yy1515; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1478; - if (yych <= 'z') goto yy187; + if (yych <= 'a') goto yy1551; + if (yych <= 'z') goto yy194; goto yy3; } } -yy1478: - YYDEBUG(1478, *YYCURSOR); - yyaccept = 0; +yy1551: + YYDEBUG(1551, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'Y') goto yy207; - if (yych == '_') goto yy182; + if (yych <= 'Y') goto yy1516; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'y') goto yy220; - if (yych <= 'z') goto yy188; + if (yych == 'y') goto yy1552; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1479: - YYDEBUG(1479, *YYCURSOR); - yyaccept = 0; +yy1552: + YYDEBUG(1552, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'S') { + if (yych <= '.') { + if (yych == '-') goto yy189; + goto yy219; + } else { + if (yych <= '/') goto yy189; + if (yych <= 'R') goto yy219; + goto yy225; + } + } else { + if (yych <= '`') { + if (yych == '_') goto yy189; + goto yy219; + } else { + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; + } + } +yy1553: + YYDEBUG(1553, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1453; - if (yych <= 'Z') goto yy177; + if (yych <= 'A') goto yy1525; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1486; - if (yych <= 'z') goto yy185; + if (yych <= 'a') goto yy1560; + if (yych <= 'z') goto yy192; goto yy3; } } -yy1480: - YYDEBUG(1480, *YYCURSOR); - yyaccept = 0; +yy1554: + YYDEBUG(1554, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'O') goto yy1447; - if (yych <= 'Z') goto yy177; + if (yych <= 'O') goto yy1519; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'n') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'o') goto yy1481; - if (yych <= 'z') goto yy185; + if (yych <= 'o') goto yy1555; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1481: - YYDEBUG(1481, *YYCURSOR); - yyaccept = 0; +yy1555: + YYDEBUG(1555, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1448; - if (yych <= 'Z') goto yy178; + if (yych <= 'R') goto yy1520; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'r') goto yy1482; - if (yych <= 'z') goto yy186; + if (yych <= 'r') goto yy1556; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1482: - YYDEBUG(1482, *YYCURSOR); - yyaccept = 0; +yy1556: + YYDEBUG(1556, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1449; - if (yych <= 'Z') goto yy179; + if (yych <= 'R') goto yy1521; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'r') goto yy1483; - if (yych <= 'z') goto yy187; + if (yych <= 'r') goto yy1557; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1483: - YYDEBUG(1483, *YYCURSOR); - yyaccept = 0; +yy1557: + YYDEBUG(1557, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'N') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'O') goto yy1450; - if (yych == '_') goto yy182; + if (yych <= 'O') goto yy1522; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'o') goto yy1484; - if (yych <= 'z') goto yy188; + if (yych == 'o') goto yy1558; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1484: - YYDEBUG(1484, *YYCURSOR); +yy1558: + YYDEBUG(1558, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'W') goto yy1451; - if (yych != 'w') goto yy189; - YYDEBUG(1485, *YYCURSOR); - yyaccept = 28; + if (yych == 'W') goto yy1523; + if (yych != 'w') goto yy196; + YYDEBUG(1559, *YYCURSOR); + yyaccept = 29; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '.') { - if (yych == '-') goto yy182; - goto yy1452; + if (yych == '-') goto yy189; + goto yy1524; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; - goto yy1452; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; + goto yy1524; } -yy1486: - YYDEBUG(1486, *YYCURSOR); - yyaccept = 0; +yy1560: + YYDEBUG(1560, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1454; - if (yych <= 'Z') goto yy178; + if (yych <= 'Y') goto yy1526; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'x') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'y') goto yy1487; - if (yych <= 'z') goto yy186; + if (yych <= 'y') goto yy1561; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1487: - YYDEBUG(1487, *YYCURSOR); - yyaccept = 29; +yy1561: + YYDEBUG(1561, *YYCURSOR); + yyaccept = 30; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; - goto yy1455; + if (yych == ')') goto yy181; + goto yy1527; } else { - if (yych == '.') goto yy1455; - goto yy182; + if (yych == '.') goto yy1527; + goto yy189; } } else { if (yych <= '^') { - if (yych <= '@') goto yy1455; - if (yych <= 'Z') goto yy179; - goto yy1455; + if (yych <= '@') goto yy1527; + if (yych <= 'Z') goto yy186; + goto yy1527; } else { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy1455; - if (yych <= 'z') goto yy187; - goto yy1455; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy1527; + if (yych <= 'z') goto yy194; + goto yy1527; } } -yy1488: - YYDEBUG(1488, *YYCURSOR); - yyaccept = 0; +yy1562: + YYDEBUG(1562, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '/') { if (yych <= '.') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy177; - goto yy1462; + if (yych <= 'Q') goto yy184; + goto yy1535; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'S') goto yy1463; - goto yy177; + if (yych <= 'S') goto yy1536; + goto yy184; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'r') { - if (yych <= 'q') goto yy185; - goto yy1494; + if (yych <= 'q') goto yy192; + goto yy1569; } else { - if (yych <= 's') goto yy1495; - if (yych <= 'z') goto yy185; + if (yych <= 's') goto yy1570; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1489: - YYDEBUG(1489, *YYCURSOR); +yy1563: + YYDEBUG(1563, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1458; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'R') goto yy1530; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 'q') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 'r') goto yy1490; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 'r') goto yy1564; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy1490: - YYDEBUG(1490, *YYCURSOR); - yyaccept = 0; +yy1564: + YYDEBUG(1564, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1459; - if (yych <= 'Z') goto yy178; + if (yych <= 'S') goto yy1531; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'r') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 's') goto yy1491; - if (yych <= 'z') goto yy186; + if (yych <= 's') goto yy1565; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1491: - YYDEBUG(1491, *YYCURSOR); - yyaccept = 0; +yy1565: + YYDEBUG(1565, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1460; - if (yych <= 'Z') goto yy179; + if (yych <= 'D') goto yy1532; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'd') goto yy1492; - if (yych <= 'z') goto yy187; + if (yych <= 'd') goto yy1566; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1492: - YYDEBUG(1492, *YYCURSOR); - yyaccept = 0; +yy1566: + YYDEBUG(1566, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1461; + if (yych <= 'A') goto yy1533; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1493; - if (yych <= 'z') goto yy188; + if (yych <= 'a') goto yy1567; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1493: - YYDEBUG(1493, *YYCURSOR); +yy1567: + YYDEBUG(1567, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy207; - if (yych == 'y') goto yy220; - goto yy189; -yy1494: - YYDEBUG(1494, *YYCURSOR); - yyaccept = 0; + if (yych == 'Y') goto yy1534; + if (yych != 'y') goto yy196; + YYDEBUG(1568, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'S') { + if (yych <= '.') { + if (yych == '-') goto yy189; + goto yy219; + } else { + if (yych <= '/') goto yy189; + if (yych <= 'R') goto yy219; + goto yy225; + } + } else { + if (yych <= '`') { + if (yych == '_') goto yy189; + goto yy219; + } else { + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; + } + } +yy1569: + YYDEBUG(1569, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1263; - if (yych <= 'Z') goto yy178; + if (yych <= 'D') goto yy1330; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'd') goto yy1292; - if (yych <= 'z') goto yy186; + if (yych <= 'd') goto yy1360; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1495: - YYDEBUG(1495, *YYCURSOR); - yyaccept = 0; +yy1570: + YYDEBUG(1570, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy1104; + if (yych == '\t') goto yy1164; if (yych <= 0x1F) goto yy3; - goto yy1104; + goto yy1164; } else { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } } else { if (yych <= 'Z') { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } else { if (yych <= '_') { if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'z') goto yy186; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1496: - YYDEBUG(1496, *YYCURSOR); - yyaccept = 0; +yy1571: + YYDEBUG(1571, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1465; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1538; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1497; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1572; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1497: - YYDEBUG(1497, *YYCURSOR); - yyaccept = 0; +yy1572: + YYDEBUG(1572, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1263; - if (yych <= 'Z') goto yy178; + if (yych <= 'H') goto yy1330; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'h') goto yy1292; - if (yych <= 'z') goto yy186; + if (yych <= 'h') goto yy1360; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1498: - YYDEBUG(1498, *YYCURSOR); +yy1573: + YYDEBUG(1573, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych == 'R') goto yy1510; - if (yych <= 'X') goto yy176; - goto yy1511; + if (yych == 'R') goto yy1586; + if (yych <= 'X') goto yy183; + goto yy1587; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'q') goto yy176; - goto yy1510; + if (yych <= 'q') goto yy183; + goto yy1586; } else { - if (yych == 'y') goto yy1511; - if (yych <= 'z') goto yy176; + if (yych == 'y') goto yy1587; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1499: - YYDEBUG(1499, *YYCURSOR); +yy1574: + YYDEBUG(1574, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'C') goto yy176; - goto yy1504; + if (yych <= 'C') goto yy183; + goto yy1580; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'd') goto yy1504; - if (yych <= 'z') goto yy176; + if (yych <= 'd') goto yy1580; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1500: - YYDEBUG(1500, *YYCURSOR); +yy1575: + YYDEBUG(1575, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy176; + if (yych <= 'M') goto yy183; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'n') goto yy1501; - if (yych <= 'z') goto yy176; + if (yych <= 'n') goto yy1576; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1501: - YYDEBUG(1501, *YYCURSOR); +yy1576: + YYDEBUG(1576, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'D') { if (yych <= ')') { - if (yych <= '(') goto yy201; - goto yy174; + if (yych <= '(') goto yy219; + goto yy181; } else { - if (yych <= '@') goto yy201; - if (yych <= 'C') goto yy177; + if (yych <= '@') goto yy219; + if (yych <= 'C') goto yy184; } } else { if (yych <= 'c') { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy201; - goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy219; + goto yy184; } else { - if (yych <= 'd') goto yy1502; - if (yych <= 'z') goto yy177; - goto yy201; + if (yych <= 'd') goto yy1577; + if (yych <= 'z') goto yy184; + goto yy219; } } -yy1502: - YYDEBUG(1502, *YYCURSOR); +yy1577: + YYDEBUG(1577, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'A') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; } else { if (yych <= '`') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; goto yy3; } else { - if (yych <= 'a') goto yy1503; - if (yych <= 'z') goto yy178; + if (yych <= 'a') goto yy1578; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1503: - YYDEBUG(1503, *YYCURSOR); +yy1578: + YYDEBUG(1578, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'X') goto yy179; - goto yy1260; + if (yych <= 'X') goto yy186; } } else { if (yych <= 'x') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'y') goto yy1260; - if (yych <= 'z') goto yy179; + if (yych <= 'y') goto yy1579; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1504: - YYDEBUG(1504, *YYCURSOR); +yy1579: + YYDEBUG(1579, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= 'R') { + if (yych == ')') goto yy181; + goto yy219; + } else { + if (yych <= 'S') goto yy225; + if (yych == 's') goto yy225; + goto yy219; + } +yy1580: + YYDEBUG(1580, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy177; + if (yych <= 'M') goto yy184; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'n') goto yy1505; - if (yych <= 'z') goto yy177; + if (yych <= 'n') goto yy1581; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1505: - YYDEBUG(1505, *YYCURSOR); +yy1581: + YYDEBUG(1581, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'I') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'H') goto yy178; + if (yych <= 'H') goto yy185; } } else { if (yych <= 'h') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'i') goto yy1506; - if (yych <= 'z') goto yy178; + if (yych <= 'i') goto yy1582; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1506: - YYDEBUG(1506, *YYCURSOR); +yy1582: + YYDEBUG(1582, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'G') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'F') goto yy179; + if (yych <= 'F') goto yy186; } } else { if (yych <= 'f') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'g') goto yy1507; - if (yych <= 'z') goto yy179; + if (yych <= 'g') goto yy1583; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1507: - YYDEBUG(1507, *YYCURSOR); - yyaccept = 0; +yy1583: + YYDEBUG(1583, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'H') goto yy1508; + if (yych <= 'H') goto yy1584; if (yych != 'h') goto yy3; } -yy1508: - YYDEBUG(1508, *YYCURSOR); +yy1584: + YYDEBUG(1584, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1509; + if (yych == 'T') goto yy1585; if (yych != 't') goto yy55; -yy1509: - YYDEBUG(1509, *YYCURSOR); +yy1585: + YYDEBUG(1585, *YYCURSOR); yych = *++YYCURSOR; - goto yy1455; -yy1510: - YYDEBUG(1510, *YYCURSOR); + goto yy1527; +yy1586: + YYDEBUG(1586, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych == 'C') goto yy1512; - goto yy177; + if (yych == 'C') goto yy1588; + goto yy184; } } else { if (yych <= 'b') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'c') goto yy1512; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'c') goto yy1588; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy1511: - YYDEBUG(1511, *YYCURSOR); +yy1587: + YYDEBUG(1587, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { if (yych <= ' ') { - if (yych == '\t') goto yy230; - if (yych <= 0x1F) goto yy228; - goto yy230; + if (yych == '\t') goto yy250; + if (yych <= 0x1F) goto yy248; + goto yy250; } else { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy231; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy251; } } else { if (yych <= '@') { - if (yych == '/') goto yy228; - if (yych <= '9') goto yy230; - goto yy228; + if (yych == '/') goto yy248; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy228; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy248; + if (yych <= 'z') goto yy184; + goto yy248; } } -yy1512: - YYDEBUG(1512, *YYCURSOR); +yy1588: + YYDEBUG(1588, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy178; - goto yy370; + if (yych <= 'G') goto yy185; + goto yy401; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'h') goto yy370; - if (yych <= 'z') goto yy178; + if (yych <= 'h') goto yy401; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1513: - YYDEBUG(1513, *YYCURSOR); - yyaccept = 0; +yy1589: + YYDEBUG(1589, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= '@') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } else { - if (yych == 'R') goto yy1510; - goto yy176; + if (yych == 'R') goto yy1586; + goto yy183; } } } else { if (yych <= '`') { if (yych <= 'Z') { - if (yych <= 'Y') goto yy1511; - goto yy176; + if (yych <= 'Y') goto yy1587; + goto yy183; } else { - if (yych == '_') goto yy182; + if (yych == '_') goto yy189; goto yy3; } } else { if (yych <= 'x') { - if (yych == 'r') goto yy1525; - goto yy181; + if (yych == 'r') goto yy1602; + goto yy188; } else { - if (yych <= 'y') goto yy1526; - if (yych <= 'z') goto yy181; + if (yych <= 'y') goto yy1603; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1514: - YYDEBUG(1514, *YYCURSOR); - yyaccept = 0; +yy1590: + YYDEBUG(1590, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1504; - if (yych <= 'Z') goto yy176; + if (yych <= 'D') goto yy1580; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'c') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'd') goto yy1519; - if (yych <= 'z') goto yy181; + if (yych <= 'd') goto yy1596; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1515: - YYDEBUG(1515, *YYCURSOR); - yyaccept = 0; +yy1591: + YYDEBUG(1591, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1501; - if (yych <= 'Z') goto yy176; + if (yych <= 'N') goto yy1576; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'n') goto yy1516; - if (yych <= 'z') goto yy181; + if (yych <= 'n') goto yy1592; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1516: - YYDEBUG(1516, *YYCURSOR); +yy1592: + YYDEBUG(1592, *YYCURSOR); yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= '-') { - if (yych == ')') goto yy174; - if (yych <= ',') goto yy201; - goto yy182; + if (yych == ')') goto yy181; + if (yych <= ',') goto yy219; + goto yy189; } else { - if (yych == '/') goto yy182; - if (yych <= '@') goto yy201; - goto yy177; + if (yych == '/') goto yy189; + if (yych <= '@') goto yy219; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'D') goto yy1502; - if (yych <= 'Z') goto yy177; - if (yych <= '^') goto yy201; - goto yy182; + if (yych <= 'D') goto yy1577; + if (yych <= 'Z') goto yy184; + if (yych <= '^') goto yy219; + goto yy189; } else { if (yych <= 'c') { - if (yych <= '`') goto yy201; - goto yy185; + if (yych <= '`') goto yy219; + goto yy192; } else { - if (yych <= 'd') goto yy1517; - if (yych <= 'z') goto yy185; - goto yy201; + if (yych <= 'd') goto yy1593; + if (yych <= 'z') goto yy192; + goto yy219; } } } -yy1517: - YYDEBUG(1517, *YYCURSOR); - yyaccept = 0; +yy1593: + YYDEBUG(1593, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '@') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '_') { - if (yych <= 'A') goto yy1503; - if (yych <= 'Z') goto yy178; + if (yych <= 'A') goto yy1578; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= '`') goto yy3; - if (yych <= 'a') goto yy1518; - if (yych <= 'z') goto yy186; + if (yych <= 'a') goto yy1594; + if (yych <= 'z') goto yy193; goto yy3; } } -yy1518: - YYDEBUG(1518, *YYCURSOR); - yyaccept = 0; +yy1594: + YYDEBUG(1594, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'X') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'Y') goto yy1260; - if (yych <= 'Z') goto yy179; + if (yych <= 'Y') goto yy1579; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'x') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'y') goto yy1289; - if (yych <= 'z') goto yy187; + if (yych <= 'y') goto yy1595; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1519: - YYDEBUG(1519, *YYCURSOR); - yyaccept = 0; +yy1595: + YYDEBUG(1595, *YYCURSOR); + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= 'R') { + if (yych <= ',') { + if (yych == ')') goto yy181; + goto yy219; + } else { + if (yych == '.') goto yy219; + if (yych <= '/') goto yy189; + goto yy219; + } + } else { + if (yych <= '`') { + if (yych <= 'S') goto yy225; + if (yych == '_') goto yy189; + goto yy219; + } else { + if (yych == 's') goto yy239; + if (yych <= 'z') goto yy195; + goto yy219; + } + } +yy1596: + YYDEBUG(1596, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1505; - if (yych <= 'Z') goto yy177; + if (yych <= 'N') goto yy1581; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'n') goto yy1520; - if (yych <= 'z') goto yy185; + if (yych <= 'n') goto yy1597; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1520: - YYDEBUG(1520, *YYCURSOR); - yyaccept = 0; +yy1597: + YYDEBUG(1597, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'H') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'I') goto yy1506; - if (yych <= 'Z') goto yy178; + if (yych <= 'I') goto yy1582; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'h') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'i') goto yy1521; - if (yych <= 'z') goto yy186; + if (yych <= 'i') goto yy1598; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1521: - YYDEBUG(1521, *YYCURSOR); - yyaccept = 0; +yy1598: + YYDEBUG(1598, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'F') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'G') goto yy1507; - if (yych <= 'Z') goto yy179; + if (yych <= 'G') goto yy1583; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'f') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'g') goto yy1522; - if (yych <= 'z') goto yy187; + if (yych <= 'g') goto yy1599; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1522: - YYDEBUG(1522, *YYCURSOR); - yyaccept = 0; +yy1599: + YYDEBUG(1599, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'H') goto yy1508; - if (yych == '_') goto yy182; + if (yych <= 'H') goto yy1584; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'h') goto yy1523; - if (yych <= 'z') goto yy188; + if (yych == 'h') goto yy1600; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1523: - YYDEBUG(1523, *YYCURSOR); +yy1600: + YYDEBUG(1600, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy1509; - if (yych != 't') goto yy189; - YYDEBUG(1524, *YYCURSOR); - yyaccept = 29; + if (yych == 'T') goto yy1585; + if (yych != 't') goto yy196; + YYDEBUG(1601, *YYCURSOR); + yyaccept = 30; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '.') { - if (yych == '-') goto yy182; - goto yy1455; + if (yych == '-') goto yy189; + goto yy1527; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; - goto yy1455; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; + goto yy1527; } -yy1525: - YYDEBUG(1525, *YYCURSOR); +yy1602: + YYDEBUG(1602, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'B') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'C') goto yy1512; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'C') goto yy1588; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'b') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'c') goto yy1527; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'c') goto yy1604; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy1526: - YYDEBUG(1526, *YYCURSOR); +yy1603: + YYDEBUG(1603, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= ' ') { - if (yych == '\t') goto yy230; - if (yych <= 0x1F) goto yy228; - goto yy230; + if (yych == '\t') goto yy250; + if (yych <= 0x1F) goto yy248; + goto yy250; } else { if (yych <= ')') { - if (yych <= '(') goto yy228; - goto yy174; + if (yych <= '(') goto yy248; + goto yy181; } else { - if (yych <= ',') goto yy228; - if (yych <= '-') goto yy346; - goto yy230; + if (yych <= ',') goto yy248; + if (yych <= '-') goto yy377; + goto yy250; } } } else { if (yych <= 'Z') { - if (yych <= '/') goto yy182; - if (yych <= '9') goto yy230; - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '/') goto yy189; + if (yych <= '9') goto yy250; + if (yych <= '@') goto yy248; + goto yy184; } else { if (yych <= '_') { - if (yych <= '^') goto yy228; - goto yy182; + if (yych <= '^') goto yy248; + goto yy189; } else { - if (yych <= '`') goto yy228; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= '`') goto yy248; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy1527: - YYDEBUG(1527, *YYCURSOR); - yyaccept = 0; +yy1604: + YYDEBUG(1604, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy370; - if (yych <= 'Z') goto yy178; + if (yych <= 'H') goto yy401; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'h') goto yy381; - if (yych <= 'z') goto yy186; + if (yych <= 'h') goto yy412; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1528: - YYDEBUG(1528, *YYCURSOR); +yy1605: + YYDEBUG(1605, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'W') { if (yych <= 'N') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'O') goto yy1536; - if (yych <= 'U') goto yy176; - if (yych <= 'V') goto yy1537; - goto yy1534; + if (yych <= 'O') goto yy1613; + if (yych <= 'U') goto yy183; + if (yych <= 'V') goto yy1614; + goto yy1611; } } else { if (yych <= 'o') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - if (yych <= 'n') goto yy176; - goto yy1536; + if (yych <= 'n') goto yy183; + goto yy1613; } else { if (yych <= 'v') { - if (yych <= 'u') goto yy176; - goto yy1537; + if (yych <= 'u') goto yy183; + goto yy1614; } else { - if (yych <= 'w') goto yy1534; - if (yych <= 'z') goto yy176; + if (yych <= 'w') goto yy1611; + if (yych <= 'z') goto yy183; goto yy3; } } } -yy1529: - YYDEBUG(1529, *YYCURSOR); +yy1606: + YYDEBUG(1606, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'X') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'W') goto yy176; - goto yy1533; + if (yych <= 'W') goto yy183; + goto yy1610; } } else { if (yych <= 'w') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'x') goto yy1533; - if (yych <= 'z') goto yy176; + if (yych <= 'x') goto yy1610; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1530: - YYDEBUG(1530, *YYCURSOR); +yy1607: + YYDEBUG(1607, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy176; + if (yych <= 'M') goto yy183; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'n') goto yy1531; - if (yych <= 'z') goto yy176; + if (yych <= 'n') goto yy1608; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1531: - YYDEBUG(1531, *YYCURSOR); +yy1608: + YYDEBUG(1608, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; + if (yych <= 'S') goto yy184; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1532; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1609; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1532: - YYDEBUG(1532, *YYCURSOR); +yy1609: + YYDEBUG(1609, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'G') goto yy178; - goto yy1263; + if (yych <= 'G') goto yy185; + goto yy1330; } } else { if (yych <= 'g') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'h') goto yy1263; - if (yych <= 'z') goto yy178; + if (yych <= 'h') goto yy1330; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1533: - YYDEBUG(1533, *YYCURSOR); +yy1610: + YYDEBUG(1610, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; - goto yy1463; + if (yych <= 'S') goto yy184; + goto yy1536; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1463; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1536; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1534: - YYDEBUG(1534, *YYCURSOR); +yy1611: + YYDEBUG(1611, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; } else { - if (yych <= 'Z') goto yy177; - if (yych <= '`') goto yy1535; - if (yych <= 'z') goto yy177; + if (yych <= 'Z') goto yy184; + if (yych <= '`') goto yy1612; + if (yych <= 'z') goto yy184; } -yy1535: - YYDEBUG(1535, *YYCURSOR); -#line 1067 "ext/date/lib/parse_date.re" +yy1612: + YYDEBUG(1612, *YYCURSOR); +#line 1101 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("now"); TIMELIB_INIT; @@ -24235,146 +25044,146 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 24237 "" -yy1536: - YYDEBUG(1536, *YYCURSOR); +#line 25048 "" +yy1613: + YYDEBUG(1613, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'M') goto yy177; - goto yy1542; + if (yych <= 'M') goto yy184; + goto yy1619; } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 'n') goto yy1542; - if (yych <= 'z') goto yy177; + if (yych <= 'n') goto yy1619; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1537: - YYDEBUG(1537, *YYCURSOR); +yy1614: + YYDEBUG(1614, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= ',') { - if (yych <= ')') goto yy174; - goto yy228; + if (yych <= ')') goto yy181; + goto yy248; } else { - if (yych <= '-') goto yy231; - if (yych <= '.') goto yy230; - goto yy228; + if (yych <= '-') goto yy251; + if (yych <= '.') goto yy250; + goto yy248; } } } else { if (yych <= 'Z') { if (yych <= '@') { - if (yych <= '9') goto yy230; - goto yy228; + if (yych <= '9') goto yy250; + goto yy248; } else { - if (yych != 'E') goto yy177; + if (yych != 'E') goto yy184; } } else { if (yych <= 'd') { - if (yych <= '`') goto yy228; - goto yy177; + if (yych <= '`') goto yy248; + goto yy184; } else { - if (yych <= 'e') goto yy1538; - if (yych <= 'z') goto yy177; - goto yy228; + if (yych <= 'e') goto yy1615; + if (yych <= 'z') goto yy184; + goto yy248; } } } -yy1538: - YYDEBUG(1538, *YYCURSOR); +yy1615: + YYDEBUG(1615, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'M') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'L') goto yy178; + if (yych <= 'L') goto yy185; } } else { if (yych <= 'l') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'm') goto yy1539; - if (yych <= 'z') goto yy178; + if (yych <= 'm') goto yy1616; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1539: - YYDEBUG(1539, *YYCURSOR); +yy1616: + YYDEBUG(1616, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'B') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'A') goto yy179; + if (yych <= 'A') goto yy186; } } else { if (yych <= 'a') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'b') goto yy1540; - if (yych <= 'z') goto yy179; + if (yych <= 'b') goto yy1617; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1540: - YYDEBUG(1540, *YYCURSOR); - yyaccept = 0; +yy1617: + YYDEBUG(1617, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'E') goto yy1541; + if (yych <= 'E') goto yy1618; if (yych != 'e') goto yy3; } -yy1541: - YYDEBUG(1541, *YYCURSOR); +yy1618: + YYDEBUG(1618, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy239; - if (yych == 'r') goto yy239; + if (yych == 'R') goto yy259; + if (yych == 'r') goto yy259; goto yy55; -yy1542: - YYDEBUG(1542, *YYCURSOR); +yy1619: + YYDEBUG(1619, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; } else { - if (yych <= 'Z') goto yy178; - if (yych <= '`') goto yy1543; - if (yych <= 'z') goto yy178; + if (yych <= 'Z') goto yy185; + if (yych <= '`') goto yy1620; + if (yych <= 'z') goto yy185; } -yy1543: - YYDEBUG(1543, *YYCURSOR); -#line 1076 "ext/date/lib/parse_date.re" +yy1620: + YYDEBUG(1620, *YYCURSOR); +#line 1110 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("noon"); TIMELIB_INIT; @@ -24385,540 +25194,540 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 24387 "" -yy1544: - YYDEBUG(1544, *YYCURSOR); - yyaccept = 0; +#line 25198 "" +yy1621: + YYDEBUG(1621, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= '.') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { - if (yych == '-') goto yy182; + if (yych == '-') goto yy189; goto yy3; } } else { if (yych <= 'N') { - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 'O') goto yy1536; - if (yych <= 'U') goto yy176; - goto yy1537; + if (yych <= 'O') goto yy1613; + if (yych <= 'U') goto yy183; + goto yy1614; } } } else { if (yych <= 'n') { if (yych <= '^') { - if (yych <= 'W') goto yy1534; - if (yych <= 'Z') goto yy176; + if (yych <= 'W') goto yy1611; + if (yych <= 'Z') goto yy183; goto yy3; } else { - if (yych <= '_') goto yy182; + if (yych <= '_') goto yy189; if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } } else { if (yych <= 'v') { - if (yych <= 'o') goto yy1551; - if (yych <= 'u') goto yy181; - goto yy1552; + if (yych <= 'o') goto yy1628; + if (yych <= 'u') goto yy188; + goto yy1629; } else { - if (yych <= 'w') goto yy1550; - if (yych <= 'z') goto yy181; + if (yych <= 'w') goto yy1627; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1545: - YYDEBUG(1545, *YYCURSOR); - yyaccept = 0; +yy1622: + YYDEBUG(1622, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'W') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'X') goto yy1533; - if (yych <= 'Z') goto yy176; + if (yych <= 'X') goto yy1610; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'w') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'x') goto yy1549; - if (yych <= 'z') goto yy181; + if (yych <= 'x') goto yy1626; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1546: - YYDEBUG(1546, *YYCURSOR); - yyaccept = 0; +yy1623: + YYDEBUG(1623, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1531; - if (yych <= 'Z') goto yy176; + if (yych <= 'N') goto yy1608; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 'n') goto yy1547; - if (yych <= 'z') goto yy181; + if (yych <= 'n') goto yy1624; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1547: - YYDEBUG(1547, *YYCURSOR); - yyaccept = 0; +yy1624: + YYDEBUG(1624, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1532; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1609; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1548; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1625; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1548: - YYDEBUG(1548, *YYCURSOR); - yyaccept = 0; +yy1625: + YYDEBUG(1625, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'G') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'H') goto yy1263; - if (yych <= 'Z') goto yy178; + if (yych <= 'H') goto yy1330; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'g') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'h') goto yy1292; - if (yych <= 'z') goto yy186; + if (yych <= 'h') goto yy1360; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1549: - YYDEBUG(1549, *YYCURSOR); - yyaccept = 0; +yy1626: + YYDEBUG(1626, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1463; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1536; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1495; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1570; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1550: - YYDEBUG(1550, *YYCURSOR); - yyaccept = 30; +yy1627: + YYDEBUG(1627, *YYCURSOR); + yyaccept = 31; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; - goto yy1535; + if (yych == ')') goto yy181; + goto yy1612; } else { - if (yych == '.') goto yy1535; - goto yy182; + if (yych == '.') goto yy1612; + goto yy189; } } else { if (yych <= '^') { - if (yych <= '@') goto yy1535; - if (yych <= 'Z') goto yy177; - goto yy1535; + if (yych <= '@') goto yy1612; + if (yych <= 'Z') goto yy184; + goto yy1612; } else { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy1535; - if (yych <= 'z') goto yy185; - goto yy1535; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy1612; + if (yych <= 'z') goto yy192; + goto yy1612; } } -yy1551: - YYDEBUG(1551, *YYCURSOR); - yyaccept = 0; +yy1628: + YYDEBUG(1628, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'M') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'N') goto yy1542; - if (yych <= 'Z') goto yy177; + if (yych <= 'N') goto yy1619; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'm') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 'n') goto yy1557; - if (yych <= 'z') goto yy185; + if (yych <= 'n') goto yy1634; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1552: - YYDEBUG(1552, *YYCURSOR); +yy1629: + YYDEBUG(1629, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= '(') { if (yych <= '\t') { - if (yych <= 0x08) goto yy228; - goto yy230; + if (yych <= 0x08) goto yy248; + goto yy250; } else { - if (yych == ' ') goto yy230; - goto yy228; + if (yych == ' ') goto yy250; + goto yy248; } } else { if (yych <= '-') { - if (yych <= ')') goto yy174; - if (yych <= ',') goto yy228; - goto yy346; + if (yych <= ')') goto yy181; + if (yych <= ',') goto yy248; + goto yy377; } else { - if (yych == '/') goto yy182; - goto yy230; + if (yych == '/') goto yy189; + goto yy250; } } } else { if (yych <= '^') { if (yych <= 'D') { - if (yych <= '@') goto yy228; - goto yy177; + if (yych <= '@') goto yy248; + goto yy184; } else { - if (yych <= 'E') goto yy1538; - if (yych <= 'Z') goto yy177; - goto yy228; + if (yych <= 'E') goto yy1615; + if (yych <= 'Z') goto yy184; + goto yy248; } } else { if (yych <= 'd') { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy228; - goto yy185; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy248; + goto yy192; } else { - if (yych <= 'e') goto yy1553; - if (yych <= 'z') goto yy185; - goto yy228; + if (yych <= 'e') goto yy1630; + if (yych <= 'z') goto yy192; + goto yy248; } } } -yy1553: - YYDEBUG(1553, *YYCURSOR); - yyaccept = 0; +yy1630: + YYDEBUG(1630, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'L') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'M') goto yy1539; - if (yych <= 'Z') goto yy178; + if (yych <= 'M') goto yy1616; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'l') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'm') goto yy1554; - if (yych <= 'z') goto yy186; + if (yych <= 'm') goto yy1631; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1554: - YYDEBUG(1554, *YYCURSOR); - yyaccept = 0; +yy1631: + YYDEBUG(1631, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'A') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'B') goto yy1540; - if (yych <= 'Z') goto yy179; + if (yych <= 'B') goto yy1617; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'a') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'b') goto yy1555; - if (yych <= 'z') goto yy187; + if (yych <= 'b') goto yy1632; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1555: - YYDEBUG(1555, *YYCURSOR); - yyaccept = 0; +yy1632: + YYDEBUG(1632, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'E') goto yy1541; - if (yych == '_') goto yy182; + if (yych <= 'E') goto yy1618; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'e') goto yy1556; - if (yych <= 'z') goto yy188; + if (yych == 'e') goto yy1633; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1556: - YYDEBUG(1556, *YYCURSOR); +yy1633: + YYDEBUG(1633, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'R') goto yy239; - if (yych == 'r') goto yy351; - goto yy189; -yy1557: - YYDEBUG(1557, *YYCURSOR); - yyaccept = 31; + if (yych == 'R') goto yy259; + if (yych == 'r') goto yy382; + goto yy196; +yy1634: + YYDEBUG(1634, *YYCURSOR); + yyaccept = 32; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { if (yych <= ',') { - if (yych == ')') goto yy174; - goto yy1543; + if (yych == ')') goto yy181; + goto yy1620; } else { - if (yych == '.') goto yy1543; - goto yy182; + if (yych == '.') goto yy1620; + goto yy189; } } else { if (yych <= '^') { - if (yych <= '@') goto yy1543; - if (yych <= 'Z') goto yy178; - goto yy1543; + if (yych <= '@') goto yy1620; + if (yych <= 'Z') goto yy185; + goto yy1620; } else { - if (yych <= '_') goto yy182; - if (yych <= '`') goto yy1543; - if (yych <= 'z') goto yy186; - goto yy1543; + if (yych <= '_') goto yy189; + if (yych <= '`') goto yy1620; + if (yych <= 'z') goto yy193; + goto yy1620; } } -yy1558: - YYDEBUG(1558, *YYCURSOR); +yy1635: + YYDEBUG(1635, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'R') goto yy176; + if (yych <= 'R') goto yy183; } } else { if (yych <= 'r') { - if (yych <= 'Z') goto yy176; + if (yych <= 'Z') goto yy183; if (yych <= '`') goto yy3; - goto yy176; + goto yy183; } else { - if (yych <= 's') goto yy1559; - if (yych <= 'z') goto yy176; + if (yych <= 's') goto yy1636; + if (yych <= 'z') goto yy183; goto yy3; } } -yy1559: - YYDEBUG(1559, *YYCURSOR); +yy1636: + YYDEBUG(1636, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'T') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'S') goto yy177; + if (yych <= 'S') goto yy184; } } else { if (yych <= 's') { - if (yych <= 'Z') goto yy177; + if (yych <= 'Z') goto yy184; if (yych <= '`') goto yy3; - goto yy177; + goto yy184; } else { - if (yych <= 't') goto yy1560; - if (yych <= 'z') goto yy177; + if (yych <= 't') goto yy1637; + if (yych <= 'z') goto yy184; goto yy3; } } -yy1560: - YYDEBUG(1560, *YYCURSOR); +yy1637: + YYDEBUG(1637, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'D') goto yy178; + if (yych <= 'D') goto yy185; } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy178; + if (yych <= 'Z') goto yy185; if (yych <= '`') goto yy3; - goto yy178; + goto yy185; } else { - if (yych <= 'e') goto yy1561; - if (yych <= 'z') goto yy178; + if (yych <= 'e') goto yy1638; + if (yych <= 'z') goto yy185; goto yy3; } } -yy1561: - YYDEBUG(1561, *YYCURSOR); +yy1638: + YYDEBUG(1638, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= ')') { if (yych <= '(') goto yy3; - goto yy174; + goto yy181; } else { if (yych <= '@') goto yy3; - if (yych <= 'Q') goto yy179; + if (yych <= 'Q') goto yy186; } } else { if (yych <= 'q') { - if (yych <= 'Z') goto yy179; + if (yych <= 'Z') goto yy186; if (yych <= '`') goto yy3; - goto yy179; + goto yy186; } else { - if (yych <= 'r') goto yy1562; - if (yych <= 'z') goto yy179; + if (yych <= 'r') goto yy1639; + if (yych <= 'z') goto yy186; goto yy3; } } -yy1562: - YYDEBUG(1562, *YYCURSOR); - yyaccept = 0; +yy1639: + YYDEBUG(1639, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { - if (yych <= 'D') goto yy1563; + if (yych <= 'D') goto yy1640; if (yych != 'd') goto yy3; } -yy1563: - YYDEBUG(1563, *YYCURSOR); +yy1640: + YYDEBUG(1640, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1564; + if (yych == 'A') goto yy1641; if (yych != 'a') goto yy55; -yy1564: - YYDEBUG(1564, *YYCURSOR); +yy1641: + YYDEBUG(1641, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1565; + if (yych == 'Y') goto yy1642; if (yych != 'y') goto yy55; -yy1565: - YYDEBUG(1565, *YYCURSOR); +yy1642: + YYDEBUG(1642, *YYCURSOR); ++YYCURSOR; -yy1566: - YYDEBUG(1566, *YYCURSOR); -#line 1055 "ext/date/lib/parse_date.re" +yy1643: + YYDEBUG(1643, *YYCURSOR); +#line 1089 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("yesterday"); TIMELIB_INIT; @@ -24929,184 +25738,184 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper) TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 24931 "" -yy1567: - YYDEBUG(1567, *YYCURSOR); - yyaccept = 0; +#line 25742 "" +yy1644: + YYDEBUG(1644, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy176; + goto yy183; } } else { if (yych <= '_') { - if (yych <= 'S') goto yy1559; - if (yych <= 'Z') goto yy176; + if (yych <= 'S') goto yy1636; + if (yych <= 'Z') goto yy183; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'r') { if (yych <= '`') goto yy3; - goto yy181; + goto yy188; } else { - if (yych <= 's') goto yy1568; - if (yych <= 'z') goto yy181; + if (yych <= 's') goto yy1645; + if (yych <= 'z') goto yy188; goto yy3; } } } -yy1568: - YYDEBUG(1568, *YYCURSOR); - yyaccept = 0; +yy1645: + YYDEBUG(1645, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy177; + goto yy184; } } else { if (yych <= '_') { - if (yych <= 'T') goto yy1560; - if (yych <= 'Z') goto yy177; + if (yych <= 'T') goto yy1637; + if (yych <= 'Z') goto yy184; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 's') { if (yych <= '`') goto yy3; - goto yy185; + goto yy192; } else { - if (yych <= 't') goto yy1569; - if (yych <= 'z') goto yy185; + if (yych <= 't') goto yy1646; + if (yych <= 'z') goto yy192; goto yy3; } } } -yy1569: - YYDEBUG(1569, *YYCURSOR); - yyaccept = 0; +yy1646: + YYDEBUG(1646, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'D') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy178; + goto yy185; } } else { if (yych <= '_') { - if (yych <= 'E') goto yy1561; - if (yych <= 'Z') goto yy178; + if (yych <= 'E') goto yy1638; + if (yych <= 'Z') goto yy185; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'd') { if (yych <= '`') goto yy3; - goto yy186; + goto yy193; } else { - if (yych <= 'e') goto yy1570; - if (yych <= 'z') goto yy186; + if (yych <= 'e') goto yy1647; + if (yych <= 'z') goto yy193; goto yy3; } } } -yy1570: - YYDEBUG(1570, *YYCURSOR); - yyaccept = 0; +yy1647: + YYDEBUG(1647, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'Q') { if (yych <= '-') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; if (yych <= ',') goto yy3; - goto yy182; + goto yy189; } else { - if (yych == '/') goto yy182; + if (yych == '/') goto yy189; if (yych <= '@') goto yy3; - goto yy179; + goto yy186; } } else { if (yych <= '_') { - if (yych <= 'R') goto yy1562; - if (yych <= 'Z') goto yy179; + if (yych <= 'R') goto yy1639; + if (yych <= 'Z') goto yy186; if (yych <= '^') goto yy3; - goto yy182; + goto yy189; } else { if (yych <= 'q') { if (yych <= '`') goto yy3; - goto yy187; + goto yy194; } else { - if (yych <= 'r') goto yy1571; - if (yych <= 'z') goto yy187; + if (yych <= 'r') goto yy1648; + if (yych <= 'z') goto yy194; goto yy3; } } } -yy1571: - YYDEBUG(1571, *YYCURSOR); - yyaccept = 0; +yy1648: + YYDEBUG(1648, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'C') { if (yych <= ',') { - if (yych == ')') goto yy174; + if (yych == ')') goto yy181; goto yy3; } else { if (yych == '.') goto yy3; - if (yych <= '/') goto yy182; + if (yych <= '/') goto yy189; goto yy3; } } else { if (yych <= '`') { - if (yych <= 'D') goto yy1563; - if (yych == '_') goto yy182; + if (yych <= 'D') goto yy1640; + if (yych == '_') goto yy189; goto yy3; } else { - if (yych == 'd') goto yy1572; - if (yych <= 'z') goto yy188; + if (yych == 'd') goto yy1649; + if (yych <= 'z') goto yy195; goto yy3; } } -yy1572: - YYDEBUG(1572, *YYCURSOR); +yy1649: + YYDEBUG(1649, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1564; - if (yych != 'a') goto yy189; - YYDEBUG(1573, *YYCURSOR); + if (yych == 'A') goto yy1641; + if (yych != 'a') goto yy196; + YYDEBUG(1650, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'Y') goto yy1565; - if (yych != 'y') goto yy189; - YYDEBUG(1574, *YYCURSOR); - yyaccept = 32; + if (yych == 'Y') goto yy1642; + if (yych != 'y') goto yy196; + YYDEBUG(1651, *YYCURSOR); + yyaccept = 33; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 8) { - goto yy188; + goto yy195; } if (yych <= '.') { - if (yych == '-') goto yy182; - goto yy1566; + if (yych == '-') goto yy189; + goto yy1643; } else { - if (yych <= '/') goto yy182; - if (yych == '_') goto yy182; - goto yy1566; + if (yych <= '/') goto yy189; + if (yych == '_') goto yy189; + goto yy1643; } } -#line 1874 "ext/date/lib/parse_date.re" +#line 1917 "ext/date/lib/parse_date.re" } -#define YYMAXFILL 33 +#define YYMAXFILL 36 timelib_time *timelib_strtotime(const char *s, size_t len, timelib_error_container **errors, const timelib_tzdb *tzdb, timelib_tz_get_wrapper tz_get_wrapper) { @@ -25465,7 +26274,7 @@ timelib_time *timelib_parse_from_format_with_map(const char *format, const char break; } if (s->time->h > 12) { - add_pbf_error(s, TIMELIB_ERR_HOUR_LARGER_THAN_12, "Hour can not be higher than 12", string, begin); + add_pbf_error(s, TIMELIB_ERR_HOUR_LARGER_THAN_12, "Hour cannot be higher than 12", string, begin); break; } @@ -25711,7 +26520,7 @@ timelib_time *timelib_parse_from_format_with_map(const char *format, const char break; default: - add_pbf_error(s, TIMELIB_ERR_DATA_MISSING, "Data missing", string, ptr); + add_pbf_error(s, TIMELIB_ERR_DATA_MISSING, "Not enough data available to satisfy format", string, ptr); done = 1; } fptr++; diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index d69b9093389e6..6240e47d51993 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -211,18 +211,25 @@ static timelib_relunit const timelib_relunit_lookup[] = { { "year", TIMELIB_YEAR, 1 }, { "years", TIMELIB_YEAR, 1 }, + { "mondays", TIMELIB_WEEKDAY, 1 }, { "monday", TIMELIB_WEEKDAY, 1 }, { "mon", TIMELIB_WEEKDAY, 1 }, + { "tuesdays", TIMELIB_WEEKDAY, 2 }, { "tuesday", TIMELIB_WEEKDAY, 2 }, { "tue", TIMELIB_WEEKDAY, 2 }, + { "wednesdays", TIMELIB_WEEKDAY, 3 }, { "wednesday", TIMELIB_WEEKDAY, 3 }, { "wed", TIMELIB_WEEKDAY, 3 }, + { "thursdays", TIMELIB_WEEKDAY, 4 }, { "thursday", TIMELIB_WEEKDAY, 4 }, { "thu", TIMELIB_WEEKDAY, 4 }, + { "fridays", TIMELIB_WEEKDAY, 5 }, { "friday", TIMELIB_WEEKDAY, 5 }, { "fri", TIMELIB_WEEKDAY, 5 }, + { "saturdays", TIMELIB_WEEKDAY, 6 }, { "saturday", TIMELIB_WEEKDAY, 6 }, { "sat", TIMELIB_WEEKDAY, 6 }, + { "sundays", TIMELIB_WEEKDAY, 0 }, { "sunday", TIMELIB_WEEKDAY, 0 }, { "sun", TIMELIB_WEEKDAY, 0 }, @@ -813,6 +820,22 @@ static timelib_long timelib_parse_tz_cor(const char **ptr, int *tz_not_found) *tz_not_found = 0; tmp = sHOUR(strtol(begin, NULL, 10)) + sMIN(strtol(begin + 3, NULL, 10)); return tmp; + + case 6: /* HHMMSS */ + *tz_not_found = 0; + tmp = strtol(begin, NULL, 10); + tmp = sHOUR(tmp / 10000) + sMIN((tmp / 100) % 100) + (tmp % 100); + return tmp; + + case 8: /* HH:MM:SS */ + if (begin[2] != ':' || begin[5] != ':') { + break; + } + + *tz_not_found = 0; + tmp = sHOUR(strtol(begin, NULL, 10)) + sMIN(strtol(begin + 3, NULL, 10)) + strtol(begin + 6, NULL, 10); + return tmp; + } return 0; } @@ -945,7 +968,7 @@ second = minute | "60"; secondlz = minutelz | "60"; meridian = ([AaPp] "."? [Mm] "."?) [\000\t ]; tz = "("? [A-Za-z]{1,6} ")"? | [A-Z][a-z]+([_/-][A-Za-z]+)+; -tzcorrection = "GMT"? [+-] hour24 ":"? minute?; +tzcorrection = "GMT"? [+-] ((hour24 (":"? minute)?) | (hour24lz minutelz secondlz) | (hour24lz ":" minutelz ":" secondlz)); daysuf = "st" | "nd" | "rd" | "th"; @@ -963,10 +986,11 @@ weekofyear = "0"[1-9] | [1-4][0-9] | "5"[0-3]; monthlz = "0" [0-9] | "1" [0-2]; daylz = "0" [0-9] | [1-2][0-9] | "3" [01]; +dayfulls = 'sundays' | 'mondays' | 'tuesdays' | 'wednesdays' | 'thursdays' | 'fridays' | 'saturdays'; dayfull = 'sunday' | 'monday' | 'tuesday' | 'wednesday' | 'thursday' | 'friday' | 'saturday'; dayabbr = 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun'; dayspecial = 'weekday' | 'weekdays'; -daytext = dayfull | dayabbr | dayspecial; +daytext = dayfulls | dayfull | dayabbr | dayspecial; monthfull = 'january' | 'february' | 'march' | 'april' | 'may' | 'june' | 'july' | 'august' | 'september' | 'october' | 'november' | 'december'; monthabbr = 'jan' | 'feb' | 'mar' | 'apr' | 'may' | 'jun' | 'jul' | 'aug' | 'sep' | 'sept' | 'oct' | 'nov' | 'dec'; @@ -978,6 +1002,7 @@ timetiny12 = hour12 space? meridian; timeshort12 = hour12[:.]minutelz space? meridian; timelong12 = hour12[:.]minute[:.]secondlz space? meridian; +timetiny24 = 't' hour24; timeshort24 = 't'? hour24[:.]minute; timelong24 = 't'? hour24[:.]minute[:.]second; iso8601long = 't'? hour24 [:.] minute [:.] second frac; @@ -1016,7 +1041,7 @@ soap = year4 "-" monthlz "-" daylz "T" hour24lz ":" minutelz ":" sec xmlrpc = year4 monthlz daylz "T" hour24 ":" minutelz ":" secondlz; xmlrpcnocolon = year4 monthlz daylz 't' hour24 minutelz secondlz; wddx = year4 "-" month "-" day "T" hour24 ":" minute ":" second; -pgydotd = year4 "."? dayofyear; +pgydotd = year4 [.-]? dayofyear; pgtextshort = monthabbr "-" daylz "-" year; pgtextreverse = year "-" monthabbr "-" daylz; mssqltime = hour12 ":" minutelz ":" secondlz [:.] [0-9]+ meridian; @@ -1054,7 +1079,7 @@ relative = relnumber space? (reltextunit | 'week' ); relativetext = (reltextnumber|reltexttext) space reltextunit; relativetextweek = reltexttext space 'week'; -weekdayof = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of'; +weekdayof = (reltextnumber|reltexttext) space (dayfulls|dayfull|dayabbr) space 'of'; */ @@ -1143,8 +1168,10 @@ weekdayof = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of timestampms { - timelib_ull i, us; + timelib_sll i; + timelib_ull us; const char *ptr_before; + bool is_negative; TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -1152,11 +1179,16 @@ weekdayof = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of TIMELIB_UNHAVE_TIME(); TIMELIB_HAVE_TZ(); + is_negative = *(ptr + 1) == '-'; + i = timelib_get_signed_nr(s, &ptr, 24); ptr_before = ptr; us = timelib_get_signed_nr(s, &ptr, 6); us = us * pow(10, 7 - (ptr - ptr_before)); + if (is_negative) { + us *= -1; + } s->time->y = 1970; s->time->m = 1; @@ -1273,19 +1305,21 @@ weekdayof = (reltextnumber|reltexttext) space (dayfull|dayabbr) space 'of return TIMELIB_TIME24_WITH_ZONE; } - timeshort24 | timelong24 /* | iso8601short | iso8601norm */ | iso8601long /*| iso8601shorttz | iso8601normtz | iso8601longtz*/ + timetiny24 | timeshort24 | timelong24 /* | iso8601short | iso8601norm */ | iso8601long /*| iso8601shorttz | iso8601normtz | iso8601longtz*/ { int tz_not_found; - DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long"); + DEBUG_OUTPUT("timetiny24 | timeshort24 | timelong24 | iso8601long"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); s->time->h = timelib_get_nr(&ptr, 2); - s->time->i = timelib_get_nr(&ptr, 2); if (*ptr == ':' || *ptr == '.') { - s->time->s = timelib_get_nr(&ptr, 2); + s->time->i = timelib_get_nr(&ptr, 2); + if (*ptr == ':' || *ptr == '.') { + s->time->s = timelib_get_nr(&ptr, 2); - if (*ptr == '.') { - s->time->us = timelib_get_frac_nr(&ptr); + if (*ptr == '.') { + s->time->us = timelib_get_frac_nr(&ptr); + } } } @@ -2242,7 +2276,7 @@ timelib_time *timelib_parse_from_format_with_map(const char *format, const char break; } if (s->time->h > 12) { - add_pbf_error(s, TIMELIB_ERR_HOUR_LARGER_THAN_12, "Hour can not be higher than 12", string, begin); + add_pbf_error(s, TIMELIB_ERR_HOUR_LARGER_THAN_12, "Hour cannot be higher than 12", string, begin); break; } @@ -2488,7 +2522,7 @@ timelib_time *timelib_parse_from_format_with_map(const char *format, const char break; default: - add_pbf_error(s, TIMELIB_ERR_DATA_MISSING, "Data missing", string, ptr); + add_pbf_error(s, TIMELIB_ERR_DATA_MISSING, "Not enough data available to satisfy format", string, ptr); done = 1; } fptr++; diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c index 202e5bf41da1e..3fba30c68199e 100644 --- a/ext/date/lib/parse_iso_intervals.c +++ b/ext/date/lib/parse_iso_intervals.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.15.3 on Mon Dec 21 10:32:02 2020 */ -#line 1 "parse_iso_intervals.re" +/* Generated by re2c 0.15.3 on Fri May 20 11:35:03 2022 */ +#line 1 "ext/date/lib/parse_iso_intervals.re" /* * The MIT License (MIT) * @@ -176,7 +176,7 @@ static int scan(Scanner *s) std: s->tok = cursor; s->len = 0; -#line 204 "parse_iso_intervals.re" +#line 204 "ext/date/lib/parse_iso_intervals.re" @@ -249,7 +249,7 @@ static int scan(Scanner *s) if (yych <= '9') goto yy98; yy3: YYDEBUG(3, *YYCURSOR); -#line 317 "parse_iso_intervals.re" +#line 317 "ext/date/lib/parse_iso_intervals.re" { add_error(s, "Unexpected character"); goto std; @@ -271,7 +271,7 @@ static int scan(Scanner *s) if (yych == 'T') goto yy14; yy6: YYDEBUG(6, *YYCURSOR); -#line 244 "parse_iso_intervals.re" +#line 244 "ext/date/lib/parse_iso_intervals.re" { timelib_sll nr; int in_time = 0; @@ -317,7 +317,7 @@ static int scan(Scanner *s) YYDEBUG(7, *YYCURSOR); ++YYCURSOR; YYDEBUG(8, *YYCURSOR); -#line 306 "parse_iso_intervals.re" +#line 306 "ext/date/lib/parse_iso_intervals.re" { goto std; } @@ -326,7 +326,7 @@ static int scan(Scanner *s) YYDEBUG(9, *YYCURSOR); ++YYCURSOR; YYDEBUG(10, *YYCURSOR); -#line 311 "parse_iso_intervals.re" +#line 311 "ext/date/lib/parse_iso_intervals.re" { s->pos = cursor; s->line++; goto std; @@ -661,7 +661,7 @@ static int scan(Scanner *s) YYDEBUG(57, *YYCURSOR); ++YYCURSOR; YYDEBUG(58, *YYCURSOR); -#line 286 "parse_iso_intervals.re" +#line 286 "ext/date/lib/parse_iso_intervals.re" { DEBUG_OUTPUT("combinedrep"); TIMELIB_INIT; @@ -809,7 +809,7 @@ static int scan(Scanner *s) YYDEBUG(83, *YYCURSOR); ++YYCURSOR; YYDEBUG(84, *YYCURSOR); -#line 220 "parse_iso_intervals.re" +#line 220 "ext/date/lib/parse_iso_intervals.re" { timelib_time *current; @@ -910,7 +910,7 @@ static int scan(Scanner *s) if (yych <= '9') goto yy98; yy100: YYDEBUG(100, *YYCURSOR); -#line 209 "parse_iso_intervals.re" +#line 209 "ext/date/lib/parse_iso_intervals.re" { DEBUG_OUTPUT("recurrences"); TIMELIB_INIT; @@ -922,7 +922,7 @@ static int scan(Scanner *s) } #line 924 "" } -#line 321 "parse_iso_intervals.re" +#line 321 "ext/date/lib/parse_iso_intervals.re" } #ifdef PHP_WIN32 diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c index 060c2d79db46e..d42c69bbd6f06 100644 --- a/ext/date/lib/timelib.c +++ b/ext/date/lib/timelib.c @@ -37,7 +37,7 @@ const char *timelib_error_messages[10] = { "No error", - "Can not allocate buffer for parsing", + "Cannot allocate buffer for parsing", "Corrupt tzfile: The transitions in the file don't always increase", "Corrupt tzfile: The expected 64-bit preamble is missing", "Corrupt tzfile: No abbreviation could be found for a transition", diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h index 6b5b259a57a44..2f1c604cd28eb 100644 --- a/ext/date/lib/timelib.h +++ b/ext/date/lib/timelib.h @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2015-2021 Derick Rethans + * Copyright (c) 2015-2022 Derick Rethans * Copyright (c) 2018,2021 MongoDB, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -30,9 +30,9 @@ # include "timelib_config.h" #endif -#define TIMELIB_VERSION 202111 -#define TIMELIB_EXTENDED_VERSION 20211101 -#define TIMELIB_ASCII_VERSION "2021.11" +#define TIMELIB_VERSION 202112 +#define TIMELIB_EXTENDED_VERSION 20211201 +#define TIMELIB_ASCII_VERSION "2021.12" #include #include diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c index 051bb01b1b68a..7740b25e97eb6 100644 --- a/ext/date/lib/tm2unixtime.c +++ b/ext/date/lib/tm2unixtime.c @@ -364,11 +364,8 @@ static void do_adjust_timezone(timelib_time *tz, timelib_tzinfo *tzi) return; case TIMELIB_ZONETYPE_ABBR: { - timelib_sll tmp; tz->is_localtime = 1; - tmp = -tz->z; - tmp -= tz->dst * 3600; tz->sse += (-tz->z - tz->dst * SECS_PER_HOUR); return; } @@ -382,6 +379,8 @@ static void do_adjust_timezone(timelib_time *tz, timelib_tzinfo *tzi) timelib_time_offset *current, *after; timelib_sll adjustment; int in_transition; + int32_t actual_offset; + timelib_sll actual_transition_time; if (!tzi) { return; @@ -389,15 +388,42 @@ static void do_adjust_timezone(timelib_time *tz, timelib_tzinfo *tzi) current = timelib_get_time_zone_info(tz->sse, tzi); after = timelib_get_time_zone_info(tz->sse - current->offset, tzi); + actual_offset = after->offset; + actual_transition_time = after->transition_time; + if (current->offset == after->offset && tz->have_zone) { + /* Make sure we're not missing a DST change because we don't know the actual offset yet */ + if (current->offset >= 0 && tz->dst && !current->is_dst) { + /* Timezone or its DST at or east of UTC, so the local time, interpreted as UTC, leaves DST (as defined in the actual timezone) before the actual local time */ + timelib_time_offset *earlier; + earlier = timelib_get_time_zone_info(tz->sse - current->offset - 7200, tzi); + if ((earlier->offset != after->offset) && (tz->sse - earlier->offset < after->transition_time)) { + /* Looking behind a bit clarified the actual offset to use */ + actual_offset = earlier->offset; + actual_transition_time = earlier->transition_time; + } + timelib_time_offset_dtor(earlier); + } else if (current->offset <= 0 && current->is_dst && !tz->dst) { + /* Timezone west of UTC, so the local time, interpreted as UTC, leaves DST (as defined in the actual timezone) after the actual local time */ + timelib_time_offset *later; + later = timelib_get_time_zone_info(tz->sse - current->offset + 7200, tzi); + if ((later->offset != after->offset) && (tz->sse - later->offset >= later->transition_time)) { + /* Looking ahead a bit clarified the actual offset to use */ + actual_offset = later->offset; + actual_transition_time = later->transition_time; + } + timelib_time_offset_dtor(later); + } + } + tz->is_localtime = 1; in_transition = ( - ((tz->sse - after->offset) >= (after->transition_time + (current->offset - after->offset))) && - ((tz->sse - after->offset) < after->transition_time) + ((tz->sse - actual_offset) >= (actual_transition_time + (current->offset - actual_offset))) && + ((tz->sse - actual_offset) < actual_transition_time) ); - if ((current->offset != after->offset) && !in_transition) { - adjustment = -after->offset; + if ((current->offset != actual_offset) && !in_transition) { + adjustment = -actual_offset; } else { adjustment = -current->offset; } diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 96cd22129c10a..41521e27d0049 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1430,6 +1430,7 @@ PHP_FUNCTION(getdate) #define PHP_DATE_TIMEZONE_PER_COUNTRY 0x1000 #define PHP_DATE_PERIOD_EXCLUDE_START_DATE 0x0001 +#define PHP_DATE_PERIOD_INCLUDE_END_DATE 0x0002 /* define an overloaded iterator structure */ @@ -1470,7 +1471,11 @@ static int date_period_it_has_more(zend_object_iterator *iter) php_period_obj *object = Z_PHPPERIOD_P(&iterator->intern.data); if (object->end) { - return object->current->sse < object->end->sse ? SUCCESS : FAILURE; + if (object->include_end_date) { + return object->current->sse <= object->end->sse ? SUCCESS : FAILURE; + } else { + return object->current->sse < object->end->sse ? SUCCESS : FAILURE; + } } else { return (iterator->current_index < object->recurrences) ? SUCCESS : FAILURE; } @@ -1734,6 +1739,7 @@ static void date_register_classes(void) /* {{{ */ zend_declare_class_constant_long(date_ce_period, const_name, sizeof(const_name)-1, value); REGISTER_PERIOD_CLASS_CONST_STRING("EXCLUDE_START_DATE", PHP_DATE_PERIOD_EXCLUDE_START_DATE); + REGISTER_PERIOD_CLASS_CONST_STRING("INCLUDE_END_DATE", PHP_DATE_PERIOD_INCLUDE_END_DATE); } /* }}} */ static zend_object *date_object_new_date(zend_class_entry *class_type) /* {{{ */ @@ -2143,6 +2149,7 @@ static zend_object *date_object_clone_period(zend_object *this_ptr) /* {{{ */ new_obj->initialized = old_obj->initialized; new_obj->recurrences = old_obj->recurrences; new_obj->include_start_date = old_obj->include_start_date; + new_obj->include_end_date = old_obj->include_end_date; new_obj->start_ce = old_obj->start_ce; if (old_obj->start) { @@ -4567,9 +4574,10 @@ PHP_METHOD(DatePeriod, __construct) /* options */ dpobj->include_start_date = !(options & PHP_DATE_PERIOD_EXCLUDE_START_DATE); + dpobj->include_end_date = options & PHP_DATE_PERIOD_INCLUDE_END_DATE; /* recurrrences */ - dpobj->recurrences = recurrences + dpobj->include_start_date; + dpobj->recurrences = recurrences + dpobj->include_start_date + dpobj->include_end_date; dpobj->initialized = 1; } @@ -4653,11 +4661,11 @@ PHP_METHOD(DatePeriod, getRecurrences) dpobj = Z_PHPPERIOD_P(ZEND_THIS); - if (0 == dpobj->recurrences - dpobj->include_start_date) { + if (0 == dpobj->recurrences - dpobj->include_start_date - dpobj->include_end_date) { return; } - RETURN_LONG(dpobj->recurrences - dpobj->include_start_date); + RETURN_LONG(dpobj->recurrences - dpobj->include_start_date - dpobj->include_end_date); } /* }}} */ @@ -5082,6 +5090,9 @@ static void date_period_object_to_hash(php_period_obj *period_obj, HashTable *pr ZVAL_BOOL(&zv, period_obj->include_start_date); zend_hash_str_update(props, "include_start_date", sizeof("include_start_date")-1, &zv); + + ZVAL_BOOL(&zv, period_obj->include_end_date); + zend_hash_str_update(props, "include_end_date", sizeof("include_end_date")-1, &zv); } static HashTable *date_object_get_properties_period(zend_object *object) /* {{{ */ @@ -5175,6 +5186,14 @@ static bool php_date_period_initialize_from_hash(php_period_obj *period_obj, Has return 0; } + ht_entry = zend_hash_str_find(myht, "include_end_date", sizeof("include_end_date")-1); + if (ht_entry && + (Z_TYPE_P(ht_entry) == IS_FALSE || Z_TYPE_P(ht_entry) == IS_TRUE)) { + period_obj->include_end_date = (Z_TYPE_P(ht_entry) == IS_TRUE); + } else { + return 0; + } + period_obj->initialized = 1; return 1; @@ -5267,6 +5286,7 @@ static bool date_period_is_magic_property(zend_string *name) { if (zend_string_equals_literal(name, "recurrences") || zend_string_equals_literal(name, "include_start_date") + || zend_string_equals_literal(name, "include_end_date") || zend_string_equals_literal(name, "start") || zend_string_equals_literal(name, "current") || zend_string_equals_literal(name, "end") diff --git a/ext/date/php_date.h b/ext/date/php_date.h index d18529f10d30f..129f3617617a7 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -93,6 +93,7 @@ struct _php_period_obj { int recurrences; bool initialized; bool include_start_date; + bool include_end_date; zend_object std; }; diff --git a/ext/date/tests/DatePeriod_serialize-001.phpt b/ext/date/tests/DatePeriod_serialize-001.phpt index 0f555ab425145..5bfc94578d83e 100644 --- a/ext/date/tests/DatePeriod_serialize-001.phpt +++ b/ext/date/tests/DatePeriod_serialize-001.phpt @@ -22,9 +22,9 @@ var_dump($d->__serialize()); ?> --EXPECTF-- Original object: -object(DatePeriod)#1 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#2 (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2012-07-01 00:00:00.000000" ["timezone_type"]=> @@ -37,7 +37,7 @@ object(DatePeriod)#1 (6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#3 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(0) ["m"]=> @@ -63,17 +63,19 @@ object(DatePeriod)#1 (6) { int(5) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } Serialised object: -string(411) "O:10:"DatePeriod":6:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2012-07-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;}" +string(%d) "O:10:"DatePeriod":7:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2012-07-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;s:16:"include_end_date";b:0;}" Unserialised object: -object(DatePeriod)#5 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#6 (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2012-07-01 00:00:00.000000" ["timezone_type"]=> @@ -86,7 +88,7 @@ object(DatePeriod)#5 (6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#4 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(0) ["m"]=> @@ -112,13 +114,15 @@ object(DatePeriod)#5 (6) { int(5) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } Calling __serialize manually: -array(6) { +array(%d) { ["start"]=> - object(DateTime)#7 (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2012-07-01 00:00:00.000000" ["timezone_type"]=> @@ -131,7 +135,7 @@ array(6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#8 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(0) ["m"]=> @@ -157,4 +161,6 @@ array(6) { int(5) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } diff --git a/ext/date/tests/DatePeriod_serialize-002.phpt b/ext/date/tests/DatePeriod_serialize-002.phpt index 7e9d3e62dae54..d87bcd9a866db 100644 --- a/ext/date/tests/DatePeriod_serialize-002.phpt +++ b/ext/date/tests/DatePeriod_serialize-002.phpt @@ -30,9 +30,9 @@ foreach ( $e as $d ) ?> --EXPECTF-- Original object: -object(DatePeriod)#4 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTimeImmutable)#5 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -43,7 +43,7 @@ object(DatePeriod)#4 (6) { ["current"]=> NULL ["end"]=> - object(DateTimeImmutable)#6 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "2022-04-29 15:51:56.000000" ["timezone_type"]=> @@ -52,7 +52,7 @@ object(DatePeriod)#4 (6) { string(13) "Europe/London" } ["interval"]=> - object(DateInterval)#7 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(2) ["m"]=> @@ -78,17 +78,19 @@ object(DatePeriod)#4 (6) { int(1) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } Serialised object: -string(565) "O:10:"DatePeriod":6:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1978-12-22 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:7:"current";N;s:3:"end";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2022-04-29 15:51:56.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:2;s:1:"m";i:6;s:1:"d";i:0;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:1;s:18:"include_start_date";b:1;}" +string(%d) "O:10:"DatePeriod":7:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1978-12-22 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:7:"current";N;s:3:"end";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2022-04-29 15:51:56.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:2;s:1:"m";i:6;s:1:"d";i:0;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:1;s:18:"include_start_date";b:1;s:16:"include_end_date";b:0;}" Unserialised object: -object(DatePeriod)#1 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTimeImmutable)#2 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -99,7 +101,7 @@ object(DatePeriod)#1 (6) { ["current"]=> NULL ["end"]=> - object(DateTimeImmutable)#8 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "2022-04-29 15:51:56.000000" ["timezone_type"]=> @@ -108,7 +110,7 @@ object(DatePeriod)#1 (6) { string(13) "Europe/London" } ["interval"]=> - object(DateInterval)#9 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(2) ["m"]=> @@ -134,13 +136,15 @@ object(DatePeriod)#1 (6) { int(1) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } Calling __serialize manually: -array(6) { +array(%d) { ["start"]=> - object(DateTimeImmutable)#10 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -151,7 +155,7 @@ array(6) { ["current"]=> NULL ["end"]=> - object(DateTimeImmutable)#11 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "2022-04-29 15:51:56.000000" ["timezone_type"]=> @@ -160,7 +164,7 @@ array(6) { string(13) "Europe/London" } ["interval"]=> - object(DateInterval)#12 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(2) ["m"]=> @@ -186,6 +190,8 @@ array(6) { int(1) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } diff --git a/ext/date/tests/DatePeriod_serialize-003.phpt b/ext/date/tests/DatePeriod_serialize-003.phpt index ada8c7478f586..af52e5642b41e 100644 --- a/ext/date/tests/DatePeriod_serialize-003.phpt +++ b/ext/date/tests/DatePeriod_serialize-003.phpt @@ -30,9 +30,9 @@ foreach ( $e as $d ) ?> --EXPECTF-- Original object: -object(DatePeriod)#4 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTimeImmutable)#5 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -43,7 +43,7 @@ object(DatePeriod)#4 (6) { ["current"]=> NULL ["end"]=> - object(DateTimeImmutable)#6 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "2022-04-29 15:51:56.000000" ["timezone_type"]=> @@ -52,7 +52,7 @@ object(DatePeriod)#4 (6) { string(13) "Europe/London" } ["interval"]=> - object(DateInterval)#7 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(2) ["m"]=> @@ -78,17 +78,19 @@ object(DatePeriod)#4 (6) { int(0) ["include_start_date"]=> bool(false) + ["include_end_date"]=> + bool(false) } Serialised object: -string(565) "O:10:"DatePeriod":6:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1978-12-22 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:7:"current";N;s:3:"end";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2022-04-29 15:51:56.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:2;s:1:"m";i:6;s:1:"d";i:0;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:0;s:18:"include_start_date";b:0;}" +string(%d) "O:10:"DatePeriod":7:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1978-12-22 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:7:"current";N;s:3:"end";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2022-04-29 15:51:56.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:2;s:1:"m";i:6;s:1:"d";i:0;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:0;s:18:"include_start_date";b:0;s:16:"include_end_date";b:0;}" Unserialised object: -object(DatePeriod)#1 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTimeImmutable)#2 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -99,7 +101,7 @@ object(DatePeriod)#1 (6) { ["current"]=> NULL ["end"]=> - object(DateTimeImmutable)#8 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "2022-04-29 15:51:56.000000" ["timezone_type"]=> @@ -108,7 +110,7 @@ object(DatePeriod)#1 (6) { string(13) "Europe/London" } ["interval"]=> - object(DateInterval)#9 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(2) ["m"]=> @@ -134,13 +136,15 @@ object(DatePeriod)#1 (6) { int(0) ["include_start_date"]=> bool(false) + ["include_end_date"]=> + bool(false) } Calling __serialize manually: -array(6) { +array(%d) { ["start"]=> - object(DateTimeImmutable)#10 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -151,7 +155,7 @@ array(6) { ["current"]=> NULL ["end"]=> - object(DateTimeImmutable)#11 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "2022-04-29 15:51:56.000000" ["timezone_type"]=> @@ -160,7 +164,7 @@ array(6) { string(13) "Europe/London" } ["interval"]=> - object(DateInterval)#12 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(2) ["m"]=> @@ -186,6 +190,8 @@ array(6) { int(0) ["include_start_date"]=> bool(false) + ["include_end_date"]=> + bool(false) } diff --git a/ext/date/tests/DatePeriod_serialize-004.phpt b/ext/date/tests/DatePeriod_serialize-004.phpt index fd62c5e2b7630..f3e8b1156e9be 100644 --- a/ext/date/tests/DatePeriod_serialize-004.phpt +++ b/ext/date/tests/DatePeriod_serialize-004.phpt @@ -35,9 +35,9 @@ foreach ( $p as $d ) ?> --EXPECTF-- Original object: -object(DatePeriod)#3 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTimeImmutable)#4 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -50,7 +50,7 @@ object(DatePeriod)#3 (6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#5 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(0) ["m"]=> @@ -76,6 +76,8 @@ object(DatePeriod)#3 (6) { int(7) ["include_start_date"]=> bool(false) + ["include_end_date"]=> + bool(false) } @@ -90,13 +92,13 @@ Iterate of object: Serialised object: -string(568) "O:10:"DatePeriod":6:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1978-12-22 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:7:"current";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1979-08-06 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:3:"end";N;s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:1;s:1:"d";i:0;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:7;s:18:"include_start_date";b:0;}" +string(%d) "O:10:"DatePeriod":7:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1978-12-22 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:7:"current";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"1979-08-06 09:15:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:16:"Europe/Amsterdam";}s:3:"end";N;s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:1;s:1:"d";i:0;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:7;s:18:"include_start_date";b:0;s:16:"include_end_date";b:0;}" Unserialised object: -object(DatePeriod)#1 (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTimeImmutable)#6 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -105,7 +107,7 @@ object(DatePeriod)#1 (6) { string(16) "Europe/Amsterdam" } ["current"]=> - object(DateTimeImmutable)#8 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1979-08-06 09:15:00.000000" ["timezone_type"]=> @@ -116,7 +118,7 @@ object(DatePeriod)#1 (6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#9 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(0) ["m"]=> @@ -142,13 +144,15 @@ object(DatePeriod)#1 (6) { int(7) ["include_start_date"]=> bool(false) + ["include_end_date"]=> + bool(false) } Calling __serialize manually: -array(6) { +array(%d) { ["start"]=> - object(DateTimeImmutable)#10 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1978-12-22 09:15:00.000000" ["timezone_type"]=> @@ -157,7 +161,7 @@ array(6) { string(16) "Europe/Amsterdam" } ["current"]=> - object(DateTimeImmutable)#11 (3) { + object(DateTimeImmutable)#%d (%d) { ["date"]=> string(26) "1979-08-06 09:15:00.000000" ["timezone_type"]=> @@ -168,7 +172,7 @@ array(6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#12 (10) { + object(DateInterval)#%d (%d) { ["y"]=> int(0) ["m"]=> @@ -194,6 +198,8 @@ array(6) { int(7) ["include_start_date"]=> bool(false) + ["include_end_date"]=> + bool(false) } diff --git a/ext/date/tests/DatePeriod_set_state.phpt b/ext/date/tests/DatePeriod_set_state.phpt index de41eac50a5f9..b7d537e98570b 100644 --- a/ext/date/tests/DatePeriod_set_state.phpt +++ b/ext/date/tests/DatePeriod_set_state.phpt @@ -19,9 +19,9 @@ var_dump($datePeriodObjectNew); ?> --EXPECTF-- -object(DatePeriod)#%d (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2017-10-06 23:30:00.000000" ["timezone_type"]=> @@ -60,4 +60,6 @@ object(DatePeriod)#%d (6) { int(25) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } diff --git a/ext/date/tests/DateTime_construct-dst-overlap.phpt b/ext/date/tests/DateTime_construct-dst-overlap.phpt index 05ed525ac4127..4a8b04b9d9ee3 100644 --- a/ext/date/tests/DateTime_construct-dst-overlap.phpt +++ b/ext/date/tests/DateTime_construct-dst-overlap.phpt @@ -10,6 +10,24 @@ date_default_timezone_set('America/New_York'); $d = new DateTime('2011-11-06 01:30:00'); echo $d->format('P') . "\n"; +date_default_timezone_set('Atlantic/Azores'); +// PHP defaults to Daylight Saving Time. Ensure consistency in future. +$d = new DateTime('2011-10-30 00:30:00'); +echo $d->format('P') . "\n"; + +date_default_timezone_set('Europe/London'); +// PHP defaults to normal time. Ensure consistency in future. +$d = new DateTime('2011-10-30 01:30:00'); +echo $d->format('P') . "\n"; + +date_default_timezone_set('Europe/Amsterdam'); +// PHP defaults to normal time. Ensure consistency in future. +$d = new DateTime('2011-10-30 02:30:00'); +echo $d->format('P') . "\n"; + ?> --EXPECT-- -04:00 ++00:00 ++00:00 ++01:00 diff --git a/ext/date/tests/bug50392.phpt b/ext/date/tests/bug50392.phpt index 64def49f66f5c..a347f02c7983b 100644 --- a/ext/date/tests/bug50392.phpt +++ b/ext/date/tests/bug50392.phpt @@ -20,7 +20,7 @@ for ($i = 0; $i < 8; $i++) { --EXPECT-- 2009-03-01 18:00:00. - X -- Data missing +- Not enough data available to satisfy format 2009-03-01 18:00:00.1 - 0.1 diff --git a/ext/date/tests/bug51866.phpt b/ext/date/tests/bug51866.phpt index 1751add68d5a9..921a9392932f7 100644 --- a/ext/date/tests/bug51866.phpt +++ b/ext/date/tests/bug51866.phpt @@ -133,7 +133,7 @@ array(4) { ["errors"]=> array(1) { [10]=> - string(12) "Data missing" + string(%d) "Not enough data available to satisfy format" } } diff --git a/ext/date/tests/bug51934.phpt b/ext/date/tests/bug51934.phpt new file mode 100644 index 0000000000000..50b63d038f556 --- /dev/null +++ b/ext/date/tests/bug51934.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #51934 (strtotime plurals / incorrect time) +--FILE-- + +--EXPECTF-- +2010-05-02 19:18:00 +2010-05-02 19:18:00 diff --git a/ext/date/tests/bug51987.phpt b/ext/date/tests/bug51987.phpt new file mode 100644 index 0000000000000..640a02177f362 --- /dev/null +++ b/ext/date/tests/bug51987.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #51987 (Datetime fails to parse an ISO 8601 ordinal date (extended format)) +--FILE-- + +--EXPECTF-- +object(DateTime)#%d (%d) { + ["date"]=> + string(26) "1985-04-12 00:00:00.000000" + ["timezone_type"]=> + int(3) + ["timezone"]=> + string(13) "Europe/London" +} diff --git a/ext/date/tests/bug52113.phpt b/ext/date/tests/bug52113.phpt index 2e02195bd1d1a..74c8157fcad46 100644 --- a/ext/date/tests/bug52113.phpt +++ b/ext/date/tests/bug52113.phpt @@ -89,9 +89,9 @@ string(164) "O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h" ["from_string"]=> bool(false) } -object(DatePeriod)#%d (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2003-01-02 08:00:00.000000" ["timezone_type"]=> @@ -130,6 +130,8 @@ object(DatePeriod)#%d (6) { int(3) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } object(DateInterval)#%d (%d) { ["y"]=> @@ -153,9 +155,9 @@ object(DateInterval)#%d (%d) { ["from_string"]=> bool(false) } -object(DatePeriod)#%d (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2003-01-02 08:00:00.000000" ["timezone_type"]=> @@ -194,4 +196,6 @@ object(DatePeriod)#%d (6) { int(3) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } diff --git a/ext/date/tests/bug53437_var0.phpt b/ext/date/tests/bug53437_var0.phpt index 36b6c317177f2..9ae257a61b0fe 100644 --- a/ext/date/tests/bug53437_var0.phpt +++ b/ext/date/tests/bug53437_var0.phpt @@ -28,9 +28,9 @@ Original: 2010-01-02 00:00:00 2010-01-03 00:00:00 -object(DatePeriod)#%d (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2010-01-01 00:00:00.000000" ["timezone_type"]=> @@ -39,7 +39,7 @@ object(DatePeriod)#%d (6) { string(3) "UTC" } ["current"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2010-01-04 00:00:00.000000" ["timezone_type"]=> @@ -76,10 +76,12 @@ object(DatePeriod)#%d (6) { int(3) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } -object(DatePeriod)#%d (6) { +object(DatePeriod)#%d (%d) { ["start"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2010-01-01 00:00:00.000000" ["timezone_type"]=> @@ -88,7 +90,7 @@ object(DatePeriod)#%d (6) { string(3) "UTC" } ["current"]=> - object(DateTime)#%d (3) { + object(DateTime)#%d (%d) { ["date"]=> string(26) "2010-01-04 00:00:00.000000" ["timezone_type"]=> @@ -125,6 +127,8 @@ object(DatePeriod)#%d (6) { int(3) ["include_start_date"]=> bool(true) + ["include_end_date"]=> + bool(false) } Unserialized: 2010-01-01 00:00:00 diff --git a/ext/date/tests/bug66019.phpt b/ext/date/tests/bug66019.phpt new file mode 100644 index 0000000000000..6b6543a16e3a3 --- /dev/null +++ b/ext/date/tests/bug66019.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #66019 (DateTime object does not support short ISO 8601 time format - YYYY-MM-DDTHH) +--FILE-- +format( 'j F Y H:i' ); +?> +--EXPECT-- +2 February 2012 10:00 diff --git a/ext/date/tests/bug67253.phpt b/ext/date/tests/bug67253.phpt index 53c587c2901c9..4e213ca87d943 100644 --- a/ext/date/tests/bug67253.phpt +++ b/ext/date/tests/bug67253.phpt @@ -35,7 +35,7 @@ array(12) { [0]=> string(29) "A meridian could not be found" [9]=> - string(12) "Data missing" + string(43) "Not enough data available to satisfy format" } ["is_localtime"]=> bool(false) diff --git a/ext/date/tests/bug68549-dst-transition-DateTime-setTimestamp.phpt b/ext/date/tests/bug68549-dst-transition-DateTime-setTimestamp.phpt new file mode 100644 index 0000000000000..cb7ef9493e7cb --- /dev/null +++ b/ext/date/tests/bug68549-dst-transition-DateTime-setTimestamp.phpt @@ -0,0 +1,242 @@ +--TEST-- +Bug #68549 (setting timestamp around a DST transition) +--CREDITS-- +Roel Harbers +--FILE-- + [ + // LANG=en_US TZ="America/Los_Angeles" date --date=@<...> + // forward: + 1615687199, // Sat Mar 13 17:59:59 PST 2021 (Sun Mar 14 01:59:59 UTC 2021) + 1615687200, // Sat Mar 13 18:00:00 PST 2021 (Sun Mar 14 02:00:00 UTC 2021) + 1615687201, // Sat Mar 13 18:00:01 PST 2021 (Sun Mar 14 02:00:01 UTC 2021) + 1615690799, // Sat Mar 13 18:59:59 PST 2021 (Sun Mar 14 02:59:59 UTC 2021) + 1615690800, // Sat Mar 13 19:00:00 PST 2021 (Sun Mar 14 03:00:00 UTC 2021) + 1615690801, // Sat Mar 13 19:00:01 PST 2021 (Sun Mar 14 03:00:01 UTC 2021) + 1615708799, // Sun Mar 13 23:59:59 PST 2021 + 1615708800, // Sun Mar 14 00:00:00 PST 2021 + 1615708801, // Sun Mar 14 00:00:01 PST 2021 + 1615712399, // Sun Mar 14 00:59:59 PST 2021 + 1615712400, // Sun Mar 14 01:00:00 PST 2021 + 1615712401, // Sun Mar 14 01:00:01 PST 2021 + 1615715999, // Sun Mar 14 01:59:59 PST 2021 + 1615716000, // Sun Mar 14 03:00:00 PDT 2021 + 1615716001, // Sun Mar 14 03:00:01 PDT 2021 + 1615719599, // Sun Mar 14 03:59:59 PDT 2021 + 1615719600, // Sun Mar 14 04:00:00 PDT 2021 + 1615719601, // Sun Mar 14 04:00:01 PDT 2021 + // backward: + 1636246799, // Sat Nov 6 17:59:59 PDT 2021 (Sun Nov 7 00:59:59 UTC 2021) + 1636246800, // Sat Nov 6 18:00:00 PDT 2021 (Sun Nov 7 01:00:00 UTC 2021) + 1636246801, // Sat Nov 6 18:00:01 PDT 2021 (Sun Nov 7 01:00:01 UTC 2021) + 1636250399, // Sat Nov 6 18:59:59 PDT 2021 (Sun Nov 7 01:59:59 UTC 2021) + 1636250400, // Sat Nov 6 19:00:00 PDT 2021 (Sun Nov 7 02:00:00 UTC 2021) + 1636250401, // Sat Nov 6 19:00:01 PDT 2021 (Sun Nov 7 02:00:01 UTC 2021) + 1636268399, // Sat Nov 6 23:59:59 PDT 2021 + 1636268400, // Sun Nov 7 00:00:00 PDT 2021 + 1636268401, // Sun Nov 7 00:00:01 PDT 2021 + 1636271999, // Sun Nov 7 00:59:59 PDT 2021 + 1636272000, // Sun Nov 7 01:00:00 PDT 2021 + 1636272001, // Sun Nov 7 01:00:01 PDT 2021 + 1636275599, // Sun Nov 7 01:59:59 PDT 2021 + 1636275600, // Sun Nov 7 01:00:00 PST 2021 + 1636275601, // Sun Nov 7 01:00:01 PST 2021 + 1636279199, // Sun Nov 7 01:59:59 PST 2021 + 1636279200, // Sun Nov 7 02:00:00 PST 2021 + 1636279201, // Sun Nov 7 02:00:01 PST 2021 + ], + 'Atlantic/Azores' => [ + // LANG=en_US TZ="Atlantic/Azores" date --date=@<...> + // forward: + 1616889599, // Sat Mar 27 22:59:59 AZOT 2021 (Sat Mar 27 23:59:59 UTC 2021) + 1616889600, // Sat Mar 27 23:00:00 AZOT 2021 (Sun Mar 28 00:00:00 UTC 2021) + 1616889601, // Sat Mar 27 23:00:01 AZOT 2021 (Sun Mar 28 00:00:01 UTC 2021) + 1616893199, // Sat Mar 27 23:59:59 AZOT 2021 (Sun Mar 28 00:59:59 UTC 2021) + 1616893200, // Sun Mar 28 01:00:00 AZOST 2021 (Sun Mar 28 01:00:00 UTC 2021) + 1616893201, // Sun Mar 28 01:00:01 AZOST 2021 (Sun Mar 28 01:00:01 UTC 2021) + 1616896799, // Sun Mar 28 01:59:59 AZOST 2021 + 1616896800, // Sun Mar 28 02:00:00 AZOST 2021 + 1616896801, // Sun Mar 28 02:00:01 AZOST 2021 + // backward: + 1635638399, // Sat Oct 30 23:59:59 AZOST 2021 (Sat Oct 30 23:59:59 UTC 2021) + 1635638400, // Sun Oct 31 00:00:00 AZOST 2021 (Sun Oct 31 00:00:00 UTC 2021) + 1635638401, // Sun Oct 31 00:00:01 AZOST 2021 (Sun Oct 31 00:00:01 UTC 2021) + 1635641999, // Sun Oct 31 00:59:59 AZOST 2021 (Sun Oct 31 00:59:59 UTC 2021) + 1635642000, // Sun Oct 31 00:00:00 AZOT 2021 (Sun Oct 31 01:00:00 UTC 2021) + 1635642001, // Sun Oct 31 00:00:01 AZOT 2021 (Sun Oct 31 01:00:01 UTC 2021) + 1635645599, // Sun Oct 31 00:59:59 AZOT 2021 + 1635645600, // Sun Oct 31 01:00:00 AZOT 2021 + 1635645601, // Sun Oct 31 01:00:01 AZOT 2021 + ], + 'Europe/London' => [ + // LANG=en_US TZ="Europe/London" date --date=@<...> + // forward: + 1616889599, // Sat Mar 27 23:59:59 GMT 2021 + 1616889600, // Sun Mar 28 00:00:00 GMT 2021 + 1616889601, // Sun Mar 28 00:00:01 GMT 2021 + 1616893199, // Sun Mar 28 00:59:59 GMT 2021 (Sun Mar 28 00:59:59 UTC 2021) + 1616893200, // Sun Mar 28 02:00:00 BST 2021 (Sun Mar 28 01:00:00 UTC 2021) + 1616893201, // Sun Mar 28 02:00:01 BST 2021 (Sun Mar 28 01:00:01 UTC 2021) + 1616896799, // Sun Mar 28 02:59:59 BST 2021 (Sun Mar 28 01:59:59 UTC 2021) + 1616896800, // Sun Mar 28 03:00:00 BST 2021 (Sun Mar 28 02:00:00 UTC 2021) + 1616896801, // Sun Mar 28 03:00:01 BST 2021 (Sun Mar 28 02:00:01 UTC 2021) + // backward: + 1635638399, // Sun Oct 31 00:59:59 BST 2021 + 1635638400, // Sun Oct 31 01:00:00 BST 2021 + 1635638401, // Sun Oct 31 01:00:01 BST 2021 + 1635641999, // Sun Oct 31 01:59:59 BST 2021 (Sun Oct 31 00:59:59 UTC 2021) + 1635642000, // Sun Oct 31 01:00:00 GMT 2021 (Sun Oct 31 01:00:00 UTC 2021) + 1635642001, // Sun Oct 31 01:00:01 GMT 2021 (Sun Oct 31 01:00:01 UTC 2021) + 1635645599, // Sun Oct 31 01:59:59 GMT 2021 (Sun Oct 31 01:59:59 UTC 2021) + 1635645600, // Sun Oct 31 02:00:00 GMT 2021 (Sun Oct 31 02:00:00 UTC 2021) + 1635645601, // Sun Oct 31 02:00:01 GMT 2021 (Sun Oct 31 02:00:01 UTC 2021) + ], + 'Europe/Amsterdam' => [ + // LANG=en_US TZ="Europe/Amsterdam" date --date=@<...> + // forward: + 1616885999, // Sat Mar 27 23:59:59 CET 2021 + 1616886000, // Sun Mar 28 00:00:00 CET 2021 + 1616886001, // Sun Mar 28 00:00:01 CET 2021 + 1616889599, // Sun Mar 28 00:59:59 CET 2021 + 1616889600, // Sun Mar 28 01:00:00 CET 2021 + 1616889601, // Sun Mar 28 01:00:01 CET 2021 + 1616893199, // Sun Mar 28 01:59:59 CET 2021 + 1616893200, // Sun Mar 28 03:00:00 CEST 2021 + 1616893201, // Sun Mar 28 03:00:01 CEST 2021 + 1616896799, // Sun Mar 28 03:59:59 CEST 2021 (Sun Mar 28 01:59:59 UTC 2021) + 1616896800, // Sun Mar 28 04:00:00 CEST 2021 (Sun Mar 28 02:00:00 UTC 2021) + 1616896801, // Sun Mar 28 04:00:01 CEST 2021 (Sun Mar 28 02:00:01 UTC 2021) + 1616900399, // Sun Mar 28 04:59:59 CEST 2021 (Sun Mar 28 02:59:59 UTC 2021) + 1616900400, // Sun Mar 28 05:00:00 CEST 2021 (Sun Mar 28 03:00:00 UTC 2021) + 1616900401, // Sun Mar 28 05:00:01 CEST 2021 (Sun Mar 28 03:00:01 UTC 2021) + // backward: + 1635631199, // Sat Oct 30 23:59:59 CEST 2021 + 1635631200, // Sun Oct 31 00:00:00 CEST 2021 + 1635631201, // Sun Oct 31 00:00:01 CEST 2021 + 1635638399, // Sun Oct 31 01:59:59 CEST 2021 + 1635638400, // Sun Oct 31 02:00:00 CEST 2021 + 1635638401, // Sun Oct 31 02:00:01 CEST 2021 + 1635641999, // Sun Oct 31 02:59:59 CEST 2021 + 1635642000, // Sun Oct 31 02:00:00 CET 2021 + 1635642001, // Sun Oct 31 02:00:01 CET 2021 + 1635645599, // Sun Oct 31 02:59:59 CET 2021 (Sun Oct 31 01:59:59 UTC 2021) + 1635645600, // Sun Oct 31 03:00:00 CET 2021 (Sun Oct 31 02:00:00 UTC 2021) + 1635645601, // Sun Oct 31 03:00:01 CET 2021 (Sun Oct 31 02:00:01 UTC 2021) + 1635649199, // Sun Oct 31 03:59:59 CET 2021 (Sun Oct 31 02:59:59 UTC 2021) + 1635649200, // Sun Oct 31 04:00:00 CET 2021 (Sun Oct 31 03:00:00 UTC 2021) + 1635649201, // Sun Oct 31 04:00:01 CET 2021 (Sun Oct 31 03:00:01 UTC 2021) + ], +]; +foreach ($timezonesWithTimestamps as $timezone => $timestamps) { + foreach ($timestamps as $timestamp) { + $tz = new DateTimeZone($timezone); + $dt = new DateTime('now', $tz); + $dt->setTimestamp($timestamp); + printf("%s %d -> %d %s\n", $timezone, $timestamp, $dt->getTimestamp(), $dt->format(DateTimeInterface::ISO8601)); + } +} +?> +--EXPECT-- +America/Los_Angeles 1615687199 -> 1615687199 2021-03-13T17:59:59-0800 +America/Los_Angeles 1615687200 -> 1615687200 2021-03-13T18:00:00-0800 +America/Los_Angeles 1615687201 -> 1615687201 2021-03-13T18:00:01-0800 +America/Los_Angeles 1615690799 -> 1615690799 2021-03-13T18:59:59-0800 +America/Los_Angeles 1615690800 -> 1615690800 2021-03-13T19:00:00-0800 +America/Los_Angeles 1615690801 -> 1615690801 2021-03-13T19:00:01-0800 +America/Los_Angeles 1615708799 -> 1615708799 2021-03-13T23:59:59-0800 +America/Los_Angeles 1615708800 -> 1615708800 2021-03-14T00:00:00-0800 +America/Los_Angeles 1615708801 -> 1615708801 2021-03-14T00:00:01-0800 +America/Los_Angeles 1615712399 -> 1615712399 2021-03-14T00:59:59-0800 +America/Los_Angeles 1615712400 -> 1615712400 2021-03-14T01:00:00-0800 +America/Los_Angeles 1615712401 -> 1615712401 2021-03-14T01:00:01-0800 +America/Los_Angeles 1615715999 -> 1615715999 2021-03-14T01:59:59-0800 +America/Los_Angeles 1615716000 -> 1615716000 2021-03-14T03:00:00-0700 +America/Los_Angeles 1615716001 -> 1615716001 2021-03-14T03:00:01-0700 +America/Los_Angeles 1615719599 -> 1615719599 2021-03-14T03:59:59-0700 +America/Los_Angeles 1615719600 -> 1615719600 2021-03-14T04:00:00-0700 +America/Los_Angeles 1615719601 -> 1615719601 2021-03-14T04:00:01-0700 +America/Los_Angeles 1636246799 -> 1636246799 2021-11-06T17:59:59-0700 +America/Los_Angeles 1636246800 -> 1636246800 2021-11-06T18:00:00-0700 +America/Los_Angeles 1636246801 -> 1636246801 2021-11-06T18:00:01-0700 +America/Los_Angeles 1636250399 -> 1636250399 2021-11-06T18:59:59-0700 +America/Los_Angeles 1636250400 -> 1636250400 2021-11-06T19:00:00-0700 +America/Los_Angeles 1636250401 -> 1636250401 2021-11-06T19:00:01-0700 +America/Los_Angeles 1636268399 -> 1636268399 2021-11-06T23:59:59-0700 +America/Los_Angeles 1636268400 -> 1636268400 2021-11-07T00:00:00-0700 +America/Los_Angeles 1636268401 -> 1636268401 2021-11-07T00:00:01-0700 +America/Los_Angeles 1636271999 -> 1636271999 2021-11-07T00:59:59-0700 +America/Los_Angeles 1636272000 -> 1636272000 2021-11-07T01:00:00-0700 +America/Los_Angeles 1636272001 -> 1636272001 2021-11-07T01:00:01-0700 +America/Los_Angeles 1636275599 -> 1636275599 2021-11-07T01:59:59-0700 +America/Los_Angeles 1636275600 -> 1636275600 2021-11-07T01:00:00-0800 +America/Los_Angeles 1636275601 -> 1636275601 2021-11-07T01:00:01-0800 +America/Los_Angeles 1636279199 -> 1636279199 2021-11-07T01:59:59-0800 +America/Los_Angeles 1636279200 -> 1636279200 2021-11-07T02:00:00-0800 +America/Los_Angeles 1636279201 -> 1636279201 2021-11-07T02:00:01-0800 +Atlantic/Azores 1616889599 -> 1616889599 2021-03-27T22:59:59-0100 +Atlantic/Azores 1616889600 -> 1616889600 2021-03-27T23:00:00-0100 +Atlantic/Azores 1616889601 -> 1616889601 2021-03-27T23:00:01-0100 +Atlantic/Azores 1616893199 -> 1616893199 2021-03-27T23:59:59-0100 +Atlantic/Azores 1616893200 -> 1616893200 2021-03-28T01:00:00+0000 +Atlantic/Azores 1616893201 -> 1616893201 2021-03-28T01:00:01+0000 +Atlantic/Azores 1616896799 -> 1616896799 2021-03-28T01:59:59+0000 +Atlantic/Azores 1616896800 -> 1616896800 2021-03-28T02:00:00+0000 +Atlantic/Azores 1616896801 -> 1616896801 2021-03-28T02:00:01+0000 +Atlantic/Azores 1635638399 -> 1635638399 2021-10-30T23:59:59+0000 +Atlantic/Azores 1635638400 -> 1635638400 2021-10-31T00:00:00+0000 +Atlantic/Azores 1635638401 -> 1635638401 2021-10-31T00:00:01+0000 +Atlantic/Azores 1635641999 -> 1635641999 2021-10-31T00:59:59+0000 +Atlantic/Azores 1635642000 -> 1635642000 2021-10-31T00:00:00-0100 +Atlantic/Azores 1635642001 -> 1635642001 2021-10-31T00:00:01-0100 +Atlantic/Azores 1635645599 -> 1635645599 2021-10-31T00:59:59-0100 +Atlantic/Azores 1635645600 -> 1635645600 2021-10-31T01:00:00-0100 +Atlantic/Azores 1635645601 -> 1635645601 2021-10-31T01:00:01-0100 +Europe/London 1616889599 -> 1616889599 2021-03-27T23:59:59+0000 +Europe/London 1616889600 -> 1616889600 2021-03-28T00:00:00+0000 +Europe/London 1616889601 -> 1616889601 2021-03-28T00:00:01+0000 +Europe/London 1616893199 -> 1616893199 2021-03-28T00:59:59+0000 +Europe/London 1616893200 -> 1616893200 2021-03-28T02:00:00+0100 +Europe/London 1616893201 -> 1616893201 2021-03-28T02:00:01+0100 +Europe/London 1616896799 -> 1616896799 2021-03-28T02:59:59+0100 +Europe/London 1616896800 -> 1616896800 2021-03-28T03:00:00+0100 +Europe/London 1616896801 -> 1616896801 2021-03-28T03:00:01+0100 +Europe/London 1635638399 -> 1635638399 2021-10-31T00:59:59+0100 +Europe/London 1635638400 -> 1635638400 2021-10-31T01:00:00+0100 +Europe/London 1635638401 -> 1635638401 2021-10-31T01:00:01+0100 +Europe/London 1635641999 -> 1635641999 2021-10-31T01:59:59+0100 +Europe/London 1635642000 -> 1635642000 2021-10-31T01:00:00+0000 +Europe/London 1635642001 -> 1635642001 2021-10-31T01:00:01+0000 +Europe/London 1635645599 -> 1635645599 2021-10-31T01:59:59+0000 +Europe/London 1635645600 -> 1635645600 2021-10-31T02:00:00+0000 +Europe/London 1635645601 -> 1635645601 2021-10-31T02:00:01+0000 +Europe/Amsterdam 1616885999 -> 1616885999 2021-03-27T23:59:59+0100 +Europe/Amsterdam 1616886000 -> 1616886000 2021-03-28T00:00:00+0100 +Europe/Amsterdam 1616886001 -> 1616886001 2021-03-28T00:00:01+0100 +Europe/Amsterdam 1616889599 -> 1616889599 2021-03-28T00:59:59+0100 +Europe/Amsterdam 1616889600 -> 1616889600 2021-03-28T01:00:00+0100 +Europe/Amsterdam 1616889601 -> 1616889601 2021-03-28T01:00:01+0100 +Europe/Amsterdam 1616893199 -> 1616893199 2021-03-28T01:59:59+0100 +Europe/Amsterdam 1616893200 -> 1616893200 2021-03-28T03:00:00+0200 +Europe/Amsterdam 1616893201 -> 1616893201 2021-03-28T03:00:01+0200 +Europe/Amsterdam 1616896799 -> 1616896799 2021-03-28T03:59:59+0200 +Europe/Amsterdam 1616896800 -> 1616896800 2021-03-28T04:00:00+0200 +Europe/Amsterdam 1616896801 -> 1616896801 2021-03-28T04:00:01+0200 +Europe/Amsterdam 1616900399 -> 1616900399 2021-03-28T04:59:59+0200 +Europe/Amsterdam 1616900400 -> 1616900400 2021-03-28T05:00:00+0200 +Europe/Amsterdam 1616900401 -> 1616900401 2021-03-28T05:00:01+0200 +Europe/Amsterdam 1635631199 -> 1635631199 2021-10-30T23:59:59+0200 +Europe/Amsterdam 1635631200 -> 1635631200 2021-10-31T00:00:00+0200 +Europe/Amsterdam 1635631201 -> 1635631201 2021-10-31T00:00:01+0200 +Europe/Amsterdam 1635638399 -> 1635638399 2021-10-31T01:59:59+0200 +Europe/Amsterdam 1635638400 -> 1635638400 2021-10-31T02:00:00+0200 +Europe/Amsterdam 1635638401 -> 1635638401 2021-10-31T02:00:01+0200 +Europe/Amsterdam 1635641999 -> 1635641999 2021-10-31T02:59:59+0200 +Europe/Amsterdam 1635642000 -> 1635642000 2021-10-31T02:00:00+0100 +Europe/Amsterdam 1635642001 -> 1635642001 2021-10-31T02:00:01+0100 +Europe/Amsterdam 1635645599 -> 1635645599 2021-10-31T02:59:59+0100 +Europe/Amsterdam 1635645600 -> 1635645600 2021-10-31T03:00:00+0100 +Europe/Amsterdam 1635645601 -> 1635645601 2021-10-31T03:00:01+0100 +Europe/Amsterdam 1635649199 -> 1635649199 2021-10-31T03:59:59+0100 +Europe/Amsterdam 1635649200 -> 1635649200 2021-10-31T04:00:00+0100 +Europe/Amsterdam 1635649201 -> 1635649201 2021-10-31T04:00:01+0100 diff --git a/ext/date/tests/bug68549-dst-transition-DateTime-setTimezone.phpt b/ext/date/tests/bug68549-dst-transition-DateTime-setTimezone.phpt new file mode 100644 index 0000000000000..51c48928bd42c --- /dev/null +++ b/ext/date/tests/bug68549-dst-transition-DateTime-setTimezone.phpt @@ -0,0 +1,242 @@ +--TEST-- +Bug #68549 (setting timezone around a DST transition) +--CREDITS-- +Roel Harbers +--FILE-- + [ + // LANG=en_US TZ="America/Los_Angeles" date --date=@<...> + // forward: + 1615687199, // Sat Mar 13 17:59:59 PST 2021 (Sun Mar 14 01:59:59 UTC 2021) + 1615687200, // Sat Mar 13 18:00:00 PST 2021 (Sun Mar 14 02:00:00 UTC 2021) + 1615687201, // Sat Mar 13 18:00:01 PST 2021 (Sun Mar 14 02:00:01 UTC 2021) + 1615690799, // Sat Mar 13 18:59:59 PST 2021 (Sun Mar 14 02:59:59 UTC 2021) + 1615690800, // Sat Mar 13 19:00:00 PST 2021 (Sun Mar 14 03:00:00 UTC 2021) + 1615690801, // Sat Mar 13 19:00:01 PST 2021 (Sun Mar 14 03:00:01 UTC 2021) + 1615708799, // Sun Mar 13 23:59:59 PST 2021 + 1615708800, // Sun Mar 14 00:00:00 PST 2021 + 1615708801, // Sun Mar 14 00:00:01 PST 2021 + 1615712399, // Sun Mar 14 00:59:59 PST 2021 + 1615712400, // Sun Mar 14 01:00:00 PST 2021 + 1615712401, // Sun Mar 14 01:00:01 PST 2021 + 1615715999, // Sun Mar 14 01:59:59 PST 2021 + 1615716000, // Sun Mar 14 03:00:00 PDT 2021 + 1615716001, // Sun Mar 14 03:00:01 PDT 2021 + 1615719599, // Sun Mar 14 03:59:59 PDT 2021 + 1615719600, // Sun Mar 14 04:00:00 PDT 2021 + 1615719601, // Sun Mar 14 04:00:01 PDT 2021 + // backward: + 1636246799, // Sat Nov 6 17:59:59 PDT 2021 (Sun Nov 7 00:59:59 UTC 2021) + 1636246800, // Sat Nov 6 18:00:00 PDT 2021 (Sun Nov 7 01:00:00 UTC 2021) + 1636246801, // Sat Nov 6 18:00:01 PDT 2021 (Sun Nov 7 01:00:01 UTC 2021) + 1636250399, // Sat Nov 6 18:59:59 PDT 2021 (Sun Nov 7 01:59:59 UTC 2021) + 1636250400, // Sat Nov 6 19:00:00 PDT 2021 (Sun Nov 7 02:00:00 UTC 2021) + 1636250401, // Sat Nov 6 19:00:01 PDT 2021 (Sun Nov 7 02:00:01 UTC 2021) + 1636268399, // Sat Nov 6 23:59:59 PDT 2021 + 1636268400, // Sun Nov 7 00:00:00 PDT 2021 + 1636268401, // Sun Nov 7 00:00:01 PDT 2021 + 1636271999, // Sun Nov 7 00:59:59 PDT 2021 + 1636272000, // Sun Nov 7 01:00:00 PDT 2021 + 1636272001, // Sun Nov 7 01:00:01 PDT 2021 + 1636275599, // Sun Nov 7 01:59:59 PDT 2021 + 1636275600, // Sun Nov 7 01:00:00 PST 2021 + 1636275601, // Sun Nov 7 01:00:01 PST 2021 + 1636279199, // Sun Nov 7 01:59:59 PST 2021 + 1636279200, // Sun Nov 7 02:00:00 PST 2021 + 1636279201, // Sun Nov 7 02:00:01 PST 2021 + ], + 'Atlantic/Azores' => [ + // LANG=en_US TZ="Atlantic/Azores" date --date=@<...> + // forward: + 1616889599, // Sat Mar 27 22:59:59 AZOT 2021 (Sat Mar 27 23:59:59 UTC 2021) + 1616889600, // Sat Mar 27 23:00:00 AZOT 2021 (Sun Mar 28 00:00:00 UTC 2021) + 1616889601, // Sat Mar 27 23:00:01 AZOT 2021 (Sun Mar 28 00:00:01 UTC 2021) + 1616893199, // Sat Mar 27 23:59:59 AZOT 2021 (Sun Mar 28 00:59:59 UTC 2021) + 1616893200, // Sun Mar 28 01:00:00 AZOST 2021 (Sun Mar 28 01:00:00 UTC 2021) + 1616893201, // Sun Mar 28 01:00:01 AZOST 2021 (Sun Mar 28 01:00:01 UTC 2021) + 1616896799, // Sun Mar 28 01:59:59 AZOST 2021 + 1616896800, // Sun Mar 28 02:00:00 AZOST 2021 + 1616896801, // Sun Mar 28 02:00:01 AZOST 2021 + // backward: + 1635638399, // Sat Oct 30 23:59:59 AZOST 2021 (Sat Oct 30 23:59:59 UTC 2021) + 1635638400, // Sun Oct 31 00:00:00 AZOST 2021 (Sun Oct 31 00:00:00 UTC 2021) + 1635638401, // Sun Oct 31 00:00:01 AZOST 2021 (Sun Oct 31 00:00:01 UTC 2021) + 1635641999, // Sun Oct 31 00:59:59 AZOST 2021 (Sun Oct 31 00:59:59 UTC 2021) + 1635642000, // Sun Oct 31 00:00:00 AZOT 2021 (Sun Oct 31 01:00:00 UTC 2021) + 1635642001, // Sun Oct 31 00:00:01 AZOT 2021 (Sun Oct 31 01:00:01 UTC 2021) + 1635645599, // Sun Oct 31 00:59:59 AZOT 2021 + 1635645600, // Sun Oct 31 01:00:00 AZOT 2021 + 1635645601, // Sun Oct 31 01:00:01 AZOT 2021 + ], + 'Europe/London' => [ + // LANG=en_US TZ="Europe/London" date --date=@<...> + // forward: + 1616889599, // Sat Mar 27 23:59:59 GMT 2021 + 1616889600, // Sun Mar 28 00:00:00 GMT 2021 + 1616889601, // Sun Mar 28 00:00:01 GMT 2021 + 1616893199, // Sun Mar 28 00:59:59 GMT 2021 (Sun Mar 28 00:59:59 UTC 2021) + 1616893200, // Sun Mar 28 02:00:00 BST 2021 (Sun Mar 28 01:00:00 UTC 2021) + 1616893201, // Sun Mar 28 02:00:01 BST 2021 (Sun Mar 28 01:00:01 UTC 2021) + 1616896799, // Sun Mar 28 02:59:59 BST 2021 (Sun Mar 28 01:59:59 UTC 2021) + 1616896800, // Sun Mar 28 03:00:00 BST 2021 (Sun Mar 28 02:00:00 UTC 2021) + 1616896801, // Sun Mar 28 03:00:01 BST 2021 (Sun Mar 28 02:00:01 UTC 2021) + // backward: + 1635638399, // Sun Oct 31 00:59:59 BST 2021 + 1635638400, // Sun Oct 31 01:00:00 BST 2021 + 1635638401, // Sun Oct 31 01:00:01 BST 2021 + 1635641999, // Sun Oct 31 01:59:59 BST 2021 (Sun Oct 31 00:59:59 UTC 2021) + 1635642000, // Sun Oct 31 01:00:00 GMT 2021 (Sun Oct 31 01:00:00 UTC 2021) + 1635642001, // Sun Oct 31 01:00:01 GMT 2021 (Sun Oct 31 01:00:01 UTC 2021) + 1635645599, // Sun Oct 31 01:59:59 GMT 2021 (Sun Oct 31 01:59:59 UTC 2021) + 1635645600, // Sun Oct 31 02:00:00 GMT 2021 (Sun Oct 31 02:00:00 UTC 2021) + 1635645601, // Sun Oct 31 02:00:01 GMT 2021 (Sun Oct 31 02:00:01 UTC 2021) + ], + 'Europe/Amsterdam' => [ + // LANG=en_US TZ="Europe/Amsterdam" date --date=@<...> + // forward: + 1616885999, // Sat Mar 27 23:59:59 CET 2021 + 1616886000, // Sun Mar 28 00:00:00 CET 2021 + 1616886001, // Sun Mar 28 00:00:01 CET 2021 + 1616889599, // Sun Mar 28 00:59:59 CET 2021 + 1616889600, // Sun Mar 28 01:00:00 CET 2021 + 1616889601, // Sun Mar 28 01:00:01 CET 2021 + 1616893199, // Sun Mar 28 01:59:59 CET 2021 + 1616893200, // Sun Mar 28 03:00:00 CEST 2021 + 1616893201, // Sun Mar 28 03:00:01 CEST 2021 + 1616896799, // Sun Mar 28 03:59:59 CEST 2021 (Sun Mar 28 01:59:59 UTC 2021) + 1616896800, // Sun Mar 28 04:00:00 CEST 2021 (Sun Mar 28 02:00:00 UTC 2021) + 1616896801, // Sun Mar 28 04:00:01 CEST 2021 (Sun Mar 28 02:00:01 UTC 2021) + 1616900399, // Sun Mar 28 04:59:59 CEST 2021 (Sun Mar 28 02:59:59 UTC 2021) + 1616900400, // Sun Mar 28 05:00:00 CEST 2021 (Sun Mar 28 03:00:00 UTC 2021) + 1616900401, // Sun Mar 28 05:00:01 CEST 2021 (Sun Mar 28 03:00:01 UTC 2021) + // backward: + 1635631199, // Sat Oct 30 23:59:59 CEST 2021 + 1635631200, // Sun Oct 31 00:00:00 CEST 2021 + 1635631201, // Sun Oct 31 00:00:01 CEST 2021 + 1635638399, // Sun Oct 31 01:59:59 CEST 2021 + 1635638400, // Sun Oct 31 02:00:00 CEST 2021 + 1635638401, // Sun Oct 31 02:00:01 CEST 2021 + 1635641999, // Sun Oct 31 02:59:59 CEST 2021 + 1635642000, // Sun Oct 31 02:00:00 CET 2021 + 1635642001, // Sun Oct 31 02:00:01 CET 2021 + 1635645599, // Sun Oct 31 02:59:59 CET 2021 (Sun Oct 31 01:59:59 UTC 2021) + 1635645600, // Sun Oct 31 03:00:00 CET 2021 (Sun Oct 31 02:00:00 UTC 2021) + 1635645601, // Sun Oct 31 03:00:01 CET 2021 (Sun Oct 31 02:00:01 UTC 2021) + 1635649199, // Sun Oct 31 03:59:59 CET 2021 (Sun Oct 31 02:59:59 UTC 2021) + 1635649200, // Sun Oct 31 04:00:00 CET 2021 (Sun Oct 31 03:00:00 UTC 2021) + 1635649201, // Sun Oct 31 04:00:01 CET 2021 (Sun Oct 31 03:00:01 UTC 2021) + ], +]; +foreach ($timezonesWithTimestamps as $timezone => $timestamps) { + foreach ($timestamps as $timestamp) { + $tz = new DateTimeZone($timezone); + $dt = DateTime::createFromFormat('U', $timestamp); + $dt->setTimezone($tz); + printf("%s %d -> %d %s\n", $timezone, $timestamp, $dt->getTimestamp(), $dt->format(DateTimeInterface::ISO8601)); + } +} +?> +--EXPECT-- +America/Los_Angeles 1615687199 -> 1615687199 2021-03-13T17:59:59-0800 +America/Los_Angeles 1615687200 -> 1615687200 2021-03-13T18:00:00-0800 +America/Los_Angeles 1615687201 -> 1615687201 2021-03-13T18:00:01-0800 +America/Los_Angeles 1615690799 -> 1615690799 2021-03-13T18:59:59-0800 +America/Los_Angeles 1615690800 -> 1615690800 2021-03-13T19:00:00-0800 +America/Los_Angeles 1615690801 -> 1615690801 2021-03-13T19:00:01-0800 +America/Los_Angeles 1615708799 -> 1615708799 2021-03-13T23:59:59-0800 +America/Los_Angeles 1615708800 -> 1615708800 2021-03-14T00:00:00-0800 +America/Los_Angeles 1615708801 -> 1615708801 2021-03-14T00:00:01-0800 +America/Los_Angeles 1615712399 -> 1615712399 2021-03-14T00:59:59-0800 +America/Los_Angeles 1615712400 -> 1615712400 2021-03-14T01:00:00-0800 +America/Los_Angeles 1615712401 -> 1615712401 2021-03-14T01:00:01-0800 +America/Los_Angeles 1615715999 -> 1615715999 2021-03-14T01:59:59-0800 +America/Los_Angeles 1615716000 -> 1615716000 2021-03-14T03:00:00-0700 +America/Los_Angeles 1615716001 -> 1615716001 2021-03-14T03:00:01-0700 +America/Los_Angeles 1615719599 -> 1615719599 2021-03-14T03:59:59-0700 +America/Los_Angeles 1615719600 -> 1615719600 2021-03-14T04:00:00-0700 +America/Los_Angeles 1615719601 -> 1615719601 2021-03-14T04:00:01-0700 +America/Los_Angeles 1636246799 -> 1636246799 2021-11-06T17:59:59-0700 +America/Los_Angeles 1636246800 -> 1636246800 2021-11-06T18:00:00-0700 +America/Los_Angeles 1636246801 -> 1636246801 2021-11-06T18:00:01-0700 +America/Los_Angeles 1636250399 -> 1636250399 2021-11-06T18:59:59-0700 +America/Los_Angeles 1636250400 -> 1636250400 2021-11-06T19:00:00-0700 +America/Los_Angeles 1636250401 -> 1636250401 2021-11-06T19:00:01-0700 +America/Los_Angeles 1636268399 -> 1636268399 2021-11-06T23:59:59-0700 +America/Los_Angeles 1636268400 -> 1636268400 2021-11-07T00:00:00-0700 +America/Los_Angeles 1636268401 -> 1636268401 2021-11-07T00:00:01-0700 +America/Los_Angeles 1636271999 -> 1636271999 2021-11-07T00:59:59-0700 +America/Los_Angeles 1636272000 -> 1636272000 2021-11-07T01:00:00-0700 +America/Los_Angeles 1636272001 -> 1636272001 2021-11-07T01:00:01-0700 +America/Los_Angeles 1636275599 -> 1636275599 2021-11-07T01:59:59-0700 +America/Los_Angeles 1636275600 -> 1636275600 2021-11-07T01:00:00-0800 +America/Los_Angeles 1636275601 -> 1636275601 2021-11-07T01:00:01-0800 +America/Los_Angeles 1636279199 -> 1636279199 2021-11-07T01:59:59-0800 +America/Los_Angeles 1636279200 -> 1636279200 2021-11-07T02:00:00-0800 +America/Los_Angeles 1636279201 -> 1636279201 2021-11-07T02:00:01-0800 +Atlantic/Azores 1616889599 -> 1616889599 2021-03-27T22:59:59-0100 +Atlantic/Azores 1616889600 -> 1616889600 2021-03-27T23:00:00-0100 +Atlantic/Azores 1616889601 -> 1616889601 2021-03-27T23:00:01-0100 +Atlantic/Azores 1616893199 -> 1616893199 2021-03-27T23:59:59-0100 +Atlantic/Azores 1616893200 -> 1616893200 2021-03-28T01:00:00+0000 +Atlantic/Azores 1616893201 -> 1616893201 2021-03-28T01:00:01+0000 +Atlantic/Azores 1616896799 -> 1616896799 2021-03-28T01:59:59+0000 +Atlantic/Azores 1616896800 -> 1616896800 2021-03-28T02:00:00+0000 +Atlantic/Azores 1616896801 -> 1616896801 2021-03-28T02:00:01+0000 +Atlantic/Azores 1635638399 -> 1635638399 2021-10-30T23:59:59+0000 +Atlantic/Azores 1635638400 -> 1635638400 2021-10-31T00:00:00+0000 +Atlantic/Azores 1635638401 -> 1635638401 2021-10-31T00:00:01+0000 +Atlantic/Azores 1635641999 -> 1635641999 2021-10-31T00:59:59+0000 +Atlantic/Azores 1635642000 -> 1635642000 2021-10-31T00:00:00-0100 +Atlantic/Azores 1635642001 -> 1635642001 2021-10-31T00:00:01-0100 +Atlantic/Azores 1635645599 -> 1635645599 2021-10-31T00:59:59-0100 +Atlantic/Azores 1635645600 -> 1635645600 2021-10-31T01:00:00-0100 +Atlantic/Azores 1635645601 -> 1635645601 2021-10-31T01:00:01-0100 +Europe/London 1616889599 -> 1616889599 2021-03-27T23:59:59+0000 +Europe/London 1616889600 -> 1616889600 2021-03-28T00:00:00+0000 +Europe/London 1616889601 -> 1616889601 2021-03-28T00:00:01+0000 +Europe/London 1616893199 -> 1616893199 2021-03-28T00:59:59+0000 +Europe/London 1616893200 -> 1616893200 2021-03-28T02:00:00+0100 +Europe/London 1616893201 -> 1616893201 2021-03-28T02:00:01+0100 +Europe/London 1616896799 -> 1616896799 2021-03-28T02:59:59+0100 +Europe/London 1616896800 -> 1616896800 2021-03-28T03:00:00+0100 +Europe/London 1616896801 -> 1616896801 2021-03-28T03:00:01+0100 +Europe/London 1635638399 -> 1635638399 2021-10-31T00:59:59+0100 +Europe/London 1635638400 -> 1635638400 2021-10-31T01:00:00+0100 +Europe/London 1635638401 -> 1635638401 2021-10-31T01:00:01+0100 +Europe/London 1635641999 -> 1635641999 2021-10-31T01:59:59+0100 +Europe/London 1635642000 -> 1635642000 2021-10-31T01:00:00+0000 +Europe/London 1635642001 -> 1635642001 2021-10-31T01:00:01+0000 +Europe/London 1635645599 -> 1635645599 2021-10-31T01:59:59+0000 +Europe/London 1635645600 -> 1635645600 2021-10-31T02:00:00+0000 +Europe/London 1635645601 -> 1635645601 2021-10-31T02:00:01+0000 +Europe/Amsterdam 1616885999 -> 1616885999 2021-03-27T23:59:59+0100 +Europe/Amsterdam 1616886000 -> 1616886000 2021-03-28T00:00:00+0100 +Europe/Amsterdam 1616886001 -> 1616886001 2021-03-28T00:00:01+0100 +Europe/Amsterdam 1616889599 -> 1616889599 2021-03-28T00:59:59+0100 +Europe/Amsterdam 1616889600 -> 1616889600 2021-03-28T01:00:00+0100 +Europe/Amsterdam 1616889601 -> 1616889601 2021-03-28T01:00:01+0100 +Europe/Amsterdam 1616893199 -> 1616893199 2021-03-28T01:59:59+0100 +Europe/Amsterdam 1616893200 -> 1616893200 2021-03-28T03:00:00+0200 +Europe/Amsterdam 1616893201 -> 1616893201 2021-03-28T03:00:01+0200 +Europe/Amsterdam 1616896799 -> 1616896799 2021-03-28T03:59:59+0200 +Europe/Amsterdam 1616896800 -> 1616896800 2021-03-28T04:00:00+0200 +Europe/Amsterdam 1616896801 -> 1616896801 2021-03-28T04:00:01+0200 +Europe/Amsterdam 1616900399 -> 1616900399 2021-03-28T04:59:59+0200 +Europe/Amsterdam 1616900400 -> 1616900400 2021-03-28T05:00:00+0200 +Europe/Amsterdam 1616900401 -> 1616900401 2021-03-28T05:00:01+0200 +Europe/Amsterdam 1635631199 -> 1635631199 2021-10-30T23:59:59+0200 +Europe/Amsterdam 1635631200 -> 1635631200 2021-10-31T00:00:00+0200 +Europe/Amsterdam 1635631201 -> 1635631201 2021-10-31T00:00:01+0200 +Europe/Amsterdam 1635638399 -> 1635638399 2021-10-31T01:59:59+0200 +Europe/Amsterdam 1635638400 -> 1635638400 2021-10-31T02:00:00+0200 +Europe/Amsterdam 1635638401 -> 1635638401 2021-10-31T02:00:01+0200 +Europe/Amsterdam 1635641999 -> 1635641999 2021-10-31T02:59:59+0200 +Europe/Amsterdam 1635642000 -> 1635642000 2021-10-31T02:00:00+0100 +Europe/Amsterdam 1635642001 -> 1635642001 2021-10-31T02:00:01+0100 +Europe/Amsterdam 1635645599 -> 1635645599 2021-10-31T02:59:59+0100 +Europe/Amsterdam 1635645600 -> 1635645600 2021-10-31T03:00:00+0100 +Europe/Amsterdam 1635645601 -> 1635645601 2021-10-31T03:00:01+0100 +Europe/Amsterdam 1635649199 -> 1635649199 2021-10-31T03:59:59+0100 +Europe/Amsterdam 1635649200 -> 1635649200 2021-10-31T04:00:00+0100 +Europe/Amsterdam 1635649201 -> 1635649201 2021-10-31T04:00:01+0100 diff --git a/ext/date/tests/bug81097.phpt b/ext/date/tests/bug81097.phpt index 2bfec4859557b..2cfd7e00a9dd4 100644 --- a/ext/date/tests/bug81097.phpt +++ b/ext/date/tests/bug81097.phpt @@ -1,12 +1,14 @@ --TEST-- -Bug #81097: DateTimeZone silently falls back to UTC when providing an offset with seconds +Bug #81097 (DateTimeZone silently falls back to UTC when providing an offset with seconds) --FILE-- getMessage(); -} +$d = new DatetimeZone('+01:45:30'); +var_dump($d); ?> ---EXPECT-- -DateTimeZone::__construct(): Unknown or bad timezone (+01:45:30) +--EXPECTF-- +object(DateTimeZone)#%d (%d) { + ["timezone_type"]=> + int(1) + ["timezone"]=> + string(6) "+01:45" +} diff --git a/ext/date/tests/bug81565.phpt b/ext/date/tests/bug81565.phpt new file mode 100644 index 0000000000000..282093c7ec329 --- /dev/null +++ b/ext/date/tests/bug81565.phpt @@ -0,0 +1,20 @@ +--TEST-- +Bug #81565 (date parsing fails when provided with timezones including seconds) +--FILE-- +getName(); +?> +--EXPECT-- +\DateTime::__set_state(array( + 'date' => '0021-08-21 00:00:00.000000', + 'timezone_type' => 1, + 'timezone' => '+00:49', +)) ++01:45 diff --git a/ext/date/tests/date_period_exclude_start_and_include_end.phpt b/ext/date/tests/date_period_exclude_start_and_include_end.phpt new file mode 100644 index 0000000000000..6238f67073519 --- /dev/null +++ b/ext/date/tests/date_period_exclude_start_and_include_end.phpt @@ -0,0 +1,19 @@ +--TEST-- +DatePeriod::EXCLUDE_START_DATE|DatePeriod::INCLUDE_END_DATE +--FILE-- +format('Y-m-d') . "\n"; +} +?> +--EXPECT-- +2010-06-08 +2010-06-09 +2010-06-10 + diff --git a/ext/date/tests/date_period_include_end.phpt b/ext/date/tests/date_period_include_end.phpt new file mode 100644 index 0000000000000..c96e279465367 --- /dev/null +++ b/ext/date/tests/date_period_include_end.phpt @@ -0,0 +1,19 @@ +--TEST-- +DatePeriod::INCLUDE_END_DATE +--FILE-- +format('Y-m-d') . "\n"; +} +?> +--EXPECT-- +2010-06-07 +2010-06-08 +2010-06-09 +2010-06-10 + diff --git a/ext/date/tests/gh7758.phpt b/ext/date/tests/gh7758.phpt new file mode 100644 index 0000000000000..cec5b7d77bf75 --- /dev/null +++ b/ext/date/tests/gh7758.phpt @@ -0,0 +1,42 @@ +--TEST-- +GH-7758 (Problems with negative timestamps and fractions) +--FILE-- + +--EXPECT-- +DateTime Object +( + [date] => 1970-01-01 00:00:00.400000 + [timezone_type] => 1 + [timezone] => +00:00 +) +DateTime Object +( + [date] => 1970-01-01 00:00:00.000000 + [timezone_type] => 1 + [timezone] => +00:00 +) +DateTime Object +( + [date] => 1969-12-31 23:59:59.600000 + [timezone_type] => 1 + [timezone] => +00:00 +) +DateTime Object +( + [date] => 1969-12-31 23:59:59.000000 + [timezone_type] => 1 + [timezone] => +00:00 +) +DateTime Object +( + [date] => 1969-12-31 23:59:58.600000 + [timezone_type] => 1 + [timezone] => +00:00 +) diff --git a/ext/opcache/tests/opt/inference_008.phpt b/ext/opcache/tests/opt/inference_008.phpt new file mode 100644 index 0000000000000..ef52424d76af8 --- /dev/null +++ b/ext/opcache/tests/opt/inference_008.phpt @@ -0,0 +1,19 @@ +--TEST-- +Type inference 008: ASSIGN_DIM with invalid op1 +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--FILE-- + +DONE +--EXPECT-- +DONE diff --git a/ext/opcache/tests/opt/sccp_040.phpt b/ext/opcache/tests/opt/sccp_040.phpt new file mode 100644 index 0000000000000..2f075f5846250 --- /dev/null +++ b/ext/opcache/tests/opt/sccp_040.phpt @@ -0,0 +1,22 @@ +--TEST-- +SCCP 040: Memory leak +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +--FILE-- + +--EXPECTF-- +Warning: Undefined variable $y in %ssccp_040.php on line 3 + +Fatal error: Uncaught Error: Array callback must have exactly two elements in %ssccp_040.php:4 +Stack trace: +#0 %ssccp_040.php(6): f() +#1 {main} + thrown in %ssccp_040.php on line 4 diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 34d6d2043a6fa..692f187a04df8 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -62,7 +62,7 @@ void pdo_throw_exception(unsigned int driver_errcode, char *driver_errmsg, pdo_e zend_throw_exception_object(&pdo_exception); } -void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate, const char *supp) /* {{{ */ +void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, pdo_error_type sqlstate, const char *supp) /* {{{ */ { pdo_error_type *pdo_err = &dbh->error_code; char *message = NULL; @@ -81,7 +81,7 @@ void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate pdo_err = &stmt->error_code; } - strncpy(*pdo_err, sqlstate, 6); + memcpy(*pdo_err, sqlstate, sizeof(pdo_error_type)); /* hash sqlstate to error messages */ msg = pdo_sqlstate_state_to_description(*pdo_err); diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index 91a60fe323244..c832284627750 100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -672,7 +672,7 @@ PDO_API zend_class_entry *php_pdo_get_exception(void); PDO_API int pdo_parse_params(pdo_stmt_t *stmt, zend_string *inquery, zend_string **outquery); PDO_API void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, - const char *sqlstate, const char *supp); + pdo_error_type sqlstate, const char *supp); PDO_API void php_pdo_dbh_addref(pdo_dbh_t *dbh); PDO_API void php_pdo_dbh_delref(pdo_dbh_t *dbh); diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 5ca89f0d2a742..a901e454a9bcf 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -348,6 +348,9 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, char if (ce->ce_flags & ZEND_ACC_FINAL) { smart_str_append_printf(str, "final "); } + if (ce->ce_flags & ZEND_ACC_READONLY_CLASS) { + smart_str_append_printf(str, "readonly "); + } smart_str_append_printf(str, "class "); } smart_str_append_printf(str, "%s", ZSTR_VAL(ce->name)); @@ -4863,6 +4866,12 @@ ZEND_METHOD(ReflectionClass, isFinal) } /* }}} */ +/* Returns whether this class is readonly */ +ZEND_METHOD(ReflectionClass, isReadOnly) +{ + _class_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU, ZEND_ACC_READONLY_CLASS); +} + /* {{{ Returns whether this class is abstract */ ZEND_METHOD(ReflectionClass, isAbstract) { @@ -4875,8 +4884,7 @@ ZEND_METHOD(ReflectionClass, getModifiers) { reflection_object *intern; zend_class_entry *ce; - uint32_t keep_flags = ZEND_ACC_FINAL - | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; + uint32_t keep_flags = ZEND_ACC_FINAL | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_READONLY_CLASS; if (zend_parse_parameters_none() == FAILURE) { RETURN_THROWS(); @@ -7123,6 +7131,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */ REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_IMPLICIT_ABSTRACT", ZEND_ACC_IMPLICIT_ABSTRACT_CLASS); REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_EXPLICIT_ABSTRACT", ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_FINAL", ZEND_ACC_FINAL); + REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_READONLY", ZEND_ACC_READONLY_CLASS); reflection_object_ptr = register_class_ReflectionObject(reflection_class_ptr); reflection_object_ptr->create_object = reflection_objects_new; diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php index 22d01b6905168..33130d568c7b0 100644 --- a/ext/reflection/php_reflection.stub.php +++ b/ext/reflection/php_reflection.stub.php @@ -318,6 +318,8 @@ public function isAbstract(): bool {} /** @tentative-return-type */ public function isFinal(): bool {} + public function isReadOnly(): bool {} + /** @tentative-return-type */ public function getModifiers(): int {} diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h index 25a750f2bdcac..a2e598c2105be 100644 --- a/ext/reflection/php_reflection_arginfo.h +++ b/ext/reflection/php_reflection_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: c9656b23db965e890e73d0064005b981ee1991cf */ + * Stub hash: 4191864554b030bea40306c0d30090a8e2c76ab2 */ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 1, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0) @@ -260,6 +260,8 @@ ZEND_END_ARG_INFO() #define arginfo_class_ReflectionClass_isFinal arginfo_class_ReflectionFunctionAbstract_inNamespace +#define arginfo_class_ReflectionClass_isReadOnly arginfo_class_ReflectionFunctionAbstract_hasTentativeReturnType + #define arginfo_class_ReflectionClass_getModifiers arginfo_class_ReflectionFunctionAbstract_getNumberOfParameters ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ReflectionClass_isInstance, 0, 1, _IS_BOOL, 0) @@ -697,6 +699,7 @@ ZEND_METHOD(ReflectionClass, isTrait); ZEND_METHOD(ReflectionClass, isEnum); ZEND_METHOD(ReflectionClass, isAbstract); ZEND_METHOD(ReflectionClass, isFinal); +ZEND_METHOD(ReflectionClass, isReadOnly); ZEND_METHOD(ReflectionClass, getModifiers); ZEND_METHOD(ReflectionClass, isInstance); ZEND_METHOD(ReflectionClass, newInstance); @@ -963,6 +966,7 @@ static const zend_function_entry class_ReflectionClass_methods[] = { ZEND_ME(ReflectionClass, isEnum, arginfo_class_ReflectionClass_isEnum, ZEND_ACC_PUBLIC) ZEND_ME(ReflectionClass, isAbstract, arginfo_class_ReflectionClass_isAbstract, ZEND_ACC_PUBLIC) ZEND_ME(ReflectionClass, isFinal, arginfo_class_ReflectionClass_isFinal, ZEND_ACC_PUBLIC) + ZEND_ME(ReflectionClass, isReadOnly, arginfo_class_ReflectionClass_isReadOnly, ZEND_ACC_PUBLIC) ZEND_ME(ReflectionClass, getModifiers, arginfo_class_ReflectionClass_getModifiers, ZEND_ACC_PUBLIC) ZEND_ME(ReflectionClass, isInstance, arginfo_class_ReflectionClass_isInstance, ZEND_ACC_PUBLIC) ZEND_ME(ReflectionClass, newInstance, arginfo_class_ReflectionClass_newInstance, ZEND_ACC_PUBLIC) diff --git a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt index cb2a6555f1956..6be2f155ff384 100644 --- a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt +++ b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt @@ -9,15 +9,17 @@ abstract class A {} class B extends A {} class C {} final class D {} +readonly class E {} interface I {} -$classes = array("A", "B", "C", "D", "I"); +$classes = array("A", "B", "C", "D", "E", "I"); foreach ($classes as $class) { $rc = new ReflectionClass($class); var_dump($rc->isFinal()); var_dump($rc->isInterface()); var_dump($rc->isAbstract()); + var_dump($rc->isReadOnly()); var_dump($rc->getModifiers()); } ?> @@ -25,20 +27,30 @@ foreach ($classes as $class) { bool(false) bool(false) bool(true) +bool(false) int(64) bool(false) bool(false) bool(false) +bool(false) int(0) bool(false) bool(false) bool(false) +bool(false) int(0) bool(true) bool(false) bool(false) +bool(false) int(32) bool(false) +bool(false) +bool(false) +bool(true) +int(65536) +bool(false) bool(true) bool(false) +bool(false) int(0) diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt index 3ca0d9a37a82b..3b2c276ebc071 100644 --- a/ext/reflection/tests/ReflectionClass_toString_001.phpt +++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt @@ -11,10 +11,11 @@ echo $rc; --EXPECT-- Class [ class ReflectionClass implements Stringable, Reflector ] { - - Constants [3] { + - Constants [4] { Constant [ public int IS_IMPLICIT_ABSTRACT ] { 16 } Constant [ public int IS_EXPLICIT_ABSTRACT ] { 64 } Constant [ public int IS_FINAL ] { 32 } + Constant [ public int IS_READONLY ] { 65536 } } - Static properties [0] { @@ -27,7 +28,7 @@ Class [ class ReflectionClass implements Stringable, Refle Property [ public string $name ] } - - Methods [55] { + - Methods [56] { Method [ private method __clone ] { - Parameters [0] { @@ -284,6 +285,13 @@ Class [ class ReflectionClass implements Stringable, Refle - Tentative return [ bool ] } + Method [ public method isReadOnly ] { + + - Parameters [0] { + } + - Return [ bool ] + } + Method [ public method getModifiers ] { - Parameters [0] { diff --git a/ext/reflection/tests/ReflectionClass_toString_005.phpt b/ext/reflection/tests/ReflectionClass_toString_005.phpt new file mode 100644 index 0000000000000..4d4178828cc8e --- /dev/null +++ b/ext/reflection/tests/ReflectionClass_toString_005.phpt @@ -0,0 +1,34 @@ +--TEST-- +Using ReflectionClass::__toString() on readonly classes +--FILE-- + +--EXPECTF-- +Class [ readonly class Foo ] { + @@ %s 3-6 + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [2] { + Property [ public readonly int $bar ] + Property [ public readonly int $baz ] + } + + - Methods [0] { + } +} diff --git a/ext/reflection/tests/readonly_class.phpt b/ext/reflection/tests/readonly_class.phpt new file mode 100644 index 0000000000000..dd685b900c634 --- /dev/null +++ b/ext/reflection/tests/readonly_class.phpt @@ -0,0 +1,25 @@ +--TEST-- +Readonly class reflection +--FILE-- +isReadOnly()); +var_dump(($foo->getModifiers() & ReflectionClass::IS_READONLY) != 0); + +$bar = new ReflectionClass(Bar::class); +var_dump($bar->isReadOnly()); +var_dump(($bar->getModifiers() & ReflectionClass::IS_READONLY) != 0); + +?> +--EXPECT-- +bool(false) +bool(false) +bool(true) +bool(true) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 91f71e3fc12a1..09c82e8255fa2 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -601,7 +601,7 @@ PHP_METHOD(SoapHeader, __construct) if (ZSTR_LEN(actor_str) > 2) { ZVAL_STR_COPY(Z_HEADER_ACTOR_P(this_ptr), actor_str); } else { - zend_argument_value_error(2, "must be longer than 2 characters"); + zend_argument_value_error(5, "must be longer than 2 characters"); RETURN_THROWS(); } } else if (!actor_is_null) { diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 8398e004d0b6c..5423ded4f8e7a 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -55,6 +55,9 @@ # if HAVE_IF_NAMETOINDEX # include # endif +# ifdef SO_MEMINFO +# include +# endif #endif #include @@ -550,9 +553,15 @@ static PHP_MINIT_FUNCTION(sockets) #ifdef SO_INCOMING_CPU REGISTER_LONG_CONSTANT("SO_INCOMING_CPU", SO_INCOMING_CPU, CONST_CS | CONST_PERSISTENT); #endif +#ifdef SO_MEMINFO + REGISTER_LONG_CONSTANT("SO_MEMINFO", SO_MEMINFO, CONST_CS | CONST_PERSISTENT); +#endif #ifdef TCP_NODELAY REGISTER_LONG_CONSTANT("TCP_NODELAY", TCP_NODELAY, CONST_CS | CONST_PERSISTENT); #endif +#ifdef TCP_NOTSENT_LOWAT + REGISTER_LONG_CONSTANT("TCP_NOTSENT_LOWAT", TCP_NOTSENT_LOWAT, CONST_CS | CONST_PERSISTENT); +#endif #ifdef TCP_DEFER_ACCEPT REGISTER_LONG_CONSTANT("TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT, CONST_CS | CONST_PERSISTENT); #endif @@ -1833,6 +1842,37 @@ PHP_FUNCTION(socket_get_option) add_assoc_long(return_value, "sec", tv.tv_sec); add_assoc_long(return_value, "usec", tv.tv_usec); return; +#ifdef SO_MEMINFO + case SO_MEMINFO: { + uint32_t minfo[SK_MEMINFO_VARS]; + optlen = sizeof(minfo); + + if (getsockopt(php_sock->bsd_socket, level, optname, (char*)minfo, &optlen) != 0) { + PHP_SOCKET_ERROR(php_sock, "Unable to retrieve socket option", errno); + RETURN_FALSE; + } + + if (UNEXPECTED(optlen != sizeof(minfo))) { + // unlikely since the kernel fills up the whole array if getsockopt succeeded + // but just an extra precaution in case. + php_error_docref(NULL, E_WARNING, "Unable to retrieve all socket meminfo data"); + RETURN_FALSE; + } + + array_init(return_value); + + add_assoc_long(return_value, "rmem_alloc", minfo[SK_MEMINFO_RMEM_ALLOC]); + add_assoc_long(return_value, "rcvbuf", minfo[SK_MEMINFO_RCVBUF]); + add_assoc_long(return_value, "wmem_alloc", minfo[SK_MEMINFO_WMEM_ALLOC]); + add_assoc_long(return_value, "sndbuf", minfo[SK_MEMINFO_SNDBUF]); + add_assoc_long(return_value, "fwd_alloc", minfo[SK_MEMINFO_FWD_ALLOC]); + add_assoc_long(return_value, "wmem_queued", minfo[SK_MEMINFO_WMEM_QUEUED]); + add_assoc_long(return_value, "optmem", minfo[SK_MEMINFO_OPTMEM]); + add_assoc_long(return_value, "backlog", minfo[SK_MEMINFO_BACKLOG]); + add_assoc_long(return_value, "drops", minfo[SK_MEMINFO_DROPS]); + return; + } +#endif #ifdef SO_ACCEPTFILTER case SO_ACCEPTFILTER: { diff --git a/ext/sockets/tests/socket_meminfo.phpt b/ext/sockets/tests/socket_meminfo.phpt new file mode 100644 index 0000000000000..924e263cf96cf --- /dev/null +++ b/ext/sockets/tests/socket_meminfo.phpt @@ -0,0 +1,71 @@ +--TEST-- +socket_get_option MEMINFO; +--EXTENSIONS-- +sockets +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +array(9) { + ["rmem_alloc"]=> + int(%d) + ["rcvbuf"]=> + int(%d) + ["wmem_alloc"]=> + int(%d) + ["sndbuf"]=> + int(%d) + ["fwd_alloc"]=> + int(%d) + ["wmem_queued"]=> + int(%d) + ["optmem"]=> + int(%d) + ["backlog"]=> + int(%d) + ["drops"]=> + int(%d) +} diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 15755962f410f..90872df692d6e 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -58,10 +58,19 @@ PHPAPI PHP_FUNCTION(dl) RETURN_FALSE; } +#if ZEND_RC_DEBUG + bool orig_rc_debug = zend_rc_debug; + zend_rc_debug = false; +#endif + php_dl(filename, MODULE_TEMPORARY, return_value, 0); if (Z_TYPE_P(return_value) == IS_TRUE) { EG(full_tables_cleanup) = 1; } + +#if ZEND_RC_DEBUG + zend_rc_debug = orig_rc_debug; +#endif } /* }}} */ diff --git a/ext/standard/file.c b/ext/standard/file.c index 628b8dc8f0fe1..7a6554ac1d9d9 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -566,6 +566,12 @@ PHP_FUNCTION(file_get_contents) RETURN_FALSE; } + /* disabling the read buffer allows doing the whole transfer + in just one read() system call */ + if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) { + php_stream_set_option(stream, PHP_STREAM_OPTION_READ_BUFFER, PHP_STREAM_BUFFER_NONE, NULL); + } + if (offset != 0 && php_stream_seek(stream, offset, ((offset > 0) ? SEEK_SET : SEEK_END)) < 0) { php_error_docref(NULL, E_WARNING, "Failed to seek to position " ZEND_LONG_FMT " in the stream", offset); php_stream_close(stream); diff --git a/ext/standard/tests/url/parse_url_basic_011.phpt b/ext/standard/tests/url/parse_url_basic_011.phpt new file mode 100644 index 0000000000000..90e42d5b3f106 --- /dev/null +++ b/ext/standard/tests/url/parse_url_basic_011.phpt @@ -0,0 +1,30 @@ +--TEST-- +Test parse_url() function: can not recognize port without scheme +--FILE-- + +--EXPECT-- +*** Testing parse_url() :can not recognize port without scheme *** +parse 127.0.0.1:9999? +array(3) { + ["host"]=> + string(9) "127.0.0.1" + ["port"]=> + int(9999) + ["query"]=> + string(0) "" +} +parse 127.0.0.1:9999# +array(3) { + ["host"]=> + string(9) "127.0.0.1" + ["port"]=> + int(9999) + ["fragment"]=> + string(0) "" +} diff --git a/ext/standard/url.c b/ext/standard/url.c index e3d95768fb019..b268e9b0df276 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -150,7 +150,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port p++; } - if ((p == ue || *p == '/') && (p - e) < 7) { + if ((p == ue || *p == '/' || *p == '?' || *p == '#') && (p - e) < 7) { goto parse_port; } @@ -190,7 +190,7 @@ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port pp++; } - if (pp - p > 0 && pp - p < 6 && (pp == ue || *pp == '/')) { + if (pp - p > 0 && pp - p < 6 && (pp == ue || *pp == '/' || *pp == '?' || *pp == '#')) { zend_long port; char *end; memcpy(port_buf, p, (pp - p)); diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt index 74eefb3b773af..3a12027440048 100644 --- a/ext/sysvshm/tests/bug72858.phpt +++ b/ext/sysvshm/tests/bug72858.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != "WIN") { print "skip windows only"; } diff --git a/ext/zend_test/php_test.h b/ext/zend_test/php_test.h index e51854699caa2..a08c080ee3730 100644 --- a/ext/zend_test/php_test.h +++ b/ext/zend_test/php_test.h @@ -51,6 +51,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test) HashTable global_weakmap; int replace_zend_execute_ex; int register_passes; + bool print_stderr_mshutdown; zend_test_fiber *active_fiber; ZEND_END_MODULE_GLOBALS(zend_test) diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 0a0f12e79fe2d..0cc2dcae28220 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -495,6 +495,7 @@ static ZEND_METHOD(ZendTestChildClassWithMethodWithParameterAttribute, override) PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("zend_test.replace_zend_execute_ex", "0", PHP_INI_SYSTEM, OnUpdateBool, replace_zend_execute_ex, zend_zend_test_globals, zend_test_globals) STD_PHP_INI_BOOLEAN("zend_test.register_passes", "0", PHP_INI_SYSTEM, OnUpdateBool, register_passes, zend_zend_test_globals, zend_test_globals) + STD_PHP_INI_BOOLEAN("zend_test.print_stderr_mshutdown", "0", PHP_INI_SYSTEM, OnUpdateBool, print_stderr_mshutdown, zend_zend_test_globals, zend_test_globals) PHP_INI_END() void (*old_zend_execute_ex)(zend_execute_data *execute_data); @@ -620,6 +621,10 @@ PHP_MSHUTDOWN_FUNCTION(zend_test) zend_test_observer_shutdown(SHUTDOWN_FUNC_ARGS_PASSTHRU); + if (ZT_G(print_stderr_mshutdown)) { + fprintf(stderr, "[zend-test] MSHUTDOWN\n"); + } + return SUCCESS; } diff --git a/ext/zend_test/tests/gh8575.phpt b/ext/zend_test/tests/gh8575.phpt new file mode 100644 index 0000000000000..9830547479f49 --- /dev/null +++ b/ext/zend_test/tests/gh8575.phpt @@ -0,0 +1,13 @@ +--TEST-- +CLI: stderr is available in mshutdown +--SKIPIF-- + +--EXTENSIONS-- +zend_test +--INI-- +zend_test.print_stderr_mshutdown=1 +--FILE-- +==DONE== +--EXPECTF-- +==DONE== +[zend-test] MSHUTDOWN diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index 7ea33766f10ce..620283a1d85d7 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -1,6 +1,6 @@ // vim:ft=javascript -ARG_ENABLE("zip", "ZIP support", "yes"); +ARG_ENABLE("zip", "ZIP support", "yes,shared"); if (PHP_ZIP != "no") { if (CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;" + PHP_EXTRA_INCLUDES) && diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index c0478c99b72c1..27b8aab1dfb50 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -317,7 +317,7 @@ PHP_FUNCTION(apache_getenv) } /* }}} */ -static char *php_apache_get_version() +static char *php_apache_get_version(void) { #if MODULE_MAGIC_NUMBER_MAJOR >= 20060905 return (char *) ap_get_server_banner(); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 66a1b9ad86b09..0d30d63ec7597 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -526,7 +526,7 @@ static void php_cli_usage(char *argv0) static php_stream *s_in_process = NULL; -static void cli_register_file_handles(bool no_close) /* {{{ */ +static void cli_register_file_handles(void) /* {{{ */ { php_stream *s_in, *s_out, *s_err; php_stream_context *sc_in=NULL, *sc_out=NULL, *sc_err=NULL; @@ -536,6 +536,14 @@ static void cli_register_file_handles(bool no_close) /* {{{ */ s_out = php_stream_open_wrapper_ex("php://stdout", "wb", 0, NULL, sc_out); s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL, sc_err); + /* Release stream resources, but don't free the underlying handles. Othewrise, + * extensions which write to stderr or company during mshutdown/gshutdown + * won't have the expected functionality. + */ + if (s_in) s_in->flags |= PHP_STREAM_FLAG_NO_CLOSE; + if (s_out) s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE; + if (s_err) s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE; + if (s_in==NULL || s_out==NULL || s_err==NULL) { if (s_in) php_stream_close(s_in); if (s_out) php_stream_close(s_out); @@ -543,12 +551,6 @@ static void cli_register_file_handles(bool no_close) /* {{{ */ return; } - if (no_close) { - s_in->flags |= PHP_STREAM_FLAG_NO_CLOSE; - s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE; - s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE; - } - s_in_process = s_in; php_stream_to_zval(s_in, &ic.value); @@ -954,7 +956,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ switch (behavior) { case PHP_MODE_STANDARD: if (script_file) { - cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1); + cli_register_file_handles(); } if (interactive) { @@ -989,7 +991,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ } break; case PHP_MODE_CLI_DIRECT: - cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1); + cli_register_file_handles(); zend_eval_string_ex(exec_direct, NULL, "Command line code", 1); break; @@ -1004,7 +1006,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ file_handle.filename = NULL; } - cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1); + cli_register_file_handles(); if (exec_begin) { zend_eval_string_ex(exec_begin, NULL, "Command line begin code", 1);