smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-07 03:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- removed parser restrictions in using true,false and null as ID

Browse Source
This commit is contained in:
Uwe.Tews
2010-04-12 18:22:53 +00:00
parent 5d644eb203
commit c8be3ed029
3 changed files with 1367 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,5 +1,6 @@
12/04/2010 12/04/2010
- bugfix in smarty_internal_templatecompilerbase (overloaded property) - bugfix in smarty_internal_templatecompilerbase (overloaded property)
- removed parser restrictions in using true,false and null as ID
07/04/2010 07/04/2010
- bugfix typo in smarty_internal_templatecompilerbase - bugfix typo in smarty_internal_templatecompilerbase

146
libs/sysplugins/smarty_internal_templatelexer.php
View File

@@ -73,8 +73,6 @@ class Smarty_Internal_Templatelexer
'LITERALEND' => 'literal close', 'LITERALEND' => 'literal close',
'AS' => 'as', 'AS' => 'as',
'TO' => 'to', 'TO' => 'to',
'NULL' => 'null',
'BOOLEAN' => 'boolean'
); );
@@ -319,8 +317,7 @@ class Smarty_Internal_Templatelexer
15 => 0, 15 => 0,
16 => 0, 16 => 0,
17 => 0, 17 => 0,
18 => 0, 18 => 1,
19 => 0,
20 => 1, 20 => 1,
22 => 1, 22 => 1,
24 => 1, 24 => 1,
@@ -331,7 +328,8 @@ class Smarty_Internal_Templatelexer
34 => 1, 34 => 1,
36 => 1, 36 => 1,
38 => 1, 38 => 1,
40 => 1, 40 => 0,
41 => 0,
42 => 0, 42 => 0,
43 => 0, 43 => 0,
44 => 0, 44 => 0,
@@ -340,19 +338,19 @@ class Smarty_Internal_Templatelexer
47 => 0, 47 => 0,
48 => 0, 48 => 0,
49 => 0, 49 => 0,
50 => 0, 50 => 3,
51 => 0, 54 => 0,
52 => 3, 55 => 0,
56 => 0, 56 => 0,
57 => 0, 57 => 0,
58 => 0, 58 => 0,
59 => 0, 59 => 0,
60 => 0, 60 => 0,
61 => 0, 61 => 1,
62 => 0,
63 => 1, 63 => 1,
65 => 1, 65 => 1,
67 => 1, 67 => 0,
68 => 0,
69 => 0, 69 => 0,
70 => 0, 70 => 0,
71 => 0, 71 => 0,
@@ -364,20 +362,18 @@ class Smarty_Internal_Templatelexer
77 => 0, 77 => 0,
78 => 0, 78 => 0,
79 => 0, 79 => 0,
80 => 0, 80 => 1,
81 => 0, 82 => 0,
82 => 1, 83 => 0,
84 => 0, 84 => 0,
85 => 0, 85 => 0,
86 => 0, 86 => 0,
87 => 0, 87 => 0,
88 => 0,
89 => 0,
); );
if ($this->counter >= strlen($this->data)) { if ($this->counter >= strlen($this->data)) {
return false; // end of input return false; // end of input
} }
$yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+(AS|as)\\s+)|^(\\s+(to)\\s+)|^(\\s+(step)\\s+)|^(\\s+instanceof\\s+)|^(true|TRUE|True|false|FALSE|False)|^(null|NULL|Null)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+(EQ|eq)\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(NE|NEQ|ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(GE|GTE|ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(LE|LTE|le|lte)\\s+)|^(\\s*>\\s*|\\s+(GT|gt)\\s+)|^(\\s*<\\s*|\\s+(LT|lt)\\s+)|^(\\s+(MOD|mod)\\s+)|^(!\\s*|(NOT|not)\\s+)|^(\\s*&&\\s*|\\s*(AND|and)\\s+)|^(\\s*\\|\\|\\s*|\\s*(OR|or)\\s+)|^(\\s*(XOR|xor)\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\))|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^((\\+\\+|--)\\s*)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^((if|elseif|else if|while)(?![^\s]))|^(foreach(?![^\s]))|^(for(?![^\s]))|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/"; $yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+(AS|as)\\s+)|^(\\s+(to)\\s+)|^(\\s+(step)\\s+)|^(\\s+instanceof\\s+)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+(EQ|eq)\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(NE|NEQ|ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(GE|GTE|ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(LE|LTE|le|lte)\\s+)|^(\\s*>\\s*|\\s+(GT|gt)\\s+)|^(\\s*<\\s*|\\s+(LT|lt)\\s+)|^(\\s+(MOD|mod)\\s+)|^(!\\s*|(NOT|not)\\s+)|^(\\s*&&\\s*|\\s*(AND|and)\\s+)|^(\\s*\\|\\|\\s*|\\s*(OR|or)\\s+)|^(\\s*(XOR|xor)\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\))|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^((\\+\\+|--)\\s*)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^((if|elseif|else if|while)(?![^\s]))|^(foreach(?![^\s]))|^(for(?![^\s]))|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/";
do { do {
if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
@@ -512,281 +508,271 @@ class Smarty_Internal_Templatelexer
function yy_r2_16($yy_subpatterns) function yy_r2_16($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_BOOLEAN; $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
} }
function yy_r2_17($yy_subpatterns) function yy_r2_17($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_NULL; $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
} }
function yy_r2_18($yy_subpatterns) function yy_r2_18($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_IDENTITY; $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
}
function yy_r2_19($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
} }
function yy_r2_20($yy_subpatterns) function yy_r2_20($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_EQUALS; $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
} }
function yy_r2_22($yy_subpatterns) function yy_r2_22($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS; $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
} }
function yy_r2_24($yy_subpatterns) function yy_r2_24($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL; $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
} }
function yy_r2_26($yy_subpatterns) function yy_r2_26($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL; $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
} }
function yy_r2_28($yy_subpatterns) function yy_r2_28($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN; $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
} }
function yy_r2_30($yy_subpatterns) function yy_r2_30($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_LESSTHAN; $this->token = Smarty_Internal_Templateparser::TP_MOD;
} }
function yy_r2_32($yy_subpatterns) function yy_r2_32($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_MOD; $this->token = Smarty_Internal_Templateparser::TP_NOT;
} }
function yy_r2_34($yy_subpatterns) function yy_r2_34($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_NOT; $this->token = Smarty_Internal_Templateparser::TP_LAND;
} }
function yy_r2_36($yy_subpatterns) function yy_r2_36($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_LAND; $this->token = Smarty_Internal_Templateparser::TP_LOR;
} }
function yy_r2_38($yy_subpatterns) function yy_r2_38($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_LOR; $this->token = Smarty_Internal_Templateparser::TP_LXOR;
} }
function yy_r2_40($yy_subpatterns) function yy_r2_40($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_LXOR;
}
function yy_r2_42($yy_subpatterns)
{
$this->token = Smarty_Internal_Templateparser::TP_ISODDBY; $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
} }
function yy_r2_43($yy_subpatterns) function yy_r2_41($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY; $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
} }
function yy_r2_44($yy_subpatterns) function yy_r2_42($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISODD; $this->token = Smarty_Internal_Templateparser::TP_ISODD;
} }
function yy_r2_45($yy_subpatterns) function yy_r2_43($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISNOTODD; $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
} }
function yy_r2_46($yy_subpatterns) function yy_r2_44($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISEVENBY; $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
} }
function yy_r2_47($yy_subpatterns) function yy_r2_45($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY; $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
} }
function yy_r2_48($yy_subpatterns) function yy_r2_46($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISEVEN; $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
} }
function yy_r2_49($yy_subpatterns) function yy_r2_47($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN; $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
} }
function yy_r2_50($yy_subpatterns) function yy_r2_48($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISDIVBY; $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
} }
function yy_r2_51($yy_subpatterns) function yy_r2_49($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY; $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
} }
function yy_r2_52($yy_subpatterns) function yy_r2_50($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_TYPECAST; $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
} }
function yy_r2_56($yy_subpatterns) function yy_r2_54($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_OPENP; $this->token = Smarty_Internal_Templateparser::TP_OPENP;
} }
function yy_r2_57($yy_subpatterns) function yy_r2_55($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_CLOSEP; $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
} }
function yy_r2_58($yy_subpatterns) function yy_r2_56($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_OPENB; $this->token = Smarty_Internal_Templateparser::TP_OPENB;
} }
function yy_r2_59($yy_subpatterns) function yy_r2_57($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_CLOSEB; $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
} }
function yy_r2_60($yy_subpatterns) function yy_r2_58($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_PTR; $this->token = Smarty_Internal_Templateparser::TP_PTR;
} }
function yy_r2_61($yy_subpatterns) function yy_r2_59($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_APTR; $this->token = Smarty_Internal_Templateparser::TP_APTR;
} }
function yy_r2_62($yy_subpatterns) function yy_r2_60($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_EQUAL; $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
} }
function yy_r2_63($yy_subpatterns) function yy_r2_61($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_INCDEC; $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
} }
function yy_r2_65($yy_subpatterns) function yy_r2_63($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_UNIMATH; $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
} }
function yy_r2_67($yy_subpatterns) function yy_r2_65($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_MATH; $this->token = Smarty_Internal_Templateparser::TP_MATH;
} }
function yy_r2_69($yy_subpatterns) function yy_r2_67($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_DOLLAR; $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
} }
function yy_r2_70($yy_subpatterns) function yy_r2_68($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
} }
function yy_r2_71($yy_subpatterns) function yy_r2_69($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
} }
function yy_r2_72($yy_subpatterns) function yy_r2_70($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_COLON; $this->token = Smarty_Internal_Templateparser::TP_COLON;
} }
function yy_r2_73($yy_subpatterns) function yy_r2_71($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_AT; $this->token = Smarty_Internal_Templateparser::TP_AT;
} }
function yy_r2_74($yy_subpatterns) function yy_r2_72($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_HATCH; $this->token = Smarty_Internal_Templateparser::TP_HATCH;
} }
function yy_r2_75($yy_subpatterns) function yy_r2_73($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_QUOTE; $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
$this->yypushstate(self::DOUBLEQUOTEDSTRING); $this->yypushstate(self::DOUBLEQUOTEDSTRING);
} }
function yy_r2_76($yy_subpatterns) function yy_r2_74($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_BACKTICK; $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_77($yy_subpatterns) function yy_r2_75($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_VERT; $this->token = Smarty_Internal_Templateparser::TP_VERT;
} }
function yy_r2_78($yy_subpatterns) function yy_r2_76($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_DOT; $this->token = Smarty_Internal_Templateparser::TP_DOT;
} }
function yy_r2_79($yy_subpatterns) function yy_r2_77($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_COMMA; $this->token = Smarty_Internal_Templateparser::TP_COMMA;
} }
function yy_r2_80($yy_subpatterns) function yy_r2_78($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ANDSYM; $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
} }
function yy_r2_81($yy_subpatterns) function yy_r2_79($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_QMARK; $this->token = Smarty_Internal_Templateparser::TP_QMARK;
} }
function yy_r2_82($yy_subpatterns) function yy_r2_80($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_IF; $this->token = Smarty_Internal_Templateparser::TP_IF;
} }
function yy_r2_84($yy_subpatterns) function yy_r2_82($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_FOREACH; $this->token = Smarty_Internal_Templateparser::TP_FOREACH;
} }
function yy_r2_85($yy_subpatterns) function yy_r2_83($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_FOR; $this->token = Smarty_Internal_Templateparser::TP_FOR;
} }
function yy_r2_86($yy_subpatterns) function yy_r2_84($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_ID; $this->token = Smarty_Internal_Templateparser::TP_ID;
} }
function yy_r2_87($yy_subpatterns) function yy_r2_85($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_INTEGER; $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
} }
function yy_r2_88($yy_subpatterns) function yy_r2_86($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_SPACE; $this->token = Smarty_Internal_Templateparser::TP_SPACE;
} }
function yy_r2_89($yy_subpatterns) function yy_r2_87($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Templateparser::TP_OTHER; $this->token = Smarty_Internal_Templateparser::TP_OTHER;

2706
libs/sysplugins/smarty_internal_templateparser.php
View File

File diff suppressed because it is too large Load Diff