Merge branch 'master' into tt1931-nci-parameters-deprecation

MANIFEST

@@ -78,7 +78,6 @@ compilers/opsc/src/Ops/Emitter.pm                           [opsc]
 compilers/opsc/src/Ops/File.pm                              [opsc]
 compilers/opsc/src/Ops/Op.pm                                [opsc]
 compilers/opsc/src/Ops/OpLib.pm                             [opsc]
-compilers/opsc/src/Ops/Renumberer.pm                        [opsc]
 compilers/opsc/src/Ops/Trans.pm                             [opsc]
 compilers/opsc/src/Ops/Trans/C.pm                           [opsc]
 compilers/opsc/src/builtins.pir                             [opsc]
@@ -1160,7 +1159,6 @@ runtime/parrot/library/distutils.pir                        [library]
 runtime/parrot/library/dumper.pir                           [library]
 runtime/parrot/library/libpcre.pir                          [library]
 runtime/parrot/library/ncurses.declarations                 [library]
-runtime/parrot/library/ncurses.pasm                         [library]
 runtime/parrot/library/ncurses.pir                          [library]
 runtime/parrot/library/openssl.declarations                 [library]
 runtime/parrot/library/osutils.pir                          [library]
@@ -2077,7 +2075,6 @@ t/tools/install/testlib/phony                               [test]
 t/tools/install/testlib/phony.exe                           [test]
 t/tools/install/testlib/runtime/parrot/include/sockets.pasm [test]
 t/tools/install/testlib/runtime/parrot/library/TGE.pbc      [test]
-t/tools/install/testlib/src/ops/ops.num                     [test]
 t/tools/install/testlib/src/pmc/pmc_object.h                [test]
 t/tools/install/testlib/tools/build/ops2c.pl                [test]
 t/tools/install/testlib/vtable.dump                         [test]

compilers/opsc/Defines.mak

@@ -9,8 +9,7 @@ OPSC_SOURCES_GENERATED = \
 	$(OPSC_DIR)/gen/Ops/Trans/C.pir \
 	$(OPSC_DIR)/gen/Ops/Op.pir \
 	$(OPSC_DIR)/gen/Ops/OpLib.pir \
-	$(OPSC_DIR)/gen/Ops/File.pir \
-	$(OPSC_DIR)/gen/Ops/Renumberer.pir
+	$(OPSC_DIR)/gen/Ops/File.pir
 
 OPSC_SOURCES = \
 	$(OPSC_DIR)/opsc.pir \

compilers/opsc/Rules.mak

@@ -28,9 +28,6 @@ $(OPSC_DIR)/gen/Ops/Trans.pir: $(OPSC_DIR)/src/Ops/Trans.pm $(NQP_RX)
 $(OPSC_DIR)/gen/Ops/Trans/C.pir: $(OPSC_DIR)/src/Ops/Trans/C.pm $(NQP_RX)
 	$(NQP_RX) --target=pir --output=$@ $(OPSC_DIR)/src/Ops/Trans/C.pm
 
-$(OPSC_DIR)/gen/Ops/Renumberer.pir: $(OPSC_DIR)/src/Ops/Renumberer.pm $(NQP_RX)
-	$(NQP_RX) --target=pir --output=$@ $(OPSC_DIR)/src/Ops/Renumberer.pm
-
 # Target to force rebuild opsc from main Makefile
 $(OPSC_DIR)/ops2c.nqp: $(LIBRARY_DIR)/opsc.pbc
 

compilers/opsc/opsc.pir

@@ -15,8 +15,6 @@
 .include 'compilers/opsc/gen/Ops/Op.pir'
 .include 'compilers/opsc/gen/Ops/OpLib.pir'
 .include 'compilers/opsc/gen/Ops/File.pir'
-.include 'compilers/opsc/gen/Ops/Renumberer.pir'
-
 
 .namespace []
 .sub 'main' :main

compilers/opsc/src/Ops/OpLib.pm

@@ -45,9 +45,8 @@ Reference to a 'seen-hash' of skipped opcodes.
     # ...
   },
 
-As F<src/ops/ops.skip> states, these are "... opcodes that could be listed in
-F<[src/ops/]ops.num> but aren't ever to be generated or implemented because
-they are useless and/or silly."
+As F<src/ops/ops.skip> states, these are "... opcodes that should not ever to be
+generated or implemented because they are useless and/or silly."
 
 =back
 
