Permalink
Browse files

resolve api.yaml conflict after merge from master

  • Loading branch information...
2 parents acb29d9 + 176a244 commit fc2545569b9a46820d13fb38a98f0032c1b8be6c @Whiteknight Whiteknight committed Jul 7, 2011
View
@@ -2128,7 +2128,7 @@ tools/dev/as2c.pl []
tools/dev/bench_op.pir []
tools/dev/create_language.pl [devel]
tools/dev/debian_docs.sh []
-tools/dev/dedeprecator []
+tools/dev/dedeprecator.nqp []
tools/dev/dump_pbc.pl []
tools/dev/faces.pl []
tools/dev/fetch_languages.pl []
View
4 NEWS
@@ -3,6 +3,10 @@ New in 3.6.0
+ Class.add_vtable_override now allows you to overwrite an override
+ Integers, floats and strings can now be stored in lexical variables.
Previously, only PMCs could be stored in lexicals.
+ + VTABLE_substr has been removed. VTABLE_substr_str has been renamed to
+ VTABLE_substr
+- Languages
+ + Winxed has migrated to Github: https://github.com/NotFound/winxed
New in 3.5.0
- Core
View
@@ -486,3 +486,13 @@
tags :
- 'experimental'
ticket : 'http://trac.parrot.org/parrot/ticket/2145'
+-
+ name : 'Eval PMC'
+ tags:
+ - 'deprecated'
+ ticket: 'http://trac.parrot.org/parrot/ticket/1969'
+-
+ name : 'PackFile_* API functions'
+ tags :
+ - 'deprecated'
+ ticket : 'http://trac.parrot.org/parrot/ticket/2140'
@@ -758,15 +758,28 @@ nodes of type C<PAST::Stmts>.
.param pmc options :slurpy :named
.local pmc ops
- .local string rtype
+ .local string rtype, signature
rtype = options['rtype']
+
+ signature = node.'signature'()
+ if signature goto have_signature
$P0 = node.'list'()
$I0 = elements $P0
- $S0 = repeat 'v', $I0
- $S0 = concat $S0, rtype
- ops = self.'post_children'(node, 'signature'=>$S0)
- $P0 = ops[-1]
- ops.'result'($P0)
+ signature = repeat 'v', $I0
+ signature = concat signature, rtype
+ have_signature:
+ ops = self.'post_children'(node, 'signature'=>signature)
+ .local pmc result
+ result = ops[-1]
+ $S0 = substr signature, 0, 1
+ $I0 = index '0123456789', $S0
+ if $I0 < 0 goto have_result
+ result = ops[$I0]
+ have_result:
+ ops.'result'(result)
+ unless rtype goto rtype_done
+ ops = self.'coerce'(ops, rtype)
+ rtype_done:
.local pmc eh
eh = node.'handlers'()
unless eh, no_eh
@@ -125,6 +125,20 @@ variable is being used in an lvalue context.
.end
+=item signature([signature])
+
+Get/set the signature to be used for evaluating any
+children nodes.
+
+=cut
+
+.sub 'signature' :method
+ .param pmc value :optional
+ .param int has_value :opt_flag
+ .tailcall self.'attr'('signature', value, has_value)
+.end
+
+
=item childorder([order])
Get/set the order in which children nodes should be evaluated
View
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Parrot Foundation.
+# Copyright (C) 2007-2011, Parrot Foundation.
=head1 NAME
@@ -149,6 +149,7 @@ sub _init {
-Wunknown-pragmas
-Wvariadic-macros
-Wwrite-strings
+ -Wstack-usage=500
);
$gcc->{'basic'} = [ @gcc_or_gpp ];
@@ -1342,7 +1342,7 @@ src/global_setup$(O) : $(PARROT_H_HEADERS) \
src/namespace$(O) : $(PARROT_H_HEADERS) src/namespace.str src/namespace.c \
include/pmc/pmc_sub.h
-src/pmc$(O) : include/pmc/pmc_class.h src/pmc.c \
+src/pmc$(O) : include/pmc/pmc_class.h include/pmc/pmc_integer.h src/pmc.c \
src/pmc.str $(PARROT_H_HEADERS)
src/packfile/object_serialization$(O) : $(PARROT_H_HEADERS) src/packfile/object_serialization.str src/packfile/object_serialization.c
View
@@ -1379,8 +1379,6 @@ The list may also be augmented if additional functionality is required.
=item C<Parrot_PMC_substr>
-=item C<Parrot_PMC_substr_str>
-
=item C<Parrot_PMC_subtract>
=item C<Parrot_PMC_subtract_float>
View
@@ -1356,8 +1356,7 @@ modifying the value of I<self>.
=item substr
- void substr(INTERP, PMC *self, INTVAL offset, INTVAL length, PMC *dest)
- STRING* substr_str(INTERP, PMC *self, INTVAL offset, INTVAL length)
+ STRING* substr(INTERP, PMC *self, INTVAL offset, INTVAL length)
Extracts the string starting at I<offset> with size I<length> and return
it as a PMC in I<dest> or as a string return value.
@@ -702,11 +702,6 @@ strings, and -1 if the passed in string argument is shorter.
=item substr
Extract a substring of a given length starting from a given offset (in
-graphemes) and store the result in the string argument.
-
-=item substr_str
-
-Extract a substring of a given length starting from a given offset (in
graphemes) and return the string.
=item exists_keyed
Oops, something went wrong.

0 comments on commit fc25455

Please sign in to comment.