type inference work; class\/ and class/\ words

diff --git a/library/cons.factor b/library/cons.factor
index 495abad07e8bb7acecbf8c6f32fd998fcdebc096..165a8c0316e632b2f15d7796626e681859cf74a3 100644 (file)
--- a/library/cons.factor
+++ b/library/cons.factor
@@ -66,16 +66,12 @@ BUILTIN: cons 2
     #! Last element of a list.
     last* car ;
 
-: tail ( list -- tail )
-    #! Return the cdr of the last cons cell, or f.
-    dup [ last* cdr ] when ;
-
 UNION: general-list f cons ;
 
 PREDICATE: general-list list ( list -- ? )
     #! Proper list test. A proper list is either f, or a cons
     #! cell whose cdr is a proper list.
-    tail not ;
+    dup [ last* cdr ] when not ;
 
 : all? ( list pred -- ? )
     #! Push if the predicate returns true for each element of

diff --git a/library/generic/builtin.factor b/library/generic/builtin.factor
index b6bfe5bd859cfd1006eb0b16c8049701c52c03fd..3024654058cce1cd569ec5c0c415ef68cd1c8564 100644 (file)
--- a/library/generic/builtin.factor
+++ b/library/generic/builtin.factor
@@ -39,10 +39,6 @@ USE: vectors
 ! Builtin metaclass for builtin types: fixnum, word, cons, etc.
 SYMBOL: builtin
 
-! Vector in global namespace mapping type numbers to
-! builtin classes.
-SYMBOL: types
-
 builtin [
     "builtin-type" word-property unit
 ] "builtin-supertypes" set-word-property
