core/basis/extra: use flags{ } in places.

diff --git a/basis/io/files/temp/windows/windows.factor b/basis/io/files/temp/windows/windows.factor
index 15f3ba04438a54f3bb20b663c825267d1ed3c49c..08249bbe4c42413429ec9f75d85189a780811489 100644 (file)
--- a/basis/io/files/temp/windows/windows.factor
+++ b/basis/io/files/temp/windows/windows.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2012 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.data alien.strings io.directories
-io.files.temp io.pathnames kernel math
-memoize specialized-arrays system windows.errors
-windows.kernel32 windows.ole32 windows.shell32
-windows.types ;
+USING: alien.data alien.strings io.directories io.files.temp
+io.pathnames kernel literals math memoize specialized-arrays
+system windows.errors windows.kernel32 windows.ole32
+windows.shell32 windows.types ;
 SPECIALIZED-ARRAY: WCHAR
 IN: io.files.temp.windows
 
@@ -19,7 +18,7 @@ PRIVATE>
 
 : get-appdata-directory ( -- path )
     f
-    CSIDL_LOCAL_APPDATA CSIDL_FLAG_CREATE bitor
+    flags{ CSIDL_LOCAL_APPDATA CSIDL_FLAG_CREATE }
     f
     0
     MAX_PATH 1 + WCHAR <c-array>

diff --git a/basis/ui/backend/cocoa/cocoa.factor b/basis/ui/backend/cocoa/cocoa.factor
index 93798fca782e3cb3b0d509dc77bcba4faf46c9f9..ae2d8286b90e71be7f84ab4cd32efc910e6ab5e4 100644 (file)
--- a/basis/ui/backend/cocoa/cocoa.factor
+++ b/basis/ui/backend/cocoa/cocoa.factor
@@ -111,7 +111,7 @@ CONSTANT: window-control>styleMask
         { minimize-button $ NSMiniaturizableWindowMask }
         { maximize-button 0 }
         { resize-handles $ NSResizableWindowMask }
-        { small-title-bar $[ NSTitledWindowMask NSUtilityWindowMask bitor ] }
+        { small-title-bar flags{ NSTitledWindowMask NSUtilityWindowMask } }
         { textured-background $ NSTexturedBackgroundWindowMask }
         { normal-title-bar $ NSTitledWindowMask }
         { dialog-window $ NSTitledWindowMask }

diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor
index 7ab3297a63f73364dbb7a4638ce1aed664f7d64c..8ce6463dab0f8acea5d688db2cdea5bd995fc1d9 100644 (file)
--- a/basis/ui/backend/windows/windows.factor
+++ b/basis/ui/backend/windows/windows.factor
@@ -191,7 +191,7 @@ CONSTANT: window-control>ex-style
         { minimize-button 0 }
         { maximize-button 0 }
         { resize-handles $ WS_EX_WINDOWEDGE }
-        { small-title-bar $[ WS_EX_TOOLWINDOW WS_EX_TOPMOST bitor ] }
+        { small-title-bar flags{ WS_EX_TOOLWINDOW WS_EX_TOPMOST } }
         { normal-title-bar $ WS_EX_APPWINDOW }
         { dialog-window 0 }
     }
@@ -635,7 +635,7 @@ M: windows-ui-backend do-events
     [ get-window-class f ] dip
     [
         [ ex-style ] 2dip
-        WS_CLIPSIBLINGS WS_CLIPCHILDREN bitor style bitor
+        flags{ WS_CLIPSIBLINGS WS_CLIPCHILDREN } style bitor
     ] dip get-RECT-dimensions
     f f f GetModuleHandle f CreateWindowEx dup win32-error=0/f ;
 

diff --git a/basis/ui/backend/x11/x11.factor b/basis/ui/backend/x11/x11.factor
index 6b2210704ec9134d9afb8fb7a161735537112ee0..7c63f37a7f5ee3defb6c662d0cefac299378f2a2 100644 (file)
--- a/basis/ui/backend/x11/x11.factor
+++ b/basis/ui/backend/x11/x11.factor
@@ -268,7 +268,7 @@ M: x11-ui-backend set-title ( string world -- )
         dpy get
         root get
         0
