From 6cb3e313d9f1a7d761bfd03e94f77988de8dcaf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Wed, 30 Nov 2016 14:34:28 +0100 Subject: [PATCH] dlists,http,ui.gadgets.*: nicer formatting of tuples --- basis/dlists/dlists.factor | 8 +++--- basis/http/http.factor | 42 ++++++++++++++--------------- basis/ui/gadgets/gadgets.factor | 28 +++++++++---------- basis/ui/gadgets/panes/panes.factor | 4 +-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/basis/dlists/dlists.factor b/basis/dlists/dlists.factor index 7b4eb30685..0965358950 100644 --- a/basis/dlists/dlists.factor +++ b/basis/dlists/dlists.factor @@ -7,8 +7,8 @@ sequences vocabs.loader ; IN: dlists TUPLE: dlist-link -{ prev maybe{ dlist-link } } -{ next maybe{ dlist-link } } ; + { prev maybe{ dlist-link } } + { next maybe{ dlist-link } } ; TUPLE: dlist-node < dlist-link obj ; @@ -26,8 +26,8 @@ M: dlist-link node-value obj>> ; \ dlist-node new-dlist-link ; inline TUPLE: dlist -{ front maybe{ dlist-link } } -{ back maybe{ dlist-link } } ; + { front maybe{ dlist-link } } + { back maybe{ dlist-link } } ; : ( -- list ) dlist new ; inline diff --git a/basis/http/http.factor b/basis/http/http.factor index 50a9336a9f..7dde8a9ad6 100644 --- a/basis/http/http.factor +++ b/basis/http/http.factor @@ -132,14 +132,14 @@ TUPLE: cookie name value version comment path domain expires max-age http-only s ] { } make "; " join ; TUPLE: request -method -url -proxy-url -version -header -post-data -cookies -redirects ; + method + url + proxy-url + version + header + post-data + cookies + redirects ; : set-header ( request/response value key -- request/response ) pick header>> set-at ; @@ -171,15 +171,15 @@ redirects ; TUPLE: response -version -code -message -header -cookies -content-type -content-charset -content-encoding -body ; + version + code + message + header + cookies + content-type + content-charset + content-encoding + body ; : ( -- response ) response new @@ -207,10 +207,10 @@ M: response clone over cookies>> push ; TUPLE: raw-response -version -code -message -body ; + version + code + message + body ; : ( -- response ) raw-response new diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor index 74a0f06cf9..32315561b9 100644 --- a/basis/ui/gadgets/gadgets.factor +++ b/basis/ui/gadgets/gadgets.factor @@ -10,20 +10,20 @@ CONSTANT: horizontal { 1 0 } CONSTANT: vertical { 0 1 } TUPLE: gadget < rect -pref-dim -parent -children -{ orientation initial: { 0 1 } } -focus -{ visible? initial: t } -root? -clipped? -layout-state -{ graft-state initial: { f f } } -graft-node -interior -boundary -model ; + pref-dim + parent + children + { orientation initial: { 0 1 } } + focus + { visible? initial: t } + root? + clipped? + layout-state + { graft-state initial: { f f } } + graft-node + interior + boundary + model ; M: gadget equal? 2drop f ; diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor index 81ccec06d5..72c0218a33 100644 --- a/basis/ui/gadgets/panes/panes.factor +++ b/basis/ui/gadgets/panes/panes.factor @@ -16,8 +16,8 @@ FROM: ui.gadgets.wrappers => ; IN: ui.gadgets.panes TUPLE: pane < track -output current input last-line prototype scrolls? -selection-color caret mark selecting? ; + output current input last-line prototype scrolls? + selection-color caret mark selecting? ; TUPLE: pane-stream pane ; INSTANCE: pane-stream output-stream