[parrot/parrot] 988986: Merge branch 'master' into rurban/mime-base64-utf8...

[GitHub]

  Branch: refs/heads/rurban/json-utf16-gh845
  Home:   https://github.com/parrot/parrot
  Commit: 988986b46fae0be5b215b44830edd84ba3815158
      https://github.com/parrot/parrot/commit/988986b46fae0be5b215b44830edd84ba3815158
  Author: Reini Urban <rurban at cpanel.net>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ChangeLog
    M Configure.pl
    M MANIFEST
    A config/auto/alignof.pm
    A config/auto/alignof/test_c.in
    M config/auto/attributes.pm
    M config/auto/gcc.pm
    M config/auto/warnings.pm
    M config/gen/config_h/feature_h.in
    M config/gen/makefiles.pm
    M config/gen/makefiles/root.in
    M docs/binaries/parrot.pod
    M docs/running.pod
    M examples/pir/sudoku.pir
    M frontend/parrot2/main.c
    M frontend/parrot2/prt0.pir
    M frontend/parrot2/prt0.winxed
    M include/parrot/datatypes.h
    M lib/Parrot/Configure/Step/List.pm
    M lib/Parrot/Pmc2c/Method.pm
    M lib/Parrot/Pmc2c/PMC/Null.pm
    M src/dynoplibs/Defines.in
    M src/dynoplibs/Rules.in
    M src/dynpmc/gziphandle.pmc
    M src/ops/core.ops
    M src/ops/core_ops.c
    M src/pmc/addrregistry.pmc
    M src/pmc/class.pmc
    M src/pmc/continuation.pmc
    M src/pmc/default.pmc
    M src/pmc/key.pmc
    M src/pmc/orderedhashiterator.pmc
    M src/pmc/pointer.pmc
    M src/pmc/scheduler.pmc
    M src/pmc/sub.pmc
    M src/pmc/undef.pmc
    M t/dynpmc/select.t
    M t/pmc/filehandle.t
    M t/pmc/nci.t
    M t/pmc/parrotio.t
    M t/pmc/stringhandle.t

  Log Message:
  -----------
  Merge branch 'master' into rurban/mime-base64-utf8-gh813+gh814

Fixed conflict in:
	ChangeLog


  Commit: f50380b17eba4c85080e108d02f3e7421c84676b
      https://github.com/parrot/parrot/commit/f50380b17eba4c85080e108d02f3e7421c84676b
  Author: Reini Urban <rurban at cpanel.net>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M compilers/data_json/data_json/pge2pir.tg
    M src/ops/string.ops
    M src/string/encoding/utf16.c
    M t/compilers/data_json/from_parrot.t
    M t/compilers/data_json/to_parrot.t

  Log Message:
  -----------
  [GH #845] Fix data_json \unnnn encoding

\u needs to be encoded as utf16 char, not utf8 because they
are binary different. E.g. \u00a2 is 0xc2a2 in utf8.

Add utf16_chr vtable method for the Parrot_utf16_encoding.
Add unicode tests to data_json.


Compare: https://github.com/parrot/parrot/compare/988986b46fae^...f50380b17eba