diff options
| author | Ludovic Court`es | 2006-07-31 16:29:34 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2006-07-31 16:29:34 +0000 |
| commit | 7f3b61347a8170344fffea8335945baa24ebc543 (patch) | |
| tree | bd4207b39efb0391ca9da58839c1dcf916f9d976 /src/guile/skribilo/evaluator.scm | |
| parent | 74b346c6c80c45db842143ccbbc41c055853ec4e (diff) | |
| download | skribilo-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/evaluator.scm')
| -rw-r--r-- | src/guile/skribilo/evaluator.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/guile/skribilo/evaluator.scm b/src/guile/skribilo/evaluator.scm index abee2fd..8502d51 100644 --- a/src/guile/skribilo/evaluator.scm +++ b/src/guile/skribilo/evaluator.scm @@ -31,7 +31,9 @@ :autoload (skribilo reader) (*document-reader*) :autoload (skribilo verify) (verify) - :autoload (skribilo resolve) (resolve!)) + :autoload (skribilo resolve) (resolve!) + + :autoload (skribilo module) (*skribilo-user-module*)) (use-modules (skribilo utils syntax) @@ -59,7 +61,7 @@ ;; Evaluate EXPR, an arbitrary S-expression that may contain calls to the ;; markup functions defined in a markup package such as ;; `(skribilo package base)', e.g., `(bold "hello")'. - (let ((result (eval expr (current-module)))) + (let ((result (eval expr (*skribilo-user-module*)))) (if (ast? result) (let ((file (source-property expr 'filename)) |