Revert "Delete throw-win32-error, replace with win32-error calls"

This reverts commit e1be081ec93061d1e236d6d6f4c1778feef854c2.

diff --git a/basis/io/directories/windows/windows.factor b/basis/io/directories/windows/windows.factor
index 083c5187fb6634ef26a69a9a1be897847655a076..76cc8f33f0a18460162d2f7750204bd2bc420fe8 100644 (file)
--- a/basis/io/directories/windows/windows.factor
+++ b/basis/io/directories/windows/windows.factor
@@ -31,7 +31,7 @@ ERROR: file-delete-failed path error ;
 : (delete-file) ( path -- )
     dup DeleteFile 0 = [
         GetLastError ERROR_ACCESS_DENIED =
-        [ delete-read-only-file ] [ win32-error ] if
+        [ delete-read-only-file ] [ throw-win32-error ] if
     ] [ drop ] if ;
 
 M: windows delete-file ( path -- )

diff --git a/basis/io/files/windows/windows.factor b/basis/io/files/windows/windows.factor
index 518fa8daab5c40bc121f4d312281b6f013eae0df..0531551b60c0f49499b769a44471abd5da1b98ed 100644 (file)
--- a/basis/io/files/windows/windows.factor
+++ b/basis/io/files/windows/windows.factor
@@ -117,7 +117,7 @@ M: windows init-io ( -- )
 : handle>file-size ( handle -- n/f )
     (handle>file-size) [
         GetLastError ERROR_INVALID_FUNCTION =
-        [ f ] [ win32-error ] if
+        [ f ] [ throw-win32-error ] if
     ] unless* ;
 
 ERROR: seek-before-start n ;
@@ -400,7 +400,7 @@ M: windows home
     0
     [ FindFirstStream ] keepd
     over INVALID_HANDLE_VALUE = [
-        2drop win32-error
+        2drop throw-win32-error
     ] [
         1vector swap file-streams-rest
     ] if ;

diff --git a/basis/windows/errors/errors.factor b/basis/windows/errors/errors.factor
index 5679a62ebad98ec724c8a37817b7b6646292315f..82e8701d16f0fe231dd7ba319f4d99f79a938e88 100644 (file)
--- a/basis/windows/errors/errors.factor
+++ b/basis/windows/errors/errors.factor
@@ -740,6 +740,9 @@ ERROR: windows-error n string ;
         dup n>win32-error-string windows-error
     ] if ;
 
+: throw-win32-error ( -- * )
+    win32-error-string throw ;
+
 : check-invalid-handle ( handle -- handle )
     dup INVALID_HANDLE_VALUE = [ win32-error ] when ;
 
@@ -755,7 +758,11 @@ CONSTANT: expected-io-errors
     expected-io-errors member? ;
 
 : expected-io-error ( error-code -- )
-    expected-io-error? [ win32-error ] unless ;
+    dup expected-io-error? [
+        drop
+    ] [
+        throw-win32-error
+    ] if ;
 
 : io-error ( return-value -- )
     { 0 f } member? [ GetLastError expected-io-error ] when ;