version 1.10, 2000/11/14 22:24:38
|
version 1.13, 2000/11/20 17:34:05
|
Line 23 sub evaluateold {
|
Line 23 sub evaluateold {
|
return $result |
return $result |
} |
} |
|
|
|
$Apache::run::EVALUATE_STRING=<<'ENDEVALUATE'; |
|
my %oldexpressions=(); |
|
while (!$oldexpressions{$_}) { |
|
$oldexpressions{$_}=1; |
|
$_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg; |
|
} |
|
ENDEVALUATE |
|
|
sub evaluate { |
sub evaluate { |
my ($expression,$safeeval,$decls) = @_; |
my ($expression,$safeeval,$decls) = @_; |
unless (defined $expression) { return ''; } |
unless (defined $expression) { return ''; } |
my $result = ''; |
my $result = ''; |
$@=''; |
$@=''; |
$safeeval->reval('{'.$decls.';&evaluate(q|'.$expression.'|);}'); |
print $decls |
|
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression. |
|
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}'); |
|
# $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}'); |
if ($@ eq '') { |
if ($@ eq '') { |
$result = $safeeval->reval('return $_;'); |
$result = $safeeval->reval('return $_;'); |
|
chomp $result; |
} else { |
} else { |
&Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@"); |
&Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@"); |
} |
} |