Permalink
Browse files

Fix conflicts after merge to newest master

  • Loading branch information...
2 parents a074845 + 65e6ab7 commit 3fe43f8234974aab3d7e55d36a9e5c484d2d3dc2 @Whiteknight Whiteknight committed Oct 26, 2011
Showing with 6,942 additions and 7,739 deletions.
  1. +0 −33 .gitignore
  2. +20 −2 ChangeLog
  3. +2 −20 MANIFEST
  4. +0 −64 MANIFEST.SKIP
  5. +2 −2 MANIFEST.generated
  6. +1 −0 PBC_COMPAT
  7. +1 −1 README
  8. +1 −1 VERSION
  9. +0 −2 compilers/imcc/Rules.in
  10. +1 −1 compilers/imcc/main.c
  11. +0 −1 compilers/imcc/parser_util.c
  12. +7 −3 compilers/pct/src/PCT/HLLCompiler.pir
  13. +0 −8 config/gen/makefiles.pm
  14. +0 −67 config/gen/makefiles/ext.in
  15. +9 −27 config/gen/makefiles/root.in
  16. +2 −5 docs/embed.pod
  17. +2 −1 docs/parrothist.pod
  18. +2 −2 docs/pdds/pdd10_embedding.pod
  19. +10 −0 docs/pdds/pdd17_pmc.pod
  20. +19 −30 docs/project/release_manager_guide.pod
  21. +1 −2 docs/tests.pod
  22. +0 −1 examples/c/pbc_info.c
  23. +1 −1 examples/c/test_main.c
  24. +0 −1 examples/compilers/japhc.c
  25. +1 −1 examples/embed/cotorra.c
  26. +3 −0 examples/languages/abc/src/parser/actions.nqp
  27. +1 −0 examples/languages/abc/t/abc_functions
  28. +0 −141 ext/Parrot-Embed/Build.PL
  29. +0 −17 ext/Parrot-Embed/Changes
  30. +0 −12 ext/Parrot-Embed/MANIFEST
  31. +0 −28 ext/Parrot-Embed/README
  32. +0 −10 ext/Parrot-Embed/TODO
  33. +0 −57 ext/Parrot-Embed/lib/Parrot/Embed.pm
  34. +0 −251 ext/Parrot-Embed/lib/Parrot/Embed.xs
  35. +0 −129 ext/Parrot-Embed/lib/Parrot/Interpreter.pm
  36. +0 −93 ext/Parrot-Embed/lib/Parrot/PMC.pm
  37. +0 −39 ext/Parrot-Embed/t/00-load.t
  38. +0 −28 ext/Parrot-Embed/t/greet.pir
  39. +0 −108 ext/Parrot-Embed/t/interp.t
  40. +0 −40 ext/Parrot-Embed/t/languages.t
  41. +0 −82 ext/Parrot-Embed/t/pipp.t
  42. +0 −63 ext/Parrot-Embed/tools/check_embed_coverage.pl
  43. +0 −26 ext/Parrot-Embed/tools/write_typemap.pl
  44. +0 −35 ext/Parrot-Embed/typemap
  45. +5,121 −5,114 ext/winxed/compiler.pir
  46. +15 −123 frontend/parrot2/prt0.pir
  47. +5 −3 frontend/parrot2/prt0.winxed
  48. +12 −17 frontend/parrot_debugger/main.c
  49. +0 −6 frontend/pbc_disassemble/main.c
  50. +6 −6 frontend/pbc_dump/main.c
  51. +0 −8 frontend/pbc_merge/main.c
  52. +43 −0 include/parrot/disassemble.h
  53. +0 −119 include/parrot/embed.h
  54. +13 −0 include/parrot/hash.h
  55. +1 −1 include/parrot/io.h
  56. +1 −1 include/parrot/oplib/core_ops.h
  57. +2 −2 include/parrot/packfile.h
  58. +1 −0 include/parrot/parrot.h
  59. +1 −0 include/parrot/platform_interface.h
  60. +1 −1 lib/Parrot/Harness/DefaultTests.pm
  61. +1 −1 ports/debian/rules
  62. +3 −3 runtime/parrot/library/Archive/Tar.pir
  63. +2 −2 runtime/parrot/library/Archive/Zip.pir
  64. +3 −3 runtime/parrot/library/distutils.pir
  65. +3 −2 runtime/parrot/library/postgres.pir
  66. +0 −2 src/debug.c
  67. +243 −0 src/disassemble.c
  68. +2 −0 src/dynpmc/dynlexpad.pmc
  69. +151 −127 src/dynpmc/select.pmc
  70. +0 −545 src/embed.c
  71. +0 −1 src/embed/api.c
  72. +0 −1 src/embed/bytecode.c
  73. +76 −0 src/hash.c
  74. +6 −7 src/io/buffer.c
  75. +0 −1 src/ops/core.ops
  76. +4 −5 src/ops/core_ops.c
  77. +73 −3 src/packfile/api.c
  78. +0 −1 src/packfile/pf_private.h
  79. +1 −0 src/platform/generic/io.c
  80. +1 −0 src/platform/win32/io.c
  81. +38 −4 src/pmc/bytebuffer.pmc
  82. +32 −7 src/pmc/default.pmc
  83. +63 −0 src/pmc/fixedfloatarray.pmc
  84. +33 −0 src/pmc/fixedintegerarray.pmc
  85. +26 −0 src/pmc/fixedpmcarray.pmc
  86. +28 −0 src/pmc/fixedstringarray.pmc
  87. +16 −0 src/pmc/hash.pmc
  88. +11 −8 src/pmc/imageiosize.pmc
  89. +179 −2 src/pmc/opcode.pmc
  90. +128 −8 src/pmc/oplib.pmc
  91. +1 −3 src/pmc/packfile.pmc
  92. +5 −1 src/pmc/packfileannotations.pmc
  93. +100 −29 src/pmc/packfiledebug.pmc
  94. +40 −2 src/pmc/packfileopmap.pmc
  95. +0 −1 src/pmc/parrotinterpreter.pmc
  96. +10 −2 src/pmc/pointer.pmc
  97. +5 −3 src/pmc/scheduler.pmc
  98. +1 −1 src/pmc/socket.pmc
  99. +1 −1 src/pmc/undef.pmc
  100. +0 −1 src/runcore/cores.c
  101. +0 −1 src/runcore/profiling.c
  102. +0 −1 src/runcore/subprof.c
  103. +1 −1 t/compilers/opsc/01-parse.t
  104. +7 −2 t/dynpmc/select.t
  105. +2 −1 t/library/pg.t
  106. BIN t/native_pbc/number.pbc
  107. BIN t/native_pbc/string.pbc
  108. +9 −1 t/pmc/fixedbooleanarray.t
  109. +13 −1 t/pmc/fixedfloatarray.t
  110. +2 −0 t/pmc/fixedintegerarray.t
  111. +29 −4 t/pmc/fixedpmcarray.t
  112. +49 −0 t/pmc/hash.t
  113. +9 −0 t/pmc/packfileopmap.t
  114. +38 −1 t/pmc/resizablefloatarray.t
  115. +38 −1 t/pmc/resizableintegerarray.t
  116. +38 −1 t/pmc/resizablepmcarray.t
  117. +38 −1 t/pmc/resizablestringarray.t
  118. +9 −38 t/src/embed.t
  119. +0 −1 t/src/embed/api.t
  120. +0 −1 t/src/embed/strings.t
  121. +0 −1 t/src/exit.t
  122. +49 −43 t/src/extend.t
  123. +1 −1 t/src/extend_vtable.t
  124. +0 −2 t/src/misc.t
  125. +0 −2 t/src/pointer_array.t
  126. +0 −2 t/src/warnings.t
  127. +1 −1 t/tools/dev/search_ops/samples.pm
  128. +6 −1 tools/dev/mk_inno_language.pl
  129. +3 −11 tools/dev/mk_language_shell.in
  130. +6 −6 tools/release/release.json