-        SubstructureNotifyMask SubstructureRedirectMask bitor
+        flags{ SubstructureNotifyMask SubstructureRedirectMask }
     ] dip XSendEvent drop ;
 
 M: x11-ui-backend (set-fullscreen) ( world ? -- )

diff --git a/basis/windows/ddk/setupapi/setupapi.factor b/basis/windows/ddk/setupapi/setupapi.factor
index 2d04e08c6696f32d1bac95c2c018ac7afcf6c4c0..b759a0ba39ce7b9e0de5981b0e443ca034879816 100644 (file)
--- a/basis/windows/ddk/setupapi/setupapi.factor
+++ b/basis/windows/ddk/setupapi/setupapi.factor
@@ -909,97 +909,97 @@ TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_W PSP_BACKUP_QUEUE_PARAMS_W
 TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2 SP_BACKUP_QUEUE_PARAMS
 TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2 PSP_BACKUP_QUEUE_PARAMS
 
-CONSTANT: ERROR_EXPECTED_SECTION_NAME  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0 bitor bitor ]
-CONSTANT: ERROR_BAD_SECTION_NAME_LINE  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 1 bitor bitor ]
-CONSTANT: ERROR_SECTION_NAME_TOO_LONG  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 2 bitor bitor ]
-CONSTANT: ERROR_GENERAL_SYNTAX         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 3 bitor bitor ]
-CONSTANT: ERROR_WRONG_INF_STYLE        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x100 bitor bitor ]
-CONSTANT: ERROR_SECTION_NOT_FOUND      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x101 bitor bitor ]
-CONSTANT: ERROR_LINE_NOT_FOUND         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x102 bitor bitor ]
-CONSTANT: ERROR_NO_BACKUP              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x103 bitor bitor ]
-CONSTANT: ERROR_NO_ASSOCIATED_CLASS                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x200 bitor bitor ]
-CONSTANT: ERROR_CLASS_MISMATCH                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x201 bitor bitor ]
-CONSTANT: ERROR_DUPLICATE_FOUND                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x202 bitor bitor ]
-CONSTANT: ERROR_NO_DRIVER_SELECTED                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x203 bitor bitor ]
-CONSTANT: ERROR_KEY_DOES_NOT_EXIST                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x204 bitor bitor ]
-CONSTANT: ERROR_INVALID_DEVINST_NAME               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x205 bitor bitor ]
-CONSTANT: ERROR_INVALID_CLASS                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x206 bitor bitor ]
-CONSTANT: ERROR_DEVINST_ALREADY_EXISTS             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x207 bitor bitor ]
-CONSTANT: ERROR_DEVINFO_NOT_REGISTERED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x208 bitor bitor ]
-CONSTANT: ERROR_INVALID_REG_PROPERTY               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x209 bitor bitor ]
-CONSTANT: ERROR_NO_INF                             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20A bitor bitor ]
-CONSTANT: ERROR_NO_SUCH_DEVINST                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20B bitor bitor ]
-CONSTANT: ERROR_CANT_LOAD_CLASS_ICON               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20C bitor bitor ]
-CONSTANT: ERROR_INVALID_CLASS_INSTALLER            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20D bitor bitor ]
-CONSTANT: ERROR_DI_DO_DEFAULT                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20E bitor bitor ]
-CONSTANT: ERROR_DI_NOFILECOPY                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20F bitor bitor ]
-CONSTANT: ERROR_INVALID_HWPROFILE                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x210 bitor bitor ]
-CONSTANT: ERROR_NO_DEVICE_SELECTED                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x211 bitor bitor ]
-CONSTANT: ERROR_DEVINFO_LIST_LOCKED                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x212 bitor bitor ]
-CONSTANT: ERROR_DEVINFO_DATA_LOCKED                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x213 bitor bitor ]
-CONSTANT: ERROR_DI_BAD_PATH                        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x214 bitor bitor ]
-CONSTANT: ERROR_NO_CLASSINSTALL_PARAMS             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x215 bitor bitor ]
-CONSTANT: ERROR_FILEQUEUE_LOCKED                   $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x216 bitor bitor ]
-CONSTANT: ERROR_BAD_SERVICE_INSTALLSECT            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x217 bitor bitor ]
-CONSTANT: ERROR_NO_CLASS_DRIVER_LIST               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x218 bitor bitor ]
-CONSTANT: ERROR_NO_ASSOCIATED_SERVICE              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x219 bitor bitor ]
-CONSTANT: ERROR_NO_DEFAULT_DEVICE_INTERFACE        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21A bitor bitor ]
-CONSTANT: ERROR_DEVICE_INTERFACE_ACTIVE            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21B bitor bitor ]
-CONSTANT: ERROR_DEVICE_INTERFACE_REMOVED           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21C bitor bitor ]
-CONSTANT: ERROR_BAD_INTERFACE_INSTALLSECT          $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21D bitor bitor ]
-CONSTANT: ERROR_NO_SUCH_INTERFACE_CLASS            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21E bitor bitor ]
-CONSTANT: ERROR_INVALID_REFERENCE_STRING           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21F bitor bitor ]
-CONSTANT: ERROR_INVALID_MACHINENAME                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x220 bitor bitor ]
-CONSTANT: ERROR_REMOTE_COMM_FAILURE                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x221 bitor bitor ]
-CONSTANT: ERROR_MACHINE_UNAVAILABLE                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x222 bitor bitor ]
-CONSTANT: ERROR_NO_CONFIGMGR_SERVICES              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x223 bitor bitor ]
-CONSTANT: ERROR_INVALID_PROPPAGE_PROVIDER          $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x224 bitor bitor ]
-CONSTANT: ERROR_NO_SUCH_DEVICE_INTERFACE           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x225 bitor bitor ]
-CONSTANT: ERROR_DI_POSTPROCESSING_REQUIRED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x226 bitor bitor ]
-CONSTANT: ERROR_INVALID_COINSTALLER                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x227 bitor bitor ]
-CONSTANT: ERROR_NO_COMPAT_DRIVERS                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x228 bitor bitor ]
-CONSTANT: ERROR_NO_DEVICE_ICON                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x229 bitor bitor ]
-CONSTANT: ERROR_INVALID_INF_LOGCONFIG              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22A bitor bitor ]
-CONSTANT: ERROR_DI_DONT_INSTALL                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22B bitor bitor ]
-CONSTANT: ERROR_INVALID_FILTER_DRIVER              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22C bitor bitor ]
-CONSTANT: ERROR_NON_WINDOWS_NT_DRIVER              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22D bitor bitor ]
-CONSTANT: ERROR_NON_WINDOWS_DRIVER                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22E bitor bitor ]
-CONSTANT: ERROR_NO_CATALOG_FOR_OEM_INF             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22F bitor bitor ]
-CONSTANT: ERROR_DEVINSTALL_QUEUE_NONNATIVE         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x230 bitor bitor ]
-CONSTANT: ERROR_NOT_DISABLEABLE                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x231 bitor bitor ]
-CONSTANT: ERROR_CANT_REMOVE_DEVINST                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x232 bitor bitor ]
-CONSTANT: ERROR_INVALID_TARGET                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x233 bitor bitor ]
-CONSTANT: ERROR_DRIVER_NONNATIVE                   $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x234 bitor bitor ]
-CONSTANT: ERROR_IN_WOW64                           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x235 bitor bitor ]
-CONSTANT: ERROR_SET_SYSTEM_RESTORE_POINT           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x236 bitor bitor ]
-CONSTANT: ERROR_SCE_DISABLED                       $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x238 bitor bitor ]
-CONSTANT: ERROR_UNKNOWN_EXCEPTION                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x239 bitor bitor ]
-CONSTANT: ERROR_PNP_REGISTRY_ERROR                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23A bitor bitor ]
-CONSTANT: ERROR_REMOTE_REQUEST_UNSUPPORTED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23B bitor bitor ]
-CONSTANT: ERROR_NOT_AN_INSTALLED_OEM_INF           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23C bitor bitor ]
-CONSTANT: ERROR_INF_IN_USE_BY_DEVICES              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23D bitor bitor ]
-CONSTANT: ERROR_DI_FUNCTION_OBSOLETE               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23E bitor bitor ]
-CONSTANT: ERROR_NO_AUTHENTICODE_CATALOG            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23F bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_DISALLOWED            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x240 bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_TRUSTED_PUBLISHER     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x241 bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x242 bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x243 bitor bitor ]
-CONSTANT: ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x244 bitor bitor ]
-CONSTANT: ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x245 bitor bitor ]
-CONSTANT: ERROR_DEVICE_INSTALLER_NOT_READY         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x246 bitor bitor ]
-CONSTANT: ERROR_DRIVER_STORE_ADD_FAILED            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x247 bitor bitor ]
-CONSTANT: ERROR_DEVICE_INSTALL_BLOCKED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x248 bitor bitor ]
-CONSTANT: ERROR_DRIVER_INSTALL_BLOCKED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x249 bitor bitor ]
-CONSTANT: ERROR_WRONG_INF_TYPE                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24A bitor bitor ]
-CONSTANT: ERROR_FILE_HASH_NOT_IN_CATALOG           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24B bitor bitor ]
-CONSTANT: ERROR_DRIVER_STORE_DELETE_FAILED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24C bitor bitor ]
-CONSTANT: ERROR_UNRECOVERABLE_STACK_OVERFLOW $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x300 bitor bitor ]
+CONSTANT: ERROR_EXPECTED_SECTION_NAME  flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0 }
+CONSTANT: ERROR_BAD_SECTION_NAME_LINE  flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 1 }
+CONSTANT: ERROR_SECTION_NAME_TOO_LONG  flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 2 }
+CONSTANT: ERROR_GENERAL_SYNTAX         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 3 }
+CONSTANT: ERROR_WRONG_INF_STYLE        flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x100 }
+CONSTANT: ERROR_SECTION_NOT_FOUND      flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x101 }
+CONSTANT: ERROR_LINE_NOT_FOUND         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x102 }
+CONSTANT: ERROR_NO_BACKUP              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x103 }
+CONSTANT: ERROR_NO_ASSOCIATED_CLASS                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x200 }
+CONSTANT: ERROR_CLASS_MISMATCH                     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x201 }
+CONSTANT: ERROR_DUPLICATE_FOUND                    flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x202 }
+CONSTANT: ERROR_NO_DRIVER_SELECTED                 flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x203 }
+CONSTANT: ERROR_KEY_DOES_NOT_EXIST                 flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x204 }
+CONSTANT: ERROR_INVALID_DEVINST_NAME               flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x205 }
+CONSTANT: ERROR_INVALID_CLASS                      flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x206 }
+CONSTANT: ERROR_DEVINST_ALREADY_EXISTS             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x207 }
+CONSTANT: ERROR_DEVINFO_NOT_REGISTERED             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x208 }
+CONSTANT: ERROR_INVALID_REG_PROPERTY               flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x209 }
+CONSTANT: ERROR_NO_INF                             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20A }
+CONSTANT: ERROR_NO_SUCH_DEVINST                    flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20B }
+CONSTANT: ERROR_CANT_LOAD_CLASS_ICON               flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20C }
+CONSTANT: ERROR_INVALID_CLASS_INSTALLER            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20D }
+CONSTANT: ERROR_DI_DO_DEFAULT                      flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20E }
+CONSTANT: ERROR_DI_NOFILECOPY                      flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20F }
+CONSTANT: ERROR_INVALID_HWPROFILE                  flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x210 }
+CONSTANT: ERROR_NO_DEVICE_SELECTED                 flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x211 }
+CONSTANT: ERROR_DEVINFO_LIST_LOCKED                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x212 }
+CONSTANT: ERROR_DEVINFO_DATA_LOCKED                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x213 }
+CONSTANT: ERROR_DI_BAD_PATH                        flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x214 }
+CONSTANT: ERROR_NO_CLASSINSTALL_PARAMS             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x215 }
+CONSTANT: ERROR_FILEQUEUE_LOCKED                   flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x216 }
+CONSTANT: ERROR_BAD_SERVICE_INSTALLSECT            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x217 }
+CONSTANT: ERROR_NO_CLASS_DRIVER_LIST               flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x218 }
+CONSTANT: ERROR_NO_ASSOCIATED_SERVICE              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x219 }
+CONSTANT: ERROR_NO_DEFAULT_DEVICE_INTERFACE        flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21A }
+CONSTANT: ERROR_DEVICE_INTERFACE_ACTIVE            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21B }
+CONSTANT: ERROR_DEVICE_INTERFACE_REMOVED           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21C }
+CONSTANT: ERROR_BAD_INTERFACE_INSTALLSECT          flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21D }
+CONSTANT: ERROR_NO_SUCH_INTERFACE_CLASS            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21E }
+CONSTANT: ERROR_INVALID_REFERENCE_STRING           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21F }
+CONSTANT: ERROR_INVALID_MACHINENAME                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x220 }
+CONSTANT: ERROR_REMOTE_COMM_FAILURE                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x221 }
+CONSTANT: ERROR_MACHINE_UNAVAILABLE                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x222 }
+CONSTANT: ERROR_NO_CONFIGMGR_SERVICES              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x223 }
+CONSTANT: ERROR_INVALID_PROPPAGE_PROVIDER          flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x224 }
+CONSTANT: ERROR_NO_SUCH_DEVICE_INTERFACE           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x225 }
+CONSTANT: ERROR_DI_POSTPROCESSING_REQUIRED         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x226 }
+CONSTANT: ERROR_INVALID_COINSTALLER                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x227 }
+CONSTANT: ERROR_NO_COMPAT_DRIVERS                  flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x228 }
+CONSTANT: ERROR_NO_DEVICE_ICON                     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x229 }
+CONSTANT: ERROR_INVALID_INF_LOGCONFIG              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22A }
+CONSTANT: ERROR_DI_DONT_INSTALL                    flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22B }
+CONSTANT: ERROR_INVALID_FILTER_DRIVER              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22C }
+CONSTANT: ERROR_NON_WINDOWS_NT_DRIVER              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22D }
+CONSTANT: ERROR_NON_WINDOWS_DRIVER                 flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22E }
+CONSTANT: ERROR_NO_CATALOG_FOR_OEM_INF             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22F }
+CONSTANT: ERROR_DEVINSTALL_QUEUE_NONNATIVE         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x230 }
+CONSTANT: ERROR_NOT_DISABLEABLE                    flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x231 }
+CONSTANT: ERROR_CANT_REMOVE_DEVINST                flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x232 }
+CONSTANT: ERROR_INVALID_TARGET                     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x233 }
+CONSTANT: ERROR_DRIVER_NONNATIVE                   flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x234 }
+CONSTANT: ERROR_IN_WOW64                           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x235 }
+CONSTANT: ERROR_SET_SYSTEM_RESTORE_POINT           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x236 }
+CONSTANT: ERROR_SCE_DISABLED                       flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x238 }
+CONSTANT: ERROR_UNKNOWN_EXCEPTION                  flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x239 }
+CONSTANT: ERROR_PNP_REGISTRY_ERROR                 flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23A }
+CONSTANT: ERROR_REMOTE_REQUEST_UNSUPPORTED         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23B }
+CONSTANT: ERROR_NOT_AN_INSTALLED_OEM_INF           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23C }
+CONSTANT: ERROR_INF_IN_USE_BY_DEVICES              flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23D }
+CONSTANT: ERROR_DI_FUNCTION_OBSOLETE               flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23E }
+CONSTANT: ERROR_NO_AUTHENTICODE_CATALOG            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23F }
+CONSTANT: ERROR_AUTHENTICODE_DISALLOWED            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x240 }
+CONSTANT: ERROR_AUTHENTICODE_TRUSTED_PUBLISHER     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x241 }
+CONSTANT: ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x242 }
+CONSTANT: ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x243 }
+CONSTANT: ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x244 }
+CONSTANT: ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x245 }
+CONSTANT: ERROR_DEVICE_INSTALLER_NOT_READY         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x246 }
+CONSTANT: ERROR_DRIVER_STORE_ADD_FAILED            flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x247 }
+CONSTANT: ERROR_DEVICE_INSTALL_BLOCKED             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x248 }
+CONSTANT: ERROR_DRIVER_INSTALL_BLOCKED             flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x249 }
+CONSTANT: ERROR_WRONG_INF_TYPE                     flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24A }
+CONSTANT: ERROR_FILE_HASH_NOT_IN_CATALOG           flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24B }
+CONSTANT: ERROR_DRIVER_STORE_DELETE_FAILED         flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24C }
+CONSTANT: ERROR_UNRECOVERABLE_STACK_OVERFLOW flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x300 }
 CONSTANT: EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW $ ERROR_UNRECOVERABLE_STACK_OVERFLOW
 CONSTANT: ERROR_NO_DEFAULT_INTERFACE_DEVICE $ ERROR_NO_DEFAULT_DEVICE_INTERFACE
 CONSTANT: ERROR_INTERFACE_DEVICE_ACTIVE     $ ERROR_DEVICE_INTERFACE_ACTIVE
 CONSTANT: ERROR_INTERFACE_DEVICE_REMOVED    $ ERROR_DEVICE_INTERFACE_REMOVED
 CONSTANT: ERROR_NO_SUCH_INTERFACE_DEVICE    $ ERROR_NO_SUCH_DEVICE_INTERFACE
