Merge branch 'master' of git@github.com:prunedtree/factor

[factor.git] / basis / windows / errors / errors.factor

diff --git a/basis/windows/errors/errors.factor b/basis/windows/errors/errors.factor
index 34fd019889fdcdda7937bd8d854b14e98a3f78d8..8bdbb9f1e99838bbcd812d1afce3966d2f73ce03 100644 (file)
--- a/basis/windows/errors/errors.factor
+++ b/basis/windows/errors/errors.factor
@@ -1,6 +1,7 @@
 USING: alien.c-types kernel locals math math.bitwise
 windows.kernel32 sequences byte-arrays unicode.categories
-io.encodings.string io.encodings.utf16n alien.strings ;
+io.encodings.string io.encodings.utf16n alien.strings
+arrays literals ;
 IN: windows.errors
 
 CONSTANT: ERROR_SUCCESS                               0
@@ -712,11 +713,7 @@ ERROR: error-message-failed id ;
     GetLastError n>win32-error-string ;
 
 : (win32-error) ( n -- )
-    dup zero? [
-        drop
-    ] [
-        win32-error-string throw
-    ] if ;
+    [ win32-error-string throw ] unless-zero ;
 
 : win32-error ( -- )
     GetLastError (win32-error) ;
@@ -732,7 +729,7 @@ ERROR: error-message-failed id ;
     ] when ;
 
 CONSTANT: expected-io-errors
-    {
+    ${
         ERROR_SUCCESS
         ERROR_IO_INCOMPLETE
         ERROR_IO_PENDING