@@ -6,9 +6,24 @@ "app.arc" "prompt.arc")) -; TODO: allow specification of dependencies for load-ordering in some way +; We define 'require here, rather than in a file in load/ so that things in +; load/ can use it for load-ordering. +(unless (and (bound 'required-files*) required-files*) + (= required-files* (table))) + +(def require (file) + " Loads `file' if it has not yet been `require'd. Can be fooled by changing + the name ((require \"foo.arc\") as opposed to (require \"./foo.arc\")), but + this should not be a problem. + See also [[load]]. " + (or (required-files* file) + (do (set required-files*.file) + (load file)))) + (def autoload ((o dirname "load")) + " 'require each file in `dirname' ending in \".arc\". + See also [[require]] " (each f (dir-exists&dir dirname) - (if (endmatch ".arc" f) (load (+ dirname "/" f))))) + (if (endmatch ".arc" f) (require (+ dirname "/" f))))) (autoload) libs.arc @@ -5,10 +5,6 @@ Code should go here only if it is either: 1. An important language extension (eg 'make-br-fn), especially one which a library writer would find obnoxious or undesirable to have to 'load manually. - For example, having to load a file to use 'require ("load this file unless it - has already been loaded") would more or less defeat the purpose. - - (on that note, TODO: implement 'require.) 2. Features important for, and preferably specific to, the REPL. For example, an interactive help subsystem. load/README load/require.arc f4c83bb5aa8a674796027419c0d2197a38d1a1d6 Michael Arntzenius daekharel@gmail.com http://github.com/nex3/arc/commit/8e568598832175a5ad18398bd537bf10a3d8b138 8e568598832175a5ad18398bd537bf10a3d8b138 2009-08-24T06:39:16-07:00 2009-08-24T06:39:16-07:00 move 'require into libs.arc so that load/*.arc can use it for load-ordering e859daaa0c9b5b1e4d91c8c7d8e9f834c8e0d604 Michael Arntzenius daekharel@gmail.com