Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,9 @@ public static void visitOperator(BytecodeCompiler bytecodeCompiler, OperatorNode
}
case "rand" -> {
int rd = bytecodeCompiler.allocateOutputRegister();
if (node.operand != null) {
node.operand.accept(bytecodeCompiler);
if (node.operand != null
&& !(node.operand instanceof ListNode listNode && listNode.elements.isEmpty())) {
compileScalarOperand(bytecodeCompiler, node, "rand");
int maxReg = bytecodeCompiler.lastResultReg;
bytecodeCompiler.emit(Opcodes.RAND);
bytecodeCompiler.emitReg(rd);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ public static int executeRand(int[] bytecode, int pc, RuntimeBase[] registers) {
int rd = bytecode[pc++];
int maxReg = bytecode[pc++];

RuntimeScalar max = (RuntimeScalar) registers[maxReg];
RuntimeScalar max = registers[maxReg].scalar();
registers[rd] = Random.rand(max);
return pc;
}
Expand Down
28 changes: 28 additions & 0 deletions src/test/resources/unit/rand_scalar_context.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
use strict;
use warnings;
use Test::More tests => 4;

my @values = qw(a b c d);
my $limit = rand @values;
ok($limit >= 0 && $limit < @values, 'rand uses array argument in scalar context');

my $aref = [qw(a b c d)];
my $picked = $aref->[rand @$aref];
my $found = grep { $_ eq $picked } @$aref;
ok($found, 'rand uses array dereference argument in scalar context');

my $code = q{
sub {
my %retval = @_;
my $stuff;
$stuff = ["aaa".."aaj"];
$retval{Alpha} ||= $stuff->[rand @$stuff];
return \%retval;
}
};

my $generate = eval $code;
ok($generate, 'eval-generated sub with rand array dereference compiles');

my $thing = $generate->();
like($thing->{Alpha}, qr/^aa[a-j]$/, 'eval-generated rand array dereference returns an element');
Loading