math.bitwise: remove duplicate logic in bitfield.

factor · Aug 5, 2020 · 126f3ac · 126f3ac
1 parent 70687a0
commit 126f3ac
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/basis/math/bitwise/bitwise.factor b/basis/math/bitwise/bitwise.factor
@@ -68,18 +68,16 @@ M: pair (bitfield-quot) ( spec -- quot )
         '[ _ _ shift ]
     ] if ;
 
-PRIVATE>
-
-MACRO: bitfield ( bitspec -- quot )
+: (bitfield) ( bitspec -- quot )
     [ [ 0 ] ] [
         [ (bitfield-quot) ] [ '[ @ _ dip bitor ] ] map-reduce
     ] if-empty ;
 
-MACRO: bitfield* ( bitspec -- quot )
-    reverse
-    [ [ 0 ] ] [
-        [ (bitfield-quot) ] [ '[ @ _ dip bitor ] ] map-reduce
-    ] if-empty ;
+PRIVATE>
+
+MACRO: bitfield ( bitspec -- quot ) (bitfield) ;
+
+MACRO: bitfield* ( bitspec -- quot ) reverse (bitfield) ;
 
 ! bit-count
 <PRIVATE