aboutsummaryrefslogtreecommitdiff
path: root/src/guile/skribilo.scm
diff options
context:
space:
mode:
authorLudovic Court`es2006-07-31 16:29:34 +0000
committerLudovic Court`es2006-07-31 16:29:34 +0000
commit7f3b61347a8170344fffea8335945baa24ebc543 (patch)
treebd4207b39efb0391ca9da58839c1dcf916f9d976 /src/guile/skribilo.scm
parent74b346c6c80c45db842143ccbbc41c055853ec4e (diff)
downloadskribilo-7f3b61347a8170344fffea8335945baa24ebc543.tar.gz
skribilo-7f3b61347a8170344fffea8335945baa24ebc543.tar.lz
skribilo-7f3b61347a8170344fffea8335945baa24ebc543.zip
Moved the `sui' module; removed the `skribe' subdirectory.
* configure.ac: Don't produce `src/guile/skribilo/skribe/Makefile'. * src/guile/skribilo/Makefile.am (SUBDIRS): Removed `skribe'. * src/guile/skribilo/sui.scm: No longer use `define-skribe-module'. Rewrote the use the native hash-table API, `(ice-9 match)', and `format' instead of `fprint'. * src/guile/skribilo.scm (doskribe): Use `*skribilo-user-module*'. * src/guile/skribilo/evaluator.scm: Autoload `(skribilo module)'. (%evaluate): Evaluate EXPR in `*skribilo-user-module*'. * src/guile/skribilo/module.scm (%skribilo-user-autoloads): Added `(skribilo sui)'. (%skribe-core-modules): Removed. (define-skribe-module): Don't refer to it. (make-run-time-module): Use `the-root-module'. Properly build it using `make-autoload-interface' and `module-use-interfaces!' so that duplicates are correctly handled. (*skribilo-user-module*): New parameter. git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-40
Diffstat (limited to 'src/guile/skribilo.scm')
-rw-r--r--src/guile/skribilo.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/guile/skribilo.scm b/src/guile/skribilo.scm
index 53afa89..531b0fb 100644
--- a/src/guile/skribilo.scm
+++ b/src/guile/skribilo.scm
@@ -36,7 +36,7 @@ exec ${GUILE-guile} --debug -l $0 -c "(apply $main (cdr (command-line)))" "$@"
(define-module (skribilo)
- :autoload (skribilo module) (make-run-time-module)
+ :autoload (skribilo module) (make-run-time-module *skribilo-user-module*)
:autoload (skribilo engine) (*current-engine*)
:autoload (skribilo reader) (*document-reader*)
:use-module (skribilo utils syntax))
@@ -367,14 +367,17 @@ Processes a Skribilo/Skribe source file and produces its output.
;; FIXME: Using this technique, anything written to `stderr' will
;; also end up in the output file (e.g. Guile warnings).
(set-current-output-port (*skribilo-output-port*))
- (set-current-module (make-run-time-module)))
+ (let ((user (make-run-time-module)))
+ (set-current-module user)
+ (*skribilo-user-module* user)))
(lambda ()
;;(format #t "engine is ~a~%" (*current-engine*))
(evaluate-document-from-port (current-input-port)
(*current-engine*)))
(lambda ()
(set-current-output-port output-port)
- (set-current-module user-module)))))
+ (set-current-module user-module)
+ (*skribilo-user-module* #f)))))