From dc1cb5b7d10f8b8d12e24aab626339a449343c8b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 28 Oct 2019 19:14:30 -0500 Subject: [PATCH] basis: whitespace commit --- .../prettyprint/prettyprint.factor | 1 - basis/io/backend/unix/freebsd/freebsd.factor | 2 +- basis/ui/backend/cocoa/views/views.factor | 58 +++++++++---------- basis/ui/gadgets/editors/editors.factor | 4 +- basis/ui/text/core-text/core-text.factor | 2 +- basis/unicode/breaks/breaks.factor | 10 ++-- basis/unix/ffi/bsd/bsd.factor | 2 - basis/unix/ffi/freebsd/freebsd.factor | 1 - basis/unix/getfsstat/freebsd/freebsd.factor | 4 +- basis/unix/kqueue/freebsd/freebsd.factor | 3 +- basis/unix/stat/freebsd/freebsd.factor | 3 +- basis/unix/statfs/freebsd/freebsd.factor | 3 +- basis/unix/statvfs/freebsd/freebsd.factor | 1 - basis/unix/types/freebsd/freebsd.factor | 1 - extra/dns/dns.factor | 1 - extra/modern/lexer/lexer.factor | 2 +- 16 files changed, 44 insertions(+), 54 deletions(-) diff --git a/basis/bit-vectors/prettyprint/prettyprint.factor b/basis/bit-vectors/prettyprint/prettyprint.factor index f89b8f659f..4314ab1873 100644 --- a/basis/bit-vectors/prettyprint/prettyprint.factor +++ b/basis/bit-vectors/prettyprint/prettyprint.factor @@ -4,4 +4,3 @@ IN: bit-vectors.prettyprint M: bit-vector >pprint-sequence ; M: bit-vector pprint-delims drop \ \?V{ \ \} ; M: bit-vector pprint* pprint-object ; - diff --git a/basis/io/backend/unix/freebsd/freebsd.factor b/basis/io/backend/unix/freebsd/freebsd.factor index 24c7518827..3fd1715050 100644 --- a/basis/io/backend/unix/freebsd/freebsd.factor +++ b/basis/io/backend/unix/freebsd/freebsd.factor @@ -7,5 +7,5 @@ M: freebsd init-io ( -- ) freebsd set-io-backend -[ start-signal-pipe-thread ] +[ start-signal-pipe-thread ] "io.backend.unix:signal-pipe-thread" add-startup-hook diff --git a/basis/ui/backend/cocoa/views/views.factor b/basis/ui/backend/cocoa/views/views.factor index 40ddbead4e..281ec6e3b8 100644 --- a/basis/ui/backend/cocoa/views/views.factor +++ b/basis/ui/backend/cocoa/views/views.factor @@ -213,7 +213,7 @@ IMPORT: NSAttributedString 0 0 :> effective-range text send: string CFString>string :> str str utf16n encode :> byte-16n - 0 :> cp-loc! + 0 :> cp-loc! "NSMarkedClauseSegment" :> segment-attr [ effective-range [ location>> ] [ length>> ] bi + text-length < ] [ text @@ -231,8 +231,8 @@ IMPORT: NSAttributedString [ str swap >codepoint-index ] bi@ swap - :> len cp-loc cp-loc len + dup cp-loc! 2array thickness 2array - suffix underlines! - ] while + suffix underlines! + ] while underlines length 1 = [ underlines first first 2 2array 1array ! thickness: 2 ] [ underlines ] if ; @@ -242,7 +242,7 @@ IMPORT: NSAttributedString replacementRange length>> NSNotFound = not and [ ! erase this line gadget editor-caret first dup gadget editor-line - [ + [ replacementRange length>> ! location>> >codepoint-index 2array gadget set-caret @@ -272,9 +272,9 @@ IMPORT: NSAttributedString [ str swap >codepoint-index ] bi@ - 2array v+ dup gadget preedit-selected-end<< - dup gadget set-caret gadget set-mark + dup gadget set-caret gadget set-mark gadget preedit-start>> gadget preedit-end>> = [ - gadget remove-preedit-info + gadget remove-preedit-info ] when ; PRIVATE> @@ -463,33 +463,33 @@ PRIVATE> window [ "" clone :> str! text NSString send: class send: isKindOfClass: 0 = not [ - text CFString>string str! + text CFString>string str! ] [ - text send: string CFString>string str! + text send: string CFString>string str! ] if window world-focus :> gadget gadget [ - gadget support-input-methods? [ - replacementRange location>> NSNotFound = [ + gadget support-input-methods? [ + replacementRange location>> NSNotFound = [ gadget editor-caret first dup gadget editor-line - [ + [ replacementRange location>> >codepoint-index 2array gadget set-caret ] [ - replacementRange [ location>> ] [ length>> ] bi + + replacementRange [ location>> ] [ length>> ] bi + >codepoint-index 2array gadget set-mark - ] 2bi + ] 2bi ] unless gadget preedit? [ gadget [ remove-preedit-text ] [ remove-preedit-info ] bi str gadget user-input* drop f gadget preedit-selection-mode?<< ] [ - str window user-input + str window user-input ] if - ] [ + ] [ str window user-input ] if ] when @@ -506,14 +506,14 @@ PRIVATE> ] [ 0 ] if ] ; - COCOA-METHOD: NSRange markedRange [ + COCOA-METHOD: NSRange markedRange [ self window :> window window [ window world-focus :> gadget gadget [ gadget preedit? [ - gadget [ preedit-start>> second ] [ preedit-end>> second ] bi >= [ - NSNotFound 0 + gadget [ preedit-start>> second ] [ preedit-end>> second ] bi >= [ + NSNotFound 0 ] [ gadget preedit-start>> first gadget editor-line :> str gadget @@ -538,23 +538,23 @@ PRIVATE> str gadget [ preedit-selected-start>> second ] - [ preedit-start>> second ] + [ preedit-start>> second ] bi - >utf16-index ! location gadget [ preedit-selected-end>> second ] [ preedit-selected-start>> second ] bi [ str swap >utf16-index ] bi@ - ! length - ] [ + ] [ str gadget editor-caret second >utf16-index 0 ] if ] [ 0 0 ] if ] [ 0 0 ] if - ] [ 0 0 ] if + ] [ 0 0 ] if ] ; COCOA-METHOD: void setMarkedText: id text selectedRange: NSRange selectedRange - replacementRange: NSRange replacementRange [ + replacementRange: NSRange replacementRange [ self window :> window window [ window world-focus :> gadget @@ -562,9 +562,9 @@ PRIVATE> { } clone :> underlines! "" clone :> str! text NSString send: class send: isKindOfClass: 0 = not [ - text CFString>string str! + text CFString>string str! ] [ - text send: string CFString>string str! + text send: string CFString>string str! gadget support-input-methods? [ gadget text selectedRange make-preedit-underlines underlines! ] when @@ -574,10 +574,10 @@ PRIVATE> underlines gadget preedit-underlines<< ] when ] when - ] when + ] when ] ; - COCOA-METHOD: void unmarkText [ + COCOA-METHOD: void unmarkText [ self window :> window window [ window world-focus :> gadget @@ -598,7 +598,7 @@ PRIVATE> ] when ] ; - COCOA-METHOD: id validAttributesForMarkedText [ + COCOA-METHOD: id validAttributesForMarkedText [ NSArray "NSMarkedClauseSegment" send: \arrayWithObject: ] ; @@ -614,10 +614,10 @@ PRIVATE> window world-focus :> gadget gadget [ gadget support-input-methods? [ - gadget editor-caret first gadget editor-line :> str + gadget editor-caret first gadget editor-line :> str str aRange location>> >codepoint-index :> start-pos gadget editor-caret first start-pos 2array gadget loc>x - gadget caret-loc second gadget caret-dim second + + gadget caret-loc second gadget caret-dim second + 2array ! character pos gadget screen-loc v+ ! + gadget pos { 1 -1 } v* diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor index fa637bf70f..d39b3522fa 100644 --- a/basis/ui/gadgets/editors/editors.factor +++ b/basis/ui/gadgets/editors/editors.factor @@ -178,10 +178,10 @@ M: editor ungraft* editor [ caret-loc second ] [ caret-dim second ] bi + 2.0 - :> y editor editor-caret first :> row editor font>> foreground>> gl-color - editor preedit-underlines>> [ + editor preedit-underlines>> [ GL_LINE_BIT [ dup second glLineWidth - first editor preedit-start>> second dup 2array v+ first2 + first editor preedit-start>> second dup 2array v+ first2 [ row swap 2array editor loc>x 1.0 + y 2array ] [ row swap 2array editor loc>x 1.0 - y 2array ] bi* diff --git a/basis/ui/text/core-text/core-text.factor b/basis/ui/text/core-text/core-text.factor index 38af6d8a9b..079a53f136 100644 --- a/basis/ui/text/core-text/core-text.factor +++ b/basis/ui/text/core-text/core-text.factor @@ -54,7 +54,7 @@ M:: core-text-renderer x>offset ( x font string -- n ) utf16n decode length ; M:: core-text-renderer offset>x ( n font string -- x ) - font string cached-line line>> + font string cached-line line>> 0 n string subseq utf16n encode length 2 / >integer f CTLineGetOffsetForStringIndex unscale ; diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index 8377ed7866..10f888ce65 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -80,7 +80,7 @@ CATEGORY: grapheme-control Zl Zp Cc Cf ; CATEGORY: spacing Mc ; : regional? ( ch -- ? ) - "Regional_Indicator" property? ; + "Regional_Indicator" property? ; >> : modifier? ( ch -- ? ) emoji-modifier-table interval-key? ; inline @@ -99,10 +99,10 @@ CATEGORY: spacing Mc ; [ modifier? ] tri or or not ] find-last drop [ swap ?nth ] [ last ] if* - extended-pictographic-table interval-key? [ + extended-pictographic-table interval-key? [ (Extended_Pictographic-Extend*-)ZWJ ] [ ZWJ ] if - ] when + ] when ] } { [ dup extend? ] [ drop Extend ] } { [ dup modifier? ] [ drop Extend ] } @@ -110,7 +110,7 @@ CATEGORY: spacing Mc ; interval-key? [ Any ] [ SpacingMark ] if ] } { [ dup loe? ] [ drop Prepend ] } { [ dup regional? ] [ - drop + drop f :> ri-even?! str unclip-last-slice drop [ regional? [ ri-even? not ri-even?! f ] [ t ] if @@ -338,7 +338,7 @@ define-constant { check-Extended_Pictographic [ swap ?nth extended-pictographic-table interval-key? ] } { check-RI-pair [ - 2drop + 2drop f :> ri-even?! i str [ regional? [ ri-even? not ri-even?! f ] [ t ] if diff --git a/basis/unix/ffi/bsd/bsd.factor b/basis/unix/ffi/bsd/bsd.factor index 181742ddc2..e89cd4e486 100644 --- a/basis/unix/ffi/bsd/bsd.factor +++ b/basis/unix/ffi/bsd/bsd.factor @@ -82,5 +82,3 @@ CONSTANT: AI_PASSIVE 1 CONSTANT: SEEK_SET 0 CONSTANT: SEEK_CUR 1 CONSTANT: SEEK_END 2 - - diff --git a/basis/unix/ffi/freebsd/freebsd.factor b/basis/unix/ffi/freebsd/freebsd.factor index 780898e3e7..9ddd890d2c 100644 --- a/basis/unix/ffi/freebsd/freebsd.factor +++ b/basis/unix/ffi/freebsd/freebsd.factor @@ -49,4 +49,3 @@ CONSTANT: SO_SNDTIMEO 0x1005 CONSTANT: SO_RCVTIMEO 0x1006 CONSTANT: SO_ERROR 0x1007 CONSTANT: SO_TYPE 0x1008 - diff --git a/basis/unix/getfsstat/freebsd/freebsd.factor b/basis/unix/getfsstat/freebsd/freebsd.factor index 78696b95e9..6e39392fb8 100644 --- a/basis/unix/getfsstat/freebsd/freebsd.factor +++ b/basis/unix/getfsstat/freebsd/freebsd.factor @@ -8,5 +8,5 @@ CONSTANT: MNT_LAZY 3 ! push data not written by filesystem syncer CONSTANT: MNT_SUSPEND 4 ! suspend file system after sync -FUNCTION: int getfsstat ( statfs* buf, long bufsize, int flags ) -FUNCTION: int getmntinfo ( statfs **mntbufp, int flags ) +FUNCTION: int getfsstat ( statfs* buf, long bufsize, int flags ) +FUNCTION: int getmntinfo ( statfs **mntbufp, int flags ) diff --git a/basis/unix/kqueue/freebsd/freebsd.factor b/basis/unix/kqueue/freebsd/freebsd.factor index 2b9bf2c54e..4d765a0570 100644 --- a/basis/unix/kqueue/freebsd/freebsd.factor +++ b/basis/unix/kqueue/freebsd/freebsd.factor @@ -7,7 +7,7 @@ STRUCT: kevent { flags ushort } { fflags uint } { data __int64_t } - { udata void* } + { udata void* } { ext __uint64_t[4] } ; FUNCTION-ALIAS: kevent-func int kevent ( int kq, kevent* changelist, int nchanges, kevent* eventlist, int nevents, timespec* timeout ) @@ -28,4 +28,3 @@ CONSTANT: EVFILT_USER -11 ! user events CONSTANT: EVFILT_SENDFILE -12 ! attached to sendfile requests CONSTANT: EVFILT_EMPTY -13 ! empty send socket buf CONSTANT: EVFILT_SYSCOUNT 13 - diff --git a/basis/unix/stat/freebsd/freebsd.factor b/basis/unix/stat/freebsd/freebsd.factor index 168d0fc581..7f5a64d9a8 100644 --- a/basis/unix/stat/freebsd/freebsd.factor +++ b/basis/unix/stat/freebsd/freebsd.factor @@ -27,7 +27,6 @@ STRUCT: stat { st_gen __uint64_t } { st_spare __int64_t[10] } ; -FUNCTION-ALIAS: stat-func int stat ( c-string pathname, stat* buf ) +FUNCTION-ALIAS: stat-func int stat ( c-string pathname, stat* buf ) FUNCTION: int lstat ( c-string pathname, stat* buf ) FUNCTION: int fstat ( int fd, stat* buf ) - diff --git a/basis/unix/statfs/freebsd/freebsd.factor b/basis/unix/statfs/freebsd/freebsd.factor index 085b8d9bf2..a41af52588 100644 --- a/basis/unix/statfs/freebsd/freebsd.factor +++ b/basis/unix/statfs/freebsd/freebsd.factor @@ -31,7 +31,6 @@ STRUCT: statfs { f_mntfromname { char MNAMELEN } } { f_mntonname { char MNAMELEN } } ; -FUNCTION-ALIAS: statfs-func int statfs ( c-string path, statfs* buf ) +FUNCTION-ALIAS: statfs-func int statfs ( c-string path, statfs* buf ) CONSTANT: MNT_WAIT 1 ! synchronously wait for I/O to complete CONSTANT: MNT_NOWAIT 2 ! start all I/O, but do not wait for it - diff --git a/basis/unix/statvfs/freebsd/freebsd.factor b/basis/unix/statvfs/freebsd/freebsd.factor index 7abb225dc3..990c6fbd20 100644 --- a/basis/unix/statvfs/freebsd/freebsd.factor +++ b/basis/unix/statvfs/freebsd/freebsd.factor @@ -21,4 +21,3 @@ CONSTANT: ST_RDONLY 1 ! Read-only file system CONSTANT: ST_NOSUID 2 ! Does not honor setuid/setgid FUNCTION-ALIAS: statvfs-func int statvfs ( c-string path, statvfs* buf ) - diff --git a/basis/unix/types/freebsd/freebsd.factor b/basis/unix/types/freebsd/freebsd.factor index 6f2d8e9201..76fb76b895 100644 --- a/basis/unix/types/freebsd/freebsd.factor +++ b/basis/unix/types/freebsd/freebsd.factor @@ -22,4 +22,3 @@ TYPEDEF: int pid_t TYPEDEF: long time_t TYPEDEF: __uint64_t fsblkcnt_t TYPEDEF: __uint64_t fsfilcnt_t - diff --git a/extra/dns/dns.factor b/extra/dns/dns.factor index 353542f74e..f66197a32c 100644 --- a/extra/dns/dns.factor +++ b/extra/dns/dns.factor @@ -427,4 +427,3 @@ MACOS> : with-dns-servers ( servers quot -- ) [ dns-servers ] dip with-variable ; inline - diff --git a/extra/modern/lexer/lexer.factor b/extra/modern/lexer/lexer.factor index 10a8c3bf65..1e09a2aac5 100644 --- a/extra/modern/lexer/lexer.factor +++ b/extra/modern/lexer/lexer.factor @@ -61,4 +61,4 @@ TUPLE: hashtag < lexed object ; CONSTRUCTOR: hashtag ( object -- obj ) ; TUPLE: token < lexed name ; -CONSTRUCTOR: token ( name -- obj ) ; \ No newline at end of file +CONSTRUCTOR: token ( name -- obj ) ;