Permalink
Browse files

Merge branch 'master' into ayardley/documentation_revisions

  • Loading branch information...
2 parents b39e6f8 + b878029 commit 4522cb295b47263a8b3d4e64bc87255026ac456a @ayardley ayardley committed Apr 15, 2012
Showing with 7,330 additions and 5,453 deletions.
  1. +38 −10 .travis.yml
  2. +4 −3 CREDITS
  3. +59 −4 ChangeLog
  4. +7 −3 MANIFEST
  5. +3 −3 MANIFEST.generated
  6. +7 −3 README
  7. +3 −2 RESPONSIBLE_PARTIES
  8. +1 −1 VERSION
  9. +3 −3 compilers/imcc/cfg.c
  10. +3 −1 compilers/imcc/imcc.l
  11. +1 −1 compilers/imcc/imcc.y
  12. +823 −872 compilers/imcc/imcparser.c
  13. +9 −7 compilers/imcc/imcparser.h
  14. +0 −25 compilers/imcc/main.c
  15. +7 −5 compilers/imcc/optimizer.c
  16. +65 −37 compilers/imcc/pbc.c
  17. +2 −90 compilers/imcc/pcc.c
  18. +1 −1 compilers/imcc/reg_alloc.c
  19. +2 −1 compilers/opsc/src/Ops/Emitter.pm
  20. +7 −6 compilers/opsc/src/Ops/Trans/C.pm
  21. +1 −1 compilers/pct/src/PAST/Compiler.pir
  22. +1 −1 compilers/pct/src/PCT/HLLCompiler.pir
  23. +1 −1 config/auto/byteorder.pm
  24. +4 −0 config/auto/gcc.pm
  25. +1 −1 config/auto/headers.pm
  26. +1 −8 config/auto/icu.pm
  27. +33 −27 config/auto/warnings.pm
  28. +1 −1 config/gen/makefiles/docs.in
  29. +184 −158 config/gen/makefiles/root.in
  30. +2 −2 config/init/hints/cygwin.pm
  31. +2 −2 config/init/hints/darwin.pm
  32. +13 −5 config/init/hints/mswin32.pm
  33. +2 −2 docs/book/draft/ch10_opcode_reference.pod
  34. +2 −2 docs/book/pir/ch04_variables.pod
  35. +2 −2 docs/configuration.pod
  36. +5 −3 docs/parrothist.pod
  37. +4 −0 docs/project/cage_cleaners_guide.pod
  38. +17 −0 docs/project/hacking_tips.pod
  39. +60 −32 docs/project/release_manager_guide.pod
  40. +321 −0 docs/project/release_parrot_github_guide.pod
  41. +1 −1 examples/sdl/tetris/block.pir
  42. +18 −18 examples/sdl/tetris/board.pir
  43. +1 −1 ext/nqp-rx/src/stage0/HLL-s0.pir
  44. +2 −2 ext/nqp-rx/src/stage0/Regex-s0.pir
  45. +470 −236 ext/winxed/compiler.pir
  46. +80 −82 ext/winxed/driver.pir
  47. +0 −1 frontend/parrot/main.c
  48. +3 −2 frontend/parrot2/build.pir
  49. +2 −4 frontend/parrot2/main.c
  50. +37 −13 frontend/parrot_debugger/main.c
  51. +9 −1 frontend/pbc_disassemble/main.c
  52. +89 −28 frontend/pbc_dump/main.c
  53. +2 −2 frontend/pbc_dump/packdump.c
  54. +2 −2 frontend/pbc_merge/main.c
  55. +23 −8 include/parrot/api.h
  56. +10 −0 include/parrot/call.h
  57. +17 −6 include/parrot/hash.h
  58. +1 −4 include/parrot/interpreter.h
  59. +1 −1 include/parrot/memory.h
  60. +12 −3 include/parrot/oplib/core_ops.h
  61. +219 −210 include/parrot/oplib/ops.h
  62. +219 −210 include/parrot/opsenum.h
  63. +7 −19 include/parrot/packfile.h
  64. +5 −0 include/parrot/parrot.h
  65. +45 −0 include/parrot/pmc.h
  66. +35 −57 include/parrot/pointer_array.h
  67. +1 −1 include/parrot/scheduler.h
  68. +0 −8 include/parrot/sub.h
  69. +4 −4 lib/Parrot/Configure/Compiler.pm
  70. +5 −5 lib/Parrot/Distribution.pm
  71. +8 −8 lib/Parrot/Docs/File.pm
  72. +19 −0 lib/Parrot/Docs/HTMLPage.pm
  73. +3 −3 lib/Parrot/Docs/POD2HTML.pm
  74. +4 −4 lib/Parrot/IO/File.pm
  75. +2 −2 lib/Parrot/IO/Path.pm
  76. +7 −7 lib/Parrot/Manifest.pm
  77. +4 −4 lib/Parrot/Pmc2c/PMC.pm
  78. +1 −1 lib/Parrot/Pmc2c/PMC/default.pm
  79. +2 −2 runtime/parrot/library/P6object.pir
  80. +1 −1 runtime/parrot/library/SDL/Surface.pir
  81. +1 −1 runtime/parrot/library/Stream/Writer.pir
  82. +3 −3 runtime/parrot/library/osutils.pir
  83. +1 −1 runtime/parrot/library/parrotlib.pir
  84. +4 −3 src/alarm.c
  85. +36 −0 src/call/context.c
  86. +2 −1 src/call/ops.c
  87. +20 −18 src/debug.c
  88. +7 −7 src/dynext.c
  89. +3 −3 src/dynpmc/gziphandle.pmc
  90. +29 −0 src/dynpmc/os.pmc
  91. +21 −5 src/dynpmc/rational.pmc
  92. +2 −1 src/dynpmc/subproxy.pmc
  93. +9 −10 src/embed/api.c
  94. +0 −1 src/events.c
  95. +2 −2 src/gc/alloc_resources.c
  96. +14 −14 src/gc/gc_gms.c
  97. +1 −1 src/gc/gc_ms.c
  98. +6 −6 src/gc/gc_ms2.c
  99. +1 −6 src/gc/mark_sweep.c
  100. +2 −1 src/gc/string_gc.c
  101. +7 −3 src/global_setup.c
  102. +38 −6 src/hash.c
  103. +6 −6 src/interp/api.c
  104. +16 −12 src/interp/inter_cb.c
  105. +8 −0 src/nci/libffi.c
  106. +4 −4 src/ops/core.ops
  107. +1,859 −1,625 src/ops/core_ops.c
  108. +80 −0 src/ops/experimental.ops
  109. +2 −2 src/ops/object.ops
  110. +16 −5 src/ops/pmc.ops
  111. +2 −2 src/ops/set.ops
  112. +1 −10 src/ops/string.ops
  113. +7 −5 src/packfile/api.c
  114. +0 −571 src/packfile/byteorder.h
  115. +4 −4 src/packfile/output.c
  116. +668 −12 src/packfile/pf_items.c
  117. +1 −100 src/packfile/pf_private.h
  118. +9 −5 src/packfile/segments.c
  119. +124 −9 src/platform/generic/dl.c
  120. +2 −1 src/platform/generic/socket.c
  121. +297 −0 src/pmc.c
  122. +6 −0 src/pmc/callcontext.pmc
  123. +5 −0 src/pmc/class.pmc
  124. +1 −0 src/pmc/continuation.pmc
  125. +1 −5 src/pmc/coroutine.pmc
  126. +0 −277 src/pmc/default.pmc
  127. +1 −1 src/pmc/fixedbooleanarray.pmc
  128. +1 −1 src/pmc/fixedstringarray.pmc
  129. +15 −0 src/pmc/hashiterator.pmc
  130. +1 −1 src/pmc/imageiofreeze.pmc
  131. +1 −1 src/pmc/imccompiler.pmc
  132. +36 −1 src/pmc/lexpad.pmc
  133. +5 −2 src/pmc/managedstruct.pmc
  134. +1 −1 src/pmc/namespace.pmc
  135. +1 −1 src/pmc/nativepccmethod.pmc
  136. +1 −1 src/pmc/nci.pmc
  137. +9 −2 src/pmc/null.pmc
  138. +0 −2 src/pmc/parrotinterpreter.pmc
  139. +1 −1 src/pmc/parrotlibrary.pmc
  140. +4 −4 src/pmc/resizablebooleanarray.pmc
  141. +2 −2 src/pmc/resizablefloatarray.pmc
  142. +3 −3 src/pmc/resizableintegerarray.pmc
  143. +6 −6 src/pmc/resizablepmcarray.pmc
  144. +80 −22 src/pmc/stringbuilder.pmc
  145. +0 −5 src/pmc/sub.pmc
  146. +1 −1 src/pmc/undef.pmc
  147. +12 −14 src/pmc/unmanagedstruct.pmc
  148. +7 −6 src/pointer_array.c
  149. +0 −4 src/runcore/cores.c
  150. +0 −4 src/runcore/profiling.c
  151. +11 −14 src/runcore/subprof.c
  152. +3 −3 src/scheduler.c
  153. +2 −2 src/spf_render.c
  154. +15 −15 src/string/api.c
  155. +3 −1 src/string/encoding/utf8.c
  156. +0 −20 src/sub.c
  157. +0 −6 src/vtable.tbl
  158. +1 −1 t/codingstd/c_arg_assert.t
  159. +1 −1 t/codingstd/cuddled_else.t
  160. +2 −1 t/codingstd/filenames.t
  161. +49 −1 t/compilers/imcc/syn/const.t
  162. +15 −1 t/compilers/imcc/syn/pcc.t
  163. +2 −2 t/compilers/opsc/03-past.t
  164. +2 −2 t/compilers/opsc/08-emitter.t
  165. +1 −1 t/dynpmc/foo-02.t
  166. +16 −18 t/fullharness
  167. BIN t/native_pbc/annotations.pbc
  168. BIN t/native_pbc/integer.pbc
  169. BIN t/native_pbc/number.pbc
  170. BIN t/native_pbc/number_4.pbc
  171. BIN t/native_pbc/number_5.pbc
  172. BIN t/native_pbc/string.pbc
  173. BIN t/native_pbc/string_4.pbc
  174. BIN t/native_pbc/string_5.pbc
  175. +2 −2 t/op/gc.t
  176. +2 −2 t/pmc/freeze.t
  177. +28 −1 t/pmc/lexpad.t
  178. +1 −1 t/pmc/namespace.t
  179. +1 −1 t/pmc/object-meths.t
  180. +10 −10 t/pmc/prop.t
  181. +1 −0 t/src/checkdepend.t
  182. +1 −28 t/src/extend_vtable.t
  183. +14 −14 t/src/pointer_array.t
  184. +12 −6 t/steps/auto/icu-01.t
  185. +0 −157 t/steps/auto/sha1-01.t
  186. +3 −1 tools/build/parrot_config_c.pl
  187. +3 −3 tools/dev/faces.pl
  188. +77 −0 tools/dev/new_changelog_skeleton.pl
  189. +7 −7 tools/dev/pbc_to_exe.pir
  190. +22 −2 tools/docs/{make_html_docs.pl → mk_html_docs.pl}
  191. +426 −0 tools/release/parrot_github_release.pl
  192. +7 −7 tools/release/release.json
  193. +1 −1 tools/release/update_version.pl
