Add a (temporary) workaround for ARM64 CGFloat.

diff --git a/Bridge.def b/Bridge.def
index 3cf53b067c087b9b8749a5e156c3747985eae0f6..1d3c4f08f8306b3604e6f7a6cc06adbfaefd877d 100644 (file)
--- a/Bridge.def
+++ b/Bridge.def
@@ -44,9 +44,9 @@ T UInt32 {uint32_t}
 T SInt64 {int64_t}
 T UInt64 {uint64_t}
 
 T SInt64 {int64_t}
 T UInt64 {uint64_t}
 

-S CGPoint "x"f"y"f
+S CGPoint "x"{CGFloat}"y"{CGFloat}

 S CGRect "origin"{CGPoint}"size"{CGSize}
 S CGRect "origin"{CGPoint}"size"{CGSize}

-S CGSize "width"f"height"f
+S CGSize "width"{CGFloat}"height"{CGFloat}

 
 l c
 
 
 l c
 


@@ -1241,7 +1241,7 @@ F CFShowStr v@
 
 f CoreGraphics
 
 
 f CoreGraphics
 

-T CGFloat f
+T CGFloat F

 
 # CGAffineTransform
 
 
 # CGAffineTransform
 

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 1bbd7a4b2bb603ec578be5ed80b699491a1d505f..436e3cda9947d30a38cd9614374c3460a6697d0c 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -172,6 +172,12 @@ Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback cal
         case 's': type->primitive = short_P; break;
         case 'v': type->primitive = void_P; break;
 
         case 's': type->primitive = short_P; break;
         case 'v': type->primitive = void_P; break;
 

+#ifdef __LP64__
+        case 'F': type->primitive = double_P; break;
+#else
+        case 'F': type->primitive = float_P; break;
+#endif
+

         case '{':
             type->primitive = struct_P;
             next = '}';
         case '{':
             type->primitive = struct_P;
             next = '}';