@@ -54,23 +50,20 @@ builtin [
 
 builtin 50 "priority" set-word-property
 
-: add-builtin-table types get set-vector-nth ;
-
 : builtin-predicate ( type# symbol -- )
     over f type = [
         nip [ not ] "predicate" set-word-property
     ] [
         dup predicate-word
-        [ rot [ swap type eq? ] cons define-compound ] keep 
+        [ rot [ swap type eq? ] cons define-compound ] keep
         unit "predicate" set-word-property
     ] ifte ;
 
 : builtin-class ( type# symbol -- )
-    2dup swap add-builtin-table
-    dup undefined? [ dup define-symbol ] when
+    dup intern-symbol
     2dup builtin-predicate
-    dup builtin "metaclass" set-word-property
-    swap "builtin-type" set-word-property ;
+    [ swap "builtin-type" set-word-property ] keep
+    builtin define-class ;
 
 : BUILTIN:
     #! Followed by type name and type number. Define a built-in
@@ -78,7 +71,7 @@ builtin 50 "priority" set-word-property
     CREATE scan-word swap builtin-class ; parsing
 
 : builtin-type ( n -- symbol )
-    types get vector-nth ;
+    unit classes get hash ;
 
 : type-name ( n -- string )
     builtin-type word-name ;
@@ -87,5 +80,3 @@ builtin 50 "priority" set-word-property
     #! Analogous to the type primitive. Pushes the builtin
     #! class of an object.
     type builtin-type ;
-
-global [ num-types <vector> types set ] bind

diff --git a/library/generic/generic.factor b/library/generic/generic.factor
index 785a0a4d189afb3a9aa6eb005f88f13638a049cf..f4e0c5abaf1902c5dff08f3285ac61632f1a6d15 100644 (file)
--- a/library/generic/generic.factor
+++ b/library/generic/generic.factor
@@ -82,10 +82,10 @@ USE: math-internals
 : class-ord ( class -- n ) metaclass "priority" word-property ;
 
 : class< ( cls1 cls2 -- ? )
-    swap car class-ord swap car class-ord < ;
+    swap class-ord swap class-ord < ;
 
 : sort-methods ( methods -- alist )
-    hash>alist [ class< ] sort ;
+    hash>alist [ 2car class< ] sort ;
 
 : add-method ( vtable definition class -- )
     #! Add the method entry to the vtable. Unlike define-method,
@@ -153,3 +153,38 @@ DEFER: add-traits-dispatch
     #! M: foo bar begins a definition of the bar generic word
     #! specialized to the foo type.
     scan-word  dup define-method  scan-word swap [ ] ; parsing
+
+! Maps lists of builtin type numbers to class objects.
+SYMBOL: classes
+
+SYMBOL: object
+
+: type-union ( list list -- list )
+    append prune [ > ] sort ;
+
+: class\/ ( class class -- class )
+    #! Return a class that both classes are subclasses of.
+    swap builtin-supertypes
+    swap builtin-supertypes
+    type-union classes get hash [ object ] unless* ;
+
+: class/\ ( class class -- class )
+    #! Return a class that is a subclass of both, or raise an
+    #! error if this is impossible.
+    over builtin-supertypes
+    over builtin-supertypes
+    intersection dup [
+        nip nip classes get hash [ object ] unless*
+    ] [
+        drop [
+            word-name , " and " , word-name ,
+            " do not intersect" ,
+        ] make-string throw
+    ] ifte ;
+
+: define-class ( class metaclass -- )
+    dupd "metaclass" set-word-property
+    dup builtin-supertypes [ > ] sort
+    classes get set-hash ;
+
+global [ <namespace> classes set ] bind

diff --git a/library/generic/object.factor b/library/generic/object.factor
index 95d55509a9d604805e43c83067a56e04edebc405..ab740425e2544df311e712e0b09710b159414aa2 100644 (file)
--- a/library/generic/object.factor
+++ b/library/generic/object.factor
@@ -40,8 +40,6 @@ USE: math
 ! Catch-all metaclass for providing a default method.
 SYMBOL: object
 
-object object "metaclass" set-word-property
-
 object [
     drop num-types count
 ] "builtin-supertypes" set-word-property
@@ -56,3 +54,5 @@ object [
 object [ drop t ] "predicate" set-word-property
 
 object 100 "priority" set-word-property
+
+object object define-class

diff --git a/library/generic/predicate.factor b/library/generic/predicate.factor
index aee58c001c672669303f182bb4dae36d3e958e6c..d37002c0e2d266bf8044ef6f33abf8e3793d3f1e 100644 (file)
--- a/library/generic/predicate.factor
+++ b/library/generic/predicate.factor
@@ -73,7 +73,7 @@ predicate 25 "priority" set-word-property
 : PREDICATE: ( -- class predicate definition )
     #! Followed by a superclass name, then a class name.
     scan-word
-    CREATE
+    CREATE dup intern-symbol
     dup rot "superclass" set-word-property
     dup predicate "metaclass" set-word-property
     dup predicate-word

diff --git a/library/generic/union.factor b/library/generic/union.factor
index 7559a67a5d84ced2cdf7fc928cb5981615c170bd..19f83048e1990744313249b6d54ec659fa38c0c5 100644 (file)
--- a/library/generic/union.factor
+++ b/library/generic/union.factor
@@ -74,7 +74,8 @@ union 30 "priority" set-word-property
 : UNION: ( -- class predicate definition )
     #! Followed by a class name, then a list of union members.
     CREATE
-    dup union "metaclass" set-word-property
+    dup intern-symbol
+    dup union define-class
     dup predicate-word
     [ dupd unit "predicate" set-word-property ] keep
     [ define-union ] [ ] ; parsing

diff --git a/library/inference/branches.factor b/library/inference/branches.factor
index 14d9dd41edeeb0998fac96987285fced5c204b38..5992a3a15fa4f2f958e68a2e41146295ebb8b2e6 100644 (file)
--- a/library/inference/branches.factor
+++ b/library/inference/branches.factor
@@ -54,17 +54,13 @@ USE: hashtables
     #! shorter, pad it with unknown results at the bottom.
     dup longest-vector swap [ dupd add-inputs nip ] map nip ;
 
-: unify-classes ( class class -- class )
-    #! Return a class that both classes are subclasses of.
-    2dup = [ drop ] [ 2drop object ] ifte ;
-
 : unify-results ( obj obj -- obj )
     #! Replace values with unknown result if they differ,
     #! otherwise retain them.
     2dup = [
         drop
     ] [
-        value-class swap value-class unify-classes <computed>
+        value-class swap value-class class\/ <computed>
     ] ifte ;
 
 : unify-stacks ( list -- stack )

diff --git a/library/lists.factor b/library/lists.factor
index cbac8bf161623b102b39b1f822b65c74d6288c42..3463e8f4aceba0beb3e5ba89892fe6730f669462 100644 (file)
--- a/library/lists.factor
+++ b/library/lists.factor
@@ -192,3 +192,11 @@ M: cons hashcode ( cons -- hash ) 4 cons-hashcode ;
 : head ( list n -- list )
     #! Return the first n elements of the list.
     dup 0 > [ >r uncons r> pred head cons ] [ 2drop f ] ifte ;
+
+: tail ( list n -- tail )
+    #! Return the rest of the list, from the nth index onward.
+    [ cdr ] times ;
+
+: intersection ( list list -- list )
+    #! Make a list of elements that occur in both lists.
+    [ over contains? ] subset nip ;

diff --git a/library/test/alien.factor b/library/test/alien.factor
index 46bff7d7a99bfa6b218f0d0698d074337dbeafeb..65d9a1944fa53146bbc436d55de4833be5a54480 100644 (file)
--- a/library/test/alien.factor
+++ b/library/test/alien.factor
@@ -5,4 +5,7 @@ USE: test
 
 [ t ] [ 0 <alien> 0 <alien> = ] unit-test
 [ f ] [ 0 <alien> local-alien? ] unit-test
+[ f ] [ 0 <alien> 1024 <local-alien> = ] unit-test
+[ f ] [ 0 <alien> 1024 <alien> = ] unit-test
+[ f ] [ "hello" 1024 <alien> = ] unit-test
 [ t ] [ 1024 <local-alien> local-alien? ] unit-test

diff --git a/library/test/generic.factor b/library/test/generic.factor
index 8bae61a655a5cda081f738a16e7384cb2f830a30..3c575b5307d801be14fbda1955d1b86d816eb63e 100644 (file)
--- a/library/test/generic.factor
+++ b/library/test/generic.factor
@@ -7,6 +7,7 @@ USE: kernel
 USE: math
 USE: words
 USE: lists
+USE: vectors
 
 TRAITS: test-traits
 C: test-traits ;
@@ -124,3 +125,14 @@ GENERIC: gooey
 M: very-funny gooey sq ;
 
 [ 1/4 ] [ 1/2 gooey ] unit-test
+
+[ object ] [ object object class/\ ] unit-test
+[ fixnum ] [ fixnum object class/\ ] unit-test
+[ fixnum ] [ object fixnum class/\ ] unit-test
+[ fixnum ] [ fixnum fixnum class/\ ] unit-test
+[ fixnum ] [ fixnum integer class/\ ] unit-test
+[ fixnum ] [ integer fixnum class/\ ] unit-test
+[ vector fixnum class/\ ] unit-test-fails
+[ integer ] [ fixnum bignum class\/ ] unit-test
+[ integer ] [ fixnum integer class\/ ] unit-test
+[ rational ] [ ratio integer class\/ ] unit-test

diff --git a/library/words.factor b/library/words.factor
index e7a5ad9b11acc290e4b364f782bf365637fa040b..90434601053790e23b01bcd20c9c78426ae3bcf8 100644 (file)
--- a/library/words.factor
+++ b/library/words.factor
@@ -61,6 +61,9 @@ PREDICATE: word undefined ( obj -- ? ) word-primitive 0 = ;
 : define-compound ( word def -- ) 1 swap define ;
 : define-symbol   ( word -- ) 2 over define ;
 
+: intern-symbol ( word -- )
+    dup undefined? [ define-symbol ] [ drop ] ifte ;
+
 : word-name       ( word -- str ) "name" word-property ;
 : word-vocabulary ( word -- str ) "vocabulary" word-property ;
 : stack-effect    ( word -- str ) "stack-effect" word-property ;