From ac726e6c49846b920466650fe9f3b57b1eb50e20 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Mon, 25 May 2009 03:39:47 +0200 Subject: PLT: New help functionality: - Using our own help function, which takes care of trying on not yet loaded modules. - Module children implemented. --- scheme/plt/geiser.ss | 6 +++++- scheme/plt/geiser/autodoc.ss | 9 +++++++-- scheme/plt/geiser/modules.ss | 22 ++++++++++++++++++++-- 3 files changed, 32 insertions(+), 5 deletions(-) (limited to 'scheme') diff --git a/scheme/plt/geiser.ss b/scheme/plt/geiser.ss index 2f9403e..ed3d9d4 100644 --- a/scheme/plt/geiser.ss +++ b/scheme/plt/geiser.ss @@ -40,7 +40,9 @@ geiser:module-completions geiser:symbol-location geiser:module-location - geiser:autodoc) + geiser:module-children + geiser:autodoc + geiser:help) (compile-enforce-module-constants #f) (require geiser/eval @@ -54,10 +56,12 @@ (define geiser:load-file load-file) (define geiser:compile-file compile-file) (define geiser:autodoc autodoc) + (define geiser:help get-help) (define geiser:completions symbol-completions) (define geiser:module-completions module-completions) (define geiser:symbol-location symbol-location) (define geiser:module-location module-location) + (define geiser:module-children module-children) (define geiser:macroexpand macroexpand) (current-prompt-read (compose (make-repl-reader (current-prompt-read)) diff --git a/scheme/plt/geiser/autodoc.ss b/scheme/plt/geiser/autodoc.ss index f7a0c55..73ed24d 100644 --- a/scheme/plt/geiser/autodoc.ss +++ b/scheme/plt/geiser/autodoc.ss @@ -22,9 +22,14 @@ #lang scheme -(provide autodoc update-module-cache) +(provide autodoc update-module-cache get-help) -(require geiser/utils geiser/modules geiser/locations) +(require geiser/utils geiser/modules geiser/locations scheme/help) + +(define (get-help symbol mod) + (with-handlers ((exn? (lambda (e) + (eval `(help ,symbol #:from ,mod))))) + (eval `(help ,symbol)))) (define (autodoc form) (cond ((null? form) #f) diff --git a/scheme/plt/geiser/modules.ss b/scheme/plt/geiser/modules.ss index 1b03d1a..02287e0 100644 --- a/scheme/plt/geiser/modules.ss +++ b/scheme/plt/geiser/modules.ss @@ -27,9 +27,10 @@ namespace->module-path-name module-path-name->name module-spec->path-name - module-list) + module-list + module-children) -(require srfi/13 scheme/enter) +(require srfi/13 scheme/enter syntax/modresolve syntax/modcode) (define (ensure-module-spec spec) (cond ((symbol? spec) spec) @@ -127,5 +128,22 @@ stringnamespace mod)))))) ;;; modules.ss ends here -- cgit v1.2.3