Merge branch 'master' of git://factorcode.org/git/factor

README.txt

@@ -146,12 +146,13 @@ usage documentation, enter the following in the UI listener:
 The Factor source tree is organized as follows:
 
   build-support/ - scripts used for compiling Factor
-  core/ - Factor core library and compiler
+  vm/ - sources for the Factor VM, written in C
-  extra/ - more libraries
+  core/ - Factor core library
+  basis/ - Factor basis library, compiler, tools
+  extra/ - more libraries and applications
   fonts/ - TrueType fonts used by UI
   misc/ - editor modes, icons, etc
   unmaintained/ - unmaintained contributions, please help!
-  vm/ - sources for the Factor VM, written in C
 
 * Community
 

basis/alien/remote-control/remote-control.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.strings parser
-threads words kernel.private kernel io.encodings.utf8 ;
+threads words kernel.private kernel io.encodings.utf8 eval ;
 IN: alien.remote-control
 
 : eval-callback ( -- callback )

basis/bootstrap/stage2.factor

@@ -44,57 +44,64 @@ SYMBOL: bootstrap-time
     "Now, you can run Factor:" print
     vm write " -i=" write "output-image" get print flush ;
 
-! We time bootstrap
-millis >r
-
-default-image-name "output-image" set-global
-
-"math compiler help io random tools ui ui.tools unicode handbook" "include" set-global
-"" "exclude" set-global
-
-parse-command-line
-
-"-no-crossref" cli-args member? [ do-crossref ] unless
-
-"io.thread" require
-
-! Set dll paths
-os wince? [ "windows.ce" require ] when
-os winnt? [ "windows.nt" require ] when
-
-"deploy-vocab" get [
-    "stage2: deployment mode" print
-] [
-    "listener" require
-    "none" require
-] if
-
 [
-    load-components
+    ! We time bootstrap
+    millis >r
 
-    run-bootstrap-init
+    default-image-name "output-image" set-global
-] with-compiler-errors
-:errors
 
-f error set-global
+    "threads math compiler help io random tools ui ui.tools unicode handbook" "include" set-global
-f error-continuation set-global
+    "" "exclude" set-global
+
+    parse-command-line
+
+    "-no-crossref" cli-args member? [ do-crossref ] unless
+
+    ! Set dll paths
+    os wince? [ "windows.ce" require ] when
+    os winnt? [ "windows.nt" require ] when
+
+    "deploy-vocab" get [
+        "stage2: deployment mode" print
+    ] [
+        "listener" require
+        "none" require
+    ] if
 
-"deploy-vocab" get [
-    "tools.deploy.shaker" run
-] [
     [
-        boot
+        load-components
-        do-init-hooks
+
+        run-bootstrap-init
+    ] with-compiler-errors
+    :errors
+
+    f error set-global
+    f error-continuation set-global
+
+    "deploy-vocab" get [
+        "tools.deploy.shaker" run
+    ] [
         [
-            parse-command-line
+            boot
-            run-user-init
+            do-init-hooks
-            "run" get run
+            [
-            output-stream get [ stream-flush ] when*
+                parse-command-line
-        ] [ print-error 1 exit ] recover
+                run-user-init
-    ] set-boot-quot
+                "run" get run
+                output-stream get [ stream-flush ] when*
+            ] [ print-error 1 exit ] recover
+        ] set-boot-quot
 
-    millis r> - dup bootstrap-time set-global
+        millis r> - dup bootstrap-time set-global
-    print-report
+        print-report
 
-    "output-image" get save-image-and-exit
+        "output-image" get save-image-and-exit
-] if
+    ] if
+] [
+    :c
+    dup print-error flush
+    "listener" vocab
+    [ restarts. vocab-main execute ]
+    [ die ] if*
+    1 exit
+] recover

basis/bootstrap/threads/threads.factor

@@ -0,0 +1,7 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: bootstrap.threads
+
+USE: io.thread
+USE: threads
+USE: debugger.threads