version 1.9, 2000/10/30 20:05:19
|
version 1.10, 2000/11/14 22:24:38
|
Line 1
|
Line 1
|
package Apache::run; |
package Apache::run; |
|
|
sub evaluate { |
sub evaluateold { |
my ($expression,$safeeval,$decls) = @_; |
my ($expression,$safeeval,$decls) = @_; |
# print "inside2 evaluate $decls with $expression<br>\n"; |
# print "inside2 evaluate $decls with $expression<br>\n"; |
# gerd's old method interpolates unset vars |
# gerd's old method interpolates unset vars |
Line 14 sub evaluate {
|
Line 14 sub evaluate {
|
if ($@ eq '') { |
if ($@ eq '') { |
$result = $safeeval->reval('return $_;'); |
$result = $safeeval->reval('return $_;'); |
} else { |
} else { |
&Apache::lonxml::error("substituion on:$expression:with:$decls:caused"); |
&Apache::lonxml::error("substitution on:$expression:with:$decls:caused"); |
} |
} |
} else { |
} else { |
&Apache::lonxml::error("defining:$expression:caused"); |
&Apache::lonxml::error("defining:$expression:caused"); |
Line 23 sub evaluate {
|
Line 23 sub evaluate {
|
return $result |
return $result |
} |
} |
|
|
|
sub evaluate { |
|
my ($expression,$safeeval,$decls) = @_; |
|
unless (defined $expression) { return ''; } |
|
my $result = ''; |
|
$@=''; |
|
$safeeval->reval('{'.$decls.';&evaluate(q|'.$expression.'|);}'); |
|
if ($@ eq '') { |
|
$result = $safeeval->reval('return $_;'); |
|
} else { |
|
&Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@"); |
|
} |
|
return $result |
|
} |
|
|
sub run { |
sub run { |
my ($code,$safeeval) = @_; |
my ($code,$safeeval) = @_; |
# print "inside run\n"; |
# print "inside run\n"; |