From b47d1d79fb0320a5c8a3fbbf94db405444f36146 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Wed, 6 Sep 2006 21:19:41 +0000
Subject: [PATCH] More module system work

---
 TODO.FACTOR.txt                                          | 1 +
 examples/factorbot.factor                                | 4 +++-
 examples/lcd.factor                                      | 2 ++
 examples/levenshtein.factor                              | 2 ++
 examples/mandel.factor                                   | 4 ++--
 examples/numbers-game.factor                             | 2 ++
 examples/raytracer.factor                                | 4 ++--
 examples/turing.factor                                   | 2 ++
 library/bootstrap/image.factor                           | 2 +-
 library/bootstrap/primitives.factor                      | 5 +++--
 library/compiler/amd64/load.factor                       | 7 +++++++
 .../intrinsics.factor}                                   | 0
 library/compiler/pentium4/load.factor                    | 3 +++
 library/compiler/ppc/load.factor                         | 5 +++++
 library/compiler/x86/load.factor                         | 5 +++++
 library/modules.factor                                   | 9 +++------
 16 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 library/compiler/amd64/load.factor
 rename library/compiler/{x86/intrinsics-sse2.factor => pentium4/intrinsics.factor} (100%)
 create mode 100644 library/compiler/pentium4/load.factor
 create mode 100644 library/compiler/ppc/load.factor
 create mode 100644 library/compiler/x86/load.factor

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 4702d23088..48417d6667 100644
--- a/TODO.FACTOR.txt
+++ b/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??
diff --git a/examples/factorbot.factor b/examples/factorbot.factor
index ce52e8358b..a9c804fb34 100644
--- a/examples/factorbot.factor
+++ b/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 ;
diff --git a/examples/lcd.factor b/examples/lcd.factor
index 8d1f95e132..07bf8de26d 100644
--- a/examples/lcd.factor
+++ b/examples/lcd.factor
@@ -14,3 +14,5 @@ USING: sequences kernel math io ;
     3 [ 2dup lcd-row terpri ] repeat drop ;
 
 "31337" lcd
+
+PROVIDE: examples/lcd ;
diff --git a/examples/levenshtein.factor b/examples/levenshtein.factor
index 0988230b84..84faa367ba 100644
--- a/examples/levenshtein.factor
+++ b/examples/levenshtein.factor
@@ -59,3 +59,5 @@ SYMBOL: costs
         second [ word-name ] keep [ help ] write-outliner
         terpri
     ] each ;
+
+PROVIDE: examples/levenshtein ;
diff --git a/examples/mandel.factor b/examples/mandel.factor
index ae74192ba5..a1bb7a41c6 100644
--- a/examples/mandel.factor
+++ b/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 ;
diff --git a/examples/numbers-game.factor b/examples/numbers-game.factor
index 75e3b382db..4fea6933bc 100644
--- a/examples/numbers-game.factor
+++ b/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 ;
diff --git a/examples/raytracer.factor b/examples/raytracer.factor
index 529c2b8f5a..3b42e21d50 100644
--- a/examples/raytracer.factor
+++ b/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 ;
diff --git a/examples/turing.factor b/examples/turing.factor
index 72987a56fb..0b3753959f 100644
--- a/examples/turing.factor
+++ b/examples/turing.factor
@@ -68,3 +68,5 @@ SYMBOL: tape
 : n
     #! Do one step and print new state.
     turing-step c ;
+
+PROVIDE: examples/turing ;
diff --git a/library/bootstrap/image.factor b/library/bootstrap/image.factor
index f18874f353..b687405b7f 100644
--- a/library/bootstrap/image.factor
+++ b/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 ;
diff --git a/library/bootstrap/primitives.factor b/library/bootstrap/primitives.factor
index f9562b2ba1..935624476e 100644
--- a/library/bootstrap/primitives.factor
+++ b/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
-vectors words ;
+kernel-internals math modules namespaces parser sequences
+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
 
diff --git a/library/compiler/amd64/load.factor b/library/compiler/amd64/load.factor
new file mode 100644
index 0000000000..679f9ac6d5
--- /dev/null
+++ b/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"
+} ;
diff --git a/library/compiler/x86/intrinsics-sse2.factor b/library/compiler/pentium4/intrinsics.factor
similarity index 100%
rename from library/compiler/x86/intrinsics-sse2.factor
rename to library/compiler/pentium4/intrinsics.factor
diff --git a/library/compiler/pentium4/load.factor b/library/compiler/pentium4/load.factor
new file mode 100644
index 0000000000..4715b27bfc
--- /dev/null
+++ b/library/compiler/pentium4/load.factor
@@ -0,0 +1,3 @@
+REQUIRES: library/compiler/x86 ;
+
+PROVIDE: library/compiler/pentium4 { "intrinsics.factor" } ;
diff --git a/library/compiler/ppc/load.factor b/library/compiler/ppc/load.factor
new file mode 100644
index 0000000000..412af5d3a7
--- /dev/null
+++ b/library/compiler/ppc/load.factor
@@ -0,0 +1,5 @@
+PROVIDE: library/compiler/ppc {
+    "assembler.factor"
+    "architecture.factor"
+    "intrinsics.factor"
+} ;
diff --git a/library/compiler/x86/load.factor b/library/compiler/x86/load.factor
new file mode 100644
index 0000000000..2c41de9536
--- /dev/null
+++ b/library/compiler/x86/load.factor
@@ -0,0 +1,5 @@
+PROVIDE: library/compiler/x86 {
+    "assembler.factor"
+    "architecture.factor"
+    "intrinsics.factor"
+} ;
diff --git a/library/modules.factor b/library/modules.factor
index f9cf728e1c..c742a3cc8d 100644
--- a/library/modules.factor
+++ b/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 ;