steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://repo.or.cz/factor/jcg

db4
Slava Pestov 2008-09-09 23:39:32 -05:00
parent 9dfb646606 727f0689d4
commit a41addf689
4 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Factor.app/Contents/Frameworks/libfreetype.6.dylib Normal file → Executable file
View File

Binary file not shown.

13
basis/cocoa/messages/messages.factor
View File

@ -130,12 +130,21 @@ SYMBOL: alien>objc-types
objc>alien-types get [ swap ] assoc-map objc>alien-types get [ swap ] assoc-map
! A hack... ! A hack...
H{ "ptrdiff_t" heap-size {
{ 4 [ H{
{ "NSPoint" "{_NSPoint=ff}" } { "NSPoint" "{_NSPoint=ff}" }
{ "NSRect" "{_NSRect=ffff}" } { "NSRect" "{_NSRect=ffff}" }
{ "NSSize" "{_NSSize=ff}" } { "NSSize" "{_NSSize=ff}" }
{ "NSRange" "{_NSRange=II}" } { "NSRange" "{_NSRange=II}" }
} assoc-union alien>objc-types set-global } ] }
{ 8 [ H{
{ "NSPoint" "{_NSPoint=dd}" }
{ "NSRect" "{_NSRect=dddd}" }
{ "NSSize" "{_NSSize=dd}" }
{ "NSRange" "{_NSRange=QQ}" }
} ] }
} case
assoc-union alien>objc-types set-global
: objc-struct-type ( i string -- ctype ) : objc-struct-type ( i string -- ctype )
2dup CHAR: = -rot index-from swap subseq 2dup CHAR: = -rot index-from swap subseq

41
basis/cocoa/types/types.factor
View File

@ -1,13 +1,20 @@
! Copyright (C) 2006, 2007 Slava Pestov ! Copyright (C) 2006, 2007 Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: alien.c-types alien.syntax kernel ; USING: alien.c-types alien.syntax combinators kernel ;
IN: cocoa.types IN: cocoa.types
TYPEDEF: long NSInteger
TYPEDEF: ulong NSUInteger
<< "ptrdiff_t" heap-size {
{ 4 [ "float" ] }
{ 8 [ "double" ] }
} case "CGFloat" typedef >>
C-STRUCT: NSRect C-STRUCT: NSRect
{ "float" "x" } { "CGFloat" "x" }
{ "float" "y" } { "CGFloat" "y" }
{ "float" "w" } { "CGFloat" "w" }
{ "float" "h" } ; { "CGFloat" "h" } ;
TYPEDEF: NSRect _NSRect TYPEDEF: NSRect _NSRect
TYPEDEF: NSRect CGRect TYPEDEF: NSRect CGRect
@ -23,8 +30,8 @@ TYPEDEF: NSRect CGRect
[ NSRect-x ] keep NSRect-y ; [ NSRect-x ] keep NSRect-y ;
C-STRUCT: NSPoint C-STRUCT: NSPoint
{ "float" "x" } { "CGFloat" "x" }
{ "float" "y" } ; { "CGFloat" "y" } ;
TYPEDEF: NSPoint _NSPoint TYPEDEF: NSPoint _NSPoint
TYPEDEF: NSPoint CGPoint TYPEDEF: NSPoint CGPoint
@ -35,8 +42,8 @@ TYPEDEF: NSPoint CGPoint
[ set-NSPoint-x ] keep ; [ set-NSPoint-x ] keep ;
C-STRUCT: NSSize C-STRUCT: NSSize
{ "float" "w" } { "CGFloat" "w" }
{ "float" "h" } ; { "CGFloat" "h" } ;
TYPEDEF: NSSize _NSSize TYPEDEF: NSSize _NSSize
TYPEDEF: NSPoint CGPoint TYPEDEF: NSPoint CGPoint
@ -47,8 +54,8 @@ TYPEDEF: NSPoint CGPoint
[ set-NSSize-w ] keep ; [ set-NSSize-w ] keep ;
C-STRUCT: NSRange C-STRUCT: NSRange
{ "uint" "location" } { "NSUInteger" "location" }
{ "uint" "length" } ; { "NSUInteger" "length" } ;
TYPEDEF: NSRange _NSRange TYPEDEF: NSRange _NSRange
@ -58,12 +65,12 @@ TYPEDEF: NSRange _NSRange
[ set-NSRange-location ] keep ; [ set-NSRange-location ] keep ;
C-STRUCT: CGAffineTransform C-STRUCT: CGAffineTransform
{ "float" "a" } { "CGFloat" "a" }
{ "float" "b" } { "CGFloat" "b" }
{ "float" "c" } { "CGFloat" "c" }
{ "float" "d" } { "CGFloat" "d" }
{ "float" "tx" } { "CGFloat" "tx" }
{ "float" "ty" } ; { "CGFloat" "ty" } ;
C-STRUCT: NSFastEnumerationState C-STRUCT: NSFastEnumerationState
{ "ulong" "state" } { "ulong" "state" }

6
basis/core-foundation/core-foundation.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2006, 2008 Slava Pestov ! Copyright (C) 2006, 2008 Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: alien alien.c-types alien.strings alien.syntax kernel USING: alien alien.c-types alien.strings alien.syntax kernel
math sequences io.encodings.utf16 destructors accessors ; math sequences io.encodings.utf16 destructors accessors combinators ;
IN: core-foundation IN: core-foundation
TYPEDEF: void* CFAllocatorRef TYPEDEF: void* CFAllocatorRef
@ -17,10 +17,10 @@ TYPEDEF: void* CFURLRef
TYPEDEF: void* CFUUIDRef TYPEDEF: void* CFUUIDRef
TYPEDEF: void* CFTypeRef TYPEDEF: void* CFTypeRef
TYPEDEF: bool Boolean TYPEDEF: bool Boolean
TYPEDEF: int CFIndex TYPEDEF: long CFIndex
TYPEDEF: int SInt32 TYPEDEF: int SInt32
TYPEDEF: uint UInt32 TYPEDEF: uint UInt32
TYPEDEF: uint CFTypeID TYPEDEF: ulong CFTypeID
TYPEDEF: double CFTimeInterval TYPEDEF: double CFTimeInterval
TYPEDEF: double CFAbsoluteTime TYPEDEF: double CFAbsoluteTime