Author: tewk
Date: Fri Mar 23 18:13:41 2007
New Revision: 17700
Modified:
trunk/compilers/pge/PGE/pmc/codestring.pmc
trunk/lib/Parrot/Pmc2c/PCCMETHOD.pm
trunk/src/pmc/metaattribute.pmc
trunk/src/pmc/metaclass.pmc
trunk/src/pmc/pccmethod_test.pmc
trunk/src/pmc/role.pmc
trunk/src/pmc/smop_attribute.pmc
trunk/src/pmc/smop_class.pmc
Log:
[PCCMETHOD] preturn -> PCCRETURN
Modified: trunk/compilers/pge/PGE/pmc/codestring.pmc
==============================================================================
--- trunk/compilers/pge/PGE/pmc/codestring.pmc (original)
+++ trunk/compilers/pge/PGE/pmc/codestring.pmc Fri Mar 23 18:13:41 2007
@@ -182,7 +182,7 @@
if (has_format && format != PMCNULL) {
id = Parrot_sprintf_c(interp, "%Ss%Ss", format, id);
}
- preturn(STRING* id);
+ PCCRETURN(STRING* id);
}
/*
Modified: trunk/lib/Parrot/Pmc2c/PCCMETHOD.pm
==============================================================================
--- trunk/lib/Parrot/Pmc2c/PCCMETHOD.pm (original)
+++ trunk/lib/Parrot/Pmc2c/PCCMETHOD.pm Fri Mar 23 18:13:41 2007
@@ -205,25 +205,25 @@
}
}
-=head3 C<rewrite_preturns($method, $body)>
+=head3 C<rewrite_PCCRETURNs($method, $body)>
-Rewrites the method body performing the various macro substitutions for
preturns.
+Rewrites the method body performing the various macro substitutions for
PCCRETURNs.
=cut
-sub rewrite_preturns {
+sub rewrite_PCCRETURNs {
my ( $self, $body ) = @_;
my $method_name = $self->{meth};
my $regs_used = [];
my $signature_re = qr{
- (preturn #method name
+ (PCCRETURN #method name
\s* #optional whitespace
\( ([^\(]*) \) #returns ( stuff ... )
;?) #optional semicolon
}sx;
if ( $body and $body =~ m/\breturn\b/ ) {
- croak "return not allowed in pccmethods, use preturn instead";
+ croak "return not allowed in pccmethods, use PCCRETURN instead";
}
while ( $$body and $$body =~ m/$signature_re/ ) {
@@ -355,7 +355,7 @@
my ( $params_n_regs_used, $params_indexes, $params_flags,
$params_accessors, $named_names ) =
process_pccmethod_args( $linear_args, 'arg' );
- my $n_regs = rewrite_preturns( $self, \$self->{body} );
+ my $n_regs = rewrite_PCCRETURNs( $self, \$self->{body} );
rewrite_pccinvoke( $self->{meth}, \$self->{body} );
unshift @$n_regs, $params_n_regs_used;
my $n_regs_used = find_max_regs($n_regs);
Modified: trunk/src/pmc/metaattribute.pmc
==============================================================================
--- trunk/src/pmc/metaattribute.pmc (original)
+++ trunk/src/pmc/metaattribute.pmc Fri Mar 23 18:13:41 2007
@@ -126,7 +126,7 @@
}
name_attr = attr->name;
- preturn(STRING *name_attr);
+ PCCRETURN(STRING *name_attr);
}
/*
@@ -147,7 +147,7 @@
}
type_string = attr->type;
- preturn(STRING *type_string);
+ PCCRETURN(STRING *type_string);
}
}
Modified: trunk/src/pmc/metaclass.pmc
==============================================================================
--- trunk/src/pmc/metaclass.pmc (original)
+++ trunk/src/pmc/metaclass.pmc Fri Mar 23 18:13:41 2007
@@ -227,7 +227,7 @@
PCCMETHOD void attributes() {
Parrot_MetaClass *class = PARROT_METACLASS(SELF);
PMC *ret_attrib_metadata = VTABLE_clone(interp,
class->attrib_metadata);
- preturn(PMC *ret_attrib_metadata);
+ PCCRETURN(PMC *ret_attrib_metadata);
}
@@ -287,7 +287,7 @@
}
ret_name = class->name;
- preturn(STRING *ret_name);
+ PCCRETURN(STRING *ret_name);
}
/*
@@ -329,7 +329,7 @@
}
ret_namespace = class->namespace;
- preturn(PMC *ret_namespace);
+ PCCRETURN(PMC *ret_namespace);
}
/*
@@ -371,7 +371,7 @@
/* XXX Call constructor with the supplied arguments? */
- preturn(PMC *obj)
+ PCCRETURN(PMC *obj)
}
@@ -387,7 +387,7 @@
PCCMETHOD void parents() {
Parrot_MetaClass *class = PARROT_METACLASS(SELF);
PMC *ret_parents = VTABLE_clone(interp, class->parents);
- preturn(PMC *ret_parents);
+ PCCRETURN(PMC *ret_parents);
}
/*
@@ -458,7 +458,7 @@
PCCMETHOD void roles() {
Parrot_MetaClass *class = PARROT_METACLASS(SELF);
PMC *ret_roles = VTABLE_clone(interp, class->roles);
- preturn(PMC *ret_roles);
+ PCCRETURN(PMC *ret_roles);
}
/*
@@ -508,7 +508,7 @@
}
}
- preturn(int index);
+ PCCRETURN(int index);
}
/*
@@ -539,7 +539,7 @@
}
}
- preturn(PMC *found);
+ PCCRETURN(PMC *found);
}
Modified: trunk/src/pmc/pccmethod_test.pmc
==============================================================================
--- trunk/src/pmc/pccmethod_test.pmc (original)
+++ trunk/src/pmc/pccmethod_test.pmc Fri Mar 23 18:13:41 2007
@@ -66,7 +66,7 @@
PIO_printf(interp, "test_method2\n");
PIO_printf(interp, "%d, %d, %Ss %Ss\n", a1, a1o, VTABLE_name(interp,
slurpy_pos), VTABLE_get_repr(interp,slurpy_pos));
- preturn(int 1000, STRING* kevin);
+ PCCRETURN(int 1000, STRING* kevin);
}
PCCMETHOD void test_method3(PMC* a1 :named["a1name"], PMC* a2
:named["a2name"])
{
Modified: trunk/src/pmc/role.pmc
==============================================================================
--- trunk/src/pmc/role.pmc (original)
+++ trunk/src/pmc/role.pmc Fri Mar 23 18:13:41 2007
@@ -129,7 +129,7 @@
PCCMETHOD void attributes() {
Parrot_Role *role = PARROT_ROLE(SELF);
PMC *ret_attrib_metadata = VTABLE_clone(interp, role->attrib_metadata);
- preturn(PMC *ret_attrib_metadata);
+ PCCRETURN(PMC *ret_attrib_metadata);
}
@@ -175,7 +175,7 @@
}
ret_name = role->name;
- preturn(STRING *ret_name);
+ PCCRETURN(STRING *ret_name);
}
/*
@@ -217,7 +217,7 @@
}
ret_namespace = role->namespace;
- preturn(PMC *ret_namespace);
+ PCCRETURN(PMC *ret_namespace);
}
/*
@@ -232,7 +232,7 @@
PCCMETHOD void roles() {
Parrot_Role *role = PARROT_ROLE(SELF);
PMC *ret_roles = VTABLE_clone(interp, role->roles);
- preturn(PMC *ret_roles);
+ PCCRETURN(PMC *ret_roles);
}
/*
Modified: trunk/src/pmc/smop_attribute.pmc
==============================================================================
--- trunk/src/pmc/smop_attribute.pmc (original)
+++ trunk/src/pmc/smop_attribute.pmc Fri Mar 23 18:13:41 2007
@@ -94,7 +94,7 @@
SMOP_attr(SELF)->name = VTABLE_get_string(interp, name);
}
name_attr = SMOP_attr(SELF)->name;
- preturn( STRING *name_attr );
+ PCCRETURN( STRING *name_attr );
}
/*
@@ -111,7 +111,7 @@
SMOP_attr(SELF)->class_ = class;
}
class_attr = SMOP_attr(SELF)->class_;
- preturn( PMC *class_attr );
+ PCCRETURN( PMC *class_attr );
}
/*
@@ -128,7 +128,7 @@
SMOP_attr(SELF)->type_ = VTABLE_get_string(interp, type);
}
type_string = SMOP_attr(SELF)->type_;
- preturn( STRING *type_string );
+ PCCRETURN( STRING *type_string );
}
}
Modified: trunk/src/pmc/smop_class.pmc
==============================================================================
--- trunk/src/pmc/smop_class.pmc (original)
+++ trunk/src/pmc/smop_class.pmc Fri Mar 23 18:13:41 2007
@@ -145,7 +145,7 @@
(STRING* name) = PCCINVOKE(interp, SELF, "name");
type_id = pmc_type(interp, name);
obj = pmc_new_init(interp,type_id, args);
- preturn(PMC *obj)
+ PCCRETURN(PMC *obj)
}
PCCMETHOD void attributes(PMC *attribs :optional, int got_attribs
:opt_flag) {
@@ -163,7 +163,7 @@
}
}
rv = VTABLE_get_attr_str(interp, pmc, attributes_string);
- preturn(PMC *rv)
+ PCCRETURN(PMC *rv)
}
PCCMETHOD void add_attribute(STRING *attribute_name, STRING*
attribute_type :optional, int got_type :opt_flag) {
