Merge remote-tracking branch 'origin/master' into threads

parrot · Nov 18, 2012 · 524efde · 524efde
2 parents c73ae65 + 1cc9caa
commit 524efde
Show file tree

Hide file tree

Showing 28 changed files with 55 additions and 39 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -32,8 +32,6 @@
           running.pod [GH #838]
     - Tools
         + Improved gdb pretty-printing for multi-byte strings
-    - Tests
-    - Community
 
 2012-09-18    release 4.8.0
     - Core

diff --git a/MANIFEST.generated b/MANIFEST.generated
@@ -2,14 +2,14 @@
 # See tools/dev/install_files.pl for documentation on the
 # format of this file.
 # Please re-sort this file after *EVERY* modification
-blib/lib/libparrot.4.8.0.dylib                   [main]lib
+blib/lib/libparrot.4.9.0.dylib                   [main]lib
 blib/lib/libparrot.a                             [main]lib
 blib/lib/libparrot.dylib                         [main]lib
 blib/lib/libparrot.so                            [main]lib
-blib/lib/libparrot.so.4.8.0                      [main]lib
+blib/lib/libparrot.so.4.9.0                      [main]lib
 compilers/data_json/data_json.pbc                [data_json]
 config/gen/call_list/opengl.in                   []
-cygparrot-4.8.0.dll                              [main]bin
+cygparrot-4.9.0.dll                              [main]bin
 docs/ops/bit.pod                                 [doc]
 docs/ops/cmp.pod                                 [doc]
 docs/ops/core.pod                                [doc]

diff --git a/README.pod b/README.pod
@@ -4,7 +4,7 @@
 
 =head1 NAME
 
-README.pod - Readme to Parrot, version 4.8.0.
+README.pod - Readme to Parrot, version 4.9.0.
 
 =head1 DESCRIPTION
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.8.0
+4.9.0
diff --git a/config/auto/perldoc.pm b/config/auto/perldoc.pm
@@ -20,6 +20,7 @@ use strict;
 use warnings;
 
 use File::Temp qw (tempfile );
+use File::Spec qw (catfile );
 use base qw(Parrot::Configure::Step);
 use Parrot::Configure::Utils ':auto';
 
@@ -35,8 +36,7 @@ sub _init {
 sub runstep {
     my ( $self, $conf ) = @_;
 
-    my $slash = $conf->data->get('slash');
+    my $cmd = File::Spec->catfile($conf->data->get('scriptdirexp_provisional'), q{perldoc});
-    my $cmd = $conf->data->get('scriptdirexp_provisional') . $slash . q{perldoc};
     my ( $fh, $filename ) = tempfile( UNLINK => 1 );
     my $content = capture_output("$cmd -ud $filename perldoc") || undef;
 

diff --git a/config/auto/warnings.pm b/config/auto/warnings.pm
@@ -327,6 +327,11 @@ sub runstep {
         push @{$self->{'warnings'}{$compiler}{'basic'}},
             '-fvisibility=hidden';
     };
+
+    # icu4.4 has a uset_openEmpty() declaration without (void)
+    $self->{'warnings'}{$compiler}{'never'}{'-Werror=strict-prototypes'} =
+        [ 'src/string/encoding/shared.c' ];
+
     if ($conf->data->get('clang') and $compiler eq 'g++') { # clang++
         $self->{'warnings'}{'g++'}{'override'} = {
             '-Wno-parentheses-equality' => [ qw(

diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -607,7 +607,7 @@ MAKE_C = @make_c@
 .c$(O) : # suffix rule (limited support)
 	$(CC) $(CFLAGS) @optimize@ $(CC_WARN) -I$(@D) -Isrc/ @cc_o_out@$@ -c $<
 .c.i : # suffix rule (limited support)
-	$(CC) -E $(CFLAGS) -I$(@D) -Isrc/ @cc_o_out@$@ -c $<
+	$(CC) -E $(CFLAGS) -I$(@D) -Isrc/ @cc_o_out@$@ $<
 
 #UNLESS(win32):.s$(O) : # suffix rule (limited support)
 #UNLESS(win32):	$(CC) $(CFLAGS) @optimize@ $(CC_WARN) -I$(@D) @cc_o_out@$@ -c $<
@@ -1992,11 +1992,13 @@ src/string/encoding/tables$(O) : \
 	src/string/encoding/tables.h \
 	src/string/encoding/tables.c
 
+## SUFFIX OVERRIDE
 src/string/encoding/shared$(O) : \
-	$(PARROT_H_HEADERS) \
+  $(PARROT_H_HEADERS) \
-	src/string/encoding/shared.h \
+  src/string/encoding/shared.h \
-	src/string/encoding/shared.c \
+  src/string/encoding/shared.c \
-	src/string/encoding/tables.h
+  src/string/encoding/tables.h
+	$(CC) $(CFLAGS) @optimize::src/string/encoding/shared.c@ @ccwarn::src/string/encoding/shared.c@ @cc_shared@ -I$(@D) @cc_o_out@$@ -c src/string/encoding/shared.c
 
 src/string/encoding/null$(O) : \
 	$(PARROT_H_HEADERS) \

diff --git a/docs/parrothist.pod b/docs/parrothist.pod
@@ -147,5 +147,6 @@ Starred release numbers indicate supported releases.
  rurban      4.6.0 *        2012-Jul-17     "Wild Parrots of Telegraph Hill"
  Whiteknight 4.7.0          2012-Aug-22     "Hispaniolan"
  alvis       4.8.0          2012-Sep-18     "Spix's Macaw"
+ dukeleto    4.9.0 *        2012-Oct-16     "Proto-Hydra"
 
 =cut
diff --git a/docs/project/release_manager_guide.pod b/docs/project/release_manager_guide.pod
@@ -413,9 +413,9 @@ on L<http://www.parrot.org>.
 
 =item 1
 
-Create a new page for the release announcement by navigating to I<Create content>
+Create a new page for the release announcement by navigating to going to
--> I<Story>. There's some additional stuff needed at the top of the page; use one of the
+L<https://www.parrot.org/node/add/story>. There's some additional stuff needed
-old announcements as a guide.
+at the top of the page; use one of the old announcements as a guide.
 
 The "<!--break-->" line marks the end of the text that will appear on the front page.
 
@@ -544,7 +544,6 @@ The calendar of releases is available at the C<comp.lang.parrot> Google
 calendar, visible at
 L<http://www.google.com/calendar/render?cid=ldhctdamsgfg5a1cord52po9h8@group.calendar.google.com>.
 
-    - Oct 16, 2012 - 4.9.0   - dukeleto
     - Nov 20, 2012 - 4.10.0  - rurban
     - Dec 18, 2012 - 4.11.0  - ??
     - Jan 15, 2013 - 5.0.0   - dukeleto

diff --git a/include/parrot/oplib/core_ops.h b/include/parrot/oplib/core_ops.h
@@ -19,7 +19,7 @@
 #include "parrot/runcore_api.h"
 
 PARROT_EXPORT
-op_lib_t *Parrot_DynOp_core_4_8_0(PARROT_INTERP, long init);
+op_lib_t *Parrot_DynOp_core_4_9_0(PARROT_INTERP, long init);
 
  opcode_t * Parrot_end(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_noop(opcode_t *, PARROT_INTERP);

diff --git a/lib/Parrot/Pmc2c/Pmc2cMain.pm b/lib/Parrot/Pmc2c/Pmc2cMain.pm
@@ -92,8 +92,9 @@ sub new {
     die "Must have key 'args' which is a reference to a list of the remaining arguments"
         unless ( defined $allargsref->{args} and ref( $allargsref->{args} ) eq q{ARRAY} );
 
+    my $base = File::Spec->catdir($allargsref->{bin},'..','..');
     unshift @{ $allargsref->{include} },
-        '.', "$allargsref->{bin}/../..", "$allargsref->{bin}/../../src/pmc", "$allargsref->{bin}/../../src/dynpmc";
+      '.', $base, File::Spec->catdir($base,'src','pmc'), File::Spec->catdir($base,'src','dynpmc');
 
     foreach my $opt ( qw(nolines) ) {
         if ( !defined $allargsref->{opt}{$opt} ) {

diff --git a/lib/Parrot/Pmc2c/VTable.pm b/lib/Parrot/Pmc2c/VTable.pm
@@ -6,6 +6,7 @@ use warnings;
 use Storable ();
 use Parrot::Vtable ();
 use Parrot::Pmc2c::Method ();
+use File::Spec ();
 use File::Basename;
 use Cwd qw(cwd);
 
@@ -51,8 +52,9 @@ sub dump {
     my ($self) = @_;
 
     my $dump_filename =
-          cwd() . q{/}
+          File::Spec->catfile( cwd(),
-        . basename( Parrot::Pmc2c::UtilFunctions::filename( $self->filename, '.dump' ) );
+            basename( Parrot::Pmc2c::UtilFunctions::filename( $self->filename, '.dump' ) )
+          );
     Storable::nstore( $self, $dump_filename );
     return $dump_filename;
 }

diff --git a/src/ops/core.ops b/src/ops/core.ops
@@ -567,7 +567,7 @@ inline op result_info(out PMC) {
             Parrot_str_new_constant(interp, "return_flags"));
 
     /* If no elements, hand back empty array; otherwise PMC. */
-    if (!sig)
+    if (PMC_IS_NULL(sig))
         $1 = Parrot_pmc_new(interp, enum_class_FixedIntegerArray);
     else
         $1 = sig;

diff --git a/src/ops/core_ops.c b/src/ops/core_ops.c
@@ -13795,13 +13795,15 @@ Parrot_local_return_p(opcode_t *cur_opcode, PARROT_INTERP) {
 
 opcode_t *
 Parrot_jump_i(opcode_t *cur_opcode, PARROT_INTERP) {
-    opcode_t * const loc = INTVAL2PTR(opcode_t *, IREG(1));
+    opcode_t  * const  loc = INTVAL2PTR(opcode_t *, IREG(1));
+
     return (opcode_t *)loc;
 }
 
 opcode_t *
 Parrot_jump_ic(opcode_t *cur_opcode, PARROT_INTERP) {
-    opcode_t * const loc = INTVAL2PTR(opcode_t *, ICONST(1));
+    opcode_t  * const  loc = INTVAL2PTR(opcode_t *, ICONST(1));
+
     return (opcode_t *)loc;
 }
 
@@ -14028,7 +14030,7 @@ Parrot_result_info_p(opcode_t *cur_opcode, PARROT_INTERP) {
     PMC  * const  caller_ctx = Parrot_pcc_get_caller_ctx(interp, CURRENT_CONTEXT(interp));
     PMC  * const  sig = VTABLE_get_attr_str(interp, caller_ctx, Parrot_str_new_constant(interp, "return_flags"));
 
-    if ((!sig)) {
+    if (PMC_IS_NULL(sig)) {
         PREG(1) = Parrot_pmc_new(interp, enum_class_FixedIntegerArray);
     }
     else {
@@ -24567,7 +24569,7 @@ op_lib_t core_op_lib = {
   PARROT_FUNCTION_CORE,                       /* core_type = PARROT_XX_CORE */
   0,                                /* flags */
   4,    /* major_version */
-  8,    /* minor_version */
+  9,    /* minor_version */
   0,    /* patch_version */
   1129,             /* op_count */
   core_op_info_table,       /* op_info_table */
@@ -24696,7 +24698,7 @@ static void hop_deinit(PARROT_INTERP)
     hop_buckets = NULL;
 }PARROT_EXPORT
 op_lib_t *
-Parrot_DynOp_core_4_8_0(PARROT_INTERP, long init) {
+Parrot_DynOp_core_4_9_0(PARROT_INTERP, long init) {
     /* initialize and return op_lib ptr */
     if (init == 1) {
 
@@ -24725,7 +24727,7 @@ Parrot_lib_core_ops_load(PARROT_INTERP)
 
 {
     PMC *const lib = Parrot_pmc_new(interp, enum_class_ParrotLibrary);
-    ((Parrot_ParrotLibrary_attributes*)PMC_data(lib))->oplib_init = (void *) Parrot_DynOp_core_4_8_0;
+    ((Parrot_ParrotLibrary_attributes*)PMC_data(lib))->oplib_init = (void *) Parrot_DynOp_core_4_9_0;
     dynop_register(interp, lib);
     return lib;
 }

diff --git a/src/pmc/callcontext.pmc b/src/pmc/callcontext.pmc
@@ -1019,8 +1019,9 @@ return current Namespace
         else
             Parrot_ex_throw_from_c_args(INTERP, NULL,
                 EXCEPTION_ATTRIB_NOT_FOUND, "No such attribute '%S'", key);
-
+        if (value)
-        return value;
+            return value;
+        return PMCNULL;
     }
 
     VTABLE INTVAL elements() {

diff --git a/src/pmc/filehandle.pmc b/src/pmc/filehandle.pmc
@@ -146,6 +146,7 @@ Mark active filehandle data as live.
         Parrot_gc_mark_STRING_alive(INTERP, attrs->mode);
         Parrot_gc_mark_STRING_alive(INTERP, attrs->filename);
         Parrot_gc_mark_STRING_alive(INTERP, attrs->encoding);
+        Parrot_gc_mark_STRING_alive(INTERP, attrs->record_separator);
         Parrot_io_buffer_mark(interp, attrs->read_buffer);
         Parrot_io_buffer_mark(interp, attrs->write_buffer);
     }

diff --git a/src/pmc/socket.pmc b/src/pmc/socket.pmc
@@ -99,6 +99,8 @@ Mark active socket handle data as live.
         if (data) {
             Parrot_gc_mark_PMC_alive(INTERP, data->local);
             Parrot_gc_mark_PMC_alive(INTERP, data->remote);
+            Parrot_gc_mark_STRING_alive(INTERP, data->encoding);
+            Parrot_gc_mark_STRING_alive(INTERP, data->record_separator);
             Parrot_io_buffer_mark(interp, data->read_buffer);
             Parrot_io_buffer_mark(interp, data->write_buffer);
         }

diff --git a/src/pmc/stringhandle.pmc b/src/pmc/stringhandle.pmc
@@ -136,6 +136,7 @@ Mark active stringhandle data as live.
         Parrot_gc_mark_STRING_alive(INTERP, data_struct->mode);
         Parrot_gc_mark_STRING_alive(INTERP, data_struct->encoding);
         Parrot_gc_mark_STRING_alive(INTERP, data_struct->filename);
+        Parrot_gc_mark_STRING_alive(INTERP, data_struct->record_separator);
         Parrot_io_buffer_mark(interp, data_struct->read_buffer);
         Parrot_io_buffer_mark(interp, data_struct->write_buffer);
     }

diff --git a/t/native_pbc/annotations.pbc b/t/native_pbc/annotations.pbc
diff --git a/t/native_pbc/integer.pbc b/t/native_pbc/integer.pbc
diff --git a/t/native_pbc/integer_4.pbc b/t/native_pbc/integer_4.pbc
diff --git a/t/native_pbc/number.pbc b/t/native_pbc/number.pbc
diff --git a/t/native_pbc/number_4.pbc b/t/native_pbc/number_4.pbc
diff --git a/t/native_pbc/number_5.pbc b/t/native_pbc/number_5.pbc
diff --git a/t/native_pbc/string.pbc b/t/native_pbc/string.pbc
diff --git a/t/native_pbc/string_4.pbc b/t/native_pbc/string_4.pbc
diff --git a/tools/build/pmc2c.pl b/tools/build/pmc2c.pl
@@ -5,8 +5,9 @@
 use warnings;
 use Getopt::Long ();
 use FindBin qw($Bin);
-use lib "$Bin/../lib";    # install location
+use File::Spec ();
-use lib "$Bin/../../lib"; # build location
+use lib File::Spec->catdir($Bin,'..','lib');    # install location
+use lib File::Spec->catdir($Bin,'..','..','lib'); # build location
 use Parrot::Pmc2c::Pmc2cMain ();
 
 my ( %action, %options, @pmc_include_paths );
@@ -42,7 +43,7 @@
 );
 
 if ( $action{default} ) {
-    $self->dump_vtable("$Bin/../../src/vtable.tbl");
+    $self->dump_vtable(File::Spec->catfile($Bin,'..','..','src','vtable.tbl'));
     exit;
 }
 

diff --git a/tools/release/release.json b/tools/release/release.json
@@ -1,8 +1,8 @@
 {
-    "release.version"  : "4.8.0",
+    "release.version"  : "4.9.0",
-    "release.name"     : "Spix's Macaw",
+    "release.name"     : "Proto-Hydra",
     "release.day"      : "Tuesday",
-    "release.nextdate" : "16 October 2012",
+    "release.nextdate" : "12 November 2012",
 
     "web.root"         : "http://parrot.org/",
     "web.source"       : "download",
@@ -11,10 +11,10 @@
     "web.org_root"    :  "https://github.com/parrot",
 
     "bugday.day"       : "Saturday",
-    "bugday.date"      : "13 October 2012",
+    "bugday.date"      : "10 November 2012",
 
     "wiki.root"        : "https://github.com/parrot/parrot/wiki",
     "wiki.bugday"      : "bug_day_2012_10_13",
 
-    "ftp.path"         : "ftp://ftp.parrot.org/pub/parrot/releases/devel/4.8.0/"
+    "ftp.path"         : "ftp://ftp.parrot.org/pub/parrot/releases/devel/4.9.0/"
 }