Module: gas-preprocessor Branch: master Commit: 8cb9332cbbec71f0f4182b90df1c3cfbae7fb77b
Author: Martin Storsjo <[email protected]> Committer: Martin Storsjo <[email protected]> Date: Tue Jul 23 11:06:17 2013 +0300 Explicitly check the $line variable in all conditions in parse_if_line This avoids the hidden assumption that the parameter passed is also available in $_. --- gas-preprocessor.pl | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl index b7c51c0..38b3d5b 100755 --- a/gas-preprocessor.pl +++ b/gas-preprocessor.pl @@ -179,7 +179,7 @@ sub parse_if_line { # evaluate .if blocks if (scalar(@ifstack)) { - if (/\.endif/) { + if ($line =~ /\.endif/) { pop(@ifstack); return 1; } elsif ($line =~ /\.elseif\s+(.*)/) { @@ -189,7 +189,7 @@ sub parse_if_line { $ifstack[-1] = -$ifstack[-1]; } return 1; - } elsif (/\.else/) { + } elsif ($line =~ /\.else/) { $ifstack[-1] = !$ifstack[-1]; return 1; } elsif (handle_if($line)) { @@ -513,7 +513,6 @@ foreach my $line (@pass1_lines) { my $line = $origline; $line =~ s/\\$irp_param/$i/g; $line =~ s/\\\(\)//g; # remove \() - $_ = $line; if (!parse_if_line($line) && !handle_if($line)) { print ASMFILE $line; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
