core-graphics.types: use <struct-boa> for bootstrap

diff --git a/basis/core-graphics/types/types.factor b/basis/core-graphics/types/types.factor
index 97e94adfb8224fe272b55c8537f9ebba1807e4ac..b24254513d6309f62278c4bff197e97c4dbde92e 100644 (file)
--- a/basis/core-graphics/types/types.factor
+++ b/basis/core-graphics/types/types.factor
@@ -31,30 +31,26 @@ STRUCT: CGRect
     [ w>> ] [ h>> ] bi 2array ;
 
 : CGRect>rect ( CGRect -- rect )
-    [ origin>> CGPoint>loc ]
-    [ size>> CGSize>dim ]
-    bi <rect> ; inline
-
-: CGRect-x ( CGRect -- x )
-    origin>> x>> ; inline
-: CGRect-y ( CGRect -- y )
-    origin>> y>> ; inline
-: CGRect-w ( CGRect -- w )
-    size>> w>> ; inline
-: CGRect-h ( CGRect -- h )
-    size>> h>> ; inline
-
-: set-CGRect-x ( x CGRect -- )
-    origin>> x<< ; inline
-: set-CGRect-y ( y CGRect -- )
-    origin>> y<< ; inline
-: set-CGRect-w ( w CGRect -- )
-    size>> w<< ; inline
-: set-CGRect-h ( h CGRect -- )
-    size>> h<< ; inline
+    [ origin>> CGPoint>loc ] [ size>> CGSize>dim ] bi <rect> ; inline
+
+: CGRect-x ( CGRect -- x ) origin>> x>> ; inline
+
+: CGRect-y ( CGRect -- y ) origin>> y>> ; inline
+
+: CGRect-w ( CGRect -- w ) size>> w>> ; inline
+
+: CGRect-h ( CGRect -- h ) size>> h>> ; inline
+
+: set-CGRect-x ( x CGRect -- ) origin>> x<< ; inline
+
+: set-CGRect-y ( y CGRect -- ) origin>> y<< ; inline
+
+: set-CGRect-w ( w CGRect -- ) size>> w<< ; inline
+
+: set-CGRect-h ( h CGRect -- ) size>> h<< ; inline
 
 : <CGRect> ( x y w h -- rect )
-    [ CGPoint boa ] [ CGSize boa ] 2bi* CGRect boa ;
+    [ CGPoint <struct-boa> ] [ CGSize <struct-boa> ] 2bi* CGRect <struct-boa> ;
 
 : CGRect-x-y ( alien -- origin-x origin-y )
     [ CGRect-x ] [ CGRect-y ] bi ;