From 1e1640abb3923176474caf73a3f836c4c539f6c8 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 9 Dec 2008 03:22:38 -0600 Subject: [PATCH] Load fixes --- basis/alien/strings/strings-tests.factor | 2 +- basis/environment/winnt/winnt.factor | 2 +- basis/io/encodings/utf16/utf16-tests.factor | 6 ------ basis/io/encodings/utf16n/utf16n-tests.factor | 8 ++++++++ basis/io/windows/files/files.factor | 8 ++++---- basis/io/windows/nt/files/files.factor | 12 ++++++------ basis/io/windows/nt/monitors/monitors.factor | 4 ++-- basis/ui/windows/windows.factor | 3 ++- basis/windows/winsock/winsock.factor | 2 +- basis/x11/xim/xim.factor | 2 +- 10 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 basis/io/encodings/utf16n/utf16n-tests.factor diff --git a/basis/alien/strings/strings-tests.factor b/basis/alien/strings/strings-tests.factor index c1a509041e..263453ba1c 100644 --- a/basis/alien/strings/strings-tests.factor +++ b/basis/alien/strings/strings-tests.factor @@ -1,6 +1,6 @@ USING: alien.strings tools.test kernel libc io.encodings.8-bit io.encodings.utf8 io.encodings.utf16 -io.encodings.ascii alien io.encodings.string ; +io.encodings.utf16n io.encodings.ascii alien io.encodings.string ; IN: alien.strings.tests [ "\u0000ff" ] diff --git a/basis/environment/winnt/winnt.factor b/basis/environment/winnt/winnt.factor index 33cf6a698b..2ad3393aec 100644 --- a/basis/environment/winnt/winnt.factor +++ b/basis/environment/winnt/winnt.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.strings fry io.encodings.utf16 kernel +USING: alien.strings fry io.encodings.utf16n kernel splitting windows windows.kernel32 system environment alien.c-types sequences windows.errors io.streams.memory io.encodings io ; diff --git a/basis/io/encodings/utf16/utf16-tests.factor b/basis/io/encodings/utf16/utf16-tests.factor index fd251c76db..bde92a260d 100644 --- a/basis/io/encodings/utf16/utf16-tests.factor +++ b/basis/io/encodings/utf16/utf16-tests.factor @@ -23,9 +23,3 @@ IN: io.encodings.utf16.tests [ { CHAR: x } ] [ { HEX: fe HEX: ff 0 CHAR: x } utf16 decode >array ] unit-test [ { HEX: ff HEX: fe 120 0 52 216 30 221 } ] [ { CHAR: x HEX: 1d11e } utf16 encode >array ] unit-test - -: correct-endian - code>> little-endian? [ utf16le = ] [ utf16be = ] if ; - -[ t ] [ B{ } utf16n correct-endian ] unit-test -[ t ] [ utf16n correct-endian ] unit-test diff --git a/basis/io/encodings/utf16n/utf16n-tests.factor b/basis/io/encodings/utf16n/utf16n-tests.factor new file mode 100644 index 0000000000..d39f2470dd --- /dev/null +++ b/basis/io/encodings/utf16n/utf16n-tests.factor @@ -0,0 +1,8 @@ +USING: accessors alien.c-type kernel io.streams.byte-array tools.test ; +IN: io.encodings.utf16n + +: correct-endian + code>> little-endian? [ utf16le = ] [ utf16be = ] if ; + +[ t ] [ B{ } utf16n correct-endian ] unit-test +[ t ] [ utf16n correct-endian ] unit-test diff --git a/basis/io/windows/files/files.factor b/basis/io/windows/files/files.factor index 83954e045b..894ddc83c6 100755 --- a/basis/io/windows/files/files.factor +++ b/basis/io/windows/files/files.factor @@ -1,10 +1,10 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types io.binary io.backend io.files io.buffers -io.windows kernel math splitting fry alien.strings -windows windows.kernel32 windows.time calendar combinators -math.functions sequences namespaces make words symbols system -io.ports destructors accessors math.bitwise continuations +io.encodings.utf16n io.ports io.windows kernel math splitting +fry alien.strings windows windows.kernel32 windows.time calendar +combinators math.functions sequences namespaces make words +symbols system destructors accessors math.bitwise continuations windows.errors arrays byte-arrays ; IN: io.windows.files diff --git a/basis/io/windows/nt/files/files.factor b/basis/io/windows/nt/files/files.factor index 9f25eb5eb1..e54f032873 100644 --- a/basis/io/windows/nt/files/files.factor +++ b/basis/io/windows/nt/files/files.factor @@ -1,10 +1,10 @@ USING: continuations destructors io.buffers io.files io.backend -io.timeouts io.ports io.windows io.windows.files -io.windows.nt.backend windows windows.kernel32 -kernel libc math threads system environment -alien.c-types alien.arrays alien.strings sequences combinators -combinators.short-circuit ascii splitting alien strings -assocs namespaces make io.files.private accessors tr ; +io.timeouts io.ports io.files.private io.windows +io.windows.files io.windows.nt.backend io.encodings.ut16n +windows windows.kernel32 kernel libc math threads system +environment alien.c-types alien.arrays alien.strings sequences +combinators combinators.short-circuit ascii splitting alien +strings assocs namespaces make accessors tr ; IN: io.windows.nt.files M: winnt cwd diff --git a/basis/io/windows/nt/monitors/monitors.factor b/basis/io/windows/nt/monitors/monitors.factor index 30345c8c69..a2b7c4fa2d 100755 --- a/basis/io/windows/nt/monitors/monitors.factor +++ b/basis/io/windows/nt/monitors/monitors.factor @@ -5,8 +5,8 @@ kernel math assocs namespaces make continuations sequences hashtables sorting arrays combinators math.bitwise strings system accessors threads splitting io.backend io.windows io.windows.nt.backend io.windows.nt.files io.monitors io.ports -io.buffers io.files io.timeouts io.encodings.string io -windows windows.kernel32 windows.types ; +io.buffers io.files io.timeouts io.encodings.string +io.encodings.utf16n io windows windows.kernel32 windows.types ; IN: io.windows.nt.monitors : open-directory ( path -- handle ) diff --git a/basis/ui/windows/windows.factor b/basis/ui/windows/windows.factor index 1481287e95..0510e21f17 100755 --- a/basis/ui/windows/windows.factor +++ b/basis/ui/windows/windows.factor @@ -9,7 +9,8 @@ windows.user32 windows.opengl32 windows.messages windows.types windows.nt windows threads libc combinators combinators.short-circuit continuations command-line shuffle opengl ui.render ascii math.bitwise locals symbols accessors -math.geometry.rect math.order ascii calendar ; +math.geometry.rect math.order ascii calendar +io.encodings.utf16n ; IN: ui.windows SINGLETON: windows-ui-backend diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor index 4ca07ce850..5d450897e2 100644 --- a/basis/windows/winsock/winsock.factor +++ b/basis/windows/winsock/winsock.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.c-types alien.strings alien.syntax arrays byte-arrays kernel math sequences windows.types windows.kernel32 -windows.errors windows math.bitwise alias ; +windows.errors windows math.bitwise alias io.encodings.utf16n ; IN: windows.winsock USE: libc diff --git a/basis/x11/xim/xim.factor b/basis/x11/xim/xim.factor index 71b0b5f133..862ec3355a 100644 --- a/basis/x11/xim/xim.factor +++ b/basis/x11/xim/xim.factor @@ -3,7 +3,7 @@ USING: alien alien.c-types alien.strings arrays byte-arrays hashtables io io.encodings.string kernel math namespaces sequences strings continuations x11.xlib specialized-arrays.uint -accessors ; +accessors io.encodings.utf16n ; IN: x11.xim SYMBOL: xim