Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bump NQP_REVISION and fix ast/past incompatibility
  • Loading branch information
timo committed Feb 15, 2014
1 parent ca35ec8 commit 06fee3d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Perl6/Actions.nqp
Expand Up @@ -391,7 +391,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
QAST::SVal.new( :value('GLOBAL') ),
QAST::WVal.new( :value($*GLOBALish) )
);
$*W.add_fixup_task(:deserialize_past($global_install), :fixup_past($global_install));
$*W.add_fixup_task(:deserialize_ast($global_install), :fixup_ast($global_install));

# Get the block for the entire compilation unit.
my $outer := $*UNIT_OUTER;
Expand Down
10 changes: 5 additions & 5 deletions src/Perl6/World.nqp
Expand Up @@ -320,7 +320,7 @@ class Perl6::World is HLL::World {
)
)
);
self.add_load_dependency_task(:deserialize_past($fixup), :fixup_past($fixup));
self.add_load_dependency_task(:deserialize_ast($fixup), :fixup_ast($fixup));

return nqp::ctxlexpad($setting);
}
Expand All @@ -342,7 +342,7 @@ class Perl6::World is HLL::World {
$opt_hash.push(QAST::SVal.new( :value($_.key) ));
$opt_hash.push(QAST::WVal.new( :value($_.value) ));
}
self.add_load_dependency_task(:deserialize_past(QAST::Stmts.new(
self.add_load_dependency_task(:deserialize_ast(QAST::Stmts.new(
self.perl6_module_loader_code(),
QAST::Op.new(
:op('callmethod'), :name('load_module'),
Expand Down Expand Up @@ -1098,7 +1098,7 @@ class Perl6::World is HLL::World {
nqp::bindattr($code, $routine_type, '$!package', $*PACKAGE);
}

self.add_fixup_task(:deserialize_past($des), :fixup_past($fixups));
self.add_fixup_task(:deserialize_ast($des), :fixup_ast($fixups));
$code;
}

Expand All @@ -1120,7 +1120,7 @@ class Perl6::World is HLL::World {
)
)
);
self.add_fixup_task(:fixup_past($fixups), :deserialize_past($fixups));
self.add_fixup_task(:fixup_ast($fixups), :deserialize_ast($fixups));
}

# Generates code for running phasers.
Expand Down Expand Up @@ -2413,7 +2413,7 @@ class Perl6::World is HLL::World {
# Adds various bits of initialization that must always be done early on.
method add_initializations() {
if self.is_precompilation_mode() {
self.add_load_dependency_task(:deserialize_past(QAST::VM.new(
self.add_load_dependency_task(:deserialize_ast(QAST::VM.new(
:parrot(QAST::Stmts.new(
QAST::VM.new( :pirop('nqp_dynop_setup v') ),
QAST::VM.new( :pirop('nqp_bigint_setup v') ),
Expand Down
2 changes: 1 addition & 1 deletion tools/build/NQP_REVISION
@@ -1 +1 @@
2014.01-30-g13ef89d
2014.01-41-g15869c8

0 comments on commit 06fee3d

Please sign in to comment.