From 5f89facf9efaa8b8d4352a06c5eac7cf9881ddb4 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 16 May 2020 11:17:42 -0700 Subject: [PATCH] basis/extra: replace "/ >integer" with "/i" in a few places. --- basis/core-text/core-text.factor | 2 +- basis/ui/backend/cocoa/views/views.factor | 2 +- basis/ui/text/core-text/core-text.factor | 4 ++-- basis/windows/uniscribe/uniscribe.factor | 4 ++-- extra/logic/examples/money/money.factor | 2 +- extra/project-euler/064/064.factor | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/core-text/core-text.factor b/basis/core-text/core-text.factor index 8a7b496967..47112623ce 100644 --- a/basis/core-text/core-text.factor +++ b/basis/core-text/core-text.factor @@ -86,7 +86,7 @@ render-loc render-dim ; : selection-rect ( dim line selection -- rect ) [let [ start>> ] [ end>> ] [ string>> ] tri :> ( start end string ) - start end [ 0 swap string subseq utf16n encode length 2 / >integer ] bi@ + start end [ 0 swap string subseq utf16n encode length 2 /i ] bi@ ] [ f CTLineGetOffsetForStringIndex round ] bi-curry@ bi [ drop nip 0 ] [ swap - swap second ] 3bi ; diff --git a/basis/ui/backend/cocoa/views/views.factor b/basis/ui/backend/cocoa/views/views.factor index 62e04d8f9e..0d79bbe36c 100644 --- a/basis/ui/backend/cocoa/views/views.factor +++ b/basis/ui/backend/cocoa/views/views.factor @@ -195,7 +195,7 @@ IMPORT: NSAttributedString 0 utf16-index 2 * str utf16n encode subseq utf16n decode length ; :: >utf16-index ( str codepoint-index -- utf16-index ) - 0 codepoint-index str subseq utf16n encode length 2 / >integer ; + 0 codepoint-index str subseq utf16n encode length 2 /i ; :: earlier-caret/mark ( editor -- loc ) editor editor-caret :> caret diff --git a/basis/ui/text/core-text/core-text.factor b/basis/ui/text/core-text/core-text.factor index 4225884aef..80353404a5 100644 --- a/basis/ui/text/core-text/core-text.factor +++ b/basis/ui/text/core-text/core-text.factor @@ -54,8 +54,8 @@ M:: core-text-renderer x>offset ( x font string -- n ) ] if-empty ; M:: core-text-renderer offset>x ( n font string -- x ) - font string cached-line line>> - 0 n string subseq utf16n encode length 2 / >integer + font string cached-line line>> + 0 n string subseq utf16n encode length 2 /i f CTLineGetOffsetForStringIndex unscale ; diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor index 252163e332..92ec3e5da2 100644 --- a/basis/windows/uniscribe/uniscribe.factor +++ b/basis/windows/uniscribe/uniscribe.factor @@ -20,7 +20,7 @@ CONSTANT: ssa-dwFlags flags{ SSA_GLYPHS SSA_FALLBACK SSA_TAB } 0 utf16-index 2 * str utf16n encode subseq utf16n decode length ; :: >utf16-index ( str codepoint-index -- utf16-index ) - 0 codepoint-index str subseq utf16n encode length 2 / >integer ; + 0 codepoint-index str subseq utf16n encode length 2 /i ; PRIVATE> @@ -48,7 +48,7 @@ PRIVATE> : make-ssa ( dc script-string -- ssa ) dup selection? [ string>> ] when utf16n encode ! pString - dup length 2 / >integer ! cString + dup length 2 /i ! cString dup 1.5 * 16 + >integer ! cGlyphs -- MSDN says this is "recommended size" -1 ! iCharset -- Unicode ssa-dwFlags diff --git a/extra/logic/examples/money/money.factor b/extra/logic/examples/money/money.factor index 58d62b599b..110f3df189 100644 --- a/extra/logic/examples/money/money.factor +++ b/extra/logic/examples/money/money.factor @@ -25,7 +25,7 @@ LOGIC-VARS: S E N D M O R Y A L G B T { delo D Digs3 Digs } [ [ [ D1 of ] [ D2 of ] [ C1 of ] tri + + ] S is ] [ [ S of 10 mod ] D is ] - [ [ S of 10 / >integer ] C is ] + [ [ S of 10 /i ] C is ] } rule { delo A L L } { { nonvaro A } !! } rule diff --git a/extra/project-euler/064/064.factor b/extra/project-euler/064/064.factor index eae8824803..1cd1357162 100644 --- a/extra/project-euler/064/064.factor +++ b/extra/project-euler/064/064.factor @@ -147,7 +147,7 @@ C: cfrac :: split ( fr -- k fr' ) fr >cfrac< :> ( n a b ) - n sqrt a + b / >integer + n sqrt a + b /i dup n swap b * a swap - b -- 2.34.1