Merge branch 'master' into m0-prototype

Conflicts:
	.gitignore

.gitignore

@@ -31,7 +31,8 @@
 /*.sto
 /*.suo
 /*.tmp
-*.sw?
+# vim swap files
+/\.*sw?
 /*.vcproj*
 /.git
 /.parrot_current_rev
@@ -251,6 +252,7 @@
 /runtime/parrot/include/*.fpmc
 /runtime/parrot/include/*.pasm
 /runtime/parrot/include/*.pbc
+/runtime/parrot/include/*.pir
 /runtime/parrot/languages/JSON/JSON.pir
 /runtime/parrot/languages/data_json
 /runtime/parrot/library/*.pbc

CREDITS

@@ -434,7 +434,7 @@ D: Miscellaneous codingstd fixes
 N: Gerd Pokorra
 A: gerd
 E: pokorra@uni-siegen.de
-D: Release manager for 1.9.0, 2.3.0, 2.5.0, 2.8.0, 2.9.0 and 3.2.0
+D: Release manager for 1.9.0, 2.3.0, 2.5.0, 2.8.0, 2.9.0, 3.2.0 and 3.4.0
 
 N: Goplat
 D: Win98 and other fixes.
@@ -719,6 +719,10 @@ N: Markus Mayr
 D: Implementation of the Rational PMC
 D: Fixing SDL-bindings and examples
 
+N: Matt Boyle
+U: ligne
+D: Fixes to docs and test-suite.
+
 N: Matt Diephouse
 U: mdiep
 E: matt@diephouse.com

ChangeLog

@@ -1,5 +1,9 @@
 #1
 
+2011.05.17     Gerd
+	* Released 3.4.0
+	See NEWS for more.
+
 2011.04.19     Whiteknight
     * Released 3.3.0
     See NEWS for more.

Configure.pl

@@ -66,8 +66,9 @@
 # from Parrot::Configure::Data
 $conf->options->set( %{$args} );
 # save the command-line for make reconfig
-$conf->data->set(configure_args => @ARGV ? '"'.join("\" \"", map {qq($_)} @ARGV).'"'
-                                         : '');
+$conf->data->set(configure_args => @ARGV
+    ? '"'.join("\" \"", map {qq($_)} @ARGV).'"'
+    : '');
 
 # Log files created by Configure.pl in MANIFEST.configure.generated
 $conf->{active_configuration} = 1;
@@ -358,10 +359,6 @@ =head2 Parrot Options
 
 Use the given ops files.
 
-=item C<--buildframes>
-
-Dynamically build NCI call frames.
-
 =back
 
 =head2 International Components For Unicode (ICU) Options
@@ -623,7 +620,6 @@ =head2 Example
     auto::isreg
     auto::arch
     auto::jit
-    auto::frames
     auto::cpu
     auto::inline
     auto::gc

MANIFEST

@@ -139,17 +139,12 @@ config/auto/env.pm                                          []
 config/auto/env/test_setenv_c.in                            []
 config/auto/env/test_unsetenv_c.in                          []
 config/auto/format.pm                                       []
-config/auto/frames.pm                                       []
-config/auto/frames/test_exec_cygwin_c.in                    []
-config/auto/frames/test_exec_linux_c.in                     []
-config/auto/frames/test_exec_openbsd_c.in                   []
 config/auto/gc.pm                                           []
 config/auto/gc/test_c.in                                    []
 config/auto/gcc.pm                                          []
 config/auto/gcc/test_c.in                                   []
 config/auto/gettext.pm                                      []
 config/auto/gettext/gettext_c.in                            []
-config/auto/git_describe.pm                                 []
 config/auto/glibc.pm                                        []
 config/auto/glibc/test_c.in                                 []
 config/auto/gmp.pm                                          []
@@ -189,7 +184,6 @@ config/auto/pod2man.pm                                      []
 config/auto/readline.pm                                     []
 config/auto/readline/readline_c.in                          []
 config/auto/revision.pm                                     []
-config/auto/sha1.pm                                         []
 config/auto/signal.pm                                       []
 config/auto/signal/test1_c.in                               []
 config/auto/signal/test2_c.in                               []
@@ -292,6 +286,13 @@ docs/compiler_faq.pod                                       [doc]
 docs/configuration.pod                                      [doc]
 docs/debug.pod                                              [doc]
 docs/debugger.pod                                           [doc]
+docs/deprecations/deprecations.pod                          [doc]
+docs/deprecations/deprecations_2_6.pod                      [doc]
+docs/deprecations/deprecations_2_9.pod                      [doc]
+docs/deprecations/deprecations_3_0.pod                      [doc]
+docs/deprecations/deprecations_3_3.pod                      [doc]
+docs/deprecations/deprecations_3_6.pod                      [doc]
+docs/deprecations/how_to_deprecate.pod                      [doc]
 docs/dev/byteorder.pod                                      [doc]
 docs/dev/c_functions.pod                                    [doc]
 docs/dev/coverage.pod                                       [doc]
@@ -1166,7 +1167,6 @@ runtime/parrot/library/parrotlib.pir                        [library]
 runtime/parrot/library/pcore.pir                            [library]
 runtime/parrot/library/pcre.pir                             [library]
 runtime/parrot/library/postgres.declarations                [library]
-runtime/parrot/library/postgres.pasm                        [library]
 runtime/parrot/library/postgres.pir                         [library]
 runtime/parrot/library/random_lib.pir                       [library]
 runtime/parrot/library/uuid.pir                             [library]
@@ -1291,6 +1291,7 @@ src/platform/darwin/hires_timer.c                           []
 src/platform/darwin/sysmem.c                                []
 src/platform/generic/dl.c                                   []
 src/platform/generic/encoding.c                             []
+src/platform/generic/entropy.c                              []
 src/platform/generic/env.c                                  []
 src/platform/generic/error.c                                []
 src/platform/generic/exec.c                                 []
@@ -1311,6 +1312,7 @@ src/platform/openbsd/math.c                                 []
 src/platform/solaris/math.c                                 []
 src/platform/solaris/time.c                                 []
 src/platform/win32/dl.c                                     []
+src/platform/win32/entropy.c                                []
 src/platform/win32/env.c                                    []
 src/platform/win32/error.c                                  []
 src/platform/win32/exec.c                                   []
@@ -1601,10 +1603,8 @@ t/configure/050-fatal.t                                     [test]
 t/configure/051-fatal_step.t                                [test]
 t/configure/059-silent.t                                    [test]
 t/configure/061-revision_from_cache.t                       [test]
-t/configure/062-sha1_to_cache.t                             [test]
-t/configure/063-git_describe_to_cache.t                     [test]
-t/configure/064-sha1_from_cache.t                           [test]
-t/configure/065-git_describe_from_cache.t                   [test]
+t/configure/062-sha1.t                                      [test]
+t/configure/063-git_describe.t                              [test]
 t/configure/testlib/Make_VERSION_File.pm                    [test]
 t/configure/testlib/Tie/Filehandle/Preempt/Stdin.pm         [test]
 t/configure/testlib/adefectivefoobar                        [test]
@@ -1642,7 +1642,16 @@ t/dynoplibs/trans-old.t                                     [test]
 t/dynoplibs/trans.t                                         [test]
 t/dynpmc/dynlexpad.t                                        [test]
 t/dynpmc/file.t                                             [test]
-t/dynpmc/foo.t                                              [test]
+t/dynpmc/foo-01.t                                           [test]
+t/dynpmc/foo-02.t                                           [test]
+t/dynpmc/foo-03.t                                           [test]
+t/dynpmc/foo-04.t                                           [test]
+t/dynpmc/foo-05.t                                           [test]
+t/dynpmc/foo-06.t                                           [test]
+t/dynpmc/foo-07.t                                           [test]
+t/dynpmc/foo-08.t                                           [test]
+t/dynpmc/foo-09.t                                           [test]
+t/dynpmc/foo-10.t                                           [test]
 t/dynpmc/foo2.t                                             [test]
 t/dynpmc/gziphandle.t                                       [test]
 t/dynpmc/os.t                                               [test]
@@ -1680,6 +1689,7 @@ t/library/iter.t                                            [test]
 t/library/lwp.t                                             [test]
 t/library/md5.t                                             [test]
 t/library/mime_base64.t                                     [test]
+t/library/nciutils.t                                        [test]
 t/library/osutils.t                                         [test]
 t/library/p6object.t                                        [test]
 t/library/parrotlib.t                                       [test]
@@ -1968,7 +1978,6 @@ t/steps/auto/cpu-01.t                                       [test]
 t/steps/auto/ctags-01.t                                     [test]
 t/steps/auto/env-01.t                                       [test]
 t/steps/auto/format-01.t                                    [test]
-t/steps/auto/frames-01.t                                    [test]
 t/steps/auto/gc-01.t                                        [test]
 t/steps/auto/gcc-01.t                                       [test]
 t/steps/auto/gettext-01.t                                   [test]
@@ -2095,6 +2104,7 @@ t/tools/testdata                                            [test]
 tools/build/README                                          []doc
 tools/build/c2str.pl                                        []
 tools/build/fixup_gen_file.pl                               []
+tools/build/gen_version.pl                                  []
 tools/build/h2inc.pl                                        []
 tools/build/ops2c.pl                                        [devel]
 tools/build/parrot_config_c.pl                              []

MANIFEST.SKIP

@@ -512,6 +512,8 @@
 ^/runtime/parrot/include/.*\.pasm/
 ^/runtime/parrot/include/.*\.pbc$
 ^/runtime/parrot/include/.*\.pbc/
+^/runtime/parrot/include/.*\.pir$
+^/runtime/parrot/include/.*\.pir/
 ^/runtime/parrot/languages/JSON/JSON\.pir$
 ^/runtime/parrot/languages/JSON/JSON\.pir/
 ^/runtime/parrot/languages/data_json$

MANIFEST.generated

@@ -1,11 +1,11 @@
 # 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.3.3.0.dylib                   [main]lib
+blib/lib/libparrot.3.4.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.3.3.0                      [main]lib
+blib/lib/libparrot.so.3.4.0                      [main]lib
 compilers/data_json/data_json.pbc                [data_json]
 config/gen/call_list/opengl.in                   []
 docs/ops/bit.pod                                 [doc]
@@ -234,6 +234,7 @@ runtime/parrot/include/iterator.pasm             [main]
 runtime/parrot/include/libpaths.pasm             [main]
 runtime/parrot/include/longopt.pasm              [main]
 runtime/parrot/include/opengl_defines.pasm       [main]
+runtime/parrot/include/parrot_version.pir        [main]
 runtime/parrot/include/parrotlib.pbc             [main]
 runtime/parrot/include/pmctypes.pasm             [main]
 runtime/parrot/include/signal.pasm               [main]
@@ -441,5 +442,4 @@ src/pmc/unmanagedstruct.dump                     [devel]src
 src/string_private_cstring.h                     []
 tools/build/dynpmc.pl                            []
 tools/dev/mk_language_shell.pl                   [devel]
-tools/dev/ncidef2pir.pl                          [devel]
 vtable.dump                                      [devel]src

NEWS

@@ -1,6 +1,34 @@
+New in 3.5.0
+- Core
+- Languages
+- Tests
+  + The Parrot test suite harness now understands the HARNESS_TIMER environment
+    variable. Setting it to a true value will show timing results for a test run.
+  + IPv6 tests are now parallel testing friendly
+
 New in 3.4.0
 - Core
   + The Generational Mark and Sweep garbage collector is the new default.
+  + The --gc-nursery-size command line argument was added.
+  + Parrot now gets entropy from the underlying OS.
+  + The NCI subsystem now supports 8, 16, 32 and 64 bit integers.
+  + The NCI subsystem now supports "long long" and "long double" signatures.
+    Not all platforms/compilers support these non-standard types, so developers
+    are cautioned to take note that using them reduces portability.
+  + Many more OpenGL functions in the Parrot OpenGL bindings are available,
+    which required the above-mentioned signatures.
+  + Bytecode-related embedding api functions moved to src/embed/bytecode.c.
+- Languages
+  + Winxed
+    - Use 'using extern' for module imports.
+    - Improved stage 0 prefix ++ and -- operators.
+    - Allow 'null' in conditional operator.
+    - Several examples are updated.
+- Community
+  + Google Summer of Code Bonding period is going well. Students are mostly done
+    with their classes and much code will flow soon.
+- Documentation
+  + More PCT introductions are available at: http://github.com/benabik/cish
 
 New in 3.3.0
 - Core
@@ -15,7 +43,6 @@ New in 3.3.0
 - Tests
   + The test coverage of the extend_vtable subsystem was greatly increased
 
-
 New in 3.2.0
 - Core
   + Full support for Unicode filenames on Linux and Win32

README

@@ -1,4 +1,4 @@
-This is Parrot, version 3.3.0
+This is Parrot, version 3.4.0
 ------------------------------
 
 Parrot is Copyright (C) 2001-2011, Parrot Foundation.

VERSION

@@ -1 +1 @@
-3.3.0
+3.4.0

api.yaml

@@ -1,4 +1,11 @@
 ---
+-
+  name:     '"Advanced" NCI parameter types'
+  eligible: '3.1'
+  ticket:   'http://trac.parrot.org/parrot/ticket/1931' 
+  tags:
+    - 'deprecated'
+    - 'completed'
 -
   name:     'Pointer, UnManagedStruct, and ManagedStruct'
   eligible: '3.4'

compilers/imcc/debug.h

@@ -63,7 +63,7 @@ void IMCC_debug(
 PARROT_DOES_NOT_RETURN
 void IMCC_fatal(
     ARGMOD(imc_info_t * imcc),
-    NULLOK(int code),
+    int code,
     ARGIN(const char *fmt),
     ...)
         __attribute__nonnull__(1)
@@ -83,7 +83,7 @@ void IMCC_fatal_standalone(
 PARROT_DOES_NOT_RETURN
 void IMCC_fataly(
     ARGMOD(imc_info_t * imcc),
-    NULLOK(int code),
+    int code,
     ARGIN(const char *fmt),
     ...)
         __attribute__nonnull__(1)

compilers/imcc/pbc.c

@@ -200,9 +200,7 @@ static int get_old_size(
         FUNC_MODIFIES(* imcc)
         FUNC_MODIFIES(*ins_line);
 
-static void imcc_globals_destroy(SHIM_INTERP,
-    SHIM(int ex),
-    ARGMOD(void *param))
+static void imcc_globals_destroy(PARROT_INTERP, int ex, ARGMOD(void *param))
         __attribute__nonnull__(3)
         FUNC_MODIFIES(*param);
 

compilers/imcc/pbc.h

@@ -8,13 +8,13 @@
 /* HEADERIZER BEGIN: compilers/imcc/pbc.c */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 
-void e_pbc_close(ARGMOD(imc_info_t * imcc), SHIM(void *param))
+void e_pbc_close(ARGMOD(imc_info_t * imcc), void *param)
         __attribute__nonnull__(1)
         FUNC_MODIFIES(* imcc);
 
 int e_pbc_emit(
     ARGMOD(imc_info_t * imcc),
-    SHIM(void *param),
+    void *param,
     ARGIN(const IMC_Unit *unit),
     ARGIN(const Instruction *ins))
         __attribute__nonnull__(1)
@@ -24,15 +24,15 @@ int e_pbc_emit(
 
 void e_pbc_end_sub(
     ARGMOD(imc_info_t * imcc),
-    SHIM(void *param),
+    void *param,
     ARGIN(IMC_Unit *unit))
         __attribute__nonnull__(1)
         __attribute__nonnull__(3)
         FUNC_MODIFIES(* imcc);
 
 void e_pbc_new_sub(
     ARGMOD(imc_info_t * imcc),
-    SHIM(void *param),
+    void *param,
     ARGIN(IMC_Unit *unit))
         __attribute__nonnull__(1)
         __attribute__nonnull__(3)