diff --git a/basis/alien/complex/complex-tests.factor b/basis/alien/complex/complex-tests.factor index 7bf826d87e..87f0c98b47 100644 --- a/basis/alien/complex/complex-tests.factor +++ b/basis/alien/complex/complex-tests.factor @@ -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 diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor index 1b6d765ef2..22a80776e7 100755 --- a/basis/classes/struct/struct.factor +++ b/basis/classes/struct/struct.factor @@ -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> diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor index f67c73e2e9..7e1060cbb9 100644 --- a/basis/cpu/ppc/ppc.factor +++ b/basis/cpu/ppc/ppc.factor @@ -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 ; diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor index 2b4c38beaf..825b6f9c54 100755 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -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 ;