From e4f41adf5a4e9b265b545dd2b8fe54d7516b0cf2 Mon Sep 17 00:00:00 2001 From: Uwe Tews Date: Wed, 18 Oct 2017 09:40:38 +0200 Subject: [PATCH] -bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017 https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397 https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392 --- change_log.txt | 5 + lexer/smarty_internal_templatelexer.plex | 1 - lexer/smarty_internal_templateparser.y | 1 + libs/Smarty.class.php | 2 +- .../smarty_internal_templatelexer.php | 1 - .../smarty_internal_templateparser.php | 1062 ++++++++--------- 6 files changed, 534 insertions(+), 538 deletions(-) diff --git a/change_log.txt b/change_log.txt index 39fb52f4..1745cce7 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,9 @@ ===== 3.1.32 - dev === +18.10.2017 + -bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017 + https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397 + https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392 + 12.10.2017 - bugfix $smarty.block.child and $smarty.block.parent could not be used like any $smarty special variable https://github.com/smarty-php/smarty/issues/393 diff --git a/lexer/smarty_internal_templatelexer.plex b/lexer/smarty_internal_templatelexer.plex index 189569c9..ea53f9e8 100644 --- a/lexer/smarty_internal_templatelexer.plex +++ b/lexer/smarty_internal_templatelexer.plex @@ -694,7 +694,6 @@ class Smarty_Internal_Templatelexer double_quote { $this->token = Smarty_Internal_Templateparser::TP_QUOTE; $this->yypopstate(); - $this->compiler->leaveDoubleQuote(); } backtick dollar { $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; diff --git a/lexer/smarty_internal_templateparser.y b/lexer/smarty_internal_templateparser.y index b27354df..2ed1fa83 100644 --- a/lexer/smarty_internal_templateparser.y +++ b/lexer/smarty_internal_templateparser.y @@ -1250,6 +1250,7 @@ doublequoted_with_quotes(res) ::= QUOTE QUOTE. { } doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. { + $this->compiler->leaveDoubleQuote(); res = s->to_smarty_php($this); } diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 9dcc2137..c5216d26 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.32-dev-25'; + const SMARTY_VERSION = '3.1.32-dev-26'; /** * define variable scopes diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php index 1501ab36..1afedc38 100644 --- a/libs/sysplugins/smarty_internal_templatelexer.php +++ b/libs/sysplugins/smarty_internal_templatelexer.php @@ -1066,7 +1066,6 @@ class Smarty_Internal_Templatelexer { $this->token = Smarty_Internal_Templateparser::TP_QUOTE; $this->yypopstate(); - $this->compiler->leaveDoubleQuote(); } function yy_r5_8() diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php index 03d70c45..b0a493ee 100644 --- a/libs/sysplugins/smarty_internal_templateparser.php +++ b/libs/sysplugins/smarty_internal_templateparser.php @@ -152,10 +152,10 @@ class Smarty_Internal_Templateparser const YY_NO_ACTION = 521; const YY_ACCEPT_ACTION = 520; const YY_ERROR_ACTION = 519; - const YY_SZ_ACTTAB = 2057; - const YY_SHIFT_USE_DFLT = -30; + const YY_SZ_ACTTAB = 2078; + const YY_SHIFT_USE_DFLT = -34; const YY_SHIFT_MAX = 231; - const YY_REDUCE_USE_DFLT = -68; + const YY_REDUCE_USE_DFLT = -75; const YY_REDUCE_MAX = 185; const YYNOCODE = 106; const YYSTACKDEPTH = 500; @@ -165,302 +165,314 @@ class Smarty_Internal_Templateparser const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; static public $yy_action = array( - 41, 464, 464, 306, 18, 189, 464, 122, 300, 258, - 36, 130, 99, 260, 190, 134, 213, 7, 83, 15, - 295, 269, 8, 110, 293, 312, 435, 214, 256, 212, - 38, 198, 305, 33, 136, 305, 25, 435, 40, 39, - 316, 208, 11, 215, 296, 205, 25, 81, 1, 270, - 296, 41, 11, 232, 78, 79, 89, 78, 464, 464, - 258, 36, 132, 464, 260, 197, 219, 213, 7, 83, - 122, 284, 267, 296, 110, 99, 204, 436, 214, 256, - 212, 347, 216, 305, 33, 210, 391, 293, 436, 40, - 39, 316, 208, 305, 323, 464, 205, 25, 81, 1, - 41, 296, 391, 11, 97, 78, 79, 16, 391, 258, - 36, 131, 304, 260, 197, 78, 213, 7, 83, 290, - 244, 245, 230, 110, 27, 227, 237, 214, 256, 212, - 2, 216, 22, 33, 133, 157, 166, 207, 40, 39, - 316, 208, 204, 323, 448, 205, 263, 81, 1, 41, - 296, 448, 388, 20, 225, 79, 251, 162, 258, 36, - 132, 206, 260, 186, 182, 213, 7, 83, 388, 97, - 81, 182, 110, 296, 388, 145, 214, 256, 212, 91, - 216, 217, 33, 223, 200, 263, 102, 40, 39, 316, - 208, 204, 323, 296, 205, 134, 81, 1, 41, 296, - 13, 349, 8, 181, 79, 268, 17, 258, 36, 129, - 265, 260, 80, 90, 213, 7, 83, 25, 204, 34, - 204, 110, 97, 11, 435, 214, 256, 212, 313, 216, - 353, 33, 226, 227, 204, 435, 40, 39, 316, 208, - 302, 323, 231, 205, 25, 81, 1, 41, 296, 24, - 11, 107, 97, 79, 268, 17, 258, 36, 132, 265, - 260, 188, 14, 213, 7, 83, 294, 85, 324, 309, - 110, 177, 271, 168, 214, 256, 212, 88, 203, 234, - 33, 107, 27, 263, 241, 40, 39, 316, 208, 141, - 323, 211, 205, 179, 81, 1, 41, 296, 147, 263, - 204, 181, 79, 23, 9, 258, 36, 132, 263, 260, - 192, 266, 213, 7, 83, 268, 17, 181, 296, 110, - 265, 264, 154, 214, 256, 212, 313, 216, 101, 33, - 3, 227, 263, 448, 40, 39, 316, 208, 305, 323, - 448, 205, 150, 81, 1, 41, 296, 321, 158, 206, - 182, 79, 263, 435, 258, 36, 128, 303, 260, 197, - 78, 213, 7, 83, 435, 264, 274, 27, 110, 233, - 5, 93, 214, 256, 212, 242, 216, 169, 4, 137, - 97, 109, 179, 40, 39, 316, 208, 204, 323, 144, - 205, 264, 81, 1, 41, 296, 204, 178, 252, 243, - 79, 181, 267, 258, 36, 133, 181, 260, 197, 107, - 213, 7, 83, 222, 217, 160, 262, 110, 296, 102, - 102, 214, 256, 212, 171, 216, 217, 12, 220, 280, - 159, 102, 40, 39, 316, 208, 116, 323, 281, 205, - 263, 81, 1, 41, 296, 173, 271, 176, 138, 79, - 175, 271, 258, 36, 132, 164, 260, 197, 263, 213, - 7, 83, 19, 172, 254, 263, 110, 253, 11, 167, - 214, 256, 212, 273, 187, 174, 33, 24, 228, 263, - 116, 40, 39, 316, 208, 235, 323, 181, 205, 103, - 81, 1, 41, 296, 204, 38, 153, 163, 79, 264, - 206, 258, 36, 133, 170, 260, 197, 310, 213, 7, - 83, 464, 464, 257, 184, 110, 464, 448, 299, 214, - 256, 212, 261, 216, 84, 12, 106, 311, 181, 121, - 40, 39, 316, 208, 292, 323, 315, 205, 35, 81, - 320, 156, 296, 448, 268, 17, 448, 79, 464, 265, - 448, 6, 246, 248, 249, 250, 178, 301, 317, 25, - 258, 36, 180, 224, 260, 11, 255, 213, 7, 83, - 2, 42, 32, 277, 110, 31, 247, 309, 214, 256, - 212, 401, 401, 401, 279, 259, 181, 92, 152, 227, - 194, 299, 105, 67, 108, 148, 264, 86, 299, 99, - 87, 135, 314, 289, 113, 155, 299, 322, 195, 272, - 299, 293, 299, 299, 299, 161, 435, 325, 401, 401, - 299, 196, 318, 299, 258, 28, 298, 435, 260, 299, - 299, 213, 7, 83, 401, 401, 401, 401, 110, 299, - 299, 299, 214, 256, 212, 268, 17, 299, 299, 279, - 265, 299, 299, 299, 227, 194, 299, 120, 70, 108, - 25, 204, 149, 44, 99, 142, 11, 314, 289, 180, - 276, 10, 322, 195, 272, 263, 293, 299, 42, 32, - 277, 299, 279, 202, 299, 299, 299, 227, 194, 299, - 105, 67, 108, 181, 299, 299, 299, 99, 43, 37, - 314, 289, 299, 299, 299, 322, 195, 272, 299, 293, - 299, 299, 283, 299, 285, 286, 287, 288, 299, 279, - 319, 299, 299, 299, 227, 194, 299, 120, 58, 100, - 299, 220, 299, 299, 99, 140, 299, 314, 289, 180, - 299, 299, 322, 195, 272, 263, 293, 279, 42, 32, - 277, 299, 227, 194, 299, 120, 70, 108, 299, 299, - 299, 299, 99, 181, 299, 314, 289, 299, 325, 299, - 322, 195, 272, 299, 293, 258, 28, 298, 299, 260, - 299, 199, 213, 7, 83, 299, 299, 389, 299, 110, - 299, 218, 279, 214, 256, 212, 299, 227, 194, 299, - 120, 70, 108, 389, 299, 299, 299, 99, 299, 389, - 314, 289, 435, 299, 299, 322, 195, 272, 299, 293, - 299, 275, 10, 435, 204, 299, 201, 299, 299, 299, - 279, 299, 299, 299, 359, 227, 194, 299, 120, 47, - 100, 221, 112, 299, 299, 99, 299, 299, 314, 289, - 25, 299, 299, 322, 195, 272, 11, 293, 279, 435, - 299, 299, 299, 227, 194, 299, 120, 68, 108, 299, - 435, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 204, 299, 44, 227, - 191, 299, 120, 61, 108, 299, 240, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 120, 48, - 108, 299, 299, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 194, 299, 120, 75, 108, 299, - 299, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 299, 299, 299, 227, - 194, 299, 120, 45, 108, 299, 299, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 193, 299, 114, 62, - 108, 299, 204, 299, 44, 99, 143, 299, 314, 289, - 180, 299, 299, 322, 195, 272, 263, 293, 279, 42, - 32, 277, 299, 227, 94, 299, 82, 51, 104, 299, - 299, 299, 299, 99, 181, 299, 314, 289, 299, 43, - 37, 322, 195, 272, 279, 293, 299, 299, 299, 227, - 194, 299, 120, 65, 108, 285, 286, 287, 288, 99, - 297, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 120, 58, - 108, 299, 204, 299, 44, 99, 165, 299, 314, 289, - 180, 299, 185, 322, 195, 272, 263, 293, 279, 42, - 32, 277, 299, 227, 194, 299, 96, 64, 108, 299, - 299, 299, 299, 99, 181, 299, 314, 289, 299, 43, - 37, 322, 195, 272, 279, 293, 204, 299, 44, 227, - 194, 299, 120, 71, 108, 285, 286, 287, 288, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 120, 73, - 108, 299, 239, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 194, 299, 120, 63, 108, 299, - 299, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 204, 21, 44, 227, - 194, 299, 120, 74, 108, 299, 299, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 98, 55, - 108, 299, 299, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 194, 299, 98, 72, 108, 299, - 299, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 204, 299, 44, 227, - 194, 299, 120, 57, 108, 299, 299, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 120, 50, - 108, 299, 229, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 194, 299, 120, 60, 108, 299, - 299, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 204, 299, 44, 227, - 194, 299, 120, 54, 108, 299, 183, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 120, 56, - 108, 299, 299, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 95, 299, 82, 46, 104, 299, - 299, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 204, 299, 44, 227, - 194, 299, 120, 66, 108, 299, 299, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 151, 299, 227, 194, 299, 115, 49, - 108, 299, 299, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 194, 299, 120, 69, 108, 299, - 299, 299, 299, 99, 299, 299, 314, 289, 299, 299, - 299, 322, 195, 272, 279, 293, 204, 299, 44, 227, - 194, 299, 120, 77, 108, 299, 236, 299, 299, 99, - 299, 299, 314, 289, 299, 299, 299, 322, 195, 272, - 279, 293, 299, 299, 299, 227, 194, 299, 120, 53, - 108, 299, 299, 43, 37, 99, 299, 299, 314, 289, - 299, 299, 299, 322, 195, 272, 299, 293, 279, 285, - 286, 287, 288, 227, 194, 299, 120, 59, 108, 299, - 44, 299, 299, 99, 299, 299, 314, 289, 204, 299, - 44, 322, 195, 272, 279, 293, 299, 299, 291, 227, - 194, 299, 120, 76, 108, 299, 299, 299, 299, 99, - 299, 299, 314, 289, 25, 43, 37, 322, 195, 272, - 11, 293, 204, 299, 44, 43, 37, 299, 299, 299, - 299, 285, 286, 287, 288, 299, 299, 299, 299, 299, - 299, 285, 286, 287, 288, 299, 26, 299, 25, 299, - 299, 299, 139, 299, 11, 299, 180, 299, 133, 43, - 37, 307, 263, 299, 279, 42, 32, 277, 299, 227, - 194, 299, 124, 299, 108, 285, 286, 287, 288, 99, - 181, 299, 299, 278, 299, 299, 299, 322, 195, 272, - 279, 293, 308, 299, 81, 227, 194, 296, 126, 299, - 108, 299, 299, 299, 299, 99, 299, 299, 299, 238, - 299, 299, 299, 322, 195, 272, 299, 293, 299, 279, - 299, 204, 299, 44, 227, 194, 299, 119, 299, 108, - 299, 299, 299, 299, 99, 299, 299, 299, 299, 299, - 299, 299, 322, 195, 272, 299, 293, 25, 299, 299, - 299, 299, 299, 11, 299, 279, 299, 299, 43, 37, - 227, 194, 299, 117, 299, 108, 299, 299, 299, 299, - 99, 299, 299, 299, 285, 286, 287, 288, 322, 195, - 272, 299, 293, 299, 299, 299, 279, 299, 299, 299, - 299, 227, 194, 299, 125, 299, 108, 299, 299, 299, - 299, 99, 299, 299, 299, 299, 299, 299, 299, 322, - 195, 272, 279, 293, 209, 299, 299, 227, 194, 299, - 118, 299, 108, 299, 464, 464, 299, 99, 299, 464, - 448, 299, 209, 299, 299, 322, 195, 272, 299, 293, - 299, 299, 464, 464, 299, 29, 299, 464, 448, 299, - 204, 299, 44, 299, 299, 299, 448, 299, 299, 448, - 299, 464, 299, 448, 282, 299, 299, 299, 299, 299, - 299, 111, 299, 299, 448, 299, 299, 448, 299, 464, - 209, 448, 299, 299, 299, 299, 299, 43, 37, 299, - 464, 464, 279, 9, 299, 464, 448, 227, 194, 299, - 127, 299, 108, 285, 286, 287, 288, 99, 299, 299, - 299, 299, 299, 299, 299, 322, 195, 272, 299, 293, - 299, 299, 448, 299, 299, 448, 279, 464, 209, 448, - 299, 227, 194, 299, 123, 299, 108, 299, 464, 464, - 299, 99, 299, 464, 448, 299, 30, 299, 299, 322, - 195, 272, 204, 293, 44, 299, 464, 464, 299, 299, - 299, 464, 448, 299, 520, 52, 326, 244, 245, 230, - 448, 299, 227, 448, 299, 464, 299, 448, 299, 299, - 299, 299, 299, 299, 299, 299, 299, 395, 448, 43, - 37, 448, 299, 464, 299, 448, 299, 299, 395, 299, - 395, 299, 299, 395, 299, 285, 286, 287, 288, 395, - 299, 395, 299, 395, 299, 299, 299, 299, 146, 299, - 206, 299, 180, 299, 299, 299, 299, 299, 263, 299, - 299, 42, 32, 277, 299, 299, 299, 299, 299, 299, - 299, 299, 299, 299, 299, 299, 181, + 41, 21, 4, 290, 16, 189, 176, 119, 275, 325, + 35, 128, 99, 273, 190, 134, 214, 5, 84, 306, + 347, 289, 8, 107, 318, 274, 13, 226, 277, 211, + 448, 205, 284, 9, 233, 284, 36, 448, 44, 42, + 261, 223, 34, 208, 324, 202, 36, 82, 1, 241, + 324, 41, 34, 22, 78, 79, 96, 78, 279, 15, + 325, 35, 132, 280, 273, 201, 206, 214, 5, 84, + 119, 295, 25, 224, 107, 99, 168, 436, 226, 277, + 211, 320, 230, 231, 9, 111, 284, 318, 436, 44, + 42, 261, 223, 284, 265, 216, 202, 36, 82, 1, + 41, 324, 215, 34, 227, 199, 79, 104, 78, 325, + 35, 132, 324, 273, 201, 78, 214, 5, 84, 245, + 237, 232, 212, 107, 284, 228, 148, 226, 277, 211, + 91, 187, 29, 9, 133, 96, 281, 288, 44, 42, + 261, 223, 10, 265, 244, 202, 78, 82, 1, 41, + 324, 93, 26, 250, 185, 79, 279, 15, 325, 35, + 132, 280, 273, 188, 111, 214, 5, 84, 287, 197, + 82, 252, 107, 324, 197, 3, 226, 277, 211, 388, + 196, 136, 9, 133, 391, 154, 207, 44, 42, 261, + 223, 197, 265, 213, 202, 388, 82, 1, 41, 324, + 391, 388, 283, 88, 79, 158, 391, 325, 35, 129, + 324, 273, 80, 19, 214, 5, 84, 36, 197, 82, + 324, 107, 324, 34, 435, 226, 277, 211, 349, 230, + 262, 9, 210, 137, 222, 435, 44, 42, 261, 223, + 255, 265, 231, 202, 36, 82, 1, 41, 324, 285, + 34, 172, 298, 79, 464, 464, 325, 35, 133, 464, + 273, 201, 14, 214, 5, 84, 464, 464, 34, 27, + 107, 464, 324, 147, 226, 277, 211, 173, 230, 215, + 12, 225, 90, 281, 104, 44, 42, 261, 223, 156, + 265, 464, 202, 301, 82, 1, 41, 324, 228, 279, + 15, 185, 79, 103, 280, 325, 35, 132, 276, 273, + 186, 2, 214, 5, 84, 177, 293, 322, 10, 107, + 243, 326, 106, 226, 277, 211, 10, 230, 257, 9, + 144, 31, 85, 308, 44, 42, 261, 223, 435, 265, + 281, 202, 142, 82, 1, 41, 324, 305, 164, 435, + 282, 79, 281, 282, 325, 35, 130, 174, 273, 201, + 435, 214, 5, 84, 139, 282, 282, 7, 107, 151, + 448, 435, 226, 277, 211, 301, 230, 448, 6, 281, + 228, 185, 276, 44, 42, 261, 223, 96, 265, 38, + 202, 141, 82, 1, 41, 324, 197, 181, 231, 310, + 79, 281, 309, 325, 35, 132, 239, 273, 191, 272, + 214, 5, 84, 134, 173, 296, 123, 107, 138, 181, + 8, 226, 277, 211, 215, 230, 234, 9, 281, 104, + 179, 298, 44, 42, 261, 223, 152, 265, 185, 202, + 153, 82, 1, 41, 324, 104, 281, 291, 96, 79, + 197, 178, 325, 35, 131, 180, 273, 201, 217, 214, + 5, 84, 197, 169, 100, 175, 107, 219, 197, 157, + 226, 277, 211, 268, 230, 185, 9, 111, 92, 281, + 123, 44, 42, 261, 223, 197, 265, 185, 202, 166, + 82, 1, 41, 324, 96, 353, 32, 319, 79, 281, + 258, 325, 35, 133, 181, 273, 201, 108, 214, 5, + 84, 197, 38, 256, 313, 107, 263, 171, 209, 226, + 277, 211, 165, 230, 161, 12, 40, 17, 271, 242, + 44, 42, 261, 223, 22, 265, 236, 202, 254, 82, + 286, 185, 324, 170, 298, 278, 267, 79, 259, 182, + 83, 228, 203, 251, 110, 68, 112, 3, 11, 118, + 323, 99, 269, 24, 264, 312, 113, 282, 285, 260, + 194, 266, 86, 318, 135, 155, 299, 162, 235, 246, + 238, 304, 177, 198, 303, 87, 325, 35, 167, 299, + 273, 299, 299, 214, 5, 84, 299, 299, 299, 299, + 107, 299, 267, 299, 226, 277, 211, 228, 203, 299, + 117, 57, 102, 299, 225, 299, 299, 99, 140, 299, + 264, 312, 171, 299, 299, 260, 194, 266, 281, 318, + 267, 40, 17, 271, 299, 228, 203, 299, 117, 47, + 102, 299, 114, 299, 299, 99, 185, 299, 264, 312, + 197, 299, 39, 260, 194, 266, 299, 318, 267, 299, + 299, 299, 299, 228, 203, 299, 110, 68, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 145, 260, 194, 266, 171, 318, 218, 43, 37, 299, + 281, 299, 267, 40, 17, 271, 302, 228, 203, 299, + 117, 66, 112, 317, 315, 314, 311, 99, 185, 299, + 264, 312, 299, 307, 299, 260, 194, 266, 299, 318, + 325, 28, 300, 299, 273, 299, 204, 214, 5, 84, + 299, 299, 279, 15, 107, 307, 299, 280, 226, 277, + 211, 299, 325, 28, 300, 299, 273, 36, 299, 214, + 5, 84, 299, 34, 143, 299, 107, 299, 89, 299, + 226, 277, 211, 299, 281, 299, 297, 30, 520, 52, + 249, 237, 232, 212, 299, 267, 228, 299, 299, 299, + 228, 203, 185, 117, 66, 112, 279, 15, 299, 30, + 99, 280, 299, 264, 312, 299, 299, 299, 260, 194, + 266, 36, 318, 163, 299, 267, 299, 34, 299, 200, + 228, 203, 299, 117, 66, 112, 299, 299, 299, 299, + 99, 299, 299, 264, 312, 197, 299, 299, 260, 194, + 266, 299, 318, 299, 299, 359, 299, 299, 299, 195, + 267, 299, 221, 299, 299, 228, 203, 299, 117, 77, + 112, 36, 299, 299, 299, 99, 299, 34, 264, 312, + 435, 299, 299, 260, 194, 266, 299, 318, 299, 299, + 267, 435, 299, 299, 299, 228, 203, 299, 117, 74, + 112, 299, 299, 299, 299, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 299, 299, + 299, 299, 299, 299, 267, 299, 401, 401, 401, 228, + 203, 299, 97, 72, 112, 299, 299, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 117, 69, + 112, 435, 299, 401, 401, 99, 299, 299, 264, 312, + 299, 299, 435, 260, 194, 266, 299, 318, 267, 401, + 401, 401, 401, 228, 203, 299, 117, 60, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 299, 39, 228, + 94, 299, 81, 51, 101, 299, 253, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 97, 53, + 112, 299, 299, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 203, 299, 98, 75, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 299, 39, 228, + 192, 299, 117, 55, 112, 299, 183, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 117, 67, + 112, 299, 299, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 193, 299, 115, 54, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 20, 39, 228, + 203, 299, 117, 71, 112, 299, 299, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 117, 70, + 112, 299, 299, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 203, 299, 117, 76, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 299, 39, 228, + 203, 299, 117, 57, 112, 299, 184, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 109, 49, + 112, 299, 299, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 203, 299, 117, 65, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 299, 39, 228, + 203, 299, 117, 64, 112, 299, 247, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 117, 56, + 112, 299, 299, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 203, 299, 117, 50, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 299, 39, 228, + 95, 299, 81, 46, 101, 299, 299, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 117, 48, + 112, 299, 240, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 203, 299, 117, 58, 112, 299, + 299, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 197, 299, 39, 228, + 203, 299, 117, 73, 112, 299, 299, 299, 299, 99, + 299, 299, 264, 312, 299, 299, 299, 260, 194, 266, + 267, 318, 299, 150, 299, 228, 203, 299, 117, 45, + 112, 299, 299, 43, 37, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 317, + 315, 314, 311, 228, 203, 299, 117, 62, 112, 299, + 39, 299, 299, 99, 299, 299, 264, 312, 299, 299, + 299, 260, 194, 266, 267, 318, 299, 299, 299, 228, + 203, 299, 117, 61, 112, 299, 299, 299, 299, 99, + 299, 299, 264, 312, 299, 43, 37, 260, 194, 266, + 267, 318, 299, 299, 299, 228, 203, 299, 117, 59, + 112, 317, 315, 314, 311, 99, 299, 299, 264, 312, + 299, 299, 299, 260, 194, 266, 299, 318, 267, 299, + 197, 299, 39, 228, 203, 299, 117, 63, 112, 197, + 299, 39, 299, 99, 299, 299, 264, 312, 299, 321, + 299, 260, 194, 266, 23, 318, 36, 299, 299, 299, + 299, 299, 34, 299, 267, 36, 299, 43, 37, 228, + 203, 34, 127, 299, 112, 299, 43, 37, 299, 99, + 299, 299, 299, 317, 315, 314, 311, 260, 194, 266, + 299, 318, 317, 315, 314, 311, 299, 267, 229, 299, + 299, 299, 228, 203, 299, 125, 299, 112, 464, 464, + 299, 21, 99, 464, 448, 299, 248, 299, 299, 299, + 260, 194, 266, 197, 318, 39, 299, 267, 299, 299, + 299, 299, 228, 203, 299, 124, 299, 112, 299, 299, + 448, 299, 99, 448, 299, 464, 270, 448, 299, 36, + 260, 194, 266, 299, 318, 34, 299, 267, 299, 299, + 43, 37, 228, 203, 299, 116, 299, 112, 299, 299, + 299, 299, 99, 299, 299, 299, 317, 315, 314, 311, + 260, 194, 266, 299, 318, 267, 299, 299, 299, 299, + 228, 203, 299, 121, 299, 112, 299, 299, 299, 299, + 99, 299, 299, 299, 299, 299, 299, 299, 260, 194, + 266, 267, 318, 229, 299, 299, 228, 203, 299, 120, + 299, 112, 299, 464, 464, 299, 99, 299, 464, 448, + 299, 299, 299, 299, 260, 194, 266, 299, 318, 299, + 299, 267, 299, 299, 299, 299, 228, 203, 299, 122, + 299, 112, 299, 299, 299, 448, 99, 299, 448, 229, + 464, 299, 448, 292, 260, 194, 266, 299, 318, 464, + 464, 299, 18, 267, 464, 448, 299, 299, 228, 203, + 197, 126, 39, 112, 299, 299, 299, 299, 99, 299, + 197, 299, 39, 299, 299, 299, 260, 194, 266, 299, + 318, 448, 299, 299, 448, 299, 464, 299, 448, 33, + 299, 105, 299, 299, 299, 299, 299, 43, 37, 464, + 464, 299, 299, 299, 464, 448, 299, 43, 37, 299, + 299, 316, 299, 317, 315, 314, 311, 229, 197, 299, + 39, 299, 299, 317, 315, 314, 311, 464, 464, 299, + 299, 448, 464, 448, 448, 299, 464, 299, 448, 299, + 299, 299, 299, 299, 299, 464, 464, 299, 299, 299, + 464, 448, 197, 299, 39, 43, 37, 299, 299, 448, + 299, 299, 448, 299, 464, 299, 448, 299, 299, 299, + 299, 317, 315, 314, 311, 299, 294, 448, 299, 299, + 448, 299, 464, 146, 448, 299, 299, 171, 395, 43, + 37, 299, 299, 281, 299, 299, 40, 17, 271, 395, + 299, 395, 299, 299, 395, 317, 315, 314, 311, 299, + 395, 185, 395, 299, 395, 299, 299, 299, 159, 299, + 299, 231, 171, 299, 299, 299, 160, 299, 281, 299, + 171, 40, 17, 271, 149, 299, 281, 299, 171, 40, + 17, 271, 299, 299, 281, 299, 185, 40, 17, 271, + 299, 389, 299, 299, 185, 220, 299, 299, 299, 299, + 299, 299, 185, 299, 299, 299, 299, 389, 299, 299, + 299, 299, 299, 389, 299, 299, 435, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 435, ); static public $yy_lookahead = array( - 3, 12, 13, 70, 13, 14, 17, 74, 17, 12, - 13, 14, 79, 16, 17, 44, 19, 20, 21, 29, - 11, 88, 51, 26, 91, 34, 36, 30, 31, 32, - 2, 34, 23, 36, 14, 23, 27, 47, 41, 42, + 3, 15, 35, 70, 13, 14, 80, 74, 17, 12, + 13, 14, 79, 16, 17, 44, 19, 20, 21, 52, + 11, 88, 51, 26, 91, 34, 15, 30, 31, 32, + 44, 34, 23, 36, 23, 23, 27, 51, 41, 42, 43, 44, 33, 46, 53, 48, 27, 50, 51, 52, - 53, 3, 33, 17, 45, 58, 36, 45, 12, 13, + 53, 3, 33, 15, 45, 58, 18, 45, 12, 13, 12, 13, 14, 17, 16, 17, 70, 19, 20, 21, - 74, 59, 100, 53, 26, 79, 1, 36, 30, 31, - 32, 11, 34, 23, 36, 49, 11, 91, 47, 41, + 74, 59, 13, 14, 26, 79, 17, 36, 30, 31, + 32, 11, 34, 44, 36, 47, 23, 91, 47, 41, 42, 43, 44, 23, 46, 49, 48, 27, 50, 51, - 3, 53, 27, 33, 18, 45, 58, 13, 33, 12, - 13, 14, 52, 16, 17, 45, 19, 20, 21, 63, - 64, 65, 66, 26, 35, 69, 37, 30, 31, 32, - 36, 34, 15, 36, 14, 92, 71, 17, 41, 42, - 43, 44, 1, 46, 44, 48, 81, 50, 51, 3, - 53, 51, 11, 13, 14, 58, 9, 17, 12, 13, - 14, 44, 16, 17, 99, 19, 20, 21, 27, 18, - 50, 99, 26, 53, 33, 71, 30, 31, 32, 75, - 34, 74, 36, 76, 77, 81, 79, 41, 42, 43, - 44, 1, 46, 53, 48, 44, 50, 51, 3, 53, - 22, 11, 51, 99, 58, 12, 13, 12, 13, 14, - 17, 16, 17, 35, 19, 20, 21, 27, 1, 15, - 1, 26, 18, 33, 36, 30, 31, 32, 64, 34, - 11, 36, 44, 69, 1, 47, 41, 42, 43, 44, - 52, 46, 49, 48, 27, 50, 51, 3, 53, 15, - 33, 47, 18, 58, 12, 13, 12, 13, 14, 17, - 16, 17, 29, 19, 20, 21, 96, 103, 104, 93, - 26, 95, 96, 71, 30, 31, 32, 75, 34, 14, - 36, 47, 35, 81, 37, 41, 42, 43, 44, 71, - 46, 49, 48, 75, 50, 51, 3, 53, 71, 81, - 1, 99, 58, 15, 15, 12, 13, 14, 81, 16, - 17, 23, 19, 20, 21, 12, 13, 99, 53, 26, - 17, 94, 71, 30, 31, 32, 64, 34, 67, 36, - 35, 69, 81, 44, 41, 42, 43, 44, 23, 46, - 51, 48, 71, 50, 51, 3, 53, 52, 92, 44, - 99, 58, 81, 36, 12, 13, 14, 52, 16, 17, - 45, 19, 20, 21, 47, 94, 104, 35, 26, 37, - 36, 80, 30, 31, 32, 17, 34, 75, 36, 14, - 18, 47, 75, 41, 42, 43, 44, 1, 46, 92, - 48, 94, 50, 51, 3, 53, 1, 8, 9, 10, - 58, 99, 100, 12, 13, 14, 99, 16, 17, 47, - 19, 20, 21, 18, 74, 74, 76, 26, 53, 79, - 79, 30, 31, 32, 80, 34, 74, 36, 76, 90, - 71, 79, 41, 42, 43, 44, 97, 46, 52, 48, - 81, 50, 51, 3, 53, 95, 96, 80, 71, 58, - 95, 96, 12, 13, 14, 71, 16, 17, 81, 19, - 20, 21, 27, 75, 65, 81, 26, 68, 33, 71, - 30, 31, 32, 90, 34, 14, 36, 15, 17, 81, - 97, 41, 42, 43, 44, 17, 46, 99, 48, 79, - 50, 51, 3, 53, 1, 2, 50, 92, 58, 94, - 44, 12, 13, 14, 75, 16, 17, 97, 19, 20, - 21, 12, 13, 37, 17, 26, 17, 18, 52, 30, - 31, 32, 14, 34, 17, 36, 17, 17, 99, 17, - 41, 42, 43, 44, 17, 46, 17, 48, 24, 50, - 34, 50, 53, 44, 12, 13, 47, 58, 49, 17, - 51, 36, 4, 5, 6, 7, 8, 52, 34, 27, - 12, 13, 75, 17, 16, 33, 11, 19, 20, 21, - 36, 84, 85, 86, 26, 40, 5, 93, 30, 31, - 32, 1, 2, 3, 64, 81, 99, 92, 92, 69, - 70, 105, 72, 73, 74, 92, 94, 79, 105, 79, - 79, 79, 82, 83, 78, 92, 105, 87, 88, 89, - 105, 91, 105, 105, 105, 92, 36, 5, 38, 39, - 105, 101, 102, 105, 12, 13, 14, 47, 16, 105, - 105, 19, 20, 21, 54, 55, 56, 57, 26, 105, - 105, 105, 30, 31, 32, 12, 13, 105, 105, 64, - 17, 105, 105, 105, 69, 70, 105, 72, 73, 74, - 27, 1, 29, 3, 79, 71, 33, 82, 83, 75, - 58, 59, 87, 88, 89, 81, 91, 105, 84, 85, - 86, 105, 64, 98, 105, 105, 105, 69, 70, 105, - 72, 73, 74, 99, 105, 105, 105, 79, 38, 39, - 82, 83, 105, 105, 105, 87, 88, 89, 105, 91, - 105, 105, 52, 105, 54, 55, 56, 57, 105, 64, - 102, 105, 105, 105, 69, 70, 105, 72, 73, 74, - 105, 76, 105, 105, 79, 71, 105, 82, 83, 75, - 105, 105, 87, 88, 89, 81, 91, 64, 84, 85, - 86, 105, 69, 70, 105, 72, 73, 74, 105, 105, - 105, 105, 79, 99, 105, 82, 83, 105, 5, 105, - 87, 88, 89, 105, 91, 12, 13, 14, 105, 16, - 105, 98, 19, 20, 21, 105, 105, 11, 105, 26, - 105, 15, 64, 30, 31, 32, 105, 69, 70, 105, - 72, 73, 74, 27, 105, 105, 105, 79, 105, 33, - 82, 83, 36, 105, 105, 87, 88, 89, 105, 91, - 105, 58, 59, 47, 1, 105, 98, 105, 105, 105, - 64, 105, 105, 105, 11, 69, 70, 105, 72, 73, - 74, 18, 76, 105, 105, 79, 105, 105, 82, 83, - 27, 105, 105, 87, 88, 89, 33, 91, 64, 36, + 3, 53, 74, 33, 76, 77, 58, 79, 45, 12, + 13, 14, 53, 16, 17, 45, 19, 20, 21, 63, + 64, 65, 66, 26, 23, 69, 71, 30, 31, 32, + 75, 34, 15, 36, 14, 18, 81, 17, 41, 42, + 43, 44, 35, 46, 37, 48, 45, 50, 51, 3, + 53, 80, 13, 52, 99, 58, 12, 13, 12, 13, + 14, 17, 16, 17, 47, 19, 20, 21, 48, 1, + 50, 14, 26, 53, 1, 36, 30, 31, 32, 11, + 34, 14, 36, 14, 11, 92, 17, 41, 42, 43, + 44, 1, 46, 49, 48, 27, 50, 51, 3, 53, + 27, 33, 17, 36, 58, 92, 33, 12, 13, 14, + 53, 16, 17, 15, 19, 20, 21, 27, 1, 50, + 53, 26, 53, 33, 36, 30, 31, 32, 11, 34, + 17, 36, 44, 14, 49, 47, 41, 42, 43, 44, + 52, 46, 44, 48, 27, 50, 51, 3, 53, 93, + 33, 95, 96, 58, 12, 13, 12, 13, 14, 17, + 16, 17, 27, 19, 20, 21, 12, 13, 33, 22, + 26, 17, 53, 71, 30, 31, 32, 75, 34, 74, + 36, 76, 35, 81, 79, 41, 42, 43, 44, 92, + 46, 49, 48, 64, 50, 51, 3, 53, 69, 12, + 13, 99, 58, 79, 17, 12, 13, 14, 100, 16, + 17, 36, 19, 20, 21, 8, 9, 10, 35, 26, + 37, 97, 47, 30, 31, 32, 35, 34, 37, 36, + 71, 29, 103, 104, 41, 42, 43, 44, 36, 46, + 81, 48, 71, 50, 51, 3, 53, 9, 92, 47, + 94, 58, 81, 94, 12, 13, 14, 75, 16, 17, + 36, 19, 20, 21, 92, 94, 94, 36, 26, 71, + 44, 47, 30, 31, 32, 64, 34, 51, 36, 81, + 69, 99, 100, 41, 42, 43, 44, 18, 46, 2, + 48, 71, 50, 51, 3, 53, 1, 99, 44, 65, + 58, 81, 68, 12, 13, 14, 52, 16, 17, 90, + 19, 20, 21, 44, 75, 104, 97, 26, 71, 99, + 51, 30, 31, 32, 74, 34, 76, 36, 81, 79, + 95, 96, 41, 42, 43, 44, 71, 46, 99, 48, + 74, 50, 51, 3, 53, 79, 81, 52, 18, 58, + 1, 75, 12, 13, 14, 14, 16, 17, 17, 19, + 20, 21, 1, 75, 67, 80, 26, 18, 1, 71, + 30, 31, 32, 90, 34, 99, 36, 47, 92, 81, + 97, 41, 42, 43, 44, 1, 46, 99, 48, 71, + 50, 51, 3, 53, 18, 11, 29, 96, 58, 81, + 34, 12, 13, 14, 99, 16, 17, 17, 19, 20, + 21, 1, 2, 5, 17, 26, 14, 75, 17, 30, + 31, 32, 50, 34, 50, 36, 84, 85, 86, 52, + 41, 42, 43, 44, 15, 46, 37, 48, 52, 50, + 17, 99, 53, 95, 96, 17, 64, 58, 34, 17, + 17, 69, 70, 17, 72, 73, 74, 36, 40, 17, + 11, 79, 81, 24, 82, 83, 78, 94, 93, 87, + 88, 89, 79, 91, 79, 92, 105, 92, 4, 5, + 6, 7, 8, 101, 102, 79, 12, 13, 92, 105, + 16, 105, 105, 19, 20, 21, 105, 105, 105, 105, + 26, 105, 64, 105, 30, 31, 32, 69, 70, 105, + 72, 73, 74, 105, 76, 105, 105, 79, 71, 105, + 82, 83, 75, 105, 105, 87, 88, 89, 81, 91, + 64, 84, 85, 86, 105, 69, 70, 105, 72, 73, + 74, 105, 76, 105, 105, 79, 99, 105, 82, 83, + 1, 105, 3, 87, 88, 89, 105, 91, 64, 105, 105, 105, 105, 69, 70, 105, 72, 73, 74, 105, - 47, 105, 105, 79, 105, 105, 82, 83, 105, 105, + 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, + 71, 87, 88, 89, 75, 91, 37, 38, 39, 105, + 81, 105, 64, 84, 85, 86, 102, 69, 70, 105, + 72, 73, 74, 54, 55, 56, 57, 79, 99, 105, + 82, 83, 105, 5, 105, 87, 88, 89, 105, 91, + 12, 13, 14, 105, 16, 105, 98, 19, 20, 21, + 105, 105, 12, 13, 26, 5, 105, 17, 30, 31, + 32, 105, 12, 13, 14, 105, 16, 27, 105, 19, + 20, 21, 105, 33, 71, 105, 26, 105, 75, 105, + 30, 31, 32, 105, 81, 105, 58, 59, 61, 62, + 63, 64, 65, 66, 105, 64, 69, 105, 105, 105, + 69, 70, 99, 72, 73, 74, 12, 13, 58, 59, + 79, 17, 105, 82, 83, 105, 105, 105, 87, 88, + 89, 27, 91, 29, 105, 64, 105, 33, 105, 98, + 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, + 79, 105, 105, 82, 83, 1, 105, 105, 87, 88, + 89, 105, 91, 105, 105, 11, 105, 105, 105, 98, + 64, 105, 18, 105, 105, 69, 70, 105, 72, 73, + 74, 27, 105, 105, 105, 79, 105, 33, 82, 83, + 36, 105, 105, 87, 88, 89, 105, 91, 105, 105, + 64, 47, 105, 105, 105, 69, 70, 105, 72, 73, + 74, 105, 105, 105, 105, 79, 105, 105, 82, 83, + 105, 105, 105, 87, 88, 89, 105, 91, 105, 105, + 105, 105, 105, 105, 64, 105, 1, 2, 3, 69, + 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, + 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, + 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, + 74, 36, 105, 38, 39, 79, 105, 105, 82, 83, + 105, 105, 47, 87, 88, 89, 105, 91, 64, 54, + 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, + 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 64, 91, 1, 105, 3, 69, 70, 105, 72, 73, 74, 105, 11, 105, 105, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, @@ -469,27 +481,11 @@ class Smarty_Internal_Templateparser 105, 105, 105, 87, 88, 89, 105, 91, 64, 54, 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, - 105, 87, 88, 89, 64, 91, 105, 105, 105, 69, - 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, + 105, 87, 88, 89, 64, 91, 1, 105, 3, 69, + 70, 105, 72, 73, 74, 105, 11, 105, 105, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, - 74, 105, 1, 105, 3, 79, 71, 105, 82, 83, - 75, 105, 105, 87, 88, 89, 81, 91, 64, 84, - 85, 86, 105, 69, 70, 105, 72, 73, 74, 105, - 105, 105, 105, 79, 99, 105, 82, 83, 105, 38, - 39, 87, 88, 89, 64, 91, 105, 105, 105, 69, - 70, 105, 72, 73, 74, 54, 55, 56, 57, 79, - 59, 105, 82, 83, 105, 105, 105, 87, 88, 89, - 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, - 74, 105, 1, 105, 3, 79, 71, 105, 82, 83, - 75, 105, 11, 87, 88, 89, 81, 91, 64, 84, - 85, 86, 105, 69, 70, 105, 72, 73, 74, 105, - 105, 105, 105, 79, 99, 105, 82, 83, 105, 38, - 39, 87, 88, 89, 64, 91, 1, 105, 3, 69, - 70, 105, 72, 73, 74, 54, 55, 56, 57, 79, - 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, - 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, - 74, 105, 37, 38, 39, 79, 105, 105, 82, 83, + 74, 105, 105, 38, 39, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 105, 91, 64, 54, 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, @@ -502,10 +498,10 @@ class Smarty_Internal_Templateparser 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 64, 91, 1, 105, 3, 69, - 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, + 70, 105, 72, 73, 74, 105, 11, 105, 105, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, - 74, 105, 37, 38, 39, 79, 105, 105, 82, 83, + 74, 105, 105, 38, 39, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 105, 91, 64, 54, 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, @@ -520,112 +516,120 @@ class Smarty_Internal_Templateparser 105, 87, 88, 89, 64, 91, 1, 105, 3, 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, + 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, + 74, 105, 37, 38, 39, 79, 105, 105, 82, 83, + 105, 105, 105, 87, 88, 89, 105, 91, 64, 54, + 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, + 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, + 105, 87, 88, 89, 64, 91, 1, 105, 3, 69, + 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, + 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 64, 91, 105, 28, 105, 69, 70, 105, 72, 73, 74, 105, 105, 38, 39, 79, 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, 105, 91, 64, 54, 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, - 105, 105, 105, 79, 105, 105, 82, 83, 105, 105, - 105, 87, 88, 89, 64, 91, 1, 105, 3, 69, - 70, 105, 72, 73, 74, 105, 11, 105, 105, 79, - 105, 105, 82, 83, 105, 105, 105, 87, 88, 89, - 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, - 74, 105, 105, 38, 39, 79, 105, 105, 82, 83, - 105, 105, 105, 87, 88, 89, 105, 91, 64, 54, - 55, 56, 57, 69, 70, 105, 72, 73, 74, 105, - 3, 105, 105, 79, 105, 105, 82, 83, 1, 105, - 3, 87, 88, 89, 64, 91, 105, 105, 11, 69, + 3, 105, 105, 79, 105, 105, 82, 83, 105, 105, + 105, 87, 88, 89, 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, 74, 105, 105, 105, 105, 79, - 105, 105, 82, 83, 27, 38, 39, 87, 88, 89, - 33, 91, 1, 105, 3, 38, 39, 105, 105, 105, - 105, 54, 55, 56, 57, 105, 105, 105, 105, 105, - 105, 54, 55, 56, 57, 105, 25, 105, 27, 105, - 105, 105, 71, 105, 33, 105, 75, 105, 14, 38, - 39, 17, 81, 105, 64, 84, 85, 86, 105, 69, - 70, 105, 72, 105, 74, 54, 55, 56, 57, 79, - 99, 105, 105, 83, 105, 105, 105, 87, 88, 89, - 64, 91, 48, 105, 50, 69, 70, 53, 72, 105, - 74, 105, 105, 105, 105, 79, 105, 105, 105, 83, - 105, 105, 105, 87, 88, 89, 105, 91, 105, 64, - 105, 1, 105, 3, 69, 70, 105, 72, 105, 74, - 105, 105, 105, 105, 79, 105, 105, 105, 105, 105, - 105, 105, 87, 88, 89, 105, 91, 27, 105, 105, - 105, 105, 105, 33, 105, 64, 105, 105, 38, 39, + 105, 105, 82, 83, 105, 38, 39, 87, 88, 89, + 64, 91, 105, 105, 105, 69, 70, 105, 72, 73, + 74, 54, 55, 56, 57, 79, 105, 105, 82, 83, + 105, 105, 105, 87, 88, 89, 105, 91, 64, 105, + 1, 105, 3, 69, 70, 105, 72, 73, 74, 1, + 105, 3, 105, 79, 105, 105, 82, 83, 105, 11, + 105, 87, 88, 89, 25, 91, 27, 105, 105, 105, + 105, 105, 33, 105, 64, 27, 105, 38, 39, 69, + 70, 33, 72, 105, 74, 105, 38, 39, 105, 79, + 105, 105, 105, 54, 55, 56, 57, 87, 88, 89, + 105, 91, 54, 55, 56, 57, 105, 64, 2, 105, + 105, 105, 69, 70, 105, 72, 105, 74, 12, 13, + 105, 15, 79, 17, 18, 105, 83, 105, 105, 105, + 87, 88, 89, 1, 91, 3, 105, 64, 105, 105, + 105, 105, 69, 70, 105, 72, 105, 74, 105, 105, + 44, 105, 79, 47, 105, 49, 83, 51, 105, 27, + 87, 88, 89, 105, 91, 33, 105, 64, 105, 105, + 38, 39, 69, 70, 105, 72, 105, 74, 105, 105, + 105, 105, 79, 105, 105, 105, 54, 55, 56, 57, + 87, 88, 89, 105, 91, 64, 105, 105, 105, 105, 69, 70, 105, 72, 105, 74, 105, 105, 105, 105, - 79, 105, 105, 105, 54, 55, 56, 57, 87, 88, - 89, 105, 91, 105, 105, 105, 64, 105, 105, 105, - 105, 69, 70, 105, 72, 105, 74, 105, 105, 105, - 105, 79, 105, 105, 105, 105, 105, 105, 105, 87, - 88, 89, 64, 91, 2, 105, 105, 69, 70, 105, - 72, 105, 74, 105, 12, 13, 105, 79, 105, 17, - 18, 105, 2, 105, 105, 87, 88, 89, 105, 91, - 105, 105, 12, 13, 105, 15, 105, 17, 18, 105, - 1, 105, 3, 105, 105, 105, 44, 105, 105, 47, - 105, 49, 105, 51, 52, 105, 105, 105, 105, 105, - 105, 22, 105, 105, 44, 105, 105, 47, 105, 49, - 2, 51, 105, 105, 105, 105, 105, 38, 39, 105, - 12, 13, 64, 15, 105, 17, 18, 69, 70, 105, - 72, 105, 74, 54, 55, 56, 57, 79, 105, 105, - 105, 105, 105, 105, 105, 87, 88, 89, 105, 91, - 105, 105, 44, 105, 105, 47, 64, 49, 2, 51, - 105, 69, 70, 105, 72, 105, 74, 105, 12, 13, - 105, 79, 105, 17, 18, 105, 2, 105, 105, 87, - 88, 89, 1, 91, 3, 105, 12, 13, 105, 105, - 105, 17, 18, 105, 61, 62, 63, 64, 65, 66, - 44, 105, 69, 47, 105, 49, 105, 51, 105, 105, - 105, 105, 105, 105, 105, 105, 105, 11, 44, 38, - 39, 47, 105, 49, 105, 51, 105, 105, 22, 105, - 24, 105, 105, 27, 105, 54, 55, 56, 57, 33, - 105, 35, 105, 37, 105, 105, 105, 105, 71, 105, - 44, 105, 75, 105, 105, 105, 105, 105, 81, 105, - 105, 84, 85, 86, 105, 105, 105, 105, 105, 105, - 105, 105, 105, 105, 105, 105, 99, + 79, 105, 105, 105, 105, 105, 105, 105, 87, 88, + 89, 64, 91, 2, 105, 105, 69, 70, 105, 72, + 105, 74, 105, 12, 13, 105, 79, 105, 17, 18, + 105, 105, 105, 105, 87, 88, 89, 105, 91, 105, + 105, 64, 105, 105, 105, 105, 69, 70, 105, 72, + 105, 74, 105, 105, 105, 44, 79, 105, 47, 2, + 49, 105, 51, 52, 87, 88, 89, 105, 91, 12, + 13, 105, 15, 64, 17, 18, 105, 105, 69, 70, + 1, 72, 3, 74, 105, 105, 105, 105, 79, 105, + 1, 105, 3, 105, 105, 105, 87, 88, 89, 105, + 91, 44, 105, 105, 47, 105, 49, 105, 51, 2, + 105, 22, 105, 105, 105, 105, 105, 38, 39, 12, + 13, 105, 105, 105, 17, 18, 105, 38, 39, 105, + 105, 52, 105, 54, 55, 56, 57, 2, 1, 105, + 3, 105, 105, 54, 55, 56, 57, 12, 13, 105, + 105, 44, 17, 18, 47, 105, 49, 105, 51, 105, + 105, 105, 105, 105, 105, 12, 13, 105, 105, 105, + 17, 18, 1, 105, 3, 38, 39, 105, 105, 44, + 105, 105, 47, 105, 49, 105, 51, 105, 105, 105, + 105, 54, 55, 56, 57, 105, 59, 44, 105, 105, + 47, 105, 49, 71, 51, 105, 105, 75, 11, 38, + 39, 105, 105, 81, 105, 105, 84, 85, 86, 22, + 105, 24, 105, 105, 27, 54, 55, 56, 57, 105, + 33, 99, 35, 105, 37, 105, 105, 105, 71, 105, + 105, 44, 75, 105, 105, 105, 71, 105, 81, 105, + 75, 84, 85, 86, 71, 105, 81, 105, 75, 84, + 85, 86, 105, 105, 81, 105, 99, 84, 85, 86, + 105, 11, 105, 105, 99, 15, 105, 105, 105, 105, + 105, 105, 99, 105, 105, 105, 105, 27, 105, 105, + 105, 105, 105, 33, 105, 105, 36, 105, 105, 105, + 105, 105, 105, 105, 105, 105, 105, 47, ); static public $yy_shift_ofst = array( - 548, 293, 48, 293, 342, 48, 48, 342, -3, 440, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 244, - 48, 48, 48, 48, 48, 244, 48, 48, 195, 48, - 146, 97, 48, 48, 48, 48, 195, 391, 391, 489, - 489, 489, 489, 489, 489, 1631, 1597, 1730, 1730, 1730, - 1730, 1730, 548, 1859, 1525, 1445, 1365, 885, 1285, 1205, - 1125, 1001, 660, 1081, 1961, 1961, 1961, 1961, 1961, 1961, - 1961, 1961, 1961, 1961, 1961, 1961, 1587, 1587, 1654, 612, - 823, 120, 190, 20, 217, 763, 633, 532, 217, 20, - 20, 217, 151, 493, 70, 9, 141, 140, 75, 193, - 234, 389, 303, 303, 204, 233, 395, 461, 362, 461, - 435, 365, 19, 19, 386, 219, 86, 299, 299, 299, - 299, 299, 86, 299, 299, -30, -30, -30, 1888, 1840, - 1822, 1954, 1936, 499, -9, 242, 289, -11, 19, 19, - 19, 19, 19, 19, -29, 19, 19, 19, -29, 265, - 19, 265, -29, 100, 19, -29, 100, -29, -29, 19, - 288, -29, 94, -29, 19, 19, 19, 19, 19, 299, - 299, 28, 299, 86, 515, 86, 28, 86, 147, 299, - 299, -30, -30, -30, -30, -30, 580, 1986, 776, 46, - 188, 12, -10, 60, 315, 334, 295, 317, 305, 332, - 178, 247, 89, 117, 36, 41, 524, 491, 506, 519, - 468, 510, 509, 508, 497, 466, 456, 462, 358, 446, - 476, 507, 512, 514, 505, 515, 546, 555, 534, 535, - 571, 517, + 574, 391, 48, 48, 391, 342, 342, 48, -3, 48, + 48, 440, 48, 48, 146, 48, 48, 48, 48, 48, + 48, 97, 48, 48, 48, 48, 48, 48, 195, 48, + 48, 48, 48, 293, 48, 195, 146, 244, 244, 489, + 489, 489, 489, 489, 489, 1599, 1608, 1692, 1692, 1692, + 1692, 1692, 574, 1465, 1849, 1907, 1305, 649, 985, 1065, + 1385, 1145, 1859, 1225, 1941, 1941, 1941, 1941, 1941, 1941, + 1941, 1941, 1941, 1941, 1941, 1941, 1527, 1527, 120, 730, + 824, 217, 169, 190, 167, 708, 774, 720, 167, 190, + 167, 190, 369, 510, 9, 70, 59, 173, 168, 144, + 307, 117, 38, 287, 287, 219, 441, 235, 449, 484, + 467, 441, 430, 19, 19, 395, 461, 461, 461, 476, + 461, 461, 461, 476, 461, -34, -34, -34, 1781, 1827, + 1666, 1877, 1905, 1923, -9, 46, -14, 254, 19, -29, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 157, 19, 19, 11, -29, -29, -29, 19, -29, 19, + 19, 326, -29, 157, -29, 326, 19, -29, 139, 461, + 476, 461, 476, 461, 461, 387, 387, 338, 461, 476, + 331, -34, -34, -34, -34, -34, 905, 1967, 2030, 242, + 188, 302, 12, 101, 275, 107, 198, 185, -33, 247, + 283, 324, 41, 63, 291, 354, 472, 474, 477, 486, + 501, 490, 508, 497, 502, 519, 523, 521, 518, 542, + 536, 533, 528, 514, 331, 499, 532, 539, 549, 213, + 39, 466, ); static public $yy_reduce_ofst = array( - 1913, 520, 585, 618, 655, 683, 728, 766, 926, 794, - 820, 1034, 1274, 1486, 1434, 1380, 1326, 1300, 1220, 1166, - 1114, 1540, 874, 980, 1140, 1194, 1246, 1086, 1354, 1406, - 1460, 1514, 1060, 1006, 846, 900, 954, 1610, 1636, 1701, - 1758, 1838, 1872, 1665, 1732, 594, 935, 1015, 1591, 664, - 1957, 935, 56, 487, 487, 487, 487, 487, 487, 487, - 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, - 487, 487, 487, 487, 487, 487, 487, 487, -67, 164, - 104, -4, 218, 107, 202, 262, 271, 227, 65, 352, - 340, 251, 176, 302, 398, 398, 307, 410, 307, 297, - 355, 399, 297, 405, 355, 307, 388, 383, 355, 339, - 384, 341, 377, 359, 307, 307, 350, 307, 307, 307, - 307, 429, 355, 307, 307, 307, 307, 307, 503, 503, - 503, 503, 503, 503, 522, 502, 503, 503, 504, 504, - 504, 504, 504, 504, 484, 504, 504, 504, 484, 521, - 504, 518, 484, 496, 504, 484, 513, 484, 484, 504, - 526, 484, 523, 484, 504, 504, 504, 504, 504, 72, - 72, -28, 72, 170, 495, 170, -28, 170, 261, 72, - 72, 367, 344, 256, 291, 43, + 707, 482, 741, 711, 594, 566, 538, 628, 1054, 1160, + 1400, 1480, 894, 866, 946, 1374, 1266, 1214, 1186, 1240, + 1134, 1026, 1080, 1294, 1426, 1506, 1534, 1454, 1320, 1346, + 1000, 1106, 806, 776, 974, 920, 840, 1633, 1603, 1570, + 1691, 1779, 1747, 1663, 1717, 1945, 1953, 547, 609, 1902, + 1937, 1953, 56, 442, 442, 442, 442, 442, 442, 442, + 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, + 442, 442, 442, 442, 442, 442, 442, 442, -67, 229, + 683, 202, -4, 55, 28, 311, 271, 259, 205, 298, + 350, 320, 156, 282, 347, 347, 224, 339, 339, 272, + 334, 335, 335, 256, 272, 366, 383, 418, 388, 339, + 339, 319, 335, 398, 365, 339, 339, 339, 376, 335, + 339, 339, 339, 448, 339, 339, 339, 339, 93, 93, + 93, 93, 93, 93, 495, 473, 93, 93, 481, 475, + 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, + 493, 481, 481, 488, 475, 475, 475, 481, 475, 481, + 481, 496, 475, 506, 475, 485, 481, 475, 483, 405, + 401, 405, 401, 405, 405, 208, 208, 397, 405, 401, + 386, -74, 71, 197, 113, 385, ); static public $yyExpectedTokens = array( array(4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 21, 26, 30, 31, 32,), @@ -681,16 +685,16 @@ class Smarty_Internal_Templateparser array(1, 3, 27, 33, 38, 39, 54, 55, 56, 57,), array(1, 3, 27, 33, 38, 39, 54, 55, 56, 57,), array(4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 21, 26, 30, 31, 32,), - array(1, 3, 22, 38, 39, 54, 55, 56, 57,), - array(1, 3, 11, 38, 39, 54, 55, 56, 57,), array(1, 3, 28, 38, 39, 54, 55, 56, 57,), + array(1, 3, 38, 39, 52, 54, 55, 56, 57,), + array(1, 3, 38, 39, 54, 55, 56, 57, 59,), + array(1, 3, 11, 38, 39, 54, 55, 56, 57,), + array(1, 3, 37, 38, 39, 54, 55, 56, 57,), array(1, 3, 11, 38, 39, 54, 55, 56, 57,), array(1, 3, 11, 38, 39, 54, 55, 56, 57,), array(1, 3, 37, 38, 39, 54, 55, 56, 57,), array(1, 2, 3, 38, 39, 54, 55, 56, 57,), - array(1, 3, 37, 38, 39, 54, 55, 56, 57,), - array(1, 3, 38, 39, 54, 55, 56, 57, 59,), - array(1, 3, 38, 39, 52, 54, 55, 56, 57,), + array(1, 3, 22, 38, 39, 54, 55, 56, 57,), array(1, 3, 11, 38, 39, 54, 55, 56, 57,), array(1, 3, 38, 39, 54, 55, 56, 57,), array(1, 3, 38, 39, 54, 55, 56, 57,), @@ -709,56 +713,56 @@ class Smarty_Internal_Templateparser array(14, 17, 48, 50, 53,), array(5, 12, 13, 14, 16, 19, 20, 21, 26, 30, 31, 32, 58, 59,), array(1, 11, 18, 27, 33, 36, 47,), - array(14, 17, 50, 53,), array(1, 11, 27, 33,), - array(14, 36, 53,), + array(14, 17, 50, 53,), array(1, 27, 33,), + array(14, 36, 53,), array(5, 12, 13, 14, 16, 19, 20, 21, 26, 30, 31, 32, 58, 59,), array(12, 13, 17, 27, 29, 33,), array(12, 13, 17, 27, 33,), - array(1, 27, 33,), array(14, 36, 53,), + array(1, 27, 33,), array(14, 36, 53,), array(1, 27, 33,), array(18, 44, 51,), array(1, 2,), array(11, 23, 27, 33, 45,), array(11, 23, 27, 33, 45,), - array(1, 11, 27, 33,), array(13, 14, 17, 53,), array(1, 11, 27, 33,), + array(1, 11, 27, 33,), array(12, 13, 17, 49,), - array(15, 18, 47,), array(8, 9, 10,), - array(12, 13, 17,), - array(12, 13, 17,), array(15, 18, 47,), - array(1, 29,), - array(1, 18,), - array(14, 17,), - array(18, 47,), + array(15, 18, 47,), + array(12, 13, 17,), + array(12, 13, 17,), + array(14, 53,), array(14, 17,), array(27, 33,), - array(14, 53,), + array(1, 18,), + array(1, 11,), + array(1, 29,), + array(14, 17,), + array(18, 47,), array(27, 33,), array(27, 33,), array(1, 52,), - array(1, 11,), - array(18,), - array(1,), - array(1,), array(1,), array(1,), array(1,), array(18,), array(1,), array(1,), + array(1,), + array(18,), + array(1,), array(), array(), array(), - array(2, 12, 13, 15, 17, 18, 44, 47, 49, 51,), - array(2, 12, 13, 15, 17, 18, 44, 47, 49, 51,), array(2, 12, 13, 17, 18, 44, 47, 49, 51, 52,), + array(2, 12, 13, 15, 17, 18, 44, 47, 49, 51,), + array(2, 12, 13, 15, 17, 18, 44, 47, 49, 51,), array(2, 12, 13, 17, 18, 44, 47, 49, 51,), array(2, 12, 13, 17, 18, 44, 47, 49, 51,), array(12, 13, 17, 18, 44, 47, 49, 51,), @@ -767,48 +771,48 @@ class Smarty_Internal_Templateparser array(15, 44, 51,), array(12, 13, 17,), array(27, 33,), - array(27, 33,), - array(27, 33,), - array(27, 33,), - array(27, 33,), - array(27, 33,), array(44, 51,), array(27, 33,), array(27, 33,), array(27, 33,), - array(44, 51,), + array(27, 33,), + array(27, 33,), + array(27, 33,), + array(27, 33,), + array(27, 33,), + array(27, 33,), + array(27, 33,), array(14, 53,), array(27, 33,), - array(14, 53,), - array(44, 51,), - array(44, 51,), - array(27, 33,), - array(44, 51,), - array(44, 51,), - array(44, 51,), - array(44, 51,), array(27, 33,), array(15, 23,), array(44, 51,), - array(13, 36,), + array(44, 51,), + array(44, 51,), + array(27, 33,), array(44, 51,), array(27, 33,), array(27, 33,), + array(44, 51,), + array(44, 51,), + array(14, 53,), + array(44, 51,), + array(44, 51,), array(27, 33,), - array(27, 33,), - array(27, 33,), + array(44, 51,), + array(13, 36,), + array(1,), + array(18,), + array(1,), + array(18,), array(1,), array(1,), array(2,), + array(2,), + array(9,), array(1,), array(18,), array(36,), - array(18,), - array(2,), - array(18,), - array(9,), - array(1,), - array(1,), array(), array(), array(), @@ -819,47 +823,47 @@ class Smarty_Internal_Templateparser array(11, 15, 27, 33, 36, 47,), array(12, 13, 17, 49,), array(36, 44, 47, 52,), - array(23, 45, 59,), array(29, 36, 47,), + array(23, 45, 59,), array(23, 45, 52,), - array(23, 45,), array(36, 47,), - array(35, 52,), - array(36, 47,), - array(44, 52,), - array(35, 37,), - array(22, 35,), - array(35, 37,), array(35, 37,), array(15, 44,), array(17, 49,), + array(35, 52,), + array(22, 35,), + array(35, 37,), array(36, 47,), - array(34,), + array(36, 47,), + array(23, 45,), + array(35, 37,), + array(44, 52,), array(50,), - array(34,), - array(17,), - array(17,), - array(17,), - array(17,), - array(14,), - array(17,), - array(52,), - array(44,), - array(15,), - array(17,), array(50,), - array(37,), - array(17,), - array(17,), - array(24,), array(52,), - array(36,), + array(52,), + array(17,), array(17,), - array(11,), - array(36,), - array(40,), array(5,), array(17,), + array(14,), + array(15,), + array(17,), + array(36,), + array(40,), + array(17,), + array(17,), + array(17,), + array(17,), + array(34,), + array(36,), + array(37,), + array(17,), + array(24,), + array(11,), + array(17,), + array(44,), + array(34,), array(), array(), array(), @@ -957,39 +961,39 @@ class Smarty_Internal_Templateparser array(), ); static public $yy_default = array( - 330, 504, 483, 519, 519, 483, 483, 519, 519, 519, + 330, 504, 483, 483, 519, 519, 519, 483, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 519, 385, 519, 364, 385, 354, - 385, 351, 327, 519, 519, 390, 519, 519, 519, 519, - 519, 519, 519, 519, 387, 369, 506, 507, 396, 505, - 482, 407, 390, 481, 397, 392, 412, 411, 519, 519, - 423, 519, 399, 519, 385, 519, 385, 385, 385, 519, - 519, 385, 495, 376, 413, 413, 399, 519, 399, 448, - 438, 519, 448, 448, 438, 399, 379, 519, 438, 519, - 385, 519, 366, 385, 399, 399, 492, 416, 415, 402, - 399, 381, 438, 406, 410, 403, 490, 414, 437, 437, - 437, 437, 437, 437, 519, 450, 464, 448, 367, 356, - 355, 350, 371, 352, 446, 358, 372, 374, 445, 519, - 373, 519, 444, 443, 360, 442, 441, 475, 476, 368, - 519, 473, 448, 474, 375, 365, 362, 348, 361, 377, - 382, 484, 380, 493, 448, 470, 485, 496, 342, 432, - 405, 489, 489, 448, 489, 448, 423, 419, 423, 449, - 423, 413, 423, 413, 413, 519, 519, 423, 419, 519, - 519, 519, 519, 419, 519, 433, 421, 519, 519, 519, - 519, 519, 519, 519, 519, 428, 419, 519, 519, 519, - 519, 519, 519, 393, 519, 464, 519, 519, 494, 425, - 334, 519, 487, 478, 464, 486, 469, 479, 491, 425, - 454, 480, 386, 344, 331, 332, 333, 336, 335, 337, - 338, 339, 340, 341, 343, 345, 378, 398, 346, 383, - 357, 363, 394, 384, 466, 467, 370, 488, 468, 426, - 463, 471, 429, 430, 510, 509, 508, 408, 409, 431, - 434, 461, 459, 462, 512, 497, 498, 499, 500, 404, - 329, 516, 439, 440, 472, 515, 465, 513, 514, 457, - 452, 456, 455, 458, 460, 417, 427, 435, 436, 447, - 477, 451, 453, 517, 400, 401, 418, 420, 502, 503, - 422, 501, 424, 428, 511, 518, 328, + 385, 351, 327, 390, 519, 519, 519, 519, 519, 519, + 519, 519, 519, 519, 392, 407, 482, 396, 507, 369, + 506, 397, 390, 481, 505, 387, 412, 411, 519, 519, + 423, 399, 519, 385, 519, 519, 385, 385, 519, 385, + 519, 385, 495, 376, 413, 413, 519, 399, 399, 448, + 519, 438, 438, 448, 448, 519, 519, 385, 379, 399, + 399, 519, 438, 385, 366, 399, 402, 399, 381, 438, + 415, 406, 416, 492, 410, 490, 414, 403, 437, 437, + 437, 437, 437, 437, 519, 450, 464, 448, 348, 446, + 365, 362, 373, 358, 374, 356, 355, 350, 361, 352, + 519, 360, 367, 519, 445, 473, 475, 368, 476, 372, + 371, 441, 444, 519, 474, 443, 375, 442, 448, 380, + 493, 405, 496, 432, 377, 485, 484, 342, 382, 470, + 448, 489, 489, 448, 448, 489, 423, 419, 423, 449, + 423, 423, 413, 413, 519, 519, 419, 519, 519, 519, + 519, 423, 433, 413, 519, 419, 519, 519, 428, 519, + 519, 519, 334, 519, 519, 519, 519, 494, 425, 519, + 519, 519, 519, 519, 464, 519, 519, 393, 519, 519, + 419, 421, 332, 370, 394, 333, 398, 331, 337, 458, + 425, 463, 457, 479, 478, 329, 335, 454, 491, 328, + 460, 386, 464, 469, 456, 455, 336, 480, 420, 422, + 424, 418, 401, 363, 400, 428, 429, 431, 434, 383, + 409, 408, 430, 357, 453, 452, 488, 378, 486, 468, + 467, 384, 466, 487, 417, 447, 451, 436, 435, 426, + 427, 461, 459, 340, 513, 512, 510, 509, 471, 508, + 514, 517, 503, 502, 338, 339, 501, 518, 511, 341, + 343, 500, 404, 439, 499, 498, 462, 497, 440, 472, + 515, 516, 344, 345, 465, 346, 477, ); public static $yyFallback = array(); public static $yyRuleName = array( @@ -1567,8 +1571,8 @@ class Smarty_Internal_Templateparser 184 => 184, 185 => 185, 186 => 185, + 188 => 185, 187 => 187, - 188 => 188, 189 => 189, 190 => 190, 191 => 191, @@ -1662,7 +1666,7 @@ class Smarty_Internal_Templateparser */ public $template_prefix = array(); /** - * security object + * template prefix array * * @var \Smarty_Internal_ParseTree[] */ @@ -3283,32 +3287,33 @@ class Smarty_Internal_Templateparser '\'' . $this->yystack[ $this->yyidx + -2 ]->minor . '\'=>' . $this->yystack[ $this->yyidx + 0 ]->minor; } - #line 1257 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1258 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r182() { + $this->compiler->leaveDoubleQuote(); $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor->to_smarty_php($this); } - #line 1262 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1263 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r183() { $this->yystack[ $this->yyidx + -1 ]->minor->append_subtree($this, $this->yystack[ $this->yyidx + 0 ]->minor); $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor; } - #line 1266 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1267 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r184() { $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[ $this->yyidx + 0 ]->minor); } - #line 1274 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1275 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r185() { $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[ $this->yyidx + -1 ]->minor); } - #line 1278 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1283 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r187() { $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' . @@ -3316,27 +3321,14 @@ class Smarty_Internal_Templateparser '\']->value'); } - #line 1285 "../smarty/lexer/smarty_internal_templateparser.y" - function yy_r188() - { - if ($this->template->caching && $this->compiler->tag_nocache) { - $this->compiler->tag_nocache_save = true; - } - $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . ($this->template->caching && - $this->compiler->tag_nocache ? - $this->compiler->newPrefixCode($this->yystack[ $this->yyidx + - -1 ]->minor) : - $this->yystack[ $this->yyidx + -1 ]->minor)); - } - - #line 1289 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1287 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r189() { $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[ $this->yyidx + -1 ]->minor . ')'); } - #line 1293 "../smarty/lexer/smarty_internal_templateparser.y" + #line 1291 "../smarty/lexer/smarty_internal_templateparser.y" function yy_r190() { $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[ $this->yyidx + 0 ]->minor);