[BACK]Return to lonmaxima CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lonmaxima between versions 1.39 and 1.41

version 1.39, 2008/08/19 10:59:10 version 1.41, 2012/02/16 19:54:06
Line 335  sub getmaximaoutput { Line 335  sub getmaximaoutput {
         if ($numcheck eq 2) {          if ($numcheck eq 2) {
     # command was the killall so should get a full reset on      # command was the killall so should get a full reset on
     # command numbers      # command numbers
     $regexp = '(\(\%i(1)\)|Incorrect syntax\:)';      $regexp = '(\(\%i(1)\)|[Ii]ncorrect syntax\:)';
  } elsif ($command->match() =~ /\(\%i(\d+)\)/) {   } elsif ($command->match() =~ /\(\%i(\d+)\)/) {
             my $nextmatch = $1+1;              my $nextmatch = $1+1;
             $regexp = '(\(\%i'.$nextmatch.'\)|Incorrect syntax\:)';              $regexp = '(\(\%i'.$nextmatch.'\)|[Ii]ncorrect syntax\:)';
         }          }
     }      }
     my $timeout = 20;      my $timeout = 20;
     my (undef,$error,$matched,$output) =      my (undef,$error,$matched,$output) =
  $command->expect($timeout, -re => $regexp);   $command->expect($timeout, -re => $regexp);
   
     if ($numcheck && $matched eq 'Incorrect syntax:') {      if ($numcheck && lc($matched) eq 'incorrect syntax:') {
  $syntaxerr = 1;   $syntaxerr = 1;
  if (wantarray) {   if (wantarray) {
     return ($matched,$syntaxerr);      return ($matched,$syntaxerr);
Line 356  sub getmaximaoutput { Line 356  sub getmaximaoutput {
     if ($error) {      if ($error) {
  return 'Error: '.$error;   return 'Error: '.$error;
     }      }
     $output =~ s/\r+//g; # Remove Windows-style linebreaks      $output =~ s/\r+//gs; # Remove Windows-style linebreaks
     my $foundoutput=0;      my $foundoutput=0;
     my $found_label=0;      my $found_label=0;
     my $realoutput='';      my $realoutput='';
     foreach my $line (split(/\n/,$output)) {      foreach my $line (split(/\n/,$output)) {
        if ($line=~/\;/) { $foundoutput=1; next; }         if ($line=~/\;/) { $foundoutput=1; next; }
        if (!$foundoutput) { next; }         if (!$foundoutput) { next; }
        if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }         if ($line=~/^[Ii]ncorrect syntax:/) { $syntaxerr = 1; next; }
        if ($line=~ /^(\(\%o\d+\))(.+)$/){         if ($line=~ /^(\(\%o\d+\))(.+)$/){
            my $label = $1;             my $label = $1;
            $line = $2;             $line = $2;
Removed from v.1.39  
changed lines
  Added in v.1.41

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