Merge branch 'master' into unicode

Conflicts:

	core/io/encodings/utf16/utf16-tests.factor
	core/io/encodings/utf16/utf16.factor
	core/io/encodings/utf8/utf8-tests.factor

diff --cc core/io/encodings/encodings.factor
Simple merge

diff --cc core/io/encodings/utf8/utf8-tests.factor
index a1c9edbe49bfd06962bb65597763950565c23dcb,ea7a238551b914d85a33742c4ff76e77c271132b..cbffa092d90aa2d02a553cef0a537fafc1577cc4
--- 1/core/io/encodings/utf8/utf8-tests.factor
--- 2/core/io/encodings/utf8/utf8-tests.factor
+++ b/core/io/encodings/utf8/utf8-tests.factor
@@@ -1,13 -1,13 +1,13 @@@
- USING: io.encodings.utf8 tools.test sbufs kernel io io.encodings
- sequences strings arrays unicode.syntax ;
+ USING: io.encodings.utf8 tools.test sbufs kernel io
+ sequences strings arrays unicode ;
  
  : decode-utf8-w/stream ( array -- newarray )
 -    >sbuf dup reverse-here <utf8> contents >array ;
 +    >sbuf dup reverse-here utf8 <decoding> contents ;
  
  : encode-utf8-w/stream ( array -- newarray )
 -    SBUF" " clone tuck <utf8> write >array ;
 +    SBUF" " clone tuck utf8 <encoding> stream-write >array ;
  
- [ { UNICHAR: replacement-character } ] [ { BIN: 11110101 BIN: 10111111 BIN: 10000000 BIN: 11111111 } decode-utf8-w/stream >array ] unit-test
+ [ { CHAR: replacement-character } ] [ { BIN: 11110101 BIN: 10111111 BIN: 10000000 BIN: 11111111 } decode-utf8-w/stream >array ] unit-test
  
  [ { BIN: 101111111000000111111 } ] [ { BIN: 11110101 BIN: 10111111 BIN: 10000000 BIN: 10111111 } decode-utf8-w/stream >array ] unit-test