Merge commit 'slava/master' into unicode

Conflicts:

	core/parser/parser.factor
	core/source-files/source-files.factor
	extra/unicode/unicode-tests.factor
	extra/unicode/unicode.factor

diff --cc core/io/crc32/crc32.factor
index 82af0cdb23207e547e7bb93375786b347e060565,d253170ac05836dc31a343fd8149c519dc0aa48f..b83943df48d25de8c517aeba1de19b24b1688a3e
mode 100644,100755..100755
--- 1/core/io/crc32/crc32.factor
--- 2/core/io/crc32/crc32.factor
+++ b/core/io/crc32/crc32.factor

diff --cc core/parser/parser.factor
index 2579542af0918af11d013d377e54e5e3d326a100,8dcca00e3a2827a4e6ddbc197ebc6f739c0408db..eb15df8c1bb214e79c3b4df3d5f621cf398542d8
mode 100644,100755..100755
--- 1/core/parser/parser.factor
--- 2/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@@ -372,18 -399,6 +399,19 @@@ SYMBOL: bootstrap-synta
          "Loading " write <pathname> . flush
      ] if ;
  
++<<<<<<< HEAD:core/parser/parser.factor
 +: no-parse-hook ( quot -- )
 +    >r f parse-hook r> with-variable do-parse-hook ; inline
 +
 +: start-parsing ( stream name -- )
 +    H{ } clone new-definitions set
 +    dup [
 +        source-file
 +        dup file set
 +        source-file-definitions clone old-definitions set
 +    ] [ drop ] if
 +    lines \ lines set ;
 +
  : smudged-usage-warning ( usages removed -- )
      parser-notes? [
          "Warning: the following definitions were removed from sources," print

diff --cc core/source-files/source-files.factor
index f8fdc45fe9663776f0210e7e7a63fd1fba6a5cd5,80538e2cf5661af3918b462201d76150bf6ccb40..420fa903433bd4c1b7e49038d7c0e39e54746172
mode 100644,100755..100755
--- 1/core/source-files/source-files.factor
--- 2/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor

diff --cc extra/combinators/lib/lib.factor
index 94d13a828cb715a83fcd22d569096b7ca0a0e00e,06f054928cfd5fefd04047978e65b039f7a73dcc..1c786a2559774c3a5a304b4b1dee988149ac9856
mode 100644,100755..100755
--- 1/extra/combinators/lib/lib.factor
--- 2/extra/combinators/lib/lib.factor
+++ b/extra/combinators/lib/lib.factor

diff --cc extra/delegate/delegate.factor
index f7dcc8821d08757d238b860e168052c6a076ff25,a0b2c7817c7b6793fe28c89c71ed3ac73e42bf6e..4cd25baeb918bdf03d85e6da46a2f2eb4b6bccc3
mode 100644,100755..100755
--- 1/extra/delegate/delegate.factor
--- 2/extra/delegate/delegate.factor
+++ b/extra/delegate/delegate.factor

diff --cc extra/unicode/breaks/breaks.factor
Simple merge

diff --cc extra/unicode/unicode-tests.factor
index 6c069b523eb1e3b72fc57f2a3d7fd45cd9c869c4,2d19ddc5c1a8d960084ac43cd1d8fec9c23e3af5..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/extra/unicode/unicode-tests.factor
--- 2/extra/unicode/unicode-tests.factor
+++ /dev/null
@@@ -1,1 -1,37 +1,0 @@@
--USING: unicode kernel tools.test words sequences namespaces ;
 -
 -[ "Hello How Are You? I'M Good" ] [ "hEllo how ARE yOU? I'm good" >title ] unit-test
 -[ "FUSS" ] [ "Fu\u00DF" >upper ] unit-test
 -[ "\u03C3\u03C2" ] [ "\u03A3\u03A3" >lower ] unit-test
 -[ t ] [ "hello how are you?" lower? ] unit-test
 -[
 -    "tr" locale set
 -    [ "i\u0131i \u0131jj" ] [ "i\u0131I\u0307 IJj" >lower ] unit-test
 -!    [ "I\u307\u0131i Ijj" ] [ "i\u0131I\u0307 IJj" >title ] unit-test
 -    [ "I\u0307II\u0307 IJJ" ] [ "i\u0131I\u0307 IJj" >upper ] unit-test
 -    "lt" locale set
 -    ! Lithuanian casing tests
 -] with-scope
 -
 -[ { f f t t f t t f f t } ] [ CHAR: A { 
 -    blank? letter? LETTER? Letter? digit? 
 -    printable? alpha? control? uncased? character? 
 -} [ execute ] with map ] unit-test
 -[ "Nd" ] [ CHAR: 3 category ] unit-test
 -[ CHAR: ! ] [ UNICHAR: exclamation-mark ] unit-test
 -[ "ab\u0323\u0302cd" ] [ "ab\u0302" "\u0323cd" string-append ] unit-test
 -
 -[ "ab\u064b\u034d\u034e\u0347\u0346" ] [ "ab\u0346\u0347\u064b\u034e\u034d" dup reorder ] unit-test
 -[ "hello" "hello" ] [ "hello" [ nfd ] keep nfkd ] unit-test
 -[ "\uFB012\u2075\u017F\u0323\u0307" "fi25s\u0323\u0307" ]
 -[ "\uFB012\u2075\u1E9B\u0323" [ nfd ] keep nfkd ] unit-test
 -
 -[ "\u1E69" "s\u0323\u0307" ] [ "\u1E69" [ nfc ] keep nfd ] unit-test
 -[ "\u1E0D\u0307" ] [ "\u1E0B\u0323" nfc ] unit-test
 -
 -[ 54620 ] [ 4370 4449 4523 jamo>hangul ] unit-test
 -[ 4370 4449 4523 ] [ 54620 hangul>jamo first3 ] unit-test
 -[ t ] [ 54620 hangul? ] unit-test
 -[ f ] [ 0 hangul? ] unit-test
 -[ "\u1112\u1161\u11ab" ] [ "\ud55c" nfd ] unit-test
 -[ "\ud55c" ] [ "\u1112\u1161\u11ab" nfc ] unit-test

diff --cc extra/unicode/unicode.factor
index 12673c3bde3d222cc47331d196f35f4cb2c1858a,debd8ceec01b6db42559467a3657bc238cc72827..12673c3bde3d222cc47331d196f35f4cb2c1858a
mode 100644,100755..100755
--- 1/extra/unicode/unicode.factor
--- 2/extra/unicode/unicode.factor
+++ b/extra/unicode/unicode.factor

diff --cc extra/xml/data/data.factor
Simple merge