fish: reduce code (#449)

mknos · web-flow · commit 8edad6952f5b · 2024-02-11T02:30:54.000-05:00
* Init the deck without a loop
* Loop in fisher_yates_shuffle() can be written without a "next" statement; swap if unequal
diff --git a/bin/fish b/bin/fish
@@ -149,8 +149,7 @@ sub fisher_yates_shuffle { # From The Perl Cookbook, recipe 4.17
 	my $i;
 	for($i=@$array; --$i;) {
 		my $j=int rand ($i+1);
-		next if $i==$j;
-		@$array[$i,$j]=@$array[$j,$i];
+		@$array[$i,$j] = @$array[$j,$i] if $i != $j;
 	}
 }
 
@@ -180,8 +179,7 @@ if ($status=~/^y/i) {
 	print "Press <return>"; $status=<STDIN>;
 }
 
-@DECK=split(//, 'A'x4 . 'K'x4 . 'Q'x4 . 'J'x4);
-foreach(1..4) {foreach(2..10) { push(@DECK, $_) } }
+@DECK = qw(A K Q J 10 9 8 7 6 5 4 3 2) x 4;
 fisher_yates_shuffle(\@DECK);
 
 foreach(1..7) {

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ sub fisher_yates_shuffle { # From The Perl Cookbook, recipe 4.17`
`149`	`149`	`my $i;`
`150`	`150`	`for($i=@$array; --$i;) {`
`151`	`151`	`my $j=int rand ($i+1);`
`152`		`- next if $i==$j;`
`153`		`- @$array[$i,$j]=@$array[$j,$i];`
	`152`	`+ @$array[$i,$j] = @$array[$j,$i] if $i != $j;`
`154`	`153`	`}`
`155`	`154`	`}`
`156`	`155`
`@@ -180,8 +179,7 @@ if ($status=~/^y/i) {`
`180`	`179`	`print "Press <return>"; $status=<STDIN>;`
`181`	`180`	`}`
`182`	`181`
`183`		`-@DECK=split(//, 'A'x4 . 'K'x4 . 'Q'x4 . 'J'x4);`
`184`		`-foreach(1..4) {foreach(2..10) { push(@DECK, $_) } }`
	`182`	`+@DECK = qw(A K Q J 10 9 8 7 6 5 4 3 2) x 4;`
`185`	`183`	`fisher_yates_shuffle(\@DECK);`
`186`	`184`
`187`	`185`	`foreach(1..7) {`