--- loncom/xml/run.pm	2000/11/14 22:24:38	1.10
+++ loncom/xml/run.pm	2000/11/15 15:29:33	1.11
@@ -23,12 +23,23 @@ sub evaluateold {
   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 = '';
   $@='';
-  $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 '') {
     $result = $safeeval->reval('return $_;');
   } else {