sequences: rename midpoint@ to midpoint

mrjbq7 · mrjbq7 · commit 85d94ba99867 · 2024-12-05T11:02:33.000-08:00
diff --git a/basis/binary-search/binary-search.factor b/basis/binary-search/binary-search.factor
@@ -7,16 +7,16 @@ IN: binary-search
 <PRIVATE
 
 :: (search) ( ... seq from to quot: ( ... elt -- ... <=> ) -- ... i elt )
-    from to + 2/ :> midpoint@
-    midpoint@ seq nth-unsafe :> midpoint
+    from to + 2/ :> midpoint
+    midpoint seq nth-unsafe :> elt
 
     to from - 1 <= [
-        midpoint@ midpoint
+        midpoint elt
     ] [
-        midpoint quot call {
-            { +lt+ [ seq from midpoint@ quot (search) ] }
-            { +gt+ [ seq midpoint@ to quot (search) ] }
-            { +eq+ [ midpoint@ midpoint ] }
+        elt quot call {
+            { +lt+ [ seq from midpoint quot (search) ] }
+            { +gt+ [ seq midpoint to quot (search) ] }
+            { +eq+ [ midpoint elt ] }
         } case
     ] if ; inline recursive
 
diff --git a/basis/math/statistics/statistics.factor b/basis/math/statistics/statistics.factor
@@ -168,19 +168,16 @@ PRIVATE>
     ] each ;
 
 : lower-median-index ( seq -- n )
-    [ midpoint@ ]
-    [ length odd? [ 1 - ] unless ] bi ;
+    [ midpoint ] [ length odd? [ 1 - ] unless ] bi ;
 
 : lower-median ( seq -- elt )
     [ ] [ lower-median-index ] bi kth-smallest ;
 
 : upper-median ( seq -- elt )
-    dup midpoint@ kth-smallest ;
+    dup midpoint kth-smallest ;
 
 : medians ( seq -- lower upper )
-    [ ]
-    [ [ lower-median-index ] [ midpoint@ ] bi 2array ]
-    bi kth-smallests first2 ;
+    dup [ lower-median-index ] [ midpoint ] bi 2array kth-smallests first2 ;
 
 : median ( seq -- x )
     dup length odd? [ lower-median ] [ medians + 2 / ] if ;
diff --git a/basis/tools/trace/trace.factor b/basis/tools/trace/trace.factor
@@ -9,7 +9,7 @@ IN: tools.trace
 <PRIVATE
 
 : callstack-depth ( callstack -- n )
-    callstack>array midpoint@ ;
+    callstack>array midpoint ;
 
 SYMBOL: end
 
diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
@@ -906,11 +906,11 @@ PRIVATE>
     [ exchange-unsafe ]
     3tri ;
 
-: midpoint@ ( seq -- n ) length 2/ ; inline
+: midpoint ( seq -- n ) length 2/ ; inline
 
 : reverse! ( seq -- seq )
     [
-        [ midpoint@ ] [ length ] [ ] tri
+        [ midpoint ] [ length ] [ ] tri
         [ [ over - 1 - ] dip exchange-unsafe ] 2curry
         each-integer
     ] keep ;
@@ -1006,7 +1006,7 @@ PRIVATE>
     swap cut-slice [ swap suffix ] dip append ;
 
 : halves ( seq -- first-slice second-slice )
-    dup midpoint@ cut-slice ; inline
+    dup midpoint cut-slice ; inline
 
 <PRIVATE
 
