loncom/lonmaxima - diff

Return to lonmaxima CVS log

Up to [LON-CAPA] / loncom

version 1.30, 2007/06/12 23:48:45	version 1.32, 2007/08/03 18:18:05
Line 341 sub getmaximaoutput {	Line 341 sub getmaximaoutput {
}	}
$output =~ s/\r+//g; # Remove Windows-style linebreaks	$output =~ s/\r+//g; # Remove Windows-style linebreaks
my $foundoutput=0;	my $foundoutput=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=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }
(my $label, $line) = ($line=~ /^($\%o\d+$)(.+)$/);	if ($line=~ /^($\%o\d+$)(.+)$/){
if ($label) {	my $label = $1;
$label=~s/\S/ /g;	$line = $2;
	$label =~s/\S/ /g;
$line=$label.$line;	$line=$label.$line;
	$found_label=1;
	}
	if ($found_label) {
	$realoutput.=$line."\n";
}	}
$realoutput.=$line."\n";
}	}
if (wantarray) {	if (wantarray) {
return ($realoutput,$syntaxerr);	return ($realoutput,$syntaxerr);