-CONSTANT: ERROR_NOT_INSTALLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x1000 bitor bitor ]
+CONSTANT: ERROR_NOT_INSTALLED flags{ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x1000 }
 
 FUNCTION: BOOL SetupGetInfInformationA ( LPCVOID InfSpec, DWORD SearchControl, PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize )
 FUNCTION: BOOL SetupGetInfInformationW ( LPCVOID InfSpec, DWORD SearchControl, PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize )

diff --git a/basis/windows/gdiplus/gdiplus.factor b/basis/windows/gdiplus/gdiplus.factor
index 47dfc99c85a24303474268005a1e79b772ac5d51..80ef5e78c502fdde7a8729ade89cad627f952676 100644 (file)
--- a/basis/windows/gdiplus/gdiplus.factor
+++ b/basis/windows/gdiplus/gdiplus.factor
@@ -448,11 +448,11 @@ CONSTANT: PixelFormatDontCare  0
 CONSTANT: PixelFormatMax               15
 
 : PixelFormat1bppIndexed ( -- x )
-    1  1 PixelFormatIndexed PixelFormatGDI bitor pixel-format-constant ; inline
+    1  1 flags{ PixelFormatIndexed PixelFormatGDI } pixel-format-constant ; inline
 : PixelFormat4bppIndexed ( -- x )
