[BACK]Return to run.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/run.pm between versions 1.7 and 1.11

version 1.7, 2000/10/02 22:20:18 version 1.11, 2000/11/15 15:29:33
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 8  sub evaluate { Line 8  sub evaluate {
   unless (defined $expression) { return ''; }    unless (defined $expression) { return ''; }
   my $result = '';    my $result = '';
   $@='';    $@='';
   $safeeval->reval('$_=\''.$expression.'\';');    $safeeval->reval('$_=q|'.$expression.'|;');
   if ($@ eq '') {    if ($@ eq '') {
     $safeeval->reval('{'.$decls.'$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;}');      $safeeval->reval('{'.$decls.'$_=~s/(\$[A-Za-z]\w*)/(defined(eval($1))?eval($1):$1)/ge;}');
     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
 }  }
   
   $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
     my %oldexpressions=();
     while (!$oldexpressions{$_}) {
       $oldexpressions{$_}=1;
       $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[|\{][\w\'\"]+[\]\}])*?(\([\w\'\"]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;
     }
   ENDEVALUATE
   
   sub evaluate {
     my ($expression,$safeeval,$decls) = @_;
     unless (defined $expression) { return ''; }
     my $result = '';
     $@='';
     print $decls
     $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
      "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
   #  $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";
Removed from v.1.7  
changed lines
  Added in v.1.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>