diff --git a/collections/sequences/cords/cords.factor b/collections/sequences/cords/cords.factor index 347a10988d..e4f1f8f092 100644 --- a/collections/sequences/cords/cords.factor +++ b/collections/sequences/cords/cords.factor @@ -106,7 +106,7 @@ M: cord vunordered? [ vunordered? ] [ call-next-method ] cord-2map ; M: cord vany? [ vany? ] cord-both or ; inline M: cord vall? [ vall? ] cord-both and ; inline M: cord vnone? [ vnone? ] cord-both and ; inline -M: cord vshuffle-elements +M: cord vshuffle-elements [ [ head>> ] [ tail>> ] bi ] [ split-shuffle ] bi* [ vshuffle2-elements ] bi-curry@ 2bi cord-append ; inline diff --git a/core/modern/compiler/compiler.factor b/core/modern/compiler/compiler.factor index e4884f7f70..5cb06cede0 100644 --- a/core/modern/compiler/compiler.factor +++ b/core/modern/compiler/compiler.factor @@ -282,7 +282,7 @@ ERROR: word-expects-name-effect-body payload ; [ first2 ensure-stack-effect ] [ 2 tail ] bi ; : body>quotation ( body namespace -- quot ) - 2drop [ ] + 2drop [ ] ; M:: word' definition>quotation ( namespace name definition -- quot ) diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor index b7e38cd714..20a2b5bd14 100644 --- a/core/syntax/syntax.factor +++ b/core/syntax/syntax.factor @@ -50,7 +50,7 @@ IN: bootstrap.syntax : define-fry-specifiers ( names -- ) [ define-dummy-fry ] map - dup [ define-fry-specifier ] curry each ; + dup [ define-fry-specifier ] curry each ; [ { "]" "}" ";" ">>" "COMPILE>" } [ define-delimiter ] each diff --git a/ffi/libudev/libudev.factor b/ffi/libudev/libudev.factor index 29cb97f4ac..2633bce7fe 100644 --- a/ffi/libudev/libudev.factor +++ b/ffi/libudev/libudev.factor @@ -14,7 +14,7 @@ FUNCTION: udev* udev_ref ( udev* udev ) ; FUNCTION: void udev_unref ( udev* udev ) ; -FUNCTION: udev* udev_new ( ) ; +FUNCTION: udev* udev_new ( ) ; CALLBACK: void udev_set_log_fn_callback ( udev* udev diff --git a/ffi/windows/crypt32/crypt32.factor b/ffi/windows/crypt32/crypt32.factor index 44e7026d0f..51abacb610 100644 --- a/ffi/windows/crypt32/crypt32.factor +++ b/ffi/windows/crypt32/crypt32.factor @@ -16,7 +16,7 @@ STRUCT: CRYPT_BIT_BLOB { cUnusedBits DWORD } ; TYPEDEF: CRYPT_BIT_BLOB* PCRYPT_BIT_BLOB ; -STRUCT: CRYPTOAPI_BLOB +STRUCT: CRYPTOAPI_BLOB { cbData DWORD } { pbData BYTE* } ; diff --git a/frameworks/ui/gadgets/menus/menus.factor b/frameworks/ui/gadgets/menus/menus.factor index f74b4c70da..2331c884fb 100644 --- a/frameworks/ui/gadgets/menus/menus.factor +++ b/frameworks/ui/gadgets/menus/menus.factor @@ -47,7 +47,7 @@ M: ---- { 0 3 } >>gap margins - menu-border-color >>boundary + menu-border-color >>boundary menu-background >>interior ; : ( target hook commands -- menu ) diff --git a/frameworks/ui/gadgets/status-bar/status-bar.factor b/frameworks/ui/gadgets/status-bar/status-bar.factor index 73b763c59f..48a13c05ff 100644 --- a/frameworks/ui/gadgets/status-bar/status-bar.factor +++ b/frameworks/ui/gadgets/status-bar/status-bar.factor @@ -22,7 +22,7 @@ IN: ui.gadgets.status-bar : open-status-window ( gadget title/attributes -- ) ?attributes f >>status - dup status>> + dup status>> { 7 2 } status-bar-background >>interior f track-add open-world-window ; diff --git a/frameworks/ui/pixel-formats/pixel-formats.factor b/frameworks/ui/pixel-formats/pixel-formats.factor index 4619533a17..25e1cfa521 100644 --- a/frameworks/ui/pixel-formats/pixel-formats.factor +++ b/frameworks/ui/pixel-formats/pixel-formats.factor @@ -14,7 +14,7 @@ SYMBOLS: software-rendered backing-store multisampled - supersampled + supersampled sample-alpha color-float ; diff --git a/frameworks/ui/tools/browser/browser.factor b/frameworks/ui/tools/browser/browser.factor index 9b2df280c9..a6aa0a9898 100644 --- a/frameworks/ui/tools/browser/browser.factor +++ b/frameworks/ui/tools/browser/browser.factor @@ -70,7 +70,7 @@ CONSTANT: next 1 ; : add-help-header ( track -- track ) dup { 3 3 } - help-header-background >>interior + help-header-background >>interior { 1 0 } >>fill f track-add ; : ( browser-gadget direction -- gadget ) diff --git a/frameworks/ui/tools/common/common.factor b/frameworks/ui/tools/common/common.factor index 771693143e..77328d34c0 100644 --- a/frameworks/ui/tools/common/common.factor +++ b/frameworks/ui/tools/common/common.factor @@ -40,7 +40,7 @@ slot: scroller : com-scroll-down ( tool -- ) scroller>> scroll-down-line ; -: margins ( child -- border ) +: margins ( child -- border ) { 9 9 } ; : with-lines ( track -- track ) diff --git a/frameworks/ui/tools/error-list/error-list.factor b/frameworks/ui/tools/error-list/error-list.factor index 8432aeb6fa..a57844351a 100644 --- a/frameworks/ui/tools/error-list/error-list.factor +++ b/frameworks/ui/tools/error-list/error-list.factor @@ -130,7 +130,7 @@ TUPLE: error-display < track ; vertical error-display new-track with-lines swap error>> >>model dup model>> [ [ print-error ] when* ] - margins white-interior 1 track-add + margins white-interior 1 track-add add-toolbar ; : com-inspect ( error-display -- ) diff --git a/games/snake-game/snake-game.factor b/games/snake-game/snake-game.factor index 57f612a5de..4f16f5fb6e 100644 --- a/games/snake-game/snake-game.factor +++ b/games/snake-game/snake-game.factor @@ -4,7 +4,7 @@ USING: accessors sets snake-game.ui ui ui.gadgets.status-bar ui.gadgets.worlds ; IN: snake-game : ( -- world-attributes ) - "Snake Game" >>title + "Snake Game" >>title [ { maximize-button resize-handles } without ] change-window-controls ; diff --git a/games/snake-game/sprites/sprites.factor b/games/snake-game/sprites/sprites.factor index 304da915a8..63f2b25680 100644 --- a/games/snake-game/sprites/sprites.factor +++ b/games/snake-game/sprites/sprites.factor @@ -54,7 +54,7 @@ IN: snake-game.sprites dup 1 { "body-right-up" "body-down-left" } assoc-with-value-like dup 2 { "body-down-right" "body-left-up" } assoc-with-value-like dup 3 { "body-right-right" "body-left-left" } assoc-with-value-like - dup 4 { "body-up-up" "body-down-down" } assoc-with-value-like + dup 4 { "body-up-up" "body-down-down" } assoc-with-value-like dup 5 { "body-up-right" "body-left-down" } assoc-with-value-like dup 6 { "body-right-down" "body-up-left" } assoc-with-value-like dup [ { 1 2 3 4 5 6 } ] dip [ delete-at ] curry each ; diff --git a/libs/html/html.factor b/libs/html/html.factor index 7016e3b8d9..f10dc8f25a 100644 --- a/libs/html/html.factor +++ b/libs/html/html.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2004, 2009 Chris Double, Daniel Ehrenberg, ! Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel xml.data xml.writer xml.syntax +USING: accessors kernel xml.data xml.writer xml.syntax urls.encoding ; IN: html