[svn:parrot] r40431 - in branches/auto_attrs: . compilers/pge/PGE config/auto/sizes docs/book/draft docs/dev docs/pdds examples/embed examples/languages/abc examples/languages/squaak examples/pge include/parrot ports/cpan ports/cygwin ports/debian ports/fedora ports/mandriva ports/suse runtime/parrot/languages runtime/parrot/library/Math src src/call src/gc src/interp src/runcore t/compilers/tge t/oo t/src tools/dev tools/util

NotFound at svn.parrot.org NotFound at svn.parrot.org
Thu Aug 6 20:33:43 UTC 2009


Author: NotFound
Date: Thu Aug  6 20:33:41 2009
New Revision: 40431
URL: https://trac.parrot.org/parrot/changeset/40431

Log:
merge from trunk r40430

Modified:
   branches/auto_attrs/   (props changed)
   branches/auto_attrs/DEPRECATED.pod
   branches/auto_attrs/compilers/pge/PGE/Match.pir
   branches/auto_attrs/config/auto/sizes/intval_maxmin_c.in   (props changed)
   branches/auto_attrs/docs/book/draft/README   (props changed)
   branches/auto_attrs/docs/book/draft/appa_glossary.pod   (props changed)
   branches/auto_attrs/docs/book/draft/appb_patch_submission.pod   (props changed)
   branches/auto_attrs/docs/book/draft/appc_command_line_options.pod   (props changed)
   branches/auto_attrs/docs/book/draft/appd_build_options.pod   (props changed)
   branches/auto_attrs/docs/book/draft/appe_source_code.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch01_introduction.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch02_getting_started.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch04_compiler_tools.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch05_pge.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch06_nqp.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch07_dynpmcs.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch08_dynops.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch10_opcode_reference.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch11_directive_reference.pod   (props changed)
   branches/auto_attrs/docs/book/draft/ch12_operator_reference.pod   (props changed)
   branches/auto_attrs/docs/book/draft/chXX_hlls.pod   (props changed)
   branches/auto_attrs/docs/book/draft/chXX_library.pod   (props changed)
   branches/auto_attrs/docs/book/draft/chXX_testing_and_debugging.pod   (props changed)
   branches/auto_attrs/docs/dev/c_functions.pod   (props changed)
   branches/auto_attrs/docs/pdds/pdd30_install.pod   (props changed)
   branches/auto_attrs/examples/embed/cotorra.c   (props changed)
   branches/auto_attrs/examples/languages/abc/   (props changed)
   branches/auto_attrs/examples/languages/squaak/   (props changed)
   branches/auto_attrs/examples/pge/demo.pir   (props changed)
   branches/auto_attrs/include/parrot/call.h   (props changed)
   branches/auto_attrs/include/parrot/gc_api.h   (props changed)
   branches/auto_attrs/include/parrot/oo.h
   branches/auto_attrs/include/parrot/runcore_api.h   (props changed)
   branches/auto_attrs/include/parrot/runcore_trace.h   (props changed)
   branches/auto_attrs/ports/cpan/pause_guide.pod   (props changed)
   branches/auto_attrs/ports/cygwin/parrot-1.0.0-1.cygport   (props changed)
   branches/auto_attrs/ports/debian/libparrot-dev.install.in   (props changed)
   branches/auto_attrs/ports/debian/libparrot.install.in   (props changed)
   branches/auto_attrs/ports/debian/parrot-doc.install.in   (props changed)
   branches/auto_attrs/ports/debian/parrot.install.in   (props changed)
   branches/auto_attrs/ports/fedora/parrot.spec.fedora   (props changed)
   branches/auto_attrs/ports/mandriva/parrot.spec.mandriva   (props changed)
   branches/auto_attrs/ports/suse/parrot.spec.suse   (props changed)
   branches/auto_attrs/runtime/parrot/languages/   (props changed)
   branches/auto_attrs/runtime/parrot/library/Math/Rand.pir   (props changed)
   branches/auto_attrs/src/call/ops.c   (props changed)
   branches/auto_attrs/src/call/pcc.c   (props changed)
   branches/auto_attrs/src/gc/alloc_memory.c   (props changed)
   branches/auto_attrs/src/gc/alloc_register.c   (props changed)
   branches/auto_attrs/src/gc/alloc_resources.c   (props changed)
   branches/auto_attrs/src/gc/api.c   (props changed)
   branches/auto_attrs/src/gc/generational_ms.c   (props changed)
   branches/auto_attrs/src/gc/incremental_ms.c   (props changed)
   branches/auto_attrs/src/gc/malloc.c   (props changed)
   branches/auto_attrs/src/gc/malloc_trace.c   (props changed)
   branches/auto_attrs/src/gc/mark_sweep.c   (props changed)
   branches/auto_attrs/src/gc/system.c   (props changed)
   branches/auto_attrs/src/interp/inter_cb.c   (props changed)
   branches/auto_attrs/src/interp/inter_create.c   (props changed)
   branches/auto_attrs/src/interp/inter_misc.c   (props changed)
   branches/auto_attrs/src/oo.c
   branches/auto_attrs/src/runcore/cores.c   (props changed)
   branches/auto_attrs/src/runcore/main.c   (props changed)
   branches/auto_attrs/src/runcore/trace.c   (props changed)
   branches/auto_attrs/t/compilers/tge/NoneGrammar.tg   (props changed)
   branches/auto_attrs/t/oo/root_new.t   (props changed)
   branches/auto_attrs/t/src/embed.t   (props changed)
   branches/auto_attrs/tools/dev/fetch_languages.pl   (props changed)
   branches/auto_attrs/tools/dev/mk_gitignore.pl   (props changed)
   branches/auto_attrs/tools/util/perlcritic-cage.conf   (props changed)

