Merge git://factorcode.org/git/factor

core/cpu/x86/assembler/assembler.factor

@@ -255,9 +255,8 @@ UNION: operand register indirect ;
 : extended-opcode, ( opcode -- ) extended-opcode opcode, ;
 
 : opcode-or ( opcode mask -- opcode' )
-    over array?
-    [ 1 rot cut* first rot bitor add ]
-    [ bitor ] if ;
+    swap dup array?
+    [ 1 cut* first rot bitor add ] [ bitor ] if ;
 
 : 1-operand ( op reg rex.w opcode -- )
     #! The 'reg' is not really a register, but a value for the

extra/destructors/destructors.factor

@@ -84,10 +84,6 @@ M: socket-destructor (destruct) ( obj -- ) (socket-destructor) ;
 : close-socket-later ( handle -- )
     f <socket-destructor> push-destructor ;
 
-USE-IF: windows? destructors.windows
-USE-IF: unix? destructors.unix
-
-
 
 ! : add-destructor ( word quot -- )
     ! >quotation

extra/destructors/unix/unix.factor

@@ -1,9 +0,0 @@
-USING: destructors io.windows kernel qualified ;
-QUALIFIED: unix
-IN: detructors.unix
-
-M: unix-io (handle-destructor) ( obj -- )
-    destructor-obj close drop ;
-
-
-

extra/destructors/windows/windows.factor

@@ -1,11 +0,0 @@
-USING: destructors io.windows kernel windows.kernel32
-windows.winsock ;
-IN: detructors.windows
-
-M: windows-io (handle-destructor) ( obj -- )
-    destructor-obj CloseHandle drop ;
-
-M: windows-io (socket-destructor) ( obj -- )
-    destructor-obj closesocket drop ;
-
-

extra/io/sniffer/bsd/bsd.factor

@@ -7,6 +7,9 @@ sequences ;
 QUALIFIED: unix
 IN: io.sniffer.bsd
 
+M: unix-io (handle-destructor) ( obj -- )
+    destructor-obj close drop ;
+
 C-UNION: ifreq_props "sockaddr-in" "short" "int" "caddr_t" ;
 C-STRUCT: ifreq { { "char" 16 } "name" } { "ifreq_props" "props" } ;
 

extra/io/windows/windows.factor

@@ -10,6 +10,12 @@ TUPLE: windows-nt-io ;
 TUPLE: windows-ce-io ;
 UNION: windows-io windows-nt-io windows-ce-io ;
 
+M: windows-io (handle-destructor) ( obj -- )
+    destructor-obj CloseHandle drop ;
+
+M: windows-io (socket-destructor) ( obj -- )
+    destructor-obj closesocket drop ;
+
 M: windows-io root-directory? ( path -- ? )
     [ path-separator? ] rtrim
     dup length 2 = [