-    2  4 PixelFormatIndexed PixelFormatGDI bitor pixel-format-constant ; inline
+    2  4 flags{ PixelFormatIndexed PixelFormatGDI } pixel-format-constant ; inline
 : PixelFormat8bppIndexed ( -- x )
-    3  8 PixelFormatIndexed PixelFormatGDI bitor pixel-format-constant ; inline
+    3  8 flags{ PixelFormatIndexed PixelFormatGDI } pixel-format-constant ; inline
 : PixelFormat16bppGrayScale ( -- x )
     4 16 PixelFormatExtended pixel-format-constant ; inline
 : PixelFormat16bppRGB555 ( -- x )
@@ -460,21 +460,21 @@ CONSTANT: PixelFormatMax               15
 : PixelFormat16bppRGB565 ( -- x )
     6 16 PixelFormatGDI pixel-format-constant ; inline
 : PixelFormat16bppARGB1555 ( -- x )
-    7 16 PixelFormatAlpha PixelFormatGDI bitor pixel-format-constant ; inline
+    7 16 flags{ PixelFormatAlpha PixelFormatGDI } pixel-format-constant ; inline
 : PixelFormat24bppRGB ( -- x )
     8 24 PixelFormatGDI pixel-format-constant ; inline
 : PixelFormat32bppRGB ( -- x )
     9 32 PixelFormatGDI pixel-format-constant ; inline
 : PixelFormat32bppARGB ( -- x )
