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

Diff for /loncom/xml/run.pm between versions 1.3 and 1.19

version 1.3, 2000/06/29 13:58:23 version 1.19, 2001/10/05 22:27:41
Line 1 Line 1
 package Apache::run;  package Apache::run;
   
 sub evaluate {  sub evaluateold {
   my ($expression,$safeeval) = @_;    my ($expression,$safeeval,$decls) = @_;
 #  print "inside2 evaluate with $expression\n";  # print "inside2 evaluate $decls with $expression<br />\n";
 # gerd's old method interpolates unset vars  # gerd's old method interpolates unset vars
 #  $safeeval->reval('return qq('.$expression.');');  # $safeeval->reval('return qq('.$expression.');');
   $safeeval->reval('$_=\''.$expression.'\';');    unless (defined $expression) { return ''; }
   $safeeval->reval('$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;');    my $result = '';
   $safeeval->reval('return $_;');    $@='';
     $safeeval->reval('$_=q|'.$expression.'|;');
     if ($@ eq '') {
       $safeeval->reval('{'.$decls.'$_=~s/(\$[A-Za-z]\w*)/(defined(eval($1))?eval($1):$1)/ge;}');
       if ($@ eq '') {
         $result = $safeeval->reval('return $_;');
       } else {
         &Apache::lonxml::error("substitution on:$expression:with:$decls:caused");
       }
     } else {
       &Apache::lonxml::error("defining:$expression:caused");
     }
     if ($@ ne '') {&Apache::lonxml::error($@);}
     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 {
     my ($expression,$safeeval,$decls) = @_;
     unless (defined $expression) { return ''; }
     if (!$Apache::lonxml::evaluate) { return $expression; }
     my $result = '';
     $@='';
     $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
      "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
   #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
     if ($@ eq '') {
       $result = $safeeval->reval('return $_;');
       chomp $result;
     } else {
       &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@");
     }  
     return $result
 }  }
   
 sub run {  sub run {
   my ($code,$safeeval) = @_;    my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $safeeval->reval($code);    $@='';
     my (@result)=$safeeval->reval($code);
     if ($@ ne '' && !$hideerrors) {
       &Apache::lonxml::error(":$code:caused");
       &Apache::lonxml::error($@);
     }
     if ( $#result < '1') {
       return $result[0];
     } else {
       &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
       return (@result);
     }
   }
   
   sub dump {
     my ($target,$safeeval)=@_;
     my $dump='';
     foreach my $symname (sort keys %{$safeeval->varglob('main::')}) {
       if (($symname!~/^\_/) && ($symname!~/\:$/)) {
         if ($safeeval->reval('defined $'.$symname)) {
    $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
         }
         if ($safeeval->reval('defined @'.$symname)) {
    $dump.='@'.$symname.'=('.
     $safeeval->reval('join(",",@'.$symname.')').")\n";
         }
         if ($safeeval->reval('defined %'.$symname)) {
    $dump.='%'.$symname.'=(';
    $dump.=$safeeval->reval('join(",",map { $_."=>".$'.
    $symname.'{$_} } sort keys %'.
    $symname.')').")\n";
         }
       }
     }
     $dump.='';
     return $dump;
 }  }
   
 1;  1;
Removed from v.1.3  
changed lines
  Added in v.1.19

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