3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove smart match and lexical $_ for compatibility with perl 5.18. #1216

Browse Source
This commit is contained in:
Alessandro Ranellucci 2013-06-06 10:46:58 +02:00
parent 8c40cefe1e
commit 43814e99f6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r/Config.pm
View File

@ -1141,7 +1141,7 @@ sub set {
my ($opt_key, $value, $deserialize) = @_; my ($opt_key, $value, $deserialize) = @_;
# handle legacy options # handle legacy options
return if $opt_key ~~ @Ignore; return if first { $_ eq $opt_key } @Ignore;
if ($opt_key =~ /^(extrusion_width|bottom_layer_speed|first_layer_height)_ratio$/) { if ($opt_key =~ /^(extrusion_width|bottom_layer_speed|first_layer_height)_ratio$/) {
$opt_key = $1; $opt_key = $1;
$opt_key =~ s/^bottom_layer_speed$/first_layer_speed/; $opt_key =~ s/^bottom_layer_speed$/first_layer_speed/;
@ -1413,7 +1413,7 @@ sub read_ini {
my $ini = { _ => {} }; my $ini = { _ => {} };
my $category = '_'; my $category = '_';
while (my $_ = <$fh>) { while (<$fh>) {
s/\R+$//; s/\R+$//;
next if /^\s+/; next if /^\s+/;
next if /^$/; next if /^$/;

2
lib/Slic3r/Format/OBJ.pm
View File

@ -8,7 +8,7 @@ sub read_file {
Slic3r::open(\my $fh, '<', $file) or die "Failed to open $file\n"; Slic3r::open(\my $fh, '<', $file) or die "Failed to open $file\n";
my $vertices = []; my $vertices = [];
my $facets = []; my $facets = [];
while (my $_ = <$fh>) { while (<$fh>) {
if (/^v ([^ ]+)\s+([^ ]+)\s+([^ ]+)/) { if (/^v ([^ ]+)\s+([^ ]+)\s+([^ ]+)/) {
push @$vertices, [$1, $2, $3]; push @$vertices, [$1, $2, $3];
} elsif (/^f (\d+).*? (\d+).*? (\d+).*?/) { } elsif (/^f (\d+).*? (\d+).*? (\d+).*?/) {

4
lib/Slic3r/Format/STL.pm
View File

@ -53,7 +53,7 @@ sub _read_ascii {
my $facet; my $facet;
my %vertices_map = (); my %vertices_map = ();
seek $fh, 0, 0; seek $fh, 0, 0;
while (my $_ = <$fh>) { while (<$fh>) {
if (!$facet) { if (!$facet) {
/^\s*facet\s+normal\s+/ or next; /^\s*facet\s+normal\s+/ or next;
$facet = []; # ignore normal $facet = []; # ignore normal
@ -88,7 +88,7 @@ sub _read_binary {
my %vertices_map = (); my %vertices_map = ();
binmode $fh; binmode $fh;
seek $fh, 80 + 4, 0; seek $fh, 80 + 4, 0;
while (read $fh, my $_, 4*4*3+2) { while (read $fh, $_, 4*4*3+2) {
push @$facets, my $facet = []; push @$facets, my $facet = [];
for (unpack 'x[f3](a[f3])3') { # ignore normal for (unpack 'x[f3](a[f3])3') { # ignore normal
my $vertex_idx; my $vertex_idx;