Merge branch 'master' of git://github.com/parrot/parrot

Configure.pl

@@ -201,7 +201,7 @@ =head2 General Options
 
 =item C<--coveragedir>
 
-In preparation for calling C<make quickcover> to perform coverage analysis,
+In preparation for calling C<make cover> to perform coverage analysis,
 provide a user-specified directory for top level of HTML output.
 
 =item Operating system-specific configuration options

DEPRECATED.pod

@@ -120,6 +120,13 @@ This perennially broken PMC will be removed.
 
 L<http://trac.parrot.org/parrot/ticket/1892>
 
+=item Scalar PMC [eligible in 3.1]
+
+The Scalar PMC can be removed, so long as the behaviors of PMCs which inherit
+from it do not change.
+
+L<https://trac.parrot.org/parrot/ticket/1754>
+
 =back
 
 =head1 Opcodes

NEWS

@@ -1,3 +1,8 @@
+New in 3.0.0
+- Core
+ + Added a new embedding API in "parrot/api.h"
+ + Removed autovivification behavior from ResizablePMCArray
+
 New in 2.11.0
 - Core
  + Just In Time native call frame generation using LibFFI

config/gen/makefiles/root.in

@@ -820,8 +820,8 @@ help :
 	@echo "  apilist:           Show list of PARROT_API functions"
 	@echo "  exportlist:        Show list of PARROT_EXPORT functions"
 	@echo "  malloclist:        Show list of PARROT_MALLOC functions"
-	@echo "  quickcover:        Run test suite coverage analysis (core)."
-	@echo "  cover:             Run test suite coverage analysis (full)."
+	@echo "  cover:             Run test suite coverage analysis (core)."
+	@echo "  fullcover:         Run test suite coverage analysis (full)."
 	@echo "  tags-vi:           Create tags for the vi editor."
 	@echo "  tags-emacs:        Create tags for the Emacs editor."
 	@echo "  perlcritic:        Check Perl code with Perl::Critic."
@@ -2148,7 +2148,7 @@ configure_tests :
 headerizer_tests : test_prep
 	$(PERL) t/harness $(HEADERIZER_TEST_FILES)
 
-# library tests - tests run by make test but not by make fulltest or make cover
+# library tests - tests run by make test but not by make fulltest or make fullcover
 library_tests : test_prep
 	$(PERL) t/harness $(EXTRA_TEST_ARGS) $(LIBRARY_TEST_FILES)
 
@@ -2597,7 +2597,7 @@ splint : all
 
 COVER_FLAGS = -fprofile-arcs -ftest-coverage
 
-COVER_DIRS = \
+FULLCOVER_DIRS = \
     src \
     src/call \
     src/dynoplibs \
@@ -2621,7 +2621,7 @@ COVER_DIRS = \
     $(BUILD_DIR)/t/perl \
     compilers/imcc
 
-cover: \
+fullcover: \
     cover.dummy \
     cover-testb \
     cover-testf \
@@ -2636,7 +2636,7 @@ cover: \
     cover-examples \
     cover-distro
 	build_dir=$$PWD; \
-    for dir in $(COVER_DIRS); \
+    for dir in $(FULLCOVER_DIRS); \
     do \
 	cd $$dir; \
 	gcov *.c; \
@@ -2645,7 +2645,7 @@ cover: \
     done
 	cover -ignore_re '^\/usr\/local\/bin'
 
-QUICKCOVER_DIRS = \
+COVER_DIRS = \
     src \
     src/call \
     src/dynoplibs \
@@ -2672,12 +2672,12 @@ COVER       = @cover@
 GCOV        = @gcov@
 GCOV2PERL   = @gcov2perl@
 
-quickcover: \
+cover: \
     cover.dummy \
     cover-test_runcore
 	build_dir=$$PWD; \
     $(COVER) -delete; \
-    for dir in $(QUICKCOVER_DIRS); \
+    for dir in $(COVER_DIRS); \
     do \
 	cd $$dir; \
 	$(GCOV) *.c; \

docs/dev/coverage.pod

@@ -46,10 +46,10 @@ type in C<make cover> and leave to make a sandwich and something to drink
 because it's probably going to take a I<long> time to run. If you run into
 trouble, C<make fulltest> may be of some assistance.
 
-=head1 Quickcover
+=head1 Cover
 
-If you have run C<make cover> before, you know how long it takes to execute
-that command. Recently a new tool C<make quickcover> has been added that is
+If you have run C<make fullcover> before, you know how long it takes to execute
+that command. Recently a new tool C<make cover> has been added that is
 much faster, but does not run tests in all runcores.
 
 =cut

frontend/parrot/main.c

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2007-2010, Parrot Foundation.
+Copyright (C) 2007-2011, Parrot Foundation.
 
 =head1 NAME
 
@@ -496,7 +496,7 @@ Parrot_version(void)
     ASSERT_ARGS(Parrot_version)
     printf("This is Parrot version " PARROT_VERSION);
     printf(" built for " PARROT_ARCHNAME ".\n");
-    printf("Copyright (C) 2001-2010, Parrot Foundation.\n\
+    printf("Copyright (C) 2001-2011, Parrot Foundation.\n\
 \n\
 This code is distributed under the terms of the Artistic License 2.0.\
 \n\

include/parrot/packfile.h

@@ -741,17 +741,6 @@ PackFile * PackFile_new_dummy(PARROT_INTERP, ARGIN(STRING *name))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-PackFile_Segment * PackFile_remove_segment_by_name(PARROT_INTERP,
-    ARGMOD(PackFile_Directory *dir),
-    ARGIN(STRING *name))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        FUNC_MODIFIES(*dir);
-
 PARROT_EXPORT
 void PackFile_Segment_destroy(PARROT_INTERP, ARGMOD(PackFile_Segment *self))
         __attribute__nonnull__(1)
@@ -874,10 +863,6 @@ PackFile_ByteCode * Parrot_switch_to_cs(PARROT_INTERP,
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-PARROT_EXPORT
-void Parrot_switch_to_cs_by_nr(PARROT_INTERP, opcode_t seg)
-        __attribute__nonnull__(1);
-
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
@@ -982,11 +967,6 @@ void Parrot_trace_eprintf(ARGIN(const char *s), ...)
 #define ASSERT_ARGS_PackFile_new_dummy __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(name))
-#define ASSERT_ARGS_PackFile_remove_segment_by_name \
-     __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(dir) \
-    , PARROT_ASSERT_ARG(name))
 #define ASSERT_ARGS_PackFile_Segment_destroy __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(self))
@@ -1033,8 +1013,6 @@ void Parrot_trace_eprintf(ARGIN(const char *s), ...)
 #define ASSERT_ARGS_Parrot_switch_to_cs __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(new_cs))
-#define ASSERT_ARGS_Parrot_switch_to_cs_by_nr __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_PF_create_default_segs __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(file_name))

lib/Parrot/Configure/Messages.pm

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2010, Parrot Foundation.
+# Copyright (C) 2001-2011, Parrot Foundation.
 
 package Parrot::Configure::Messages;
 
@@ -16,7 +16,7 @@ sub print_introduction {
     my $parrot_version = shift;
     print <<"END";
 Parrot Version $parrot_version Configure 2.0
-Copyright (C) 2001-2010, Parrot Foundation.
+Copyright (C) 2001-2011, Parrot Foundation.
 
 Hello, I'm Configure. My job is to poke and prod your system to figure out
 how to build Parrot. The process is completely automated, unless you passed in