Skip to content

Commit 7cd42ab

Browse files
committed
consider src/vm/parrot/NQP/Ops.nqp on parrot too
1 parent b2836cb commit 7cd42ab

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

t/docs/opcodes.t

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ my %documented_ops := find_documented_opcodes();
77
my %ops := hash_of_vms();
88

99
%ops<jvm> := find_opcodes(
10-
:file("src/vm/jvm/QAST/Compiler.nqp"),
10+
:files(["src/vm/jvm/QAST/Compiler.nqp"]),
1111
:keywords(<map_classlib_core_op add_core_op map_jvm_core_op>)
1212
);
1313

1414
%ops<parrot> := find_opcodes(
15-
:file("src/vm/parrot/QAST/Operations.nqp"),
16-
:keywords(<add_core_op add_core_pirop_mapping>)
15+
:files([
16+
"src/vm/parrot/QAST/Operations.nqp",
17+
"src/vm/parrot/NQP/Ops.nqp"
18+
]),
19+
:keywords(<add_core_op add_core_pirop_mapping add_hll_op>)
1720
);
1821

1922
%ops<moar> := find_opcodes(
20-
:file("src/vm/moar/QAST/QASTOperationsMAST.nqp"),
23+
:files(["src/vm/moar/QAST/QASTOperationsMAST.nqp"]),
2124
:keywords(<add_core_op add_core_moarop_mapping>)
2225
);
2326

@@ -53,14 +56,17 @@ for @*vms -> $vm {
5356
}
5457
}
5558

56-
sub find_opcodes(:$file, :@keywords) {
59+
sub find_opcodes(:@files, :@keywords) {
5760
my %ops := nqp::hash();
58-
my @lines := nqp::split("\n", nqp::readallfh(nqp::open($file,"r")));
59-
for @lines -> $line {
60-
next unless $line ~~ / @keywords /;
61-
$line := nqp::split("'", $line)[1];
62-
next unless nqp::chars($line);
63-
%ops{$line} := 1;
61+
for @files -> $file {
62+
my @lines := nqp::split("\n", nqp::readallfh(nqp::open($file,"r")));
63+
for @lines -> $line {
64+
next unless $line ~~ / @keywords /;
65+
my @pieces := nqp::split("'", $line);
66+
$line := @pieces[1] eq 'nqp' ?? @pieces[3] !! @pieces[1];
67+
next unless nqp::chars($line);
68+
%ops{$line} := 1;
69+
}
6470
}
6571
return %ops;
6672
}

0 commit comments

Comments
 (0)