Changeset 997

Show
Ignore:
Timestamp:
06/20/08 16:49:41 (2 months ago)
Author:
laurentj
Message:

fixed bug #605 : we couldn't use eval keyword in a local name in a template

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.0.x/lib/jelix/tpl/jTplCompiler.class.php

    r930 r997  
    4343       T_INTERFACE, T_LIST, T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_XOR, T_NEW, T_PRIVATE, T_PUBLIC, 
    4444       T_PROTECTED, T_RETURN, T_STATIC, T_SWITCH, T_THROW, T_TRY, T_USE, T_VAR, T_WHILE, 
    45        T_DNUMBER, T_LNUMBER); 
     45       T_DNUMBER, T_LNUMBER, T_EVAL); 
    4646 
    4747    protected $_allowedInVar; 
  • branches/1.0.x/testapp/modules/jelix_tests/tests/jtpl.expressions_parsing.html_cli.php

    r929 r997  
    8989        '@exit.final.for.foreach.function.global.if.implements.instanceof@'=>'jLocale::get(\'exit.final.for.foreach.function.global.if.implements.instanceof\')', 
    9090        '@interface.and.or.xor.new.private.public@'=>'jLocale::get(\'interface.and.or.xor.new.private.public\')', 
    91         '@protected.return.static.switch.throw.try.use.var.while@'=>'jLocale::get(\'protected.return.static.switch.throw.try.use.var.while\')', 
     91        '@protected.return.static.switch.throw.try.use.var.eval.while@'=>'jLocale::get(\'protected.return.static.switch.throw.try.use.var.eval.while\')', 
    9292        '$aa*(234+$b)'=>'$t->_vars[\'aa\']*(234+$t->_vars[\'b\'])', 
    9393        '$aa[$bb[4]]'=>'$t->_vars[\'aa\'][$t->_vars[\'bb\'][4]]', 
  • trunk/lib/jelix/tpl/jTplCompiler.class.php

    r930 r997  
    4343       T_INTERFACE, T_LIST, T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_XOR, T_NEW, T_PRIVATE, T_PUBLIC, 
    4444       T_PROTECTED, T_RETURN, T_STATIC, T_SWITCH, T_THROW, T_TRY, T_USE, T_VAR, T_WHILE, 
    45        T_DNUMBER, T_LNUMBER); 
     45       T_DNUMBER, T_LNUMBER, T_EVAL); 
    4646 
    4747    protected $_allowedInVar; 
  • trunk/testapp/modules/jelix_tests/tests/jtpl.expressions_parsing.html_cli.php

    r929 r997  
    8989        '@exit.final.for.foreach.function.global.if.implements.instanceof@'=>'jLocale::get(\'exit.final.for.foreach.function.global.if.implements.instanceof\')', 
    9090        '@interface.and.or.xor.new.private.public@'=>'jLocale::get(\'interface.and.or.xor.new.private.public\')', 
    91         '@protected.return.static.switch.throw.try.use.var.while@'=>'jLocale::get(\'protected.return.static.switch.throw.try.use.var.while\')', 
     91        '@protected.return.static.switch.throw.try.use.var.eval.while@'=>'jLocale::get(\'protected.return.static.switch.throw.try.use.var.eval.while\')', 
    9292        '$aa*(234+$b)'=>'$t->_vars[\'aa\']*(234+$t->_vars[\'b\'])', 
    9393        '$aa[$bb[4]]'=>'$t->_vars[\'aa\'][$t->_vars[\'bb\'][4]]', 
Download in other formats: Unified Diff Zip Archive