View
@@ -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
View
@@ -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
View
@@ -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 []
View
@@ -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$
View
@@ -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]
View
@@ -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
View
2 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.
View
@@ -1 +1 @@
-3.8.0
+3.9.0
View
@@ -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 \
View
@@ -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"
@@ -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"
@@ -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
View
@@ -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',
},
@@ -1,67 +0,0 @@
-# Copyright (C) 2006-2009, Parrot Foundation.
-
-# setup of commands
-@make_set_make@
-MAKE = @make@
-PERL = @perl@
-RM_F = @rm_f@
-
-# add new languages here
-# remove obsolete languages here
-EXT = \
- Parrot-Embed
-
-# the default target
-all: $(EXT)
-
-# hard-code these for now
-test: Parrot-Embed
- - cd Parrot-Embed && $(MAKE) test
-
-
-# This is a listing of all targets, that are meant to be called by users
-help:
- @echo ""
- @echo "Following targets are available for the user:"
- @echo ""
- @echo " all: Make a lot of language implementations."
- @echo " This is the default."
- @echo " test: Unified test suite for a lot of languages."
- @echo ""
- @echo " clean: Clean up a lot of languages."
- @echo ""
- @echo " help: Print this help message."
- @echo ""
- @echo "Following languages are available:"
- @echo " $(LANGUAGES)"
- @echo "A particular language <lang> can be built, tested and cleand up"
- @echo " make <lang>"
- @echo " make <lang>.test"
- @echo " make <lang>.clean"
- @echo "For the status of individual languages see:"
- @echo " https://trac.parrot.org/parrot/wiki/Languages"
- @echo ""
-
-clean: \
- Parrot-Embed.clean
-
-#
-# Extension specific targets
-#
-
-# The *.dummy targets are a replacement for the target .PHONY in 'GNU make'
-
-Parrot-Embed : Parrot-Embed.dummy
-
-Parrot-Embed.dummy:
-#IF(win32): - cd Parrot-Embed && $(PERL) Makefile.PL && nmake
-#UNLESS(win32): - cd Parrot-Embed && $(PERL) Makefile.PL && $(MAKE)
-
-Parrot-Embed.clean:
-#IF(win32): - cd Parrot-Embed && nmake clean
-#UNLESS(win32): - cd Parrot-Embed && $(MAKE) clean
-
-# Local variables:
-# mode: makefile
-# End:
-# vim: ft=make:
Oops, something went wrong.

0 comments on commit 3fe43f8

Please sign in to comment.