fix stack effects

diff --git a/library/bootstrap/primitives.factor b/library/bootstrap/primitives.factor
index a7c15b730f6839d04648080123d080b98f0595f8..694ddaf8d63e42bcd3845d4b548f16b255fd5274 100644 (file)
--- a/library/bootstrap/primitives.factor
+++ b/library/bootstrap/primitives.factor
@@ -114,51 +114,51 @@ vocabularies get [
     [ "update-xt" "words"                     [ [ word ] [ ] ] ]
     [ "call-profiling" "profiler"             [ [ integer ] [ ] ] ]
     [ "allot-profiling" "profiler"            [ [ integer ] [ ] ] ]
-    [ "compiled?" "words"                     [ [ object ] [ ] ] ]
-    [ "drop" "kernel"                         [ [ object ] [ object object ] ] ]
-    [ "dup" "kernel"                          [ [ object object ] [ object object ] ] ]
-    [ "swap" "kernel"                         [ [ object object ] [ object object object ] ] ]
-    [ "over" "kernel"                         [ [ object object object ] [ object object object object ] ] ]
-    [ "pick" "kernel"                         [ [ object ] [ ] ] ]
-    [ ">r" "kernel"                           [ [ ] [ object ] ] ]
-    [ "r>" "kernel"                           [ [ object object ] [ boolean ] ] ]
-    [ "eq?" "kernel"                          [ [ fixnum ] [ object ] ] ]
-    [ "getenv" "kernel-internals"             [ [ object fixnum ] [ ] ] ]
-    [ "setenv" "kernel-internals"             [ [ string object object ] [ port ] ] ]
-    [ "open-file" "io-internals"              [ [ string ] [ general-list ] ] ]
+    [ "compiled?" "words"                     [ [ word ] [ boolean ] ] ]
+    [ "drop" "kernel"                         [ [ object ] [ ] ] ]
+    [ "dup" "kernel"                          [ [ object ] [ object object ] ] ]
+    [ "swap" "kernel"                         [ [ object object ] [ object object ] ] ]
+    [ "over" "kernel"                         [ [ object object ] [ object object object ] ] ]
+    [ "pick" "kernel"                         [ [ object object object ] [ object object object object ] ] ]
+    [ ">r" "kernel"                           [ [ object ] [ ] ] ]
+    [ "r>" "kernel"                           [ [ ] [ object ] ] ]
+    [ "eq?" "kernel"                          [ [ object object ] [ boolean ] ] ]
+    [ "getenv" "kernel-internals"             [ [ fixnum ] [ object ] ] ]
+    [ "setenv" "kernel-internals"             [ [ object fixnum ] [ ] ] ]
+    [ "open-file" "io-internals"              [ [ string object object ] [ port ] ] ]
     [ "stat" "files"                          [ [ string ] [ general-list ] ] ]
-    [ "(directory)" "files"                   [ [ ] [ ] ] ]
-    [ "garbage-collection" "memory"           [ [ string ] [ ] ] ]
-    [ "gc-time" "memory"                      " -- ds "          ]
-    [ "save-image" "memory"                   " -- cs "          ]
-    [ "datastack" "kernel"                    " ds -- "          ]
-    [ "callstack" "kernel"                    " cs -- "          ]
-    [ "set-datastack" "kernel"                [ [ integer ] [ ] ] ]
-    [ "set-callstack" "kernel"                [ [ string integer ] [ port port ] ] ]
-    [ "exit*" "kernel"                        [ [ integer ] [ port ] ] ]
-    [ "client-socket" "io-internals"          [ [ port ] [ ] ] ]
-    [ "server-socket" "io-internals"          [ [ port general-list ] [ ] ] ]
-    [ "close-port" "io-internals"             [ [ port ] [ string integer port port ] ] ]
-    [ "add-accept-io-task" "io-internals"     [ [ port ] [ boolean ] ] ]
-    [ "accept-fd" "io-internals"              [ [ port general-list ] [ ] ] ]
-    [ "can-read-line?" "io-internals"         [ [ port ] [ sbuf ] ] ]
-    [ "add-read-line-io-task" "io-internals"  [ [ integer port ] [ boolean ] ] ]
-    [ "read-line-fd-8" "io-internals"         [ [ integer port general-list ] [ ] ] ]
-    [ "can-read-count?" "io-internals"        [ [ integer port ] [ sbuf ] ] ]
-    [ "add-read-count-io-task" "io-internals" [ [ integer port ] [ boolean ] ] ]
-    [ "read-count-fd-8" "io-internals"        [ [ port general-list ] [ ] ] ]
-    [ "can-write?" "io-internals"             [ [ text port ] [ ] ] ]
-    [ "add-write-io-task" "io-internals"      [ [ port port general-list ] [ ] ] ]
-    [ "write-fd-8" "io-internals"             [ [ ] [ ] ] ]
-    [ "add-copy-io-task" "io-internals"       [ [ ] [ general-list ] ] ]
-    [ "pending-io-error" "io-internals"       [ [ ] [ integer integer integer integer ] ] ]
-    [ "next-io-task" "io-internals"           [ [ string ] [ object ] ] ]
-    [ "room" "memory"                         [ [ ] [ integer ] ] ]
-    [ "os-env" "kernel"                       [ [ ] [ ] ] ]
+    [ "(directory)" "files"                   [ [ string ] [ general-list ] ] ]
+    [ "garbage-collection" "memory"           [ [ ] [ ] ] ]
+    [ "gc-time" "memory"                      [ [ string ] [ ] ] ]
+    [ "save-image" "memory"                   [ [ string ] [ ] ] ]
+    [ "datastack" "kernel"                    " -- ds "          ]
+    [ "callstack" "kernel"                    " -- cs "          ]
+    [ "set-datastack" "kernel"                " ds -- "          ]
+    [ "set-callstack" "kernel"                " cs -- "          ]
+    [ "exit*" "kernel"                        [ [ integer ] [ ] ] ]
+    [ "client-socket" "io-internals"          [ [ string integer ] [ port port ] ] ]
+    [ "server-socket" "io-internals"          [ [ integer ] [ port ] ] ]
+    [ "close-port" "io-internals"             [ [ port ] [ ] ] ]
+    [ "add-accept-io-task" "io-internals"     [ [ port general-list ] [ ] ] ]
+    [ "accept-fd" "io-internals"              [ [ port ] [ string integer port port ] ] ]
+    [ "can-read-line?" "io-internals"         [ [ port ] [ boolean ] ] ]
+    [ "add-read-line-io-task" "io-internals"  [ [ port general-list ] [ ] ] ]
+    [ "read-line-fd-8" "io-internals"         [ [ port ] [ sbuf ] ] ]
+    [ "can-read-count?" "io-internals"        [ [ integer port ] [ boolean ] ] ]
+    [ "add-read-count-io-task" "io-internals" [ [ integer port general-list ] [ ] ] ]
+    [ "read-count-fd-8" "io-internals"        [ [ integer port ] [ sbuf ] ] ]
+    [ "can-write?" "io-internals"             [ [ integer port ] [ boolean ] ] ]
+    [ "add-write-io-task" "io-internals"      [ [ port general-list ] [ ] ] ]
+    [ "write-fd-8" "io-internals"             [ [ text port ] [ ] ] ]
+    [ "add-copy-io-task" "io-internals"       [ [ port port general-list ] [ ] ] ]
+    [ "pending-io-error" "io-internals"       [ [ ] [ ] ] ]
+    [ "next-io-task" "io-internals"           [ [ ] [ general-list ] ] ]
+    [ "room" "memory"                         [ [ ] [ integer integer integer integer ] ] ]
+    [ "os-env" "kernel"                       [ [ string ] [ object ] ] ]
     [ "millis" "kernel"                       [ [ ] [ integer ] ] ]
-    [ "init-random" "random"                  [ [ object ] [ fixnum ] ] ]
-    [ "(random-int)" "random"                 [ [ integer ] [ ] ] ]
-    [ "type" "kernel"                         [ [ integer ] [ ] ] ]
+    [ "init-random" "random"                  [ [ ] [ ] ] ]
+    [ "(random-int)" "random"                 [ [ ] [ integer ] ] ]
+    [ "type" "kernel"                         [ [ object ] [ fixnum ] ] ]
     [ "cwd" "files"                           [ [ ] [ string ] ] ]
     [ "cd" "files"                            [ [ string ] [ ] ] ]
     [ "compiled-offset" "assembler"           [ [ ] [ integer ] ] ]
@@ -203,8 +203,8 @@ vocabularies get [
     [ "(instances)" "memory"                  [ [ integer ] [ general-list ] ] ]
     [ "begin-scan" "memory"                   [ [ ] [ ] ] ]
     [ "next-object" "memory"                  [ [ ] [ object ] ] ]
-    [ "end-scan" "memory"                     [ [ ] [ object ] ] ]
-] [
+    [ "end-scan" "memory"                     [ [ ] [ object ] ] ]                         
+] [                                           
     3unlist >r create >r 1 + r> 2dup swap f define r>
     dup string? [
         "stack-effect" set-word-property