From 80f30119c0b34e87fa97da4cd435e63cde76b61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Wed, 30 Mar 2016 18:59:10 +0200
Subject: [PATCH] bootstrap.image.primitives: make more primitives properties
 be declared here

This commit merges the input/output-classes and flush/foldable
declarations from stack-checker.known-words to this vocab. This should
make adding primitives a little simpler (#1134).
---
 .../image/primitives/primitives-docs.factor   |  14 +-
 .../image/primitives/primitives-tests.factor  |   7 +-
 .../image/primitives/primitives.factor        | 866 +++++++++++++-----
 .../known-words/known-words-docs.factor       |   8 +-
 .../known-words/known-words.factor            | 288 +-----
 5 files changed, 668 insertions(+), 515 deletions(-)

diff --git a/basis/bootstrap/image/primitives/primitives-docs.factor b/basis/bootstrap/image/primitives/primitives-docs.factor
index 2dbe9fc167..78b9f08056 100644
--- a/basis/bootstrap/image/primitives/primitives-docs.factor
+++ b/basis/bootstrap/image/primitives/primitives-docs.factor
@@ -2,7 +2,17 @@ USING: assocs help.markup help.syntax quotations strings words ;
 IN: bootstrap.image.primitives
 
 HELP: all-primitives
-{ $description "A constant " { $link assoc } " containing all primitives. Keys are vocab names and values are sequences of tuples declaring words. The format of the tuples are { name effect vm-func }. If 'vm-func' is a " { $link string } " then the primitive will call a function implemented in C++ code. If 'vm-func' is " { $link f } " then it is a sub-primitive and implemented in one of the files in 'basis/bootstrap/assembler/'." } ;
+{ $description "A constant " { $link assoc } " containing all primitives. Keys are vocab names and values are sequences of tuples declaring words. The format of the tuples are { name effect vm-func inputs outputs extra-props }:"
+  { $list
+    { "name: Name of the primitive." }
+    { "effect: The primitives stack effect." }
+    { "vm-func: If it is a " { $link string } " then the primitive will call a function implemented in C++ code. If 'vm-func' is " { $link f } " then it is a sub-primitive and implemented in one of the files in 'basis/bootstrap/assembler/'." }
+    { "inputs: The primitives \"input-classes\", if any." }
+    { "outputs: The primitives \"output-classes\", if any." }
+    { "extra-word: An " { $link word } " that is run with the created word as argument to add extra properties to it. Usually, it would be " { $link make-foldable } " or " { $link make-flushable } " to make the word foldable or flushable respectively." }
+  }
+}
+"See " { $link "word-props" } " for documentation of what all word properties do." ;
 
 HELP: primitive-quot
 { $values { "word" word } { "vm-func" $maybe { string } } { "quot" quotation } }
@@ -11,6 +21,6 @@ HELP: primitive-quot
 ARTICLE: "bootstrap.image.primitives" "Bootstrap primitives"
 "This vocab contains utilities for declaring primitives to be added to the bootstrap image. It is used by " { $vocab-link "bootstrap.primitives" }
 $nl
-{ $link all-primitives } " is an assoc where all primitives are declared." ;
+{ $link all-primitives } " is an assoc where all primitives are declared. See that constant for a description of the format." ;
 
 ABOUT: "bootstrap.image.primitives"
diff --git a/basis/bootstrap/image/primitives/primitives-tests.factor b/basis/bootstrap/image/primitives/primitives-tests.factor
index ae60340c06..f70b7059df 100644
--- a/basis/bootstrap/image/primitives/primitives-tests.factor
+++ b/basis/bootstrap/image/primitives/primitives-tests.factor
@@ -1,4 +1,5 @@
-USING: bootstrap.image.primitives kernel.private tools.test words ;
+USING: bootstrap.image.primitives kernel.private sequences tools.test
+vocabs words ;
 IN: bootstrap.image.primitives.tests
 
 {
@@ -11,3 +12,7 @@ IN: bootstrap.image.primitives.tests
 } [
     gensym "hello" primitive-quot
 ] unit-test
+
+{ t } [
+    all-words [ primitive? ] filter [ foldable? ] filter [ flushable? ] all?
+] unit-test
diff --git a/basis/bootstrap/image/primitives/primitives.factor b/basis/bootstrap/image/primitives/primitives.factor
index 8d4200ad1d..9c971417f9 100644
--- a/basis/bootstrap/image/primitives/primitives.factor
+++ b/basis/bootstrap/image/primitives/primitives.factor
@@ -1,92 +1,197 @@
-USING: alien.strings assocs io.encodings.ascii kernel kernel.private
-locals quotations sequences words ;
+USING: alien alien.strings arrays assocs byte-arrays
+io.encodings.ascii kernel kernel.private locals math quotations
+sequences sequences.generalizations sequences.private strings words ;
 IN: bootstrap.image.primitives
 
 CONSTANT: all-primitives {
     {
         "alien"
         {
-            { "<callback>" ( word return-rewind -- alien ) "callback" }
-            { "<displaced-alien>" ( displacement c-ptr -- alien ) "displaced_alien" }
-            { "alien-address" ( c-ptr -- addr ) "alien_address" }
-            { "free-callback" ( alien -- ) "free_callback" }
+            {
+                "<callback>" ( word return-rewind -- alien ) "callback"
+                { word integer } { alien } f
+            }
+            {
+                "<displaced-alien>" ( displacement c-ptr -- alien ) "displaced_alien"
+                { integer c-ptr } { c-ptr } make-flushable
+            }
+            {
+                "alien-address" ( c-ptr -- addr ) "alien_address"
+                { alien } { integer } make-flushable
+            }
+            { "free-callback" ( alien -- ) "free_callback" { alien } { } f }
         }
     }
     {
         "alien.private"
         {
-            { "current-callback" ( -- n ) "current_callback" }
+            { "current-callback" ( -- n ) "current_callback" { } { fixnum } make-flushable }
         }
     }
     {
         "alien.accessors"
         {
-            { "alien-cell" ( c-ptr n -- value ) "alien_cell" }
-            { "alien-double" ( c-ptr n -- value ) "alien_double" }
-            { "alien-float" ( c-ptr n -- value ) "alien_float" }
-
-            { "alien-signed-1" ( c-ptr n -- value ) "alien_signed_1" }
-            { "alien-signed-2" ( c-ptr n -- value ) "alien_signed_2" }
-            { "alien-signed-4" ( c-ptr n -- value ) "alien_signed_4" }
-            { "alien-signed-8" ( c-ptr n -- value ) "alien_signed_8" }
-            { "alien-signed-cell" ( c-ptr n -- value ) "alien_signed_cell" }
-
-            { "alien-unsigned-1" ( c-ptr n -- value ) "alien_unsigned_1" }
-            { "alien-unsigned-2" ( c-ptr n -- value ) "alien_unsigned_2" }
-            { "alien-unsigned-4" ( c-ptr n -- value ) "alien_unsigned_4" }
-            { "alien-unsigned-8" ( c-ptr n -- value ) "alien_unsigned_8" }
-            { "alien-unsigned-cell" ( c-ptr n -- value ) "alien_unsigned_cell" }
-
-            { "set-alien-cell" ( value c-ptr n -- ) "set_alien_cell" }
-            { "set-alien-double" ( value c-ptr n -- ) "set_alien_double" }
-            { "set-alien-float" ( value c-ptr n -- ) "set_alien_float" }
-
-            { "set-alien-signed-1" ( value c-ptr n -- ) "set_alien_signed_1" }
-            { "set-alien-signed-2" ( value c-ptr n -- ) "set_alien_signed_2" }
-            { "set-alien-signed-4" ( value c-ptr n -- ) "set_alien_signed_4" }
-            { "set-alien-signed-8" ( value c-ptr n -- ) "set_alien_signed_8" }
-            { "set-alien-signed-cell" ( value c-ptr n -- ) "set_alien_signed_cell" }
-
-            { "set-alien-unsigned-1" ( value c-ptr n -- ) "set_alien_unsigned_1" }
-            { "set-alien-unsigned-2" ( value c-ptr n -- ) "set_alien_unsigned_2" }
-            { "set-alien-unsigned-4" ( value c-ptr n -- ) "set_alien_unsigned_4" }
-            { "set-alien-unsigned-8" ( value c-ptr n -- ) "set_alien_unsigned_8" }
-            { "set-alien-unsigned-cell" ( value c-ptr n -- ) "set_alien_unsigned_cell" }
+            {
+                "alien-cell" ( c-ptr n -- value ) "alien_cell"
+                { c-ptr integer } { pinned-c-ptr } make-flushable
+            }
+            {
+                "alien-double" ( c-ptr n -- value ) "alien_double"
+                { c-ptr integer } { float } make-flushable
+            }
+            {
+                "alien-float" ( c-ptr n -- value ) "alien_float"
+                { c-ptr integer } { float } make-flushable
+            }
+            {
+                "alien-signed-1" ( c-ptr n -- value ) "alien_signed_1"
+                { c-ptr integer } { fixnum } make-flushable
+            }
+            {
+                "alien-signed-2" ( c-ptr n -- value ) "alien_signed_2"
+                { c-ptr integer } { fixnum } make-flushable
+            }
+            {
+                "alien-signed-4" ( c-ptr n -- value ) "alien_signed_4"
+                { c-ptr integer } { integer } make-flushable
+            }
+            {
+                "alien-signed-8" ( c-ptr n -- value ) "alien_signed_8"
+                { c-ptr integer } { integer } make-flushable
+            }
+            {
+                "alien-signed-cell" ( c-ptr n -- value ) "alien_signed_cell"
+                { c-ptr integer } { integer } make-flushable
+            }
+            {
+                "alien-unsigned-1" ( c-ptr n -- value ) "alien_unsigned_1"
+                { c-ptr integer } { fixnum } make-flushable
+            }
+            {
+                "alien-unsigned-2" ( c-ptr n -- value ) "alien_unsigned_2"
+                { c-ptr integer } { fixnum } make-flushable
+            }
+            {
+                "alien-unsigned-4" ( c-ptr n -- value ) "alien_unsigned_4"
+                { c-ptr integer } { integer } make-flushable
+            }
+            {
+                "alien-unsigned-8" ( c-ptr n -- value ) "alien_unsigned_8"
+                { c-ptr integer } { integer } make-flushable
+            }
+            {
+                "alien-unsigned-cell" ( c-ptr n -- value ) "alien_unsigned_cell"
+                { c-ptr integer } { integer } make-flushable
+            }
+            {
+                "set-alien-cell" ( value c-ptr n -- ) "set_alien_cell"
+                { c-ptr c-ptr integer } { } f
+            }
+            {
+                "set-alien-double" ( value c-ptr n -- ) "set_alien_double"
+                { float c-ptr integer } { } f
+            }
+            {
+                "set-alien-float" ( value c-ptr n -- ) "set_alien_float"
+                { float c-ptr integer } { } f
+            }
+            {
+                "set-alien-signed-1" ( value c-ptr n -- ) "set_alien_signed_1"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-signed-2" ( value c-ptr n -- ) "set_alien_signed_2"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-signed-4" ( value c-ptr n -- ) "set_alien_signed_4"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-signed-8" ( value c-ptr n -- ) "set_alien_signed_8"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-signed-cell" ( value c-ptr n -- ) "set_alien_signed_cell"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-unsigned-1" ( value c-ptr n -- ) "set_alien_unsigned_1"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-unsigned-2" ( value c-ptr n -- ) "set_alien_unsigned_2"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-unsigned-4" ( value c-ptr n -- ) "set_alien_unsigned_4"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-unsigned-8" ( value c-ptr n -- ) "set_alien_unsigned_8"
+                { integer c-ptr integer } { } f
+            }
+            {
+                "set-alien-unsigned-cell" ( value c-ptr n -- ) "set_alien_unsigned_cell"
+                { integer c-ptr integer } { } f
+            }
         }
     }
     {
         "alien.libraries"
         {
-            { "(dlopen)" ( path -- dll ) "dlopen" }
-            { "(dlsym)" ( name dll -- alien ) "dlsym" }
-            { "(dlsym-raw)" ( name dll -- alien ) "dlsym_raw" }
-            { "dlclose" ( dll -- ) "dlclose" }
-            { "dll-valid?" ( dll -- ? ) "dll_validp" }
+            { "(dlopen)" ( path -- dll ) "dlopen" { byte-array } { dll } f }
+            { "(dlsym)" ( name dll -- alien ) "dlsym" { byte-array object } { c-ptr } f }
+            {
+                "(dlsym-raw)" ( name dll -- alien ) "dlsym_raw"
+                { byte-array object } { c-ptr } f
+            }
+            { "dlclose" ( dll -- ) "dlclose" { dll } { } f }
+            { "dll-valid?" ( dll -- ? ) "dll_validp" { object } { object } f }
         }
     }
     {
         "arrays"
         {
-            { "<array>" ( n elt -- array ) "array" }
-            { "resize-array" ( n array -- new-array ) "resize_array" }
+            {
+                "<array>" ( n elt -- array ) "array"
+                { integer-array-capacity object } { array } make-flushable
+            }
+            {
+                "resize-array" ( n array -- new-array ) "resize_array"
+                { integer array } { array } f
+            }
         }
     }
     {
         "byte-arrays"
         {
-            { "(byte-array)" ( n -- byte-array ) "uninitialized_byte_array" }
-            { "<byte-array>" ( n -- byte-array ) "byte_array" }
+            {
+                "(byte-array)" ( n -- byte-array ) "uninitialized_byte_array"
+                { integer-array-capacity } { byte-array } make-flushable
+            }
+            {
+                "<byte-array>" ( n -- byte-array ) "byte_array"
+                { integer-array-capacity } { byte-array } make-flushable
+            }
             {
                 "resize-byte-array" ( n byte-array -- new-byte-array )
                 "resize_byte_array"
+                { integer byte-array } { byte-array } f
             }
         }
     }
     {
         "classes.tuple.private"
         {
-            { "<tuple-boa>" ( slots... layout -- tuple ) "tuple_boa" }
-            { "<tuple>" ( layout -- tuple ) "tuple" }
+            {
+                "<tuple-boa>" ( slots... layout -- tuple ) "tuple_boa"
+                f f make-flushable
+            }
+            {
+                "<tuple>" ( layout -- tuple ) "tuple"
+                { array } { tuple } make-flushable
+            }
         }
     }
     {
@@ -95,127 +200,201 @@ CONSTANT: all-primitives {
             {
                 "modify-code-heap" ( alist update-existing? reset-pics? -- )
                 "modify_code_heap"
+                { array object object } { } f
             }
         }
     }
     {
         "generic.single.private"
         {
-            { "inline-cache-miss" ( generic methods index cache -- ) f }
-            { "inline-cache-miss-tail" ( generic methods index cache -- ) f }
-            { "lookup-method" ( object methods -- method ) "lookup_method" }
-            { "mega-cache-lookup" ( methods index cache -- ) f }
-            { "mega-cache-miss" ( methods index cache -- method ) "mega_cache_miss" }
+            { "inline-cache-miss" ( generic methods index cache -- ) f f f f }
+            { "inline-cache-miss-tail" ( generic methods index cache -- ) f f f f }
+            {
+                "lookup-method" ( object methods -- method ) "lookup_method"
+                { object array } { word } f
+            }
+            { "mega-cache-lookup" ( methods index cache -- ) f f f f }
+            { "mega-cache-miss" ( methods index cache -- method ) "mega_cache_miss" f f f }
         }
     }
     {
         "io.files.private"
         {
-            { "(exists?)" ( path -- ? ) "existsp" }
+            { "(exists?)" ( path -- ? ) "existsp" { string } { object } f }
         }
     }
     {
         "io.streams.c"
         {
-            { "(fopen)" ( path mode -- alien ) "fopen" }
-            { "fclose" ( alien -- ) "fclose" }
-            { "fflush" ( alien -- ) "fflush" }
-            { "fgetc" ( alien -- byte/f ) "fgetc" }
-            { "fputc" ( byte alien -- ) "fputc" }
-            { "fread-unsafe" ( n buf alien -- count ) "fread" }
-            { "fseek" ( alien offset whence -- ) "fseek" }
-            { "ftell" ( alien -- n ) "ftell" }
-            { "fwrite" ( data length alien -- ) "fwrite" }
+            {
+                "(fopen)" ( path mode -- alien ) "fopen"
+                { byte-array byte-array } { alien } f
+            }
+            { "fclose" ( alien -- ) "fclose" { alien } { } f }
+            { "fflush" ( alien -- ) "fflush" { alien } { } f }
+            { "fgetc" ( alien -- byte/f ) "fgetc" { alien } { object } f }
+            { "fputc" ( byte alien -- ) "fputc" { object alien } { } f }
+            {
+                "fread-unsafe" ( n buf alien -- count ) "fread"
+                { integer c-ptr alien } { integer } f
+            }
+            {
+                "fseek" ( alien offset whence -- ) "fseek"
+                { integer integer alien } { } f
+            }
+            { "ftell" ( alien -- n ) "ftell" { alien } { integer } f }
+            { "fwrite" ( data length alien -- ) "fwrite" { c-ptr integer alien } { } f }
         }
     }
     {
         "kernel"
         {
-            { "(clone)" ( obj -- newobj ) "clone" }
-            { "<wrapper>" ( obj -- wrapper ) "wrapper" }
-            { "callstack>array" ( callstack -- array ) "callstack_to_array" }
-            { "die" ( -- ) "die" }
-            { "drop" ( x -- ) f }
-            { "2drop" ( x y -- ) f }
-            { "3drop" ( x y z -- ) f }
-            { "4drop" ( w x y z -- ) f }
-            { "dup" ( x -- x x ) f }
-            { "2dup" ( x y -- x y x y ) f }
-            { "3dup" ( x y z -- x y z x y z ) f }
-            { "4dup" ( w x y z -- w x y z w x y z ) f }
-            { "rot" ( x y z -- y z x ) f }
-            { "-rot" ( x y z -- z x y ) f }
-            { "dupd" ( x y -- x x y ) f }
-            { "swapd" ( x y z -- y x z ) f }
-            { "nip" ( x y -- y ) f }
-            { "2nip" ( x y z -- z ) f }
-            { "over" ( x y -- x y x ) f }
-            { "pick" ( x y z -- x y z x ) f }
-            { "swap" ( x y -- y x ) f }
-            { "eq?" ( obj1 obj2 -- ? ) f }
+            { "(clone)" ( obj -- newobj ) "clone" { object } { object } make-flushable }
+            {
+                "<wrapper>" ( obj -- wrapper ) "wrapper"
+                { object } { wrapper } make-foldable
+            }
+            {
+                "callstack>array" ( callstack -- array ) "callstack_to_array"
+                { callstack } { array } make-flushable
+            }
+            { "die" ( -- ) "die" { } { } f }
+            { "drop" ( x -- ) f f f f }
+            { "2drop" ( x y -- ) f f f f }
+            { "3drop" ( x y z -- ) f f f f }
+            { "4drop" ( w x y z -- ) f f f f }
+            { "dup" ( x -- x x ) f f f f }
+            { "2dup" ( x y -- x y x y ) f f f f }
+            { "3dup" ( x y z -- x y z x y z ) f f f f }
+            { "4dup" ( w x y z -- w x y z w x y z ) f f f f }
+            { "rot" ( x y z -- y z x ) f f f f }
+            { "-rot" ( x y z -- z x y ) f f f f }
+            { "dupd" ( x y -- x x y ) f f f f }
+            { "swapd" ( x y z -- y x z ) f f f f }
+            { "nip" ( x y -- y ) f f f f }
+            { "2nip" ( x y z -- z ) f f f f }
+            { "over" ( x y -- x y x ) f f f f }
+            { "pick" ( x y z -- x y z x ) f f f f }
+            { "swap" ( x y -- y x ) f f f f }
+            { "eq?" ( obj1 obj2 -- ? ) f { object object } { object } make-foldable }
         }
     }
     {
         "kernel.private"
         {
-            { "(call)" ( quot -- ) f }
-            { "(execute)" ( word -- ) f }
-            { "c-to-factor" ( -- ) f }
-            { "fpu-state" ( -- ) f }
-            { "lazy-jit-compile" ( -- ) f }
-            { "leaf-signal-handler" ( -- ) f }
-            { "set-callstack" ( callstack -- * ) f }
-            { "set-fpu-state" ( -- ) f }
-            { "signal-handler" ( -- ) f }
-            { "tag" ( object -- n ) f }
-            { "unwind-native-frames" ( -- ) f }
-
-            { "callstack-for" ( context -- array ) "callstack_for" }
-            { "datastack-for" ( context -- array ) "datastack_for" }
-            { "retainstack-for" ( context -- array ) "retainstack_for" }
-            { "(identity-hashcode)" ( obj -- code ) "identity_hashcode" }
-            { "become" ( old new -- ) "become" }
-            { "callstack-bounds" ( -- start end ) "callstack_bounds" }
-            { "check-datastack" ( array in# out# -- ? ) "check_datastack" }
-            { "compute-identity-hashcode" ( obj -- ) "compute_identity_hashcode" }
-            { "context-object" ( n -- obj ) "context_object" }
+            { "(call)" ( quot -- ) f f f f }
+            { "(execute)" ( word -- ) f f f f }
+            { "c-to-factor" ( -- ) f f f f }
+            { "fpu-state" ( -- ) f { } { } f }
+            { "lazy-jit-compile" ( -- ) f f f f }
+            { "leaf-signal-handler" ( -- ) f { } { } f }
+            { "set-callstack" ( callstack -- * ) f f f f }
+            { "set-fpu-state" ( -- ) f { } { } f }
+            { "signal-handler" ( -- ) f { } { } f }
+            {
+                "tag" ( object -- n ) f
+                { object } { fixnum } make-foldable
+            }
+            { "unwind-native-frames" ( -- ) f f f f }
+            {
+                "callstack-for" ( context -- array ) "callstack_for"
+                { c-ptr } { callstack } make-flushable
+            }
+            {
+                "datastack-for" ( context -- array ) "datastack_for"
+                { c-ptr } { array } make-flushable
+            }
+            {
+                "retainstack-for" ( context -- array ) "retainstack_for"
+                { c-ptr } { array } make-flushable
+            }
+            {
+                "(identity-hashcode)" ( obj -- code ) "identity_hashcode"
+                { object } { fixnum } f
+            }
+            { "become" ( old new -- ) "become" { array array } { } f }
+            {
+                "callstack-bounds" ( -- start end ) "callstack_bounds"
+                { } { alien alien } make-flushable
+            }
+            {
+                "check-datastack" ( array in# out# -- ? ) "check_datastack"
+                { array integer integer } { object } make-flushable
+            }
+            {
+                "compute-identity-hashcode" ( obj -- ) "compute_identity_hashcode"
+                { object } { } f
+            }
+            {
+                "context-object" ( n -- obj ) "context_object"
+                { fixnum } { object } make-flushable
+            }
             {
                 "innermost-frame-executing" ( callstack -- obj )
                 "innermost_stack_frame_executing"
+                { callstack } { object } f
             }
             {
-                "innermost-frame-scan" ( callstack -- n )
-                "innermost_stack_frame_scan"
+                "innermost-frame-scan" ( callstack -- n ) "innermost_stack_frame_scan"
+                { callstack } { fixnum } f
             }
-            { "set-context-object" ( obj n -- ) "set_context_object" }
-            { "set-datastack" ( array -- ) "set_datastack" }
+            {
+                "set-context-object" ( obj n -- ) "set_context_object"
+                { object fixnum } { } f
+            }
+            { "set-datastack" ( array -- ) "set_datastack" f f f }
             {
                 "set-innermost-frame-quotation" ( n callstack -- )
                 "set_innermost_stack_frame_quotation"
+                { quotation callstack } { } f
+            }
+            { "set-retainstack" ( array -- ) "set_retainstack" f f f }
+            {
+                "set-special-object" ( obj n -- ) "set_special_object"
+                { object fixnum } { } f
+            }
+            {
+                "special-object" ( n -- obj ) "special_object"
+                { fixnum } { object } make-flushable
+            }
+            {
+                "strip-stack-traces" ( -- ) "strip_stack_traces"
+                { } { } f
+            }
+            {
+                "unimplemented" ( -- * ) "unimplemented"
+                { } { } f
             }
-            { "set-retainstack" ( array -- ) "set_retainstack" }
-            { "set-special-object" ( obj n -- ) "set_special_object" }
-            { "special-object" ( n -- obj ) "special_object" }
-            { "strip-stack-traces" ( -- ) "strip_stack_traces" }
-            { "unimplemented" ( -- * ) "unimplemented" }
         }
     }
     {
         "locals.backend"
         {
-            { "drop-locals" ( n -- ) f }
-            { "get-local" ( n -- obj ) f }
-            { "load-local" ( obj -- ) f }
-            { "load-locals" ( ... n -- ) "load_locals" }
+            { "drop-locals" ( n -- ) f f f f }
+            { "get-local" ( n -- obj ) f f f f }
+            { "load-local" ( obj -- ) f f f f }
+            { "load-locals" ( ... n -- ) "load_locals" f f f }
         }
     }
     {
         "math"
         {
-            { "bits>double" ( n -- x ) "bits_double" }
-            { "bits>float" ( n -- x ) "bits_float" }
-            { "double>bits" ( x -- n ) "double_bits" }
-            { "float>bits" ( x -- n ) "float_bits" }
+            {
+                "bits>double" ( n -- x ) "bits_double"
+                { integer } { float } make-foldable
+            }
+            {
+                "bits>float" ( n -- x ) "bits_float"
+                { integer } { float } make-foldable
+            }
+            {
+                "double>bits" ( x -- n ) "double_bits"
+                { real } { integer } make-foldable
+            }
+            {
+                "float>bits" ( x -- n ) "float_bits"
+                { real } { integer } make-foldable
+            }
         }
     }
     {
@@ -224,181 +403,405 @@ CONSTANT: all-primitives {
             {
                 "(format-float)" ( n fill width precision format locale -- byte-array )
                 "format_float"
+                { float byte-array fixnum fixnum byte-array byte-array } { byte-array }
+                make-foldable
             }
         }
     }
     {
         "math.private"
         {
-            { "both-fixnums?" ( x y -- ? ) f }
-            { "fixnum+fast" ( x y -- z ) f }
-            { "fixnum-fast" ( x y -- z ) f }
-            { "fixnum*fast" ( x y -- z ) f }
-            { "fixnum-bitand" ( x y -- z ) f }
-            { "fixnum-bitor" ( x y -- z ) f }
-            { "fixnum-bitxor" ( x y -- z ) f }
-            { "fixnum-bitnot" ( x -- y ) f }
-            { "fixnum-mod" ( x y -- z ) f }
-            { "fixnum-shift-fast" ( x y -- z ) f }
-            { "fixnum/i-fast" ( x y -- z ) f }
-            { "fixnum/mod-fast" ( x y -- z w ) f }
-            { "fixnum+" ( x y -- z ) f }
-            { "fixnum-" ( x y -- z ) f }
-            { "fixnum*" ( x y -- z ) f }
-            { "fixnum<" ( x y -- ? ) f }
-            { "fixnum<=" ( x y -- z ) f }
-            { "fixnum>" ( x y -- ? ) f }
-            { "fixnum>=" ( x y -- ? ) f }
-
-            { "bignum*" ( x y -- z ) "bignum_multiply" }
-            { "bignum+" ( x y -- z ) "bignum_add" }
-            { "bignum-" ( x y -- z ) "bignum_subtract" }
-            { "bignum-bit?" ( x n -- ? ) "bignum_bitp" }
-            { "bignum-bitand" ( x y -- z ) "bignum_and" }
-            { "bignum-bitnot" ( x -- y ) "bignum_not" }
-            { "bignum-bitor" ( x y -- z ) "bignum_or" }
-            { "bignum-bitxor" ( x y -- z ) "bignum_xor" }
-            { "bignum-log2" ( x -- n ) "bignum_log2" }
-            { "bignum-mod" ( x y -- z ) "bignum_mod" }
-            { "bignum-gcd" ( x y -- z ) "bignum_gcd" }
-            { "bignum-shift" ( x y -- z ) "bignum_shift" }
-            { "bignum/i" ( x y -- z ) "bignum_divint" }
-            { "bignum/mod" ( x y -- z w ) "bignum_divmod" }
-            { "bignum<" ( x y -- ? ) "bignum_less" }
-            { "bignum<=" ( x y -- ? ) "bignum_lesseq" }
-            { "bignum=" ( x y -- ? ) "bignum_eq" }
-            { "bignum>" ( x y -- ? ) "bignum_greater" }
-            { "bignum>=" ( x y -- ? ) "bignum_greatereq" }
-            { "bignum>fixnum" ( x -- y ) "bignum_to_fixnum" }
-            { "bignum>fixnum-strict" ( x -- y ) "bignum_to_fixnum_strict" }
-            { "fixnum-shift" ( x y -- z ) "fixnum_shift" }
-            { "fixnum/i" ( x y -- z ) "fixnum_divint" }
-            { "fixnum/mod" ( x y -- z w ) "fixnum_divmod" }
-            { "fixnum>bignum" ( x -- y ) "fixnum_to_bignum" }
-            { "fixnum>float" ( x -- y ) "fixnum_to_float" }
-            { "float*" ( x y -- z ) "float_multiply" }
-            { "float+" ( x y -- z ) "float_add" }
-            { "float-" ( x y -- z ) "float_subtract" }
-            { "float-u<" ( x y -- ? ) "float_less" }
-            { "float-u<=" ( x y -- ? ) "float_lesseq" }
-            { "float-u>" ( x y -- ? ) "float_greater" }
-            { "float-u>=" ( x y -- ? ) "float_greatereq" }
-            { "float/f" ( x y -- z ) "float_divfloat" }
-            { "float<" ( x y -- ? ) "float_less" }
-            { "float<=" ( x y -- ? ) "float_lesseq" }
-            { "float=" ( x y -- ? ) "float_eq" }
-            { "float>" ( x y -- ? ) "float_greater" }
-            { "float>=" ( x y -- ? ) "float_greatereq" }
-            { "float>bignum" ( x -- y ) "float_to_bignum" }
-            { "float>fixnum" ( x -- y ) "float_to_fixnum" }
+            { "both-fixnums?" ( x y -- ? ) f { object object } { object } f }
+            {
+                "fixnum+fast" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-fast" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum*fast" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-bitand" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-bitor" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-bitxor" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-bitnot" ( x -- y ) f
+                { fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-mod" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum-shift" ( x y -- z ) "fixnum_shift"
+                { fixnum fixnum } { integer } make-foldable
+            }
+            {
+                "fixnum-shift-fast" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum/i-fast" ( x y -- z ) f
+                { fixnum fixnum } { fixnum } make-foldable
+            }
+            {
+                "fixnum/mod" ( x y -- z w ) "fixnum_divmod"
+                { fixnum fixnum } { integer fixnum } make-foldable
+            }
+            {
+                "fixnum/mod-fast" ( x y -- z w ) f
+                { fixnum fixnum } { fixnum fixnum } make-foldable
+            }
+            {
+                "fixnum+" ( x y -- z ) f
+                { fixnum fixnum } { integer } make-foldable
+            }
+            {
+                "fixnum-" ( x y -- z ) f
+                { fixnum fixnum } { integer } make-foldable
+            }
+            {
+                "fixnum*" ( x y -- z ) f
+                { fixnum fixnum } { integer } make-foldable
+            }
+            {
+                "fixnum<" ( x y -- ? ) f
+                { fixnum fixnum } { object } make-foldable
+            }
+            {
+                "fixnum<=" ( x y -- z ) f
+                { fixnum fixnum } { object } make-foldable
+            }
+            {
+                "fixnum>" ( x y -- ? ) f
+                { fixnum fixnum } { object } make-foldable
+            }
+            {
+                "fixnum>=" ( x y -- ? ) f
+                { fixnum fixnum } { object } make-foldable
+            }
+            {
+                "bignum*" ( x y -- z ) "bignum_multiply"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum+" ( x y -- z ) "bignum_add"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-" ( x y -- z ) "bignum_subtract"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-bit?" ( x n -- ? ) "bignum_bitp"
+                { bignum integer } { object } make-foldable
+            }
+            {
+                "bignum-bitand" ( x y -- z ) "bignum_and"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-bitnot" ( x -- y ) "bignum_not"
+                { bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-bitor" ( x y -- z ) "bignum_or"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-bitxor" ( x y -- z ) "bignum_xor"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-log2" ( x -- n ) "bignum_log2"
+                { bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-mod" ( x y -- z ) "bignum_mod"
+                { bignum bignum } { integer } make-foldable
+            }
+            {
+                "bignum-gcd" ( x y -- z ) "bignum_gcd"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum-shift" ( x y -- z ) "bignum_shift"
+                { bignum fixnum } { bignum } make-foldable
+            }
+            {
+                "bignum/i" ( x y -- z ) "bignum_divint"
+                { bignum bignum } { bignum } make-foldable
+            }
+            {
+                "bignum/mod" ( x y -- z w ) "bignum_divmod"
+                { bignum bignum } { bignum integer } make-foldable
+            }
+            {
+                "bignum<" ( x y -- ? ) "bignum_less"
+                { bignum bignum } { object } make-foldable
+            }
+            {
+                "bignum<=" ( x y -- ? ) "bignum_lesseq"
+                { bignum bignum } { object } make-foldable
+            }
+            {
+                "bignum=" ( x y -- ? ) "bignum_eq"
+                { bignum bignum } { object } make-foldable
+            }
+            {
+                "bignum>" ( x y -- ? ) "bignum_greater"
+                { bignum bignum } { object } make-foldable
+            }
+            {
+                "bignum>=" ( x y -- ? ) "bignum_greatereq"
+                { bignum bignum } { object } make-foldable
+            }
+            {
+                "bignum>fixnum" ( x -- y ) "bignum_to_fixnum"
+                { bignum } { fixnum } make-foldable
+            }
+            {
+                "bignum>fixnum-strict" ( x -- y ) "bignum_to_fixnum_strict"
+                { bignum } { fixnum } make-foldable
+            }
+            {
+                "fixnum/i" ( x y -- z ) "fixnum_divint"
+                { fixnum fixnum } { integer } make-foldable
+            }
+            {
+                "fixnum>bignum" ( x -- y ) "fixnum_to_bignum"
+                { fixnum } { bignum } make-foldable
+            }
+            {
+                "fixnum>float" ( x -- y ) "fixnum_to_float"
+                { fixnum } { float } make-foldable
+            }
+            {
+                "float*" ( x y -- z ) "float_multiply"
+                { float float } { float } make-foldable
+            }
+            {
+                "float+" ( x y -- z ) "float_add"
+                { float float } { float } make-foldable
+            }
+            {
+                "float-" ( x y -- z ) "float_subtract"
+                { float float } { float } make-foldable
+            }
+            ! -u ones redundant?
+            {
+                "float-u<" ( x y -- ? ) "float_less"
+                { float float } { object } make-foldable
+            }
+            {
+                "float-u<=" ( x y -- ? ) "float_lesseq"
+                { float float } { object } make-foldable
+            }
+            {
+                "float-u>" ( x y -- ? ) "float_greater"
+                { float float } { object } make-foldable
+            }
+            {
+                "float-u>=" ( x y -- ? ) "float_greatereq"
+                { float float } { object } make-foldable
+            }
+            {
+                "float/f" ( x y -- z ) "float_divfloat"
+                { float float } { float } make-foldable
+            }
+            {
+                "float<" ( x y -- ? ) "float_less"
+                { float float } { object } make-foldable
+            }
+            {
+                "float<=" ( x y -- ? ) "float_lesseq"
+                { float float } { object } make-foldable
+            }
+            {
+                "float=" ( x y -- ? ) "float_eq"
+                { float float } { object } make-foldable
+            }
+            {
+                "float>" ( x y -- ? ) "float_greater"
+                { float float } { object } make-foldable
+            }
+            {
+                "float>=" ( x y -- ? ) "float_greatereq"
+                { float float } { object } make-foldable
+            }
+            {
+                "float>bignum" ( x -- y ) "float_to_bignum"
+                { float } { bignum } make-foldable
+            }
+            {
+                "float>fixnum" ( x -- y ) "float_to_fixnum"
+                { float } { fixnum } make-foldable
+            }
         }
     }
     {
         "memory"
         {
-            { "all-instances" ( -- array ) "all_instances" }
-            { "compact-gc" ( -- ) "compact_gc" }
-            { "gc" ( -- ) "full_gc" }
-            { "minor-gc" ( -- ) "minor_gc" }
-            { "size" ( obj -- n ) "size" }
+            { "all-instances" ( -- array ) "all_instances" { } { array } f }
+            { "compact-gc" ( -- ) "compact_gc" { } { } f }
+            { "gc" ( -- ) "full_gc" { } { } f }
+            { "minor-gc" ( -- ) "minor_gc" { } { } f }
+            { "size" ( obj -- n ) "size" { object } { fixnum } make-flushable }
         }
     }
     {
         "memory.private"
         {
-            { "(save-image)" ( path1 path2 then-die? -- ) "save_image" }
+            {
+                "(save-image)" ( path1 path2 then-die? -- ) "save_image"
+                { byte-array byte-array object } { } f
+            }
         }
     }
     {
         "quotations"
         {
-            { "jit-compile" ( quot -- ) "jit_compile" }
-            { "quotation-code" ( quot -- start end ) "quotation_code" }
-            { "quotation-compiled?" ( quot -- ? ) "quotation_compiled_p" }
+            { "jit-compile" ( quot -- ) "jit_compile" { quotation } { } f }
+            {
+                "quotation-code" ( quot -- start end ) "quotation_code"
+                { quotation } { integer integer } make-flushable
+            }
+            {
+                "quotation-compiled?" ( quot -- ? ) "quotation_compiled_p"
+                { quotation } { object } f
+            }
         }
     }
     {
         "quotations.private"
         {
-            { "array>quotation" ( array -- quot ) "array_to_quotation" }
+            {
+                "array>quotation" ( array -- quot ) "array_to_quotation"
+                { array } { quotation } make-foldable
+            }
         }
     }
     {
         "slots.private"
         {
-            { "set-slot" ( value obj n -- ) "set_slot" }
-            { "slot" ( obj m -- value ) f }
+            { "set-slot" ( value obj n -- ) "set_slot" { object object fixnum } { } f }
+            { "slot" ( obj m -- value ) f { object fixnum } { object } make-flushable }
         }
     }
     {
         "strings"
         {
-            { "<string>" ( n ch -- string ) "string" }
-            { "resize-string" ( n str -- newstr ) "resize_string" }
+            {
+                "<string>" ( n ch -- string ) "string"
+                { integer-array-capacity integer } { string } make-flushable
+            }
+            {
+                "resize-string" ( n str -- newstr ) "resize_string"
+                { integer string } { string } f
+            }
         }
     }
     {
         "strings.private"
         {
-            { "set-string-nth-fast" ( ch n string -- ) "set_string_nth_fast" }
-            { "string-nth-fast" ( n string -- ch ) f }
+            {
+                "set-string-nth-fast" ( ch n string -- ) "set_string_nth_fast"
+                { fixnum fixnum string } { } f
+            }
+            {
+                "string-nth-fast" ( n string -- ch ) f
+                { fixnum string } { fixnum } make-flushable
+            }
         }
     }
     {
         "system"
         {
-            { "(exit)" ( n -- * ) "exit" }
-            { "nano-count" ( -- ns ) "nano_count" }
+            { "(exit)" ( n -- * ) "exit" { integer } { } f }
+            { "nano-count" ( -- ns ) "nano_count" { } { integer } make-flushable }
         }
     }
     {
         "threads.private"
         {
-            { "(sleep)" ( nanos -- ) "sleep" }
-            { "(set-context)" ( obj context -- obj' ) f }
-            { "(set-context-and-delete)" ( obj context -- * ) f }
-            { "(start-context)" ( obj quot -- obj' ) f }
-            { "(start-context-and-delete)" ( obj quot -- * ) f }
-            { "context-object-for" ( n context -- obj ) "context_object_for" }
+            { "(sleep)" ( nanos -- ) "sleep" { integer } { } f }
+            { "(set-context)" ( obj context -- obj' ) f { object alien } { object } f }
+            { "(set-context-and-delete)" ( obj context -- * ) f { object alien } { } f }
+            { "(start-context)" ( obj quot -- obj' ) f { object quotation } { object } f }
+            { "(start-context-and-delete)" ( obj quot -- * ) f { object quotation } { } f }
+            {
+                "context-object-for" ( n context -- obj ) "context_object_for"
+                { fixnum c-ptr } { object } make-flushable
+            }
         }
     }
     {
         "tools.dispatch.private"
         {
-            { "dispatch-stats" ( -- stats ) "dispatch_stats" }
-            { "reset-dispatch-stats" ( -- ) "reset_dispatch_stats" }
+            { "dispatch-stats" ( -- stats ) "dispatch_stats" { } { byte-array } f }
+            { "reset-dispatch-stats" ( -- ) "reset_dispatch_stats" { } { } f }
         }
     }
     {
         "tools.memory.private"
         {
-            { "(callback-room)" ( -- allocator-room ) "callback_room" }
-            { "(code-blocks)" ( -- array ) "code_blocks" }
-            { "(code-room)" ( -- allocator-room ) "code_room" }
-            { "(data-room)" ( -- data-room ) "data_room" }
-            { "disable-gc-events" ( -- events ) "disable_gc_events" }
-            { "enable-gc-events" ( -- ) "enable_gc_events" }
+            {
+                "(callback-room)" ( -- allocator-room ) "callback_room"
+                { } { byte-array } make-flushable
+            }
+            {
+                "(code-blocks)" ( -- array ) "code_blocks"
+                { } { array } make-flushable
+            }
+            {
+                "(code-room)" ( -- allocator-room ) "code_room"
+                { } { byte-array } make-flushable
+            }
+            {
+                "(data-room)" ( -- data-room ) "data_room"
+                { } { byte-array } make-flushable
+            }
+            { "disable-gc-events" ( -- events ) "disable_gc_events" { } { object } f }
+            { "enable-gc-events" ( -- ) "enable_gc_events" { } { } f }
         }
     }
     {
         "tools.profiler.sampling.private"
         {
-            { "profiling" ( ? -- ) "sampling_profiler" }
-            { "(get-samples)" ( -- samples/f ) "get_samples" }
-            { "(clear-samples)" ( -- ) "clear_samples" }
+            { "profiling" ( ? -- ) "sampling_profiler" { object } { } f }
+            { "(get-samples)" ( -- samples/f ) "get_samples" { } { object } f }
+            { "(clear-samples)" ( -- ) "clear_samples" { } { } f }
         }
     }
     {
         "words"
         {
-            { "word-code" ( word -- start end ) "word_code" }
-            { "word-optimized?" ( word -- ? ) "word_optimized_p" }
+            {
+                "word-code" ( word -- start end ) "word_code"
+                { word } { integer integer } make-flushable
+            }
+            { "word-optimized?" ( word -- ? ) "word_optimized_p" { word } { object } f }
         }
     }
     {
         "words.private"
         {
-            { "(word)" ( name vocab hashcode -- word ) "word" }
+            {
+                "(word)" ( name vocab hashcode -- word ) "word"
+                { object object object } { word } make-flushable
+            }
         }
     }
 }
@@ -411,9 +814,18 @@ CONSTANT: all-primitives {
 : primitive-word ( name vocab -- word )
     create-word dup t "primitive" set-word-prop ;
 
-:: create-primitive ( vocab word effect vm-func -- )
-    word vocab primitive-word
-    dup vm-func primitive-quot effect define-declared ;
+: set-extra-props ( word extra-props -- )
+    [ rot set-word-prop ] with assoc-each ;
+
+:: create-primitive ( vocab word effect vm-func inputs outputs extra-word -- )
+    word vocab primitive-word :> word
+    word vm-func primitive-quot :> quot
+    word quot effect define-declared
+    word inputs "input-classes" set-word-prop
+    word outputs "default-output-classes" set-word-prop
+    word extra-word [ execute( x -- ) ] [ drop ] if* ;
 
 : create-primitives ( assoc -- )
-    [ [ first3 create-primitive ] with each ] assoc-each ;
+    [
+        [ 6 firstn create-primitive ] with each
+    ] assoc-each ;
diff --git a/basis/stack-checker/known-words/known-words-docs.factor b/basis/stack-checker/known-words/known-words-docs.factor
index 1c1ab76525..cfa16aa408 100644
--- a/basis/stack-checker/known-words/known-words-docs.factor
+++ b/basis/stack-checker/known-words/known-words-docs.factor
@@ -6,10 +6,6 @@ HELP: check-declaration
 { $values { "declaration" sequence } }
 { $description "Checks that a declaration sequence as inputted to a " { $link declare } " word is well-formed." } ;
 
-HELP: define-primitive
-{ $values { "word" word } { "inputs" sequence } { "outputs" sequence } }
-{ $description "Marks the word as a primitive whose input and output types must be the given ones." } ;
-
 HELP: infer-call
 { $description "Performs inferencing for the " { $link call } " word." } ;
 
@@ -30,7 +26,7 @@ HELP: infer-special
 { $description "Performs inferencing of a word with the \"special\" property set." } ;
 
 
-ARTICLE: "stack-checker.known-words" "Hard-coded stack effects for primitive words"
-"This vocab declares primitive and shuffle words." ;
+ARTICLE: "stack-checker.known-words" "Extra properties for special words"
+"This vocab adds properties for words that are handled specially by the compiler. Such as " { $link curry } " and " { $link dip } "." ;
 
 ABOUT: "stack-checker.known-words"
diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor
index 07df204183..fcfc0b5be1 100644
--- a/basis/stack-checker/known-words/known-words.factor
+++ b/basis/stack-checker/known-words/known-words.factor
@@ -1,30 +1,14 @@
 ! Copyright (C) 2004, 2011 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry accessors alien alien.accessors alien.private arrays
-byte-arrays classes continuations.private effects generic
-hashtables hashtables.private io io.backend io.files
-io.files.private io.streams.c kernel kernel.private math
-math.private math.parser.private memory memory.private
-namespaces namespaces.private parser quotations
-quotations.private sbufs sbufs.private sequences
-sequences.private slots.private strings strings.private system
-threads.private classes.tuple classes.tuple.private vectors
-vectors.private words words.private definitions assocs summary
-compiler.units system.private combinators tools.memory.private
-combinators.short-circuit locals locals.backend locals.types
-combinators.private stack-checker.values generic.single
-generic.single.private alien.libraries tools.dispatch.private
-macros tools.profiler.sampling.private classes.algebra
-stack-checker.alien
-stack-checker.state
-stack-checker.errors
-stack-checker.visitor
-stack-checker.backend
-stack-checker.branches
-stack-checker.transforms
-stack-checker.dependencies
-stack-checker.recursive-state
-stack-checker.row-polymorphism ;
+USING: accessors alien arrays assocs classes classes.tuple.private
+combinators combinators.private combinators.short-circuit effects fry
+generic.single.private kernel kernel.private locals locals.backend
+locals.types macros math namespaces quotations.private sequences
+sequences.private stack-checker.alien stack-checker.backend
+stack-checker.branches stack-checker.dependencies stack-checker.errors
+stack-checker.row-polymorphism stack-checker.state
+stack-checker.transforms stack-checker.values stack-checker.visitor
+words ;
 QUALIFIED-WITH: generic.single.private gsp
 IN: stack-checker.known-words
 
@@ -178,8 +162,6 @@ M: object infer-call* \ call bad-macro-input ;
 
 \ <tuple-boa> [ infer-<tuple-boa> ] "special" set-word-prop
 
-\ <tuple-boa> t "flushable" set-word-prop
-
 : infer-effect-unsafe ( word -- )
     pop-literal nip
     add-effect-input
@@ -272,255 +254,3 @@ M: object infer-call* \ call bad-macro-input ;
 
 ! More words not to compile
 \ clear t "no-compile" set-word-prop
-
-: define-primitive ( word inputs outputs -- )
-    [ "input-classes" set-word-prop ]
-    [ "default-output-classes" set-word-prop ]
-    bi-curry* bi ;
-
-: define-primitives ( seq -- )
-    [ first3 define-primitive ] each ;
-
-: make-flushable-primitives ( flushables -- )
-    dup define-primitives [ first make-flushable ] each ;
-
-: make-foldable-primitives ( flushables -- )
-    dup define-primitives [ first make-foldable ] each ;
-
-! ! Stack effects for all primitives
-
-! Alien getters
-{
-    { alien-cell { c-ptr integer } { pinned-c-ptr } }
-    { alien-double { c-ptr integer } { float } }
-    { alien-float { c-ptr integer } { float } }
-    { alien-signed-1 { c-ptr integer } { fixnum } }
-    { alien-signed-2 { c-ptr integer } { fixnum } }
-    { alien-signed-4 { c-ptr integer } { integer } }
-    { alien-signed-8 { c-ptr integer } { integer } }
-    { alien-signed-cell { c-ptr integer } { integer } }
-    { alien-unsigned-1 { c-ptr integer } { fixnum } }
-    { alien-unsigned-2 { c-ptr integer } { fixnum } }
-    { alien-unsigned-4 { c-ptr integer } { integer } }
-    { alien-unsigned-8 { c-ptr integer } { integer } }
-    { alien-unsigned-cell { c-ptr integer } { integer } }
-} make-flushable-primitives
-
-! Alien setters
-{
-    { set-alien-cell { c-ptr c-ptr integer } { } }
-    { set-alien-double { float c-ptr integer } { } }
-    { set-alien-float { float c-ptr integer } { } }
-    { set-alien-signed-1 { integer c-ptr integer } { } }
-    { set-alien-signed-2 { integer c-ptr integer } { } }
-    { set-alien-signed-4 { integer c-ptr integer } { } }
-    { set-alien-signed-8 { integer c-ptr integer } { } }
-    { set-alien-signed-cell { integer c-ptr integer } { } }
-    { set-alien-unsigned-1 { integer c-ptr integer } { } }
-    { set-alien-unsigned-2 { integer c-ptr integer } { } }
-    { set-alien-unsigned-4 { integer c-ptr integer } { } }
-    { set-alien-unsigned-8 { integer c-ptr integer } { } }
-    { set-alien-unsigned-cell { integer c-ptr integer } { } }
-} define-primitives
-
-! Container constructors
-{
-    { (byte-array) { integer-array-capacity } { byte-array } }
-    { <array> { integer-array-capacity object } { array } }
-    { <byte-array> { integer-array-capacity } { byte-array } }
-    { <string> { integer-array-capacity integer } { string } }
-    { <tuple> { array } { tuple } }
-} make-flushable-primitives
-
-! Misc flushables
-{
-    { (callback-room) { } { byte-array } }
-    { (clone) { object } { object } }
-    { (code-blocks) { } { array } }
-    { (code-room) { } { byte-array } }
-    { (data-room) { } { byte-array } }
-    { (word) { object object object } { word } }
-    { <displaced-alien> { integer c-ptr } { c-ptr } }
-    { alien-address { alien } { integer } }
-    { callstack-bounds { } { alien alien } }
-    { callstack-for { c-ptr } { callstack } }
-    { callstack>array { callstack } { array } }
-    { check-datastack { array integer integer } { object } }
-    { context-object { fixnum } { object } }
-    { context-object-for { fixnum c-ptr } { object } }
-    { current-callback { } { fixnum } }
-    { datastack-for { c-ptr } { array } }
-    { nano-count { } { integer } }
-    { quotation-code { quotation } { integer integer } }
-    { retainstack-for { c-ptr } { array } }
-    { size { object } { fixnum } }
-    { slot { object fixnum } { object } }
-    { special-object { fixnum } { object } }
-    { string-nth-fast { fixnum string } { fixnum } }
-    { word-code { word } { integer integer } }
-} make-flushable-primitives
-
-! Misc foldables
-{
-    { <wrapper> { object } { wrapper } }
-    { array>quotation { array } { quotation } }
-    { eq? { object object } { object } }
-    { tag { object } { fixnum } }
-} make-foldable-primitives
-
-! Numeric primitives
-{
-    ! bignum
-    { bignum* { bignum bignum } { bignum } }
-    { bignum+ { bignum bignum } { bignum } }
-    { bignum- { bignum bignum } { bignum } }
-    { bignum-bit? { bignum integer } { object } }
-    { bignum-bitand { bignum bignum } { bignum } }
-    { bignum-bitnot { bignum } { bignum } }
-    { bignum-bitor { bignum bignum } { bignum } }
-    { bignum-bitxor { bignum bignum } { bignum } }
-    { bignum-log2 { bignum } { bignum } }
-    { bignum-mod { bignum bignum } { integer } }
-    { bignum-gcd { bignum bignum } { bignum } }
-    { bignum-shift { bignum fixnum } { bignum } }
-    { bignum/i { bignum bignum } { bignum } }
-    { bignum/mod { bignum bignum } { bignum integer } }
-    { bignum< { bignum bignum } { object } }
-    { bignum<= { bignum bignum } { object } }
-    { bignum= { bignum bignum } { object } }
-    { bignum> { bignum bignum } { object } }
-    { bignum>= { bignum bignum } { object } }
-    { bignum>fixnum { bignum } { fixnum } }
-    { bignum>fixnum-strict { bignum } { fixnum } }
-
-    ! fixnum
-    { fixnum* { fixnum fixnum } { integer } }
-    { fixnum*fast { fixnum fixnum } { fixnum } }
-    { fixnum+ { fixnum fixnum } { integer } }
-    { fixnum+fast { fixnum fixnum } { fixnum } }
-    { fixnum- { fixnum fixnum } { integer } }
-    { fixnum-bitand { fixnum fixnum } { fixnum } }
-    { fixnum-bitnot { fixnum } { fixnum } }
-    { fixnum-bitor { fixnum fixnum } { fixnum } }
-    { fixnum-bitxor { fixnum fixnum } { fixnum } }
-    { fixnum-fast { fixnum fixnum } { fixnum } }
-    { fixnum-mod { fixnum fixnum } { fixnum } }
-    { fixnum-shift { fixnum fixnum } { integer } }
-    { fixnum-shift-fast { fixnum fixnum } { fixnum } }
-    { fixnum/i { fixnum fixnum } { integer } }
-    { fixnum/i-fast { fixnum fixnum } { fixnum } }
-    { fixnum/mod { fixnum fixnum } { integer fixnum } }
-    { fixnum/mod-fast { fixnum fixnum } { fixnum fixnum } }
-    { fixnum< { fixnum fixnum } { object } }
-    { fixnum<= { fixnum fixnum } { object } }
-    { fixnum> { fixnum fixnum } { object } }
-    { fixnum>= { fixnum fixnum } { object } }
-    { fixnum>bignum { fixnum } { bignum } }
-    { fixnum>float { fixnum } { float } }
-
-    ! float
-    { (format-float) { float byte-array fixnum fixnum byte-array byte-array } { byte-array } }
-    { bits>float { integer } { float } }
-    { float* { float float } { float } }
-    { float+ { float float } { float } }
-    { float- { float float } { float } }
-    { float-u< { float float } { object } }
-    { float-u<= { float float } { object } }
-    { float-u> { float float } { object } }
-    { float-u>= { float float } { object } }
-    { float/f { float float } { float } }
-    { float< { float float } { object } }
-    { float<= { float float } { object } }
-    { float= { float float } { object } }
-    { float> { float float } { object } }
-    { float>= { float float } { object } }
-    { float>bignum { float } { bignum } }
-    { float>bits { real } { integer } }
-    { float>fixnum { float } { fixnum } }
-
-    ! double
-    { bits>double { integer } { float } }
-    { double>bits { real } { integer } }
-} make-foldable-primitives
-
-! ! Misc primitives
-{
-    ! Contexts
-    { (set-context) { object alien } { object } }
-    { (set-context-and-delete) { object alien } { } }
-    { (sleep) { integer } { } }
-    { (start-context) { object quotation } { object } }
-    { (start-context-and-delete) { object quotation } { } }
-    { set-context-object { object fixnum } { } }
-
-    ! Dispatch stats
-    { dispatch-stats { } { byte-array } }
-    { reset-dispatch-stats { } { } }
-
-    ! FFI
-    { (dlopen) { byte-array } { dll } }
-    { (dlsym) { byte-array object } { c-ptr } }
-    { (dlsym-raw) { byte-array object } { c-ptr } }
-    { dlclose { dll } { } }
-    { dll-valid? { object } { object } }
-
-    ! GC
-    { compact-gc { } { } }
-    { disable-gc-events { } { object } }
-    { enable-gc-events { } { } }
-    { gc { } { } }
-    { minor-gc { } { } }
-
-    ! Hashing
-    { (identity-hashcode) { object } { fixnum } }
-    { compute-identity-hashcode { object } { } }
-
-    ! IO
-    { (exists?) { string } { object } }
-    { (fopen) { byte-array byte-array } { alien } }
-    { fclose { alien } { } }
-    { fflush { alien } { } }
-    { fgetc { alien } { object } }
-    { fputc { object alien } { } }
-    { fread-unsafe { integer c-ptr alien } { integer } }
-    { fseek { integer integer alien } { } }
-    { ftell { alien } { integer } }
-    { fwrite { c-ptr integer alien } { } }
-
-    ! Profiling
-    { (clear-samples) { } { } }
-    { (get-samples) { } { object } }
-    { profiling { object } { } }
-
-    ! Resizing
-    { resize-array { integer array } { array } }
-    { resize-byte-array { integer byte-array } { byte-array } }
-    { resize-string { integer string } { string } }
-
-    ! Other primitives
-    { (exit) { integer } { } }
-    { (save-image) { byte-array byte-array object } { } }
-    { <callback> { word integer } { alien } }
-    { all-instances { } { array } }
-    { become { array array } { } }
-    { both-fixnums? { object object } { object } }
-    { die { } { } }
-    { fpu-state { } { } }
-    { free-callback { alien } { } }
-    { innermost-frame-executing { callstack } { object } }
-    { innermost-frame-scan { callstack } { fixnum } }
-    { jit-compile { quotation } { } }
-    { leaf-signal-handler { } { } }
-    { gsp:lookup-method { object array } { word } }
-    { modify-code-heap { array object object } { } }
-    { quotation-compiled? { quotation } { object } }
-    { set-fpu-state { } { } }
-    { set-innermost-frame-quotation { quotation callstack } { } }
-    { set-slot { object object fixnum } { } }
-    { set-special-object { object fixnum } { } }
-    { set-string-nth-fast { fixnum fixnum string } { } }
-    { signal-handler { } { } }
-    { strip-stack-traces { } { } }
-    { unimplemented { } { } }
-    { word-optimized? { word } { object } }
-} define-primitives