diff options
| -rw-r--r-- | elisp/geiser-plt.el | 4 | ||||
| -rw-r--r-- | scheme/plt/geiser.ss | 6 | ||||
| -rw-r--r-- | scheme/plt/geiser/autodoc.ss | 9 | ||||
| -rw-r--r-- | scheme/plt/geiser/modules.ss | 22 |
4 files changed, 34 insertions, 7 deletions
diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el index 572ec5f..e60a576 100644 --- a/elisp/geiser-plt.el +++ b/elisp/geiser-plt.el @@ -123,8 +123,8 @@ This function uses `geiser-plt-init-file' if it exists." ;;; External help (defun geiser-plt-external-help (symbol module) (message "Requesting help for '%s'..." symbol) - (geiser-eval--send/wait `(:eval (help ,symbol) scheme/help)) - (message "%s done" (current-message)) + (geiser-eval--send/wait `(:eval (get-help ',symbol (:module ,module)) geiser/autodoc)) + (minibuffer-message "%s done" (current-message)) t) 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 @@ string<?))) module-cache) +(define (module-children mod) + (define (extract-ids ls) + (append-map (lambda (idls) + (map car (cdr idls))) + ls)) + (define (classify-ids ids ns) + (let loop ((ids ids) (procs '()) (vars '())) + (cond ((null? ids) `((procs ,@(reverse procs)) (vars ,@(reverse vars)))) + ((procedure? (namespace-variable-value (car ids) #t (lambda () #f) ns)) + (loop (cdr ids) (cons (car ids) procs) vars)) + (else (loop (cdr ids) procs (cons (car ids) vars)))))) + (let-values (((reg syn) + (module-compiled-exports + (get-module-code (resolve-module-path mod #f))))) + (let ((syn (extract-ids syn)) + (reg (extract-ids reg))) + `((syntax ,@syn) ,@(classify-ids reg (module-spec->namespace mod)))))) ;;; modules.ss ends here |