Modified: branches/auto_attrs/DEPRECATED.pod
==============================================================================
--- branches/auto_attrs/DEPRECATED.pod	Thu Aug  6 18:05:37 2009	(r40430)
+++ branches/auto_attrs/DEPRECATED.pod	Thu Aug  6 20:33:41 2009	(r40431)
@@ -250,12 +250,6 @@
 
 L<https://trac.parrot.org/parrot/ticket/843>
 
-=item C<find_key> method on PGE::Match [eligible in 1.5]
-
-The C<find_key> method on PGE::Match objects will be removed.
-
-L<https://trac.parrot.org/parrot/ticket/851>
-
 =back
 
 =head2 Parrot Compiler Toolkit

Modified: branches/auto_attrs/compilers/pge/PGE/Match.pir
==============================================================================
--- branches/auto_attrs/compilers/pge/PGE/Match.pir	Thu Aug  6 18:05:37 2009	(r40430)
+++ branches/auto_attrs/compilers/pge/PGE/Match.pir	Thu Aug  6 20:33:41 2009	(r40431)
@@ -278,40 +278,6 @@
 .end
 
 
-=item C<find_key([ key1, key2, ... ])>
-
-Find the first of C<key1>, C<key2>, etc. in the current
-Match object, and return it.  Returns '' if none of
-the specified keys are found.  If no keys are specified,
-then simply return the first key found.
-
-=cut
-
-.sub 'find_key' :method
-    .param pmc keys            :slurpy
-    if null keys goto first_key
-    unless keys goto first_key
-  loop:
-    unless keys goto not_found
-    $S0 = shift keys
-    $I0 = exists self[$S0]
-    unless $I0 goto loop
-    .return ($S0)
-  first_key:
-    $P0 = self.'hash'()
-    $P1 = iter $P0
-    unless $P1 goto not_found
-  next:
-    $S0 = shift $P1
-    $P2 = $P0[$S0]
-    $I0 = isa $P2, 'Capture'
-    unless $I0 goto next
-    .return ($S0)
-  not_found:
-    .return ('')
-.end
-
-
 =item C<_failcut(int cutvalue)>
 
 Immediately "fail" this Match object, removing any

Modified: branches/auto_attrs/include/parrot/oo.h
==============================================================================
--- branches/auto_attrs/include/parrot/oo.h	Thu Aug  6 18:05:37 2009	(r40430)
+++ branches/auto_attrs/include/parrot/oo.h	Thu Aug  6 20:33:41 2009	(r40431)
@@ -106,6 +106,16 @@
 PARROT_EXPORT
 PARROT_CAN_RETURN_NULL
 PARROT_WARN_UNUSED_RESULT
+PMC * Parrot_oo_find_vtable_override_for_class(PARROT_INTERP,
+    ARGIN(PMC *classobj),
+    ARGIN(STRING *name))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2)
+        __attribute__nonnull__(3);
+
+PARROT_EXPORT
+PARROT_CAN_RETURN_NULL
+PARROT_WARN_UNUSED_RESULT
 PMC * Parrot_oo_get_class(PARROT_INTERP, ARGIN(PMC *key))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -154,15 +164,6 @@
 
 PARROT_CAN_RETURN_NULL
 PARROT_WARN_UNUSED_RESULT
-PMC * Parrot_oo_find_vtable_override_for_class(PARROT_INTERP,
-    ARGIN(PMC *classobj),
-    ARGIN(STRING *name))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3);
-
-PARROT_CAN_RETURN_NULL
-PARROT_WARN_UNUSED_RESULT
 PMC * Parrot_oo_get_namespace(SHIM_INTERP, ARGIN(const PMC *classobj))
         __attribute__nonnull__(2);
 
@@ -210,6 +211,11 @@
 #define ASSERT_ARGS_Parrot_invalidate_method_cache \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
+#define ASSERT_ARGS_Parrot_oo_find_vtable_override_for_class \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(interp) \
+    || PARROT_ASSERT_ARG(classobj) \
+    || PARROT_ASSERT_ARG(name)
 #define ASSERT_ARGS_Parrot_oo_get_class __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(key)
@@ -235,11 +241,6 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(classobj) \
     || PARROT_ASSERT_ARG(name)
-#define ASSERT_ARGS_Parrot_oo_find_vtable_override_for_class \
-     __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(classobj) \
-    || PARROT_ASSERT_ARG(name)
 #define ASSERT_ARGS_Parrot_oo_get_namespace __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(classobj)
 #define ASSERT_ARGS_Parrot_oo_new_object_attrs __attribute__unused__ int _ASSERT_ARGS_CHECK = \

Modified: branches/auto_attrs/src/oo.c
==============================================================================
--- branches/auto_attrs/src/oo.c	Thu Aug  6 18:05:37 2009	(r40430)
+++ branches/auto_attrs/src/oo.c	Thu Aug  6 20:33:41 2009	(r40431)
@@ -481,6 +481,7 @@
 
 */
 
+PARROT_EXPORT
 PARROT_CAN_RETURN_NULL
 PARROT_WARN_UNUSED_RESULT
 PMC *


More information about the parrot-commits mailing list