View
@@ -1,17 +1,45 @@
+language: "perl"
+perl:
+# - "5.10"
+ - "5.14"
+install: "echo"
before_script:
- - sudo apt-get install ccache libffi-dev libicu-dev libgmp3-dev
-script: "perl Configure.pl --optimize --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' && make fulltest"
-# branches:
-# only:
-# - master
+ - sudo apt-get install libffi-dev libicu-dev libgmp3-dev clang llvm-dev zlib1g-dev gcc-multilib
+# No, we are not going to run the tests for all these dependencies on every commit
+ - cpanm -n LWP::UserAgent TAP::Harness::Archive TAP::Harness::ReportByDescription
+# This stuff used to be required, but was rolled into the Travis CI perl support.
+# - curl -L http://cpanmin.us | sudo perl - --self-upgrade
+# - export CI_USER=$USER
+# - mkdir ~/perl5 && perl -Mlocal::lib >> /tmp/local_lib_junk.sh && source /tmp/local_lib_junk.sh
+# - sudo chown -R $CI_USER ~/.cpanm
+# - sudo chown -R $CI_USER ~/perl5
+
+# Don't run Configure.pl tests, for now
+#script: "perl Configure.pl --test=build $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
+
+script: "perl Configure.pl $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
+
+branches:
+ only:
+ - master
notifications:
recipients:
- - duke@leto.net
+ - parrot-ci@lists.parrot.org
email:
on_success: change
on_failure: always
+ irc:
+ channels:
+ - "irc.parrot.org#parrot"
+ on_success: change
+ on_failure: change
env:
- - CC="ccache gcc"
- - CC="ccache g++"
- - CC="gcc"
- - CC="g++"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="clang"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="clang"
+ - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="clang"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="gcc"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="gcc"
+ - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="gcc"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="g++"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="g++"
+ - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="g++"
View
@@ -78,6 +78,7 @@ U: allison
N: Alvis Yardley
D: Documentation Shepherd (3.9.0 - Present)
+D: Release manger for 4.1.0
E: ac.yardley@gmail.com
U: alvis
S: Ft. Worth, Texas
@@ -527,7 +528,7 @@ D: lot of general hints and patches to improve portability
N: Jason Gloudon
-N: Jay Emmerson
+N: Jay Emerson
E: john.emerson@yale.edu
U: jay
@@ -599,8 +600,8 @@ S: Ohio, USA
N: Jonathan "Duke" Leto
E: jonathan@leto.net
-W: http://leto.net
-D: Release manager for 1.7.0
+W: http://dukeleto.pl
+D: Release manager for 1.7.0, 3.9.0,4.2.0 GCI/GSoC Org Admin/Mentor
U: dukeleto
A: leto
A: Duke Leto
View
@@ -1,10 +1,65 @@
-2012-01-17 release 4.1.0
+2012-04-17 release 4.3.0
- Core
- + Shared libraries and installable binaries are now stripped if built with
- --optimize on Cygwin, which greatly reduces their size on disk
+ + Winxed snapshot updated to 375562d
+ + New 'tools/release/parrot_github_release.pl' script to automate
+ updates to the 'parrot.github.com' and 'parrot-docsx' repositories.
- Documentation
- + Revised 'docs/project/release_manager_guide.pod'
+ + Updated 'docs/projects/release_manager_guide.pod'
+ + Updated 'docs/projects/release_parrot_github_guide.pod'
- Tests
+ - Community
+
+2012-03-20 release 4.2.0
+ - API Changes
+ + The signature of getprop was changed from (PMC,String,PMC) to
+ (PMC, PMC,String) for consistency
+ - Core
+ + Parrot Calling Conventions (pcc) now reuses Continuation PMCs
+ internally, which reduces GC work by 25% and improves
+ the fib.pir benchmark by 6%
+ + Winxed snapshot updated to 1.6.devel 44a04cfa7b
+ + Improved the detection of Clang-ish compilers during configuration
+ + Fixed a possible segfault bug when reading packfiles with no
+ constants or main_sub
+ + By default, Parrot has now elevated these GCC warnings to errors
+ during compile time:
+ implicit-function-declaration, undef, missing-braces,
+ nested externs, old-style-definition, strict-prototypes,
+ + The OS Dynamic PMC now has separate functions to unlink a file
+ and remove an empty directory (rmdir)
+ + Fix building on Cygwin due to an improperly named DLL file
+ + Various small bug fixes pointed out by static and dynamic analysis
+ tools
+ - Branches
+ + Work on M0 continues now in the m0 branch, which contains both
+ implementations (currently C and Perl) and specification.
+ + Good progress has been made on the threads branch which builds
+ on the green_threads branch. This gets Parrot much closer to
+ being able to utilize multiple CPU cores seemlessly. More details
+ at http://niner.name/Hybrid_Threads_for_the_Parrot_VM.pdf
+ - Documentation
+ + New release manager documentation for parrot.github.com :
+ http://git.io/parrot-github-guide
+ - Community
+ + Parrot was accepted to Google Summer of Code 2012!
+ Ideas Page: http://git.io/parrot-gsoc-2012
+
+2012-02-21 release 4.1.0
+ - Core
+ + Shared libraries and installable binaries are now stripped if
+ built with --optimize on Cygwin, which greatly reduces their
+ size on disk
+ + New experimental PCC-related ops added to core.
+ - Documentation
+ + Revised 'docs/project/release_manager_guide.pod'
+ - Tests
+ + Parrot now uses Travis CI http://travis-ci.org
+ + Parrot Continuous Integration (CI) with Travis CI means
+ every commit of Parrot is now compiled and tested on gcc,
+ g++ and clang with various Configure.pl options.
+ + CI Notifications are sent to parrot-dev, the #parrot
+ IRC channel and Smolder
+ + Cardinal and Rakudo spec tests also on Travis CI
2012-01-17 release 4.0.0
- Core
View
@@ -7,6 +7,7 @@
# See docs/submissions.pod and the documentation in
# tools/dev/mk_manifest_and_skip.pl.
.gitignore []
+.travis.yml []
CREDITS [main]doc
ChangeLog []
Configure.pl []
@@ -392,6 +393,7 @@ docs/project/hacking_tips.pod [doc]
docs/project/merge_review_guidelines.pod [doc]
docs/project/metacommitter_guide.pod [doc]
docs/project/release_manager_guide.pod [doc]
+docs/project/release_parrot_github_guide.pod [doc]
docs/project/roles_responsibilities.pod [doc]
docs/project/support_policy.pod [doc]
docs/project/ticket_triaging.pod [doc]
@@ -1314,7 +1316,6 @@ src/ops/string.ops []
src/ops/sys.ops []
src/ops/var.ops []
src/packfile/api.c []
-src/packfile/byteorder.h []
src/packfile/object_serialization.c []
src/packfile/output.c []
src/packfile/pf_items.c []
@@ -1763,6 +1764,7 @@ t/manifest/03-regenerate_skip.t [test]
t/manifest/04-alt_file.t [test]
t/manifest/05-alt_skip.t [test]
t/manifest/README []doc
+t/native_pbc/annotations.pbc [test]
t/native_pbc/header.t [test]
t/native_pbc/integer.pbc [test]
t/native_pbc/integer.t [test]
@@ -1788,6 +1790,7 @@ t/native_pbc/string_1.pbc [test]
t/native_pbc/string_2.pbc [test]
t/native_pbc/string_3.pbc [test]
t/native_pbc/string_4.pbc [test]
+t/native_pbc/string_5.pbc [test]
t/native_pbc/string_6.pbc [test]
t/native_pbc/string_7.pbc [test]
t/native_pbc/testdata/README []doc
@@ -2050,7 +2053,6 @@ t/steps/auto/pod2man-01.t [test]
t/steps/auto/readline-01.t [test]
t/steps/auto/readline-02.t [test]
t/steps/auto/revision-01.t [test]
-t/steps/auto/sha1-01.t [test]
t/steps/auto/signal-01.t [test]
t/steps/auto/sizes-01.t [test]
t/steps/auto/snprintf-01.t [test]
@@ -2196,6 +2198,7 @@ tools/dev/mk_rpm_manifests.pl []
tools/dev/nci_test_gen.pl []
tools/dev/nci_thunk_gen.pir []
tools/dev/ncidef2pir.pl []
+tools/dev/new_changelog_skeleton.pl []
tools/dev/nopaste.pl []
tools/dev/parrot-config.pir []
tools/dev/parrot.supp []
@@ -2224,8 +2227,8 @@ tools/dev/vgp_darwin []
tools/dev/vms-patch []
tools/dev/vtablize.pl []
tools/docs/filename_and_chapter.pl []
-tools/docs/make_html_docs.pl []
tools/docs/mk_chm.pl []
+tools/docs/mk_html_docs.pl []
tools/docs/ops_summary.pl []
tools/install/smoke.pl []
tools/install/smoke_languages.pl []
@@ -2235,6 +2238,7 @@ tools/release/crow.pir []
tools/release/cut.pl []
tools/release/gen_release_info.pl []
tools/release/inc_ver.pir []
+tools/release/parrot_github_release.pl []
tools/release/release.json []
tools/release/releasecheck.pl []
tools/release/sha256sum.pl []
View
@@ -1,14 +1,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.0.0.dylib [main]lib
+blib/lib/libparrot.4.2.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.0.0 [main]lib
+blib/lib/libparrot.so.4.2.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
-cygparrot4_0_0.dll [main]bin
+cygparrot-4.2.0.dll [main]bin
docs/ops/bit.pod [doc]
docs/ops/cmp.pod [doc]
docs/ops/core.pod [doc]
View
10 README
@@ -1,7 +1,7 @@
-This is Parrot, version 4.0.0
+This is Parrot, version 4.2.0
------------------------------
-Parrot is Copyright (C) 2001-2011, Parrot Foundation.
+Parrot is Copyright (C) 2001-2012, Parrot Foundation.
LICENSE INFORMATION
@@ -37,10 +37,14 @@ I. Install Git.
Linux:
The method depends on your distribution. To install you should execute (as root or sudo <cmd>):
-On Ubuntu/Debian (apt-based):
+On Ubuntu/Debian (old versions, apt-based):
apt-get install git-core
+On Ubuntu/Debian (new versions, apt-based):
+
+ apt-get install git
+
On Red Hat, Fedora (rpm-based):
yum install git
View
@@ -16,9 +16,9 @@ Architect Christoph Otto
Product Manager Andrew Whitworth
-Project Manager
+Project Manager ENOBODY
-Community Manager Jonathan "Duke" Leto
+Community Ambassador Jonathan "Duke" Leto
Release Manager Bob Rogers
Patrick Michaud
@@ -37,6 +37,7 @@ Release Manager Bob Rogers
Tyler Curtis
James E Keenan
Kevin Polulak
+ Alvis Yardley
Metacommitter Allison Randal
Jerry Gay
View
@@ -1 +1 @@
-4.0.0
+4.2.0
View
@@ -447,11 +447,11 @@ build_cfg(ARGMOD(imc_info_t *imcc), ARGMOD(IMC_Unit *unit))
/* Decouple unreachable blocks (not the first block, with no predecessors)
* from the CFG */
do {
- unsigned int i;
+ unsigned int j;
changes = 0;
- for (i = 1; i < unit->n_basic_blocks; i++) {
- Basic_block * const bb = unit->bb_list[i];
+ for (j = 1; j < unit->n_basic_blocks; j++) {
+ Basic_block * const bb = unit->bb_list[j];
if (!bb->pred_list) {
/* Remove all successor edges of block bb */
View
@@ -788,8 +788,10 @@ destroy_frame(struct macro_frame_t *frame, void *yyscanner)
if (frame->heredoc_rest) {
mem_sys_free(frame->heredoc_rest);
frame->heredoc_rest = NULL;
- } else
+ }
+ else {
ret = frame->s.line;
+ }
mem_sys_free(frame);
View
@@ -1019,7 +1019,7 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
/* TODO: This is very ugly and heavily nested. Can we avoid this? */
if (!STRING_equal(imcc->interp,
VTABLE_get_string(imcc->interp,
- VTABLE_getprop(imcc->interp, lib_pmc,
+ Parrot_pmc_getprop(imcc->interp, lib_pmc,
Parrot_str_new_constant(imcc->interp, "_type"))),
Parrot_str_new_constant(imcc->interp, "Ops")))
imcc_pbc_add_libdep(imcc, s);
Oops, something went wrong.

0 comments on commit 4522cb2

Please sign in to comment.