@@ -83,7 +82,7 @@ method new(:$skip_file, :$quiet? = 0) {
 
 =item C<load_op_map_files>
 
-Load ops.num and ops.skip files.
+Load ops.skip.
 
 =end METHODS
 

examples/library/ncurses_life.pir

@@ -884,8 +884,8 @@ key_done:
 
 =head1 SEE ALSO
 
-F<examples/library/acorn.life>, F<examples/pasm/life.pasm>,
-F<runtime/parrot/library/ncurses.pasm>,
+F<examples/library/acorn.life>, F<examples/pir/life.pir>,
+F<runtime/parrot/library/ncurses.pir>,
 F<runtime/parrot/library/ncurses.declarations>.
 
 =head1 NOTE

include/parrot/pmc.h

@@ -141,11 +141,12 @@ PARROT_EXPORT
 PARROT_CANNOT_RETURN_NULL
 PARROT_IGNORABLE_RESULT
 PMC * Parrot_pmc_reuse(PARROT_INTERP,
-    ARGIN(PMC *pmc),
+    ARGMOD(PMC *pmc),
     INTVAL new_type,
     NULLOK(UINTVAL flags))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
+        __attribute__nonnull__(2)
+        FUNC_MODIFIES(*pmc);
 
 PARROT_EXPORT
 PARROT_CANNOT_RETURN_NULL
@@ -163,13 +164,14 @@ PARROT_EXPORT
 PARROT_CANNOT_RETURN_NULL
 PARROT_IGNORABLE_RESULT
 PMC * Parrot_pmc_reuse_init(PARROT_INTERP,
-    ARGIN(PMC *pmc),
+    ARGMOD(PMC *pmc),
     INTVAL new_type,
     ARGIN(PMC *init),
     NULLOK(UINTVAL flags))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
-        __attribute__nonnull__(4);
+        __attribute__nonnull__(4)
+        FUNC_MODIFIES(*pmc);
 
 void Parrot_pmc_free_temporary(PARROT_INTERP, ARGMOD(PMC *pmc))
         __attribute__nonnull__(1)

lib/Parrot/Manifest.pm

@@ -239,7 +239,6 @@ sub _get_special {
         languages/t/harness                             [test]
         lib/File/Which.pm                               [devel]lib
         parrot-config                                   [main]bin
-        src/ops/ops.num                                 [devel]src
         src/vtable.tbl                                  [devel]src
         tools/build/ops2c.pl                            [devel]
         tools/build/pmc2c.pl                            [devel]

lib/Parrot/Pmc2c/PMC.pm

@@ -576,8 +576,8 @@ EOH
     }
     $h->emit("${export}VTABLE* Parrot_${name}_get_vtable(PARROT_INTERP);\n");
     $h->emit("${export}VTABLE* Parrot_${name}_ro_get_vtable(PARROT_INTERP);\n");
-    $h->emit("${export}PMC*    Parrot_${name}_get_mro(PARROT_INTERP, ARGIN_NULLOK(PMC* mro));\n");
-    $h->emit("${export}Hash*   Parrot_${name}_get_isa(PARROT_INTERP, ARGIN_NULLOK(Hash* isa));\n");
+    $h->emit("${export}PMC*    Parrot_${name}_get_mro(PARROT_INTERP, ARGMOD(PMC* mro));\n");
+    $h->emit("${export}Hash*   Parrot_${name}_get_isa(PARROT_INTERP, ARGMOD_NULLOK(Hash* isa));\n");
 
 
     $self->gen_attributes;
@@ -1185,8 +1185,8 @@ EOC
 
         $cout .= <<"EOC";
         {
-            STRING *method_name = CONST_STRING_GEN(interp, "$symbol_name");
-            STRING *signature   = CONST_STRING_GEN(interp, "$pcc_signature");
+            STRING * const method_name = CONST_STRING_GEN(interp, "$symbol_name");
+            STRING * const signature   = CONST_STRING_GEN(interp, "$pcc_signature");
             register_native_pcc_method_in_ns(interp, entry,
                 F2DPTR(Parrot_${classname}_${method_name}),
                 method_name, signature);
@@ -1349,7 +1349,7 @@ sub get_mro_func {
 $export
 PARROT_CANNOT_RETURN_NULL
 PARROT_WARN_UNUSED_RESULT
-PMC* Parrot_${classname}_get_mro(PARROT_INTERP, ARGIN_NULLOK(PMC* mro)) {
+PMC* Parrot_${classname}_get_mro(PARROT_INTERP, ARGMOD(PMC* mro)) {
     if (PMC_IS_NULL(mro)) {
         mro = Parrot_pmc_new(interp, enum_class_ResizableStringArray);
     }
@@ -1478,8 +1478,8 @@ $export
 PARROT_CANNOT_RETURN_NULL
 PARROT_WARN_UNUSED_RESULT
 VTABLE* Parrot_${classname}_get_vtable_pointer(PARROT_INTERP) {
-    STRING *type_name = Parrot_str_new_constant(interp, "${classname}");
-    INTVAL  type_num  = Parrot_pmc_get_type_str(interp, type_name);
+    STRING * const type_name = Parrot_str_new_constant(interp, "${classname}");
+    const INTVAL type_num  = Parrot_pmc_get_type_str(interp, type_name);
     return interp->vtables[type_num];
 }
 

lib/Parrot/Pmc2c/PMC/default.pm

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Parrot Foundation.
+# Copyright (C) 2007-2011, Parrot Foundation.
 
 =head1 NAME
 
@@ -53,8 +53,10 @@ sub gen_methods {
         if ($vt_method_name eq 'find_method') {
             # Generate default_ro_find_method.
             $self->{emitter}->emit(<<'EOC');
+PARROT_CANNOT_RETURN_NULL
+PARROT_WARN_UNUSED_RESULT
 static  PMC *
-Parrot_default_ro_find_method(PARROT_INTERP, PMC *_self, STRING *method_name) {
+Parrot_default_ro_find_method(PARROT_INTERP, ARGMOD(PMC *_self), ARGMOD(STRING *method_name)) {
     /* Use non-readonly find_method. Current vtable is ro variant. So ro_variant contains non-ro variant */
     PMC *const method = _self->vtable->ro_variant_vtable->find_method(interp, _self, method_name);
     if (!PMC_IS_NULL(VTABLE_getprop(interp, method, CONST_STRING_GEN(interp, "write"))))

ports/debian/changelog

@@ -1,3 +1,38 @@
+parrot (3.3.0-1) unstable; urgency=low
+  * New upstream release (Closes: #612664)
+  * debian/control.in:
+    - Bumped Standards-Version to 3.9.2.
+  * debian/rules
+    - Patch from upstream explicitly sets mandir to /usr/share/man,
+      to comply with Debian policy (Closes: #610994)
+    - Updated locations of parrot_debugger, pbc_dump, and
+      pbc_merge in new release for manpage generation (patch from
+      Kyle Willmon and Dominique Dumont)
+    - Removed explicit references to quilt, patch application is
+      handled by dpkg-source with source package format "3.0 (quilt)"
+      (patch from Dominique Dumont)
+  * debian/patches:
+    - Removed 04_fix_opsc_man.patch, change included upstream (patch
+      from Kyle Willmon)
+    - Removed 05_fix_gc_ftbfs_ia64.patch, change included
+      upstream (patch from Kyle Willmon and Dominique Dumont)
+    - Added patch description to 03_fix_nqp_man.patch.
+  * debian/copyright:
+    - Updated the format to DEP5 (patch from Dominique Dumont)
+  * debian/source:
+    - Added source package format "3.0 (quilt)" (patch from Dominique
+      Dumont)
+  * debian/README.source:
+    - Removed, no longer needed with source package format "3.0 (quilt)"
+      (patch from Dominique Dumont)
+  * debian/parrot-devel.install:
+    - Removed runtime library Protoobject.pbc, no longer exists upstream.
+  * debian/parrot-doc:
+    - Replaced DEPRECATED.pod with api.yaml, filename and format
+      changed upstream.
+
+ -- Allison Randal <allison@parrot.org>  Sat, 30 Apr 2011 02:39:12 -0700
+
 parrot (2.9.1-1) unstable; urgency=low
   * New upstream release (Closes: #601704)
   * debian/rules:

ports/debian/control

@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Debian Parrot Maintainers <pkg-parrot-devel@lists.alioth.debian.org>
 Uploaders: Allison Randal <allison@parrot.org>, Nuno Carvalho <mestre.smash@gmail.com>, Patrick Michaud <pmichaud@pobox.com>
 Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libreadline-dev, quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: parrot
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, parrot-minimal (= ${binary:Version})
 Suggests: parrot-doc
 Provides: parrot-test, parrot-data-dumper
-Description: A virtual machine for dynamic languages
+Description: virtual machine for dynamic languages
  Parrot is a bytecode-based virtual machine designed for dynamic languages.
  Parrot hosts a variety of language implementations, including Tcl, Javascript,
  Ruby, Lua, Scheme, PHP, Python, Perl 6, and a .NET bytecode translator.
@@ -21,12 +21,12 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: parrot ( << 1.0.0 )
 Replaces: parrot ( << 1.0.0 )
-Description: A minimal install of the Parrot VM
+Description: minimal install of the Parrot VM
  This package contains the core Parrot virtual machine. It's all that you need
  to get up and running in the average use case, and is sufficient to run most
  language implementations.
 
-Package: libparrot2.9.1
+Package: libparrot3.3.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -37,7 +37,7 @@ Description: Parrot shared library
 Package: libparrot-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libparrot2.9.1 (= ${binary:Version}), parrot
+Depends: ${misc:Depends}, libparrot3.3.0 (= ${binary:Version}), parrot
 Description: Parrot shared library development files
  This package contains header files and a static library, needed to develop
  applications which embed Parrot.