math.vectors.simd: rename assert-positive to not conflict

diff --git a/basis/compiler/cfg/intrinsics/simd/simd.factor b/basis/compiler/cfg/intrinsics/simd/simd.factor
index fcda2e63333b11ee7796139f46f4ae4359a7c72b..be589a7d742e053478ab05838324a7d91073eb15 100644 (file)
--- a/basis/compiler/cfg/intrinsics/simd/simd.factor
+++ b/basis/compiler/cfg/intrinsics/simd/simd.factor
@@ -712,7 +712,7 @@ PREDICATE: fixnum-vector-rep < int-vector-rep
         { (simd-select)             [ emit-simd-select              ] }
         { alien-vector              [ emit-alien-vector             ] }
         { set-alien-vector          [ emit-set-alien-vector         ] }
-        { assert-positive           [ drop                          ] }
+        { (simd-positive)           [ drop                          ] }
         { (simd-vgetmask)           [ emit-simd-vgetmask            ] }
     } enable-intrinsics ;
 

diff --git a/basis/compiler/tree/propagation/simd/simd.factor b/basis/compiler/tree/propagation/simd/simd.factor
index 034eb634e3351cc76a48375a6f72d1735b18ee2f..1f874dbabe81557ac60fbf8cd883d7f1c3f4ffc7 100644 (file)
--- a/basis/compiler/tree/propagation/simd/simd.factor
+++ b/basis/compiler/tree/propagation/simd/simd.factor
@@ -106,7 +106,7 @@ vector>vector-intrinsics [ { byte-array } "default-output-classes" set-word-prop
 
 \ (simd-select) [ 2nip scalar-output-class ] "outputs" set-word-prop
 
-\ assert-positive [
+\ (simd-positive) [
     real [0,inf] <class/interval-info> value-info-intersect
 ] "outputs" set-word-prop
 

diff --git a/basis/math/vectors/simd/intrinsics/intrinsics.factor b/basis/math/vectors/simd/intrinsics/intrinsics.factor
index 09bab412536594f335ac25b4ece5f5764db683a4..3b493e51f35b270eaf593f5a11979c9987fec156 100644 (file)
--- a/basis/math/vectors/simd/intrinsics/intrinsics.factor
+++ b/basis/math/vectors/simd/intrinsics/intrinsics.factor
@@ -13,7 +13,7 @@ SPECIALIZED-ARRAYS:
 IN: math.vectors.simd.intrinsics
 
 ! Word props are added later
-: assert-positive ( x -- y ) ;
+: (simd-positive) ( x -- y ) ;
 
 <PRIVATE
 

diff --git a/basis/math/vectors/simd/simd.factor b/basis/math/vectors/simd/simd.factor
index 768235320058f66c6777f289783ca5ef7356011a..0ea9046ea63c38037da6923b526c182f7bb20913 100644 (file)
--- a/basis/math/vectors/simd/simd.factor
+++ b/basis/math/vectors/simd/simd.factor
@@ -238,7 +238,7 @@ M: simd-128 vnone?
     dup simd-rep [ (simd-vnone?) ] [ call-next-method ] v->x-op  ; inline
 M: simd-128 vcount
     dup simd-rep
-    [ [ (simd-vgetmask) assert-positive ] [ call-next-method ] v->x-op ]
+    [ [ (simd-vgetmask) (simd-positive) ] [ call-next-method ] v->x-op ]
     [ mask>count ] bi ; inline
 
 ! SIMD high-level specializations
@@ -252,7 +252,7 @@ M: simd-128 v+n over simd-with v+ ; inline
 M: simd-128 v-n over simd-with v- ; inline
 M: simd-128 v*n over simd-with v* ; inline
 M: simd-128 v/n over simd-with v/ ; inline
-M: simd-128 norm-sq dup vdot assert-positive ; inline
+M: simd-128 norm-sq dup vdot (simd-positive) ; inline
 M: simd-128 distance v- norm ; inline
 
 M: simd-128 >pprint-sequence ;