-    10 32 PixelFormatAlpha PixelFormatGDI PixelFormatCanonical bitor bitor pixel-format-constant ; inline
+    10 32 flags{ PixelFormatAlpha PixelFormatGDI PixelFormatCanonical } pixel-format-constant ; inline
 : PixelFormat32bppPARGB ( -- x )
-    11 32 PixelFormatAlpha PixelFormatPAlpha PixelFormatGDI bitor bitor pixel-format-constant ; inline
+    11 32 flags{ PixelFormatAlpha PixelFormatPAlpha PixelFormatGDI } pixel-format-constant ; inline
 : PixelFormat48bppRGB ( -- x )
     12 48 PixelFormatExtended pixel-format-constant ; inline
 : PixelFormat64bppARGB ( -- x )
-    13 64 PixelFormatAlpha PixelFormatCanonical PixelFormatExtended bitor bitor pixel-format-constant ; inline
+    13 64 flags{ PixelFormatAlpha PixelFormatCanonical PixelFormatExtended } pixel-format-constant ; inline
 : PixelFormat64bppPARGB ( -- x )
-    14 64 PixelFormatAlpha PixelFormatPAlpha PixelFormatExtended bitor bitor pixel-format-constant ; inline
+    14 64 flags{ PixelFormatAlpha PixelFormatPAlpha PixelFormatExtended } pixel-format-constant ; inline
 
 STRUCT: ColorPalette
     { Flags UINT }

