Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-02-03 16:07:28 -06:00
commit ddf39459f2
1 changed files with 9 additions and 6 deletions

View File

@ -1,9 +1,10 @@
! Copyright (C) 2004, 2007 Slava Pestov. ! Copyright (C) 2004, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: byte-arrays float-arrays arrays generator.registers assocs USING: bit-arrays byte-arrays float-arrays arrays
kernel kernel.private libc math namespaces parser sequences generator.registers assocs kernel kernel.private libc math
strings words assocs splitting math.parser cpu.architecture namespaces parser sequences strings words assocs splitting
alien alien.accessors quotations system compiler.units ; math.parser cpu.architecture alien alien.accessors quotations
system compiler.units ;
IN: alien.c-types IN: alien.c-types
TUPLE: c-type TUPLE: c-type
@ -109,10 +110,12 @@ M: c-type stack-size c-type-size ;
GENERIC: byte-length ( seq -- n ) flushable GENERIC: byte-length ( seq -- n ) flushable
M: float-array byte-length length "double" heap-size * ; M: bit-array byte-length length 7 + -3 shift ;
M: byte-array byte-length length ; M: byte-array byte-length length ;
M: float-array byte-length length "double" heap-size * ;
: c-getter ( name -- quot ) : c-getter ( name -- quot )
c-type c-type-getter [ c-type c-type-getter [
[ "Cannot read struct fields with type" throw ] [ "Cannot read struct fields with type" throw ]