Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
We need to provide explicit signatures for pir::ops now; this was mos…
…tly happening, and this tweaks the rest, hopefully.
  • Loading branch information
jnthn committed Jul 21, 2012
1 parent b2aa14b commit f9b1ed7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/core/Buf.pm
Expand Up @@ -9,7 +9,7 @@ my class X::Buf::Pack::NonASCII { ... };
my class Buf does Positional {
has Mu $!buffer;
method BUILD() {
$!buffer := pir::new__PS('ByteBuffer');
$!buffer := pir::new__Ps('ByteBuffer');
1;
}
method new(*@codes) {
Expand Down Expand Up @@ -158,7 +158,7 @@ multi prefix:<~^>(Buf:D $a) {
}
multi infix:<~>(Buf:D $a, Buf:D $b) {
my Buf $r := nqp::create(Buf);
my Mu $br := pir::new__PS('ByteBuffer');
my Mu $br := pir::new__Ps('ByteBuffer');

my Mu $ba := nqp::getattr(nqp::p6decont($a), Buf, '$!buffer');
my Mu $bb := nqp::getattr(nqp::p6decont($b), Buf, '$!buffer');
Expand Down
6 changes: 3 additions & 3 deletions src/core/Exception.pm
Expand Up @@ -20,7 +20,7 @@ my class Exception {
}

method throw() is hidden_from_backtrace {
nqp::bindattr(self, Exception, '$!ex', pir::new('Exception'))
nqp::bindattr(self, Exception, '$!ex', pir::new__Ps('Exception'))
unless nqp::defined($!ex);
pir::setattribute__vPsP($!ex, 'payload', nqp::p6decont(self));
my $msg := self.?message;
Expand Down Expand Up @@ -189,15 +189,15 @@ do {
$comp.HOW.add_method($comp, 'handle-exception',
method (|$) {
my Mu $ex := nqp::atpos(pir::perl6_current_args_rpa__P(), 1);
pir::perl6_invoke_catchhandler(&print_exception, $ex);
pir::perl6_invoke_catchhandler__vPP(&print_exception, $ex);
nqp::exit(1);
0;
}
);
$comp.HOW.add_method($comp, 'handle-control',
method (|$) {
my Mu $ex := nqp::atpos(pir::perl6_current_args_rpa__P(), 1);
pir::perl6_invoke_catchhandler(&print_control, $ex);
pir::perl6_invoke_catchhandler__vPP(&print_control, $ex);
nqp::rethrow($ex);
}
);
Expand Down
2 changes: 1 addition & 1 deletion src/core/control.pm
Expand Up @@ -134,7 +134,7 @@ multi sub die(*@msg) is hidden_from_backtrace {
}

multi sub warn(*@msg) is hidden_from_backtrace {
my $ex := pir::new('Exception');
my $ex := pir::new__Ps('Exception');
pir::setattribute__0PPsP($ex, Exception, 'message', @msg.join(''));
pir::setattribute__0PPsP($ex, Exception, 'type', nqp::p6box_i(pir::const::CONTROL_OK));
pir::setattribute__0PPsP($ex, Exception, 'severity', nqp::p6box_i(pir::const::EXCEPT_WARNING));
Expand Down
4 changes: 2 additions & 2 deletions src/core/terms.pm
Expand Up @@ -73,7 +73,7 @@ sub term:<time>() { nqp::p6box_i(nqp::time_i()) }

my $I := nqp::atkey(nqp::atkey(%*COMPILING, '%?OPTIONS'), 'I');
if nqp::defined($I) {
if pir::does($I, 'array') {
if pir::does__IPs($I, 'array') {
my Mu $iter := nqp::iterator($I);
@INC.unshift: nqp::p6box_s(nqp::shift($iter)) while $iter;
}
Expand All @@ -84,7 +84,7 @@ sub term:<time>() { nqp::p6box_i(nqp::time_i()) }

nqp::bindkey(pir::get_who__PP(PROCESS), '@INC', @INC);

my $PID = nqp::p6box_i(pir::getinterp.getpid());
my $PID = nqp::p6box_i(pir::getinterp__P().getpid());
nqp::bindkey(pir::get_who__PP(PROCESS), '$PID', $PID);

my $OS = $VM<config><osname>; # XXX: master gets this information with the sysinfo dynop
Expand Down

0 comments on commit f9b1ed7

Please sign in to comment.