[parrot/parrot] 419bd9: update pbc_merge to merge the list of tags in the ...

GitHub noreply at github.com
Sun May 6 01:39:19 UTC 2012


  Branch: refs/heads/whiteknight/fix_pbc_merge
  Home:   https://github.com/parrot/parrot
  Commit: 419bd989d96768c23a2269a2c822db5eb3a6722b
      https://github.com/parrot/parrot/commit/419bd989d96768c23a2269a2c822db5eb3a6722b
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
    M frontend/pbc_merge/main.c
    M src/packfile/api.c

  Log Message:
  -----------
  update pbc_merge to merge the list of tags in the constants segment


  Commit: 1f7fdf7f64d87961f87aa912290490dd0c6bda41
      https://github.com/parrot/parrot/commit/1f7fdf7f64d87961f87aa912290490dd0c6bda41
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
    M frontend/pbc_merge/main.c
    M src/hash.c

  Log Message:
  -----------
  Fix conflict, remove embed API routine that doesn't belong in master yet


  Commit: 6c75c8d4e7fac244c22deacc796bae35df4e09bf
      https://github.com/parrot/parrot/commit/6c75c8d4e7fac244c22deacc796bae35df4e09bf
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
    M compilers/imcc/pbc.c
    M frontend/pbc_merge/main.c
    M include/parrot/packfile.h
    M src/packfile/api.c

  Log Message:
  -----------
  Add new routine Parrot_pf_get_annotations_segment. Use it in IMCC to clean up some code. Use it in pbc_merge, along with some other magic, to implement merging annotations. Annotations need a lot more documentation.


Compare: https://github.com/parrot/parrot/compare/419bd98^...6c75c8d


More information about the parrot-commits mailing list