diff --git a/basis/windows/registry/registry.factor b/basis/windows/registry/registry.factor
index 932e09d823a5ae5d403b369cf8318e5b9401b0c1..f6568e314f0025ec4451cb544c968c8af9592d35 100644 (file)
--- a/basis/windows/registry/registry.factor
+++ b/basis/windows/registry/registry.factor
@@ -200,7 +200,7 @@ TUPLE: registry-enum-key ;
 
 :: change-registry-value ( key subkey value-name quot: ( value -- value' ) -- )
     0 DWORD <ref> :> type
-    key subkey KEY_QUERY_VALUE KEY_SET_VALUE bitor [
+    key subkey flags{ KEY_QUERY_VALUE KEY_SET_VALUE } [
         dup :> hkey value-name f type MAX_PATH <byte-array>
         reg-query-value-ex
         type DWORD deref ${ REG_SZ REG_EXPAND_SZ REG_MULTI_SZ } in?

diff --git a/basis/x11/xim/xim.factor b/basis/x11/xim/xim.factor
index db64d916e0c5125c29114a7ee198176ed04fd443..6611edf04b678a3bf143dce81d3c19f54945e1a5 100644 (file)
--- a/basis/x11/xim/xim.factor
+++ b/basis/x11/xim/xim.factor
@@ -27,7 +27,7 @@ SYMBOL: xim
     [
         [ xim get-global XNClientWindow ] dip
         XNFocusWindow over
-        XNInputStyle XIMPreeditNothing XIMStatusNothing bitor
+        flags{ XNInputStyle XIMPreeditNothing XIMStatusNothing }
         XNResourceName
     ] dip
     XNResourceClass over 0 XCreateIC

diff --git a/extra/bunny/bunny.factor b/extra/bunny/bunny.factor
index 6a74d127a9f4cc4f2953d7f5dfe62d35a0f4af93..77eee57cc6bc367fc74dd1ab9581766c7a74d1b7 100644 (file)
--- a/extra/bunny/bunny.factor
+++ b/extra/bunny/bunny.factor
@@ -1,7 +1,7 @@
 USING: accessors arrays bunny.cel-shaded bunny.fixed-pipeline
-bunny.model bunny.outlined destructors kernel math opengl.demo-support
-opengl.gl sequences ui ui.gadgets ui.gadgets.worlds ui.gestures
-ui.render words ui.pixel-formats ;
+bunny.model bunny.outlined destructors kernel literals math
+opengl.demo-support opengl.gl sequences ui ui.gadgets
+ui.gadgets.worlds ui.gestures ui.render words ui.pixel-formats ;
 IN: bunny
 
 TUPLE: bunny-world < demo-world model-triangles geom draw-seq draw-n ;
@@ -37,7 +37,7 @@ M: bunny-world end-world
 M: bunny-world draw-world*
     dup draw-seq>> empty? [ drop ] [
         0.15 0.15 0.15 1.0 glClearColor
-        GL_DEPTH_BUFFER_BIT GL_COLOR_BUFFER_BIT bitor glClear
+        flags{ GL_DEPTH_BUFFER_BIT GL_COLOR_BUFFER_BIT } glClear
         dup demo-world-set-matrix
         GL_MODELVIEW glMatrixMode
         0.02 -0.105 0.0 glTranslatef

diff --git a/extra/bunny/outlined/outlined.factor b/extra/bunny/outlined/outlined.factor
index ac13f54286484fef1171bace251073d557ba7d3e..04e11c351c632d71b6fcbbdbc78696b40bc1950c 100644 (file)
--- a/extra/bunny/outlined/outlined.factor
+++ b/extra/bunny/outlined/outlined.factor
@@ -1,5 +1,5 @@
 USING: arrays bunny.model bunny.cel-shaded continuations
-destructors kernel math multiline opengl opengl.shaders
+destructors kernel literals math multiline opengl opengl.shaders
 opengl.framebuffers opengl.gl opengl.textures opengl.demo-support fry
 opengl.capabilities sequences ui.gadgets combinators accessors
 macros locals ;
@@ -203,7 +203,7 @@ MACRO: (framebuffer-texture>>draw) ( iformat xformat setter -- quot )
 : clear-framebuffer ( -- )
     GL_COLOR_ATTACHMENT0 glDrawBuffer
     0.15 0.15 0.15 1.0 glClearColor
-    GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
+    flags{ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT } glClear
     GL_COLOR_ATTACHMENT1 glDrawBuffer
     0.0 0.0 0.0 0.0 glClearColor
     GL_COLOR_BUFFER_BIT glClear ;

diff --git a/extra/jamshred/gl/gl.factor b/extra/jamshred/gl/gl.factor
index 36d53adfd80179728e5b4322a9125885931c3f85..2ab4fe9af4719536a61f95b67b77dcfbf32d063b 100644 (file)
--- a/extra/jamshred/gl/gl.factor
+++ b/extra/jamshred/gl/gl.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types jamshred.game jamshred.oint
-jamshred.player jamshred.tunnel kernel math math.constants
-math.functions math.vectors opengl opengl.gl opengl.glu
-opengl.demo-support sequences specialized-arrays locals ;
-FROM: alien.c-types => float ;
-SPECIALIZED-ARRAY: float
+USING: accessors alien.c-types jamshred.game jamshred.tunnel
+kernel literals locals math math.constants math.functions
+math.vectors opengl opengl.demo-support opengl.gl opengl.glu
+sequences specialized-arrays ;
+SPECIALIZED-ARRAY: alien.c-types:float
 IN: jamshred.gl
 
 CONSTANT: min-vertices 6
@@ -100,7 +99,7 @@ CONSTANT: wall-drawing-offset 0.15
     GL_COLOR_MATERIAL glDisable ;
 
 : pre-draw ( width height -- )
-    GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
+    flags{ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT } glClear
     GL_PROJECTION glMatrixMode glLoadIdentity
     dup 0 = [ 2drop ] [ / >float 45.0 swap 0.1 100.0 gluPerspective ] if
     GL_MODELVIEW glMatrixMode glLoadIdentity ;

diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor
index 852e53b367a302a165067ba2833861372440dd9c..a433bfacabd8efa4b25f8bc5d313c79d8c6e5b98 100644 (file)
--- a/extra/opengl/demo-support/demo-support.factor
+++ b/extra/opengl/demo-support/demo-support.factor
@@ -55,7 +55,7 @@ M: demo-world resize-world
     [ demo-world-frustum glFrustum ] bi ;
 
 : demo-world-set-matrix ( gadget -- )
-    GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
+    flags{ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT } glClear
     GL_MODELVIEW glMatrixMode
     glLoadIdentity
     [ [ 0.0 0.0 ] dip distance>> neg glTranslatef ]

diff --git a/extra/spheres/spheres.factor b/extra/spheres/spheres.factor
index 0c6c3d134ff5393542e6996776dca98097f724e3..2b5d1db4164076641dc05a6cab2d629a88ad6c1a 100644 (file)
--- a/extra/spheres/spheres.factor
+++ b/extra/spheres/spheres.factor
@@ -206,7 +206,7 @@ M: spheres-world end-world
     program center radius (draw-sphere) ;
 
 : sphere-scene ( gadget -- )
-    GL_DEPTH_BUFFER_BIT GL_COLOR_BUFFER_BIT bitor glClear
+    flags{ GL_DEPTH_BUFFER_BIT GL_COLOR_BUFFER_BIT } glClear
     [
         solid-sphere-program>> [
             {