Skip to content

Commit 4619313

Browse files
committed
Move Lexpad HLL mapping to where it probably shoulda gone in the first place.
1 parent e96422c commit 4619313

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/HLL/SerializationContextBuilder.pm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,12 @@ class HLL::Compiler::SerializationContextBuilder {
300300
),
301301
PAST::Stmts.new(
302302
PAST::Op.new( :pirop('nqp_dynop_setup v') ),
303+
PAST::Op.new(
304+
:pasttype('callmethod'), :name('hll_map'),
305+
PAST::Op.new( :pirop('getinterp P') ),
306+
PAST::Op.new( :pirop('get_class Ps'), 'LexPad' ),
307+
PAST::Op.new( :pirop('get_class Ps'), 'NQPLexPad' )
308+
),
303309
PAST::Op.new( :pirop('load_bytecode vs'), 'nqpmo.pbc' ),
304310
PAST::Op.new(
305311
:pasttype('bind'),

src/NQP/Actions.pm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ class NQP::Actions is HLL::Actions {
6363

6464
# Need to load the NQP dynops/dympmcs.
6565
$unit.loadlibs('nqp_group', 'nqp_ops');
66-
$unit.unshift(PAST::Op.new(
67-
:pasttype('callmethod'), :name('hll_map'),
68-
PAST::Op.new( :pirop('getinterp P') ),
69-
PAST::Op.new( :pirop('get_class Ps'), 'LexPad' ),
70-
PAST::Op.new( :pirop('get_class Ps'), 'NQPLexPad' )
71-
));
7266

7367
# If we have a MAIN sub, call it at end of mainline.
7468
if $*MAIN_SUB {

0 commit comments

Comments
 (0)