classes.struct: moving to new/boa instead of <struct>/<struct-boa>

[factor.git] / basis / core-graphics / types / types.factor

diff --git a/basis/core-graphics/types/types.factor b/basis/core-graphics/types/types.factor
index 262c241cbf8777dd28ea6ea4bc6279e73ab09648..97e94adfb8224fe272b55c8537f9ebba1807e4ac 100644 (file)
--- a/basis/core-graphics/types/types.factor
+++ b/basis/core-graphics/types/types.factor
@@ -12,15 +12,13 @@ STRUCT: CGPoint
     { x CGFloat }
     { y CGFloat } ;
 
-: <CGPoint> ( x y -- point )
-    CGPoint <struct-boa> ;
+C: <CGPoint> CGPoint
 
 STRUCT: CGSize
     { w CGFloat }
     { h CGFloat } ;
 
-: <CGSize> ( w h -- size )
-    CGSize <struct-boa> ;
+C: <CGSize> CGSize
 
 STRUCT: CGRect
     { origin CGPoint }
@@ -56,8 +54,7 @@ STRUCT: CGRect
     size>> h<< ; inline
 
 : <CGRect> ( x y w h -- rect )
-    [ CGPoint <struct-boa> ] [ CGSize <struct-boa> ] 2bi*
-    CGRect <struct-boa> ;
+    [ CGPoint boa ] [ CGSize boa ] 2bi* CGRect boa ;
 
 : CGRect-x-y ( alien -- origin-x origin-y )
     [ CGRect-x ] [ CGRect-y ] bi ;