More module system work

TODO.FACTOR.txt

@@ -1,5 +1,6 @@
 + 0.85:
 
+- C+S+END doesn't work
 - \ <buffer> help --> shows infer-effect
 - pane output in UI should use less memory
 - signal 4 on datastack underflow on mac intel??

examples/factorbot.factor

@@ -1,6 +1,6 @@
 ! Simple IRC bot written in Factor.
 
-REQUIRES: httpd ;
+REQUIRES: contrib/httpd ;
 
 USING: errors generic hashtables help html http io kernel math
 memory namespaces parser prettyprint sequences strings threads
@@ -110,3 +110,5 @@ IN: factorbot-commands
 
 : quit ( text -- )
     drop speaker get "slava" = [ disconnect ] when ;
+
+PROVIDE: examples/factorbot ;

examples/lcd.factor

@@ -14,3 +14,5 @@ USING: sequences kernel math io ;
     3 [ 2dup lcd-row terpri ] repeat drop ;
 
 "31337" lcd
+
+PROVIDE: examples/lcd ;

examples/levenshtein.factor

@@ -59,3 +59,5 @@ SYMBOL: costs
         second [ word-name ] keep [ help ] write-outliner
         terpri
     ] each ;
+
+PROVIDE: examples/levenshtein ;

examples/mandel.factor

@@ -114,6 +114,6 @@ SYMBOL: cols
     "Generating " write dup write "..." print
     <file-writer> [ run write ] with-stream ;
 
-\ render compile
-
 [ "mandel.pnm" run>file ] time
+
+PROVIDE: examples/mandel ;

examples/numbers-game.factor

@@ -23,3 +23,5 @@ USING: kernel math parser io ;
     [ numbers-game-loop ] [ drop ] if ;
 
 : numbers-game number-to-guess numbers-game-loop ;
+
+PROVIDE: examples/numbers-game ;

examples/raytracer.factor

@@ -161,6 +161,6 @@ DEFER: create ( level c r -- scene )
     "Generating " write dup write "..." print
     <file-writer> [ run write ] with-stream ;
 
-\ run compile
-
 [ "raytracer.pnm" run>file ] time
+
+PROVIDE: examples/raytracer ;

examples/turing.factor

@@ -68,3 +68,5 @@ SYMBOL: tape
 : n
     #! Do one step and print new state.
     turing-step c ;
+
+PROVIDE: examples/turing ;

library/bootstrap/image.factor

@@ -292,7 +292,7 @@ M: hashtable '
         {
             vocabularies typemap builtins c-types crossref
             articles parent-graph term-index changed-words
-            class<map
+            modules class<map
         } [ dup get swap bootstrap-word set ] each
     ] make-hash '
     global-offset fixup ;

library/bootstrap/primitives.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: image
 USING: alien arrays generic hashtables help io kernel
-kernel-internals math namespaces parser sequences strings
+kernel-internals math modules namespaces parser sequences
-vectors words ;
+strings vectors words ;
 
 ! Some very tricky code creating a bootstrap embryo in the
 ! host image.
@@ -18,6 +18,7 @@ H{ } clone c-types set
 
 H{ } clone vocabularies set
 H{ } clone class<map set
+H{ } clone modules set
 
 vocabularies get [ "syntax" set ] bind
 

library/compiler/amd64/load.factor

@@ -0,0 +1,7 @@
+REQUIRES: library/compiler/x86 library/compiler/pentium4 ;
+
+PROVIDE: library/compiler/amd64 {
+    "architecture.factor"
+    "alien.factor"
+    "intrinsics.factor"
+} ;

library/compiler/pentium4/load.factor

@@ -0,0 +1,3 @@
+REQUIRES: library/compiler/x86 ;
+
+PROVIDE: library/compiler/pentium4 { "intrinsics.factor" } ;

library/compiler/ppc/load.factor

@@ -0,0 +1,5 @@
+PROVIDE: library/compiler/ppc {
+    "assembler.factor"
+    "architecture.factor"
+    "intrinsics.factor"
+} ;

library/compiler/x86/load.factor

@@ -0,0 +1,5 @@
+PROVIDE: library/compiler/x86 {
+    "assembler.factor"
+    "architecture.factor"
+    "intrinsics.factor"
+} ;

library/modules.factor

@@ -20,8 +20,6 @@ C: module ( name files tests -- module )
 
 SYMBOL: modules
 
-H{ } clone modules set-global
-
 : module modules get hash ;
 
 : load-module ( name -- )
@@ -35,10 +33,6 @@ H{ } clone modules set-global
 
 : require ( name -- ) (require) recompile ;
 
-: contrib ( name -- ) "contrib/" swap append require ;
-
-: example ( name -- ) "examples/" swap append require ;
-
 : run-resources ( seq -- )
     [
         bootstrapping? get
@@ -58,3 +52,6 @@ H{ } clone modules set-global
 : test-module ( name -- ) module module-tests run-resources ;
 
 : test-modules ( -- ) modules hash-keys [ test-module ] each ;
+
+: modules. ( -- )
+    modules get hash-keys natural-sort [ print ] each ;