classes.algebra: removing valid-classoid? (enforced in constructors).

diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor
index 87dc2e210c98fe7698c99a91d74bb19e06b2be38..afb658043018ed86949fa7599d6f5701d459b774 100644 (file)
--- a/basis/compiler/compiler.factor
+++ b/basis/compiler/compiler.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs classes.algebra combinators
+USING: accessors assocs classes classes.algebra combinators
 combinators.short-circuit compiler.cfg compiler.cfg.builder
 compiler.cfg.builder.alien compiler.cfg.finalization
 compiler.cfg.optimizer compiler.codegen compiler.crossref
@@ -141,7 +141,7 @@ M: optimizing-compiler update-call-sites ( class generic -- words )
     ! Words containing call sites with inferred type 'class'
     ! which inlined a method on 'generic'
     generic-call-sites-of keys swap '[
-        _ 2dup [ valid-classoid? ] both?
+        _ 2dup [ classoid? ] both?
         [ classes-intersect? ] [ 2drop f ] if
     ] filter ;
 

diff --git a/basis/stack-checker/dependencies/dependencies.factor b/basis/stack-checker/dependencies/dependencies.factor
index 083765088d4e90d6dcf35fcfeec4a58cc935b77a..38c2ccd7d3aa7064a72053385a537521a49883cd 100644 (file)
--- a/basis/stack-checker/dependencies/dependencies.factor
+++ b/basis/stack-checker/dependencies/dependencies.factor
@@ -79,8 +79,8 @@ TUPLE: depends-on-class-predicate class1 class2 result ;
 
 M: depends-on-class-predicate satisfied?
     {
-        [ class1>> valid-classoid? ]
-        [ class2>> valid-classoid? ]
+        [ class1>> classoid? ]
+        [ class2>> classoid? ]
         [ [ [ class1>> ] [ class2>> ] bi evaluate-class-predicate ] [ result>> ] bi eq? ]
     } 1&& ;
 
@@ -91,7 +91,7 @@ TUPLE: depends-on-instance-predicate object class result ;
 
 M: depends-on-instance-predicate satisfied?
     {
-        [ class>> valid-classoid? ]
+        [ class>> classoid? ]
         [ [ [ object>> ] [ class>> ] bi instance? ] [ result>> ] bi eq? ]
     } 1&& ;
 
@@ -103,7 +103,7 @@ TUPLE: depends-on-next-method class generic next-method ;
 
 M: depends-on-next-method satisfied?
     {
-        [ class>> valid-classoid? ]
+        [ class>> classoid? ]
         [ [ [ class>> ] [ generic>> ] bi next-method ] [ next-method>> ] bi eq? ]
     } 1&& ;
 

diff --git a/core/classes/algebra/algebra.factor b/core/classes/algebra/algebra.factor
index 6b1d2bf82a488e5495c65f218088af40010971d2..0103126d6af53039ef03bfb97ae1b6ac907a0e69 100644 (file)
--- a/core/classes/algebra/algebra.factor
+++ b/core/classes/algebra/algebra.factor
@@ -47,8 +47,7 @@ TUPLE: anonymous-complement { class read-only } ;
 INSTANCE: anonymous-complement classoid
 
 : <anonymous-complement> ( object -- classoid )
-    dup classoid? [ 1array not-classoids ] unless
-    anonymous-complement boa ;
+    check-classoid anonymous-complement boa ;
 
 M: anonymous-complement rank-class drop 3 ;
 
@@ -79,14 +78,6 @@ M: object normalize-class ;
 
 PRIVATE>
 
-GENERIC: valid-classoid? ( obj -- ? )
-
-M: word valid-classoid? class? ;
-M: anonymous-union valid-classoid? members>> [ valid-classoid? ] all? ;
-M: anonymous-intersection valid-classoid? participants>> [ valid-classoid? ] all? ;
-M: anonymous-complement valid-classoid? class>> valid-classoid? ;
-M: object valid-classoid? drop f ;
-
 : only-classoid? ( obj -- ? )
     dup classoid? [ class? not ] [ drop f ] if ;
 

diff --git a/core/classes/maybe/maybe.factor b/core/classes/maybe/maybe.factor
index 451b0513a88f4db361cc45656e76555dd040863c..a1ed5d18045cd1e808b799656052a8648185a79f 100644 (file)
--- a/core/classes/maybe/maybe.factor
+++ b/core/classes/maybe/maybe.factor
@@ -20,8 +20,6 @@ M: maybe instance?
 M: maybe normalize-class
     maybe-class-or ;
 
-M: maybe valid-classoid? class>> valid-classoid? ;
-
 M: maybe rank-class drop 6 ;
 
 M: maybe (flatten-class)