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

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

db4
Joe Groff 2009-09-24 13:05:36 -05:00
parent e0157c55d1 beab46517e
commit d5b267c401
4 changed files with 7 additions and 4 deletions
basis
alien/complex
classes/struct
cpu/ppc
tools/deploy/shaker

4
basis/alien/complex/complex-tests.factor
View File

@ -16,6 +16,6 @@ STRUCT: complex-holder
[ C{ 1.0 2.0 } ] [ "h" get z>> ] unit-test
[ number ] [ "complex-float" c-type-boxed-class ] unit-test
[ complex ] [ "complex-float" c-type-boxed-class ] unit-test
[ number ] [ "complex-double" c-type-boxed-class ] unit-test
[ complex ] [ "complex-double" c-type-boxed-class ] unit-test

3
basis/classes/struct/struct.factor
View File

@ -202,7 +202,7 @@ M: struct-c-type c-struct? drop t ;
[ type>> c-type-align ] [ max ] map-reduce ;
PRIVATE>
M: struct byte-length class "c-type" word-prop size>> ; foldable
M: struct byte-length class "struct-size" word-prop ; foldable
! class definition
@ -253,6 +253,7 @@ M: struct binary-zero?
c-type class typedef
class slot-specs define-accessors
class size "struct-size" set-word-prop
class dup make-struct-prototype "prototype" set-word-prop
class (struct-methods) ; inline
PRIVATE>

2
basis/cpu/ppc/ppc.factor
View File

@ -338,6 +338,8 @@ M: ppc %abs-vector-reps { } ;
M: ppc %and-vector-reps { } ;
M: ppc %or-vector-reps { } ;
M: ppc %xor-vector-reps { } ;
M: ppc %shl-vector-reps { } ;
M: ppc %shr-vector-reps { } ;
M: ppc %unbox-alien ( dst src -- )
alien-offset LWZ ;

2
basis/tools/deploy/shaker/shaker.factor
View File

@ -198,7 +198,7 @@ IN: tools.deploy.shaker
] when
deploy-c-types? get [
{ "c-type" "struct-slots" "struct-size" "struct-align" } %
{ "c-type" "struct-slots" "struct-align" } %
] unless
] { } make ;