Skip to content

Commit

Permalink
Revert updates for Parrot 2.0.0 for now.
Browse files Browse the repository at this point in the history
Will re-apply when we have a more-complete update.
  • Loading branch information
tene committed Jan 20, 2010
1 parent d0de156 commit 3881a5a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/PARROT_REVISION
@@ -1 +1 @@
43473 1.9.0
43076 1.9.0
8 changes: 4 additions & 4 deletions src/binder/bind.c
Expand Up @@ -6,7 +6,7 @@ Copyright (C) 2009, The Perl Foundation.
#define PARROT_IN_EXTENSION
#include "parrot/parrot.h"
#include "parrot/extend.h"
#include "pmc_callcontext.h"
#include "pmc_context.h"
#include "bind.h"
#include "../pmc/pmc_p6lowlevelsig.h"

Expand Down Expand Up @@ -440,11 +440,11 @@ Rakudo_binding_bind_signature(PARROT_INTERP, PMC *lexpad, PMC *signature,
}
}

/* If we've got a CallContext, just has an attribute with list of named
/* If we've got a CallSignature, just has an attribute with list of named
* parameter names. Otherwise, it's a Capture and we need to do .hash and
* grab out the keys. */
if (capture->vtable->base_type == enum_class_CallContext ||
VTABLE_isa(interp, capture, string_from_literal(interp, "CallContext"))) {
if (capture->vtable->base_type == enum_class_CallSignature ||
VTABLE_isa(interp, capture, string_from_literal(interp, "CallSignature"))) {
named_names = VTABLE_get_attr_str(interp, capture, string_from_literal(interp, "named"));
}
else if (VTABLE_isa(interp, capture, string_from_literal(interp, "Capture"))) {
Expand Down
4 changes: 2 additions & 2 deletions src/ops/perl6.ops
Expand Up @@ -10,7 +10,7 @@ BEGIN_OPS_PREAMBLE
#include "parrot/dynext.h"
#include "pmc_object.h"
#include "pmc_class.h"
#include "pmc_callcontext.h"
#include "pmc_callsignature.h"
#include "../pmc/pmc_p6lowlevelsig.h"
#include "../binder/bind.h"

Expand Down Expand Up @@ -596,7 +596,7 @@ inline op get_signature_elem(in PMC, in INT, out STR, out INT, out PMC, out PMC,
This is emitted into a sub to cause it's Perl 6 signature to be bound. $1 is
an array of positional arguments (obtained by using :flat) and $2 is a hash of
named arguments (obtained using :flat :slurpy). Eventually, after Parrot
refactors are complete, it will take one argument - the CallContext.
refactors are complete, it will take one argument - the CallSignature.

=cut

Expand Down

0 comments on commit 3881a5a

Please sign in to comment.