Don't print compiler warnings during bootstrap, they're useless

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 55aa4d510e3c6a33969229ee8f25e4c1840cda47..f8d4537243c3aa38cb74cc85b7b76557cc2732cc 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,6 +1,7 @@
 - sometimes fep when closing window
 - windows rollover broken again
 - compile error after reloading library/math/float.factor
+- move window while factor is busy: mouse gets messed up!
 
 + ui:
 

diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index 2e1e1e81c4d358f92b476ce994e54d2ab1b6082f..08148a6afa4e69de149a36a80e66a9e02995a55d 100644 (file)
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -5,97 +5,104 @@ kernel kernel-internals listener math memory modules namespaces
 optimizer parser sequences sequences-internals words ;
 
 [
-    ! Wrap everything in a catch which starts a listener so you
-    ! can see what went wrong, instead of dealing with a fep
+    print-warnings off
+
     [
-        "Cross-referencing..." print flush
-        H{ } clone changed-words set-global
-        H{ } clone crossref set-global xref-words
-
-        cpu "x86" = [
-            macosx?
-            "resource:/library/compiler/x86/alien-macosx.factor"
-            "resource:/library/compiler/x86/alien.factor"
-            ? run-file
-        ] when
-
-        "compile" get [
-            windows? [
-                "resource:/library/windows/dlls.factor" run-file
+        ! Wrap everything in a catch which starts a listener so
+        ! you can see what went wrong, instead of dealing with a
+        ! fep
+        [
+            "Cross-referencing..." print flush
+            H{ } clone changed-words set-global
+            H{ } clone crossref set-global xref-words
+
+            cpu "x86" = [
+                macosx?
+                "resource:/library/compiler/x86/alien-macosx.factor"
+                "resource:/library/compiler/x86/alien.factor"
+                ? run-file
             ] when
 
-            \ number= compile
-            \ + compile
-            \ nth compile
-            \ set-nth compile
-            \ = compile
-
-            ! Load UI backend
-            "cocoa" get [
-                "library/ui/cocoa" require
-            ] when
+            "compile" get [
+                windows? [
+                    "resource:/library/windows/dlls.factor"
+                    run-file
+                ] when
 
-            "x11" get [
-                "library/ui/x11" require
-            ] when
+                \ number= compile
+                \ + compile
+                \ nth compile
+                \ set-nth compile
+                \ = compile
 
-            windows? [
-                "library/ui/windows" require
-            ] when
+                ! Load UI backend
+                "cocoa" get [
+                    "library/ui/cocoa" require
+                ] when
 
-            ! Load native I/O code
-            "native-io" get [
-                unix? [
-                    "library/io/unix" require
+                "x11" get [
+                    "library/ui/x11" require
                 ] when
+
                 windows? [
-                    "library/io/windows" require
+                    "library/ui/windows" require
                 ] when
-            ] when
 
-            parse-command-line
+                ! Load native I/O code
+                "native-io" get [
+                    unix? [
+                        "library/io/unix" require
+                    ] when
+                    windows? [
+                        "library/io/windows" require
+                    ] when
+                ] when
 
-            compile-all
+                parse-command-line
 
-            "Initializing native I/O..." print flush
-            "native-io" get [ init-io ] when
+                compile-all
 
-            ! We only do this if we are compiled, otherwise it
-            ! takes too long.
-            "Building online help search index..." print flush
-            H{ } clone parent-graph set-global xref-help
-            H{ } clone term-index set-global index-help
-        ] when
-    ] no-parse-hook
+                "Initializing native I/O..." print flush
+                "native-io" get [ init-io ] when
 
-    run-bootstrap-init
+                ! We only do this if we are compiled, otherwise
+                ! it takes too long.
+                "Building online help search index..." print
+                flush
+                H{ } clone parent-graph set-global xref-help
+                H{ } clone term-index set-global index-help
+            ] when
+        ] no-parse-hook
 
-    [
-        boot
-        run-user-init
-        "shell" get "shells" lookup execute
-        0 exit
-    ] set-boot
+        run-bootstrap-init
+
+        [
+            boot
+            run-user-init
+            "shell" get "shells" lookup execute
+            0 exit
+        ] set-boot
 
-    f error set-global
-    f error-continuation set-global
+        f error set-global
+        f error-continuation set-global
 
-    [ compiled? ] word-subset length
-    number>string write " compiled words" print
+        [ compiled? ] word-subset length
+        number>string write " compiled words" print
 
-    [ symbol? ] word-subset length
-    number>string write " symbol words" print
+        [ symbol? ] word-subset length
+        number>string write " symbol words" print
 
-    all-words length
-    number>string write " words total" print
+        all-words length
+        number>string write " words total" print
 
-    "Total bootstrap GC time: " write gc-time
-    number>string write " ms" print
+        "Total bootstrap GC time: " write gc-time
+        number>string write " ms" print
 
-    "Bootstrapping is complete." print
-    "Now, you can run ./f factor.image" print flush
+        "Bootstrapping is complete." print
+        "Now, you can run ./f factor.image" print flush
 
-    "factor.image" resource-path save-image
-] [ print-error :c ] recover
+        "factor.image" resource-path save-image
+    ] [ print-error :c ] recover
+] with-scope
 
 0 exit

diff --git a/library/compiler/compiler.factor b/library/compiler/compiler.factor
index 3f5442e7c32d4124e5eb4487ddc465b9be021eb4..9aade068ebae4d1a4a926add70217492290cbc27 100644 (file)
--- a/library/compiler/compiler.factor
+++ b/library/compiler/compiler.factor
@@ -5,6 +5,10 @@ USING: errors generic hashtables inference io kernel math
 namespaces optimizer parser prettyprint sequences test threads
 words ;
 
+SYMBOL: print-warnings
+
+t print-warnings set-global
+
 SYMBOL: batch-errors
 
 GENERIC: batch-begins ( batch-errors -- )
@@ -17,7 +21,10 @@ M: f compile-begins drop "Compiling " write . flush ;
 
 GENERIC: compile-error ( error batch-errors -- )
 
-M: f compile-error drop error. flush ;
+M: f compile-error
+    drop
+    dup inference-error-major? print-warnings get or
+    [ dup error. flush ] when drop ;
 
 GENERIC: batch-ends ( batch-errors -- )