Fix conflicts after merge to newest master

parrot · Oct 26, 2011 · 3fe43f8 · 3fe43f8
2 parents a074845 + 65e6ab7
commit 3fe43f8
Show file tree

Hide file tree

Showing 130 changed files with 6,942 additions and 7,739 deletions.
diff --git a/.gitignore b/.gitignore
@@ -180,39 +180,6 @@ cachegrind.out.*
 /examples/pir/befunge/MANIFEST
 /examples/pir/befunge/befunge
 /examples/pir/befunge/installable_befunge
-/ext/Makefile
-/ext/Parrot-Embed/*.bs
-/ext/Parrot-Embed/*.bundle
-/ext/Parrot-Embed/*.c
-/ext/Parrot-Embed/*.def
-/ext/Parrot-Embed/*.dll
-/ext/Parrot-Embed/*.dump
-/ext/Parrot-Embed/*.dylib
-/ext/Parrot-Embed/*.exe
-/ext/Parrot-Embed/*.exp
-/ext/Parrot-Embed/*.h
-/ext/Parrot-Embed/*.ilk
-/ext/Parrot-Embed/*.lib
-/ext/Parrot-Embed/*.manifest
-/ext/Parrot-Embed/*.o
-/ext/Parrot-Embed/*.obj
-/ext/Parrot-Embed/*.old
-/ext/Parrot-Embed/*.pdb
-/ext/Parrot-Embed/*.pdb
-/ext/Parrot-Embed/*.so
-/ext/Parrot-Embed/*.tmp
-/ext/Parrot-Embed/*.xs
-/ext/Parrot-Embed/Build
-/ext/Parrot-Embed/Build.bat
-/ext/Parrot-Embed/Makefile
-/ext/Parrot-Embed/Makefile.PL
-/ext/Parrot-Embed/_build
-/ext/Parrot-Embed/blib
-/ext/Parrot-Embed/dll.base
-/ext/Parrot-Embed/pm_to_blib
-/ext/Parrot-Embed/lib/Parrot/*.c
-/ext/Parrot-Embed/lib/Parrot/*.obj
-/ext/Parrot-Embed/t/*.pbc
 /ext/nqp-rx/src/stage0/nqp-setting.pir
 /frontend/parrot/main.o
 /frontend/parrot2/main.o

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-15    release 3.10.0
+    - Core
+        + The mark VTABLE was added to the Select PMC
+		+ The Parrot::Embed Perl 5 module was removed from parrot.git and now lives
+	  	  at https://github.com/parrot/parrot-embed
+    - Languages
+    - Community
+    - Documentation
+    - Tests
+
 2011-10-18    release 3.9.0
     - Core
         + The whiteknight/kill_threads branch was merged, which removes the old and broken
@@ -9,13 +19,21 @@
           useful and caused hard-to-find bugs.
         + A new subroutine profiling runcore was added. It can be enabled with the command-line
         argument of -R subprof . The resulting data can be analyzed with kcachegrind.
+        + Added get_string VTABLE to FixedIntegerArray and FixedFloatArray PMCs
+        + The update() method was added to the Hash PMC, which updates one Hash with the contents
+          of another. This speeds up rakudo/nqp startup time.
     - Languages
         + Winxed
-            - Updated snapshot
+          - Updated snapshot to version 1.3.0
+          - Added the builtin sleep
+          - Modifier 'multi' allows some more multi functionality
     - Community
         + New repo for the Parrot Alternate Compiler Toolkit, a re-implementation of
-        PCT in Winxed: https://github.com/parrot/PACT
+          PCT in Winxed: https://github.com/parrot/PACT
     - Documentation
+        + We are in the process to migrating our Trac wiki at http://trac.parrot.org/ to Github 
+          at https://github.com/parrot/parrot/wiki
+        + Packfile PMC documentation was updated
     - Tests
         + Select PMC tests improved to pass on non-Linuxy platforms
 

diff --git a/MANIFEST b/MANIFEST
@@ -219,7 +219,6 @@ config/gen/core_pmcs.pm                                     []
 config/gen/makefiles.pm                                     []
 config/gen/makefiles/docs.in                                []
 config/gen/makefiles/editor.in                              []
-config/gen/makefiles/ext.in                                 []
 config/gen/makefiles/parrot_embed_pl.in                     []
 config/gen/makefiles/root.in                                []
 config/gen/opengl.pm                                        []
@@ -782,23 +781,6 @@ examples/tutorial/81_continuation.pir                       [examples]
 examples/tutorial/82_coroutine.pir                          [examples]
 examples/tutorial/83_external_libraries.pir                 [examples]
 examples/tutorial/90_writing_tests.pir                      [examples]
-ext/Parrot-Embed/Build.PL                                   []
-ext/Parrot-Embed/Changes                                    []
-ext/Parrot-Embed/MANIFEST                                   []
-ext/Parrot-Embed/README                                     []doc
-ext/Parrot-Embed/TODO                                       []
-ext/Parrot-Embed/lib/Parrot/Embed.pm                        []
-ext/Parrot-Embed/lib/Parrot/Embed.xs                        []
-ext/Parrot-Embed/lib/Parrot/Interpreter.pm                  []
-ext/Parrot-Embed/lib/Parrot/PMC.pm                          []
-ext/Parrot-Embed/t/00-load.t                                [test]
-ext/Parrot-Embed/t/greet.pir                                [test]
-ext/Parrot-Embed/t/interp.t                                 [test]
-ext/Parrot-Embed/t/languages.t                              [test]
-ext/Parrot-Embed/t/pipp.t                                   [test]
-ext/Parrot-Embed/tools/check_embed_coverage.pl              []
-ext/Parrot-Embed/tools/write_typemap.pl                     []
-ext/Parrot-Embed/typemap                                    []
 ext/nqp-rx/CREDITS                                          []
 ext/nqp-rx/Defines.mak                                      []
 ext/nqp-rx/LICENSE                                          []
@@ -893,8 +875,8 @@ include/parrot/context.h                                    [main]include
 include/parrot/core_types.h                                 [main]include
 include/parrot/datatypes.h                                  [main]include
 include/parrot/debugger.h                                   [main]include
+include/parrot/disassemble.h                                [main]include
 include/parrot/dynext.h                                     [main]include
-include/parrot/embed.h                                      [main]include
 include/parrot/encoding.h                                   [main]include
 include/parrot/enums.h                                      [main]include
 include/parrot/events.h                                     [main]include
@@ -1187,6 +1169,7 @@ src/call/ops.c                                              []
 src/call/pcc.c                                              []
 src/datatypes.c                                             []
 src/debug.c                                                 []
+src/disassemble.c                                           []
 src/dynext.c                                                []
 src/dynoplibs/Defines.in                                    []
 src/dynoplibs/README                                        []doc
@@ -1214,7 +1197,6 @@ src/dynpmc/rational.pmc                                     []
 src/dynpmc/rotest.pmc                                       []
 src/dynpmc/select.pmc                                       []
 src/dynpmc/subproxy.pmc                                     []
-src/embed.c                                                 []
 src/embed/api.c                                             []
 src/embed/bytecode.c                                        []
 src/embed/embed_private.h                                   []

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -264,70 +264,6 @@
 ^/examples/pir/befunge/befunge/
 ^/examples/pir/befunge/installable_befunge$
 ^/examples/pir/befunge/installable_befunge/
-^/ext/Makefile$
-^/ext/Makefile/
-^/ext/Parrot-Embed/.*\.bs$
-^/ext/Parrot-Embed/.*\.bs/
-^/ext/Parrot-Embed/.*\.bundle$
-^/ext/Parrot-Embed/.*\.bundle/
-^/ext/Parrot-Embed/.*\.c$
-^/ext/Parrot-Embed/.*\.c/
-^/ext/Parrot-Embed/.*\.def$
-^/ext/Parrot-Embed/.*\.def/
-^/ext/Parrot-Embed/.*\.dll$
-^/ext/Parrot-Embed/.*\.dll/
-^/ext/Parrot-Embed/.*\.dump$
-^/ext/Parrot-Embed/.*\.dump/
-^/ext/Parrot-Embed/.*\.dylib$
-^/ext/Parrot-Embed/.*\.dylib/
-^/ext/Parrot-Embed/.*\.exe$
-^/ext/Parrot-Embed/.*\.exe/
-^/ext/Parrot-Embed/.*\.exp$
-^/ext/Parrot-Embed/.*\.exp/
-^/ext/Parrot-Embed/.*\.h$
-^/ext/Parrot-Embed/.*\.h/
-^/ext/Parrot-Embed/.*\.ilk$
-^/ext/Parrot-Embed/.*\.ilk/
-^/ext/Parrot-Embed/.*\.lib$
-^/ext/Parrot-Embed/.*\.lib/
-^/ext/Parrot-Embed/.*\.manifest$
-^/ext/Parrot-Embed/.*\.manifest/
-^/ext/Parrot-Embed/.*\.o$
-^/ext/Parrot-Embed/.*\.o/
-^/ext/Parrot-Embed/.*\.obj$
-^/ext/Parrot-Embed/.*\.obj/
-^/ext/Parrot-Embed/.*\.old$
-^/ext/Parrot-Embed/.*\.old/
-^/ext/Parrot-Embed/.*\.pdb$
-^/ext/Parrot-Embed/.*\.pdb/
-^/ext/Parrot-Embed/.*\.so$
-^/ext/Parrot-Embed/.*\.so/
-^/ext/Parrot-Embed/.*\.tmp$
-^/ext/Parrot-Embed/.*\.tmp/
-^/ext/Parrot-Embed/.*\.xs$
-^/ext/Parrot-Embed/.*\.xs/
-^/ext/Parrot-Embed/Build$
-^/ext/Parrot-Embed/Build/
-^/ext/Parrot-Embed/Build\.bat$
-^/ext/Parrot-Embed/Build\.bat/
-^/ext/Parrot-Embed/Makefile$
-^/ext/Parrot-Embed/Makefile/
-^/ext/Parrot-Embed/Makefile\.PL$
-^/ext/Parrot-Embed/Makefile\.PL/
-^/ext/Parrot-Embed/_build$
-^/ext/Parrot-Embed/_build/
-^/ext/Parrot-Embed/blib$
-^/ext/Parrot-Embed/blib/
-^/ext/Parrot-Embed/dll\.base$
-^/ext/Parrot-Embed/dll\.base/
-^/ext/Parrot-Embed/lib/Parrot/.*\.c$
-^/ext/Parrot-Embed/lib/Parrot/.*\.c/
-^/ext/Parrot-Embed/lib/Parrot/.*\.obj$
-^/ext/Parrot-Embed/lib/Parrot/.*\.obj/
-^/ext/Parrot-Embed/pm_to_blib$
-^/ext/Parrot-Embed/pm_to_blib/
-^/ext/Parrot-Embed/t/.*\.pbc$
-^/ext/Parrot-Embed/t/.*\.pbc/
 ^/ext/nqp-rx/src/stage0/nqp-setting\.pir$
 ^/ext/nqp-rx/src/stage0/nqp-setting\.pir/
 ^/frontend/parrot/.*\.gcda$

diff --git a/MANIFEST.generated b/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.8.0.dylib                   [main]lib
+blib/lib/libparrot.3.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.3.8.0                      [main]lib
+blib/lib/libparrot.so.3.9.0                      [main]lib
 compilers/data_json/data_json.pbc                [data_json]
 config/gen/call_list/opengl.in                   []
 docs/ops/bit.pod                                 [doc]

diff --git a/PBC_COMPAT b/PBC_COMPAT
@@ -28,6 +28,7 @@
 
 # please insert tab separated entries at the top of the list
 
+12.0	2011.10.18	dukeleto	released 3.9.0
 11.0	2011.07.19	jkeenan	released 3.6.0
 10.0	2011.01.18	cotto	released 3.0.0
 9.0	2010.10.19	gerd	released 2.9.0

diff --git a/README b/README
@@ -1,4 +1,4 @@
-This is Parrot, version 3.8.0
+This is Parrot, version 3.9.0
 ------------------------------
 
 Parrot is Copyright (C) 2001-2011, Parrot Foundation.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.8.0
+3.9.0
diff --git a/compilers/imcc/Rules.in b/compilers/imcc/Rules.in
@@ -87,7 +87,6 @@ compilers/imcc/parser_util$(O) : \
     include/imcc/yyscanner.h \
     include/imcc/embed.h \
     $(INC_DIR)/dynext.h \
-    $(INC_DIR)/embed.h \
     $(INC_DIR)/oplib/ops.h \
     $(PARROT_H_HEADERS) \
     include/pmc/pmc_sub.h
@@ -192,7 +191,6 @@ compilers/imcc/main$(O) : \
     compilers/imcc/symreg.h \
     compilers/imcc/unit.h \
     include/imcc/yyscanner.h \
-    $(INC_DIR)/embed.h \
     $(INC_DIR)/oplib/ops.h \
     $(INC_DIR)/runcore_api.h \
     $(INC_DIR)/api.h \

diff --git a/compilers/imcc/main.c b/compilers/imcc/main.c
@@ -29,7 +29,7 @@ IMCC helpers.
 #include <stdlib.h>
 
 #include "imc.h"
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
 #include "parrot/longopt.h"
 #include "parrot/runcore_api.h"
 #include "pmc/pmc_callcontext.h"

diff --git a/compilers/imcc/parser_util.c b/compilers/imcc/parser_util.c
@@ -19,7 +19,6 @@
 
 #include "imc.h"
 #include "parrot/dynext.h"
-#include "parrot/embed.h"
 #include "pmc/pmc_sub.h"
 #include "pmc/pmc_callcontext.h"
 #include "pbc.h"

diff --git a/compilers/pct/src/PCT/HLLCompiler.pir b/compilers/pct/src/PCT/HLLCompiler.pir
@@ -855,6 +855,10 @@ Generic method for compilers invoked from a shell command line.
     $I0 = adverbs['version']
     if $I0 goto version
 
+    .local string target
+    target = adverbs['target']
+    target = downcase target
+
     .local int can_backtrace, ll_backtrace
     can_backtrace = can self, 'backtrace'
     unless can_backtrace goto no_push_eh
@@ -882,6 +886,9 @@ Generic method for compilers invoked from a shell command line.
     goto save_output
   eval_line:
     result = self.'eval'($S0, '-e', args :flat, adverbs :flat :named)
+    if target == '' goto save_output
+    if target == 'pir' goto save_output
+    '_dumper'(result, target)
 
   save_output:
     unless can_backtrace goto no_pop_eh
@@ -890,9 +897,6 @@ Generic method for compilers invoked from a shell command line.
     if null result goto end
     $I0 = defined result
     unless $I0 goto end
-    .local string target
-    target = adverbs['target']
-    target = downcase target
     if target != 'pir' goto end
     .local string output
     .local pmc ofh

diff --git a/config/gen/makefiles.pm b/config/gen/makefiles.pm
@@ -29,9 +29,6 @@ sub _init {
         'Makefile' => {
             SOURCE => 'config/gen/makefiles/root.in',
         },
-        'ext/Makefile' => {
-            SOURCE => 'config/gen/makefiles/ext.in',
-        },
         'compilers/imcc/Rules.mak' => {
              SOURCE => 'compilers/imcc/Rules.in',
         },
@@ -42,11 +39,6 @@ sub _init {
              SOURCE => 'src/dynoplibs/Defines.in',
         },
 
-        'ext/Parrot-Embed/Makefile.PL' => {
-            SOURCE            => 'config/gen/makefiles/parrot_embed_pl.in',
-            conditioned_lines => 1,
-        },
-
         'src/dynpmc/Rules.mak' => {
              SOURCE => 'src/dynpmc/Rules.in',
         },

diff --git a/config/gen/makefiles/ext.in b/config/gen/makefiles/ext.in