diff options
| -rw-r--r-- | elisp/geiser-guile.el | 4 | ||||
| -rw-r--r-- | scheme/guile/geiser/doc.scm | 11 | ||||
| -rw-r--r-- | scheme/guile/geiser/modules.scm | 29 |
3 files changed, 37 insertions, 7 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index 6b39435..160f40c 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -1,6 +1,6 @@ ;; geiser-guile.el -- guile's implementation of the geiser protocols -;; Copyright (C) 2009-2017 Jose Antonio Ortega Ruiz +;; Copyright (C) 2009-2018 Jose Antonio Ortega Ruiz ;; Copyright (C) 2017 Jan Nieuwenhuizen <janneke@gnu.org> ;; This program is free software; you can redistribute it and/or @@ -334,7 +334,7 @@ This function uses `geiser-guile-init-file' if it exists." ;;; REPL startup -(defconst geiser-guile-minimum-version "2.0") +(defconst geiser-guile-minimum-version "2.2") (defun geiser-guile--version (binary) (car (process-lines binary "-c" "(display (version))"))) diff --git a/scheme/guile/geiser/doc.scm b/scheme/guile/geiser/doc.scm index 185b204..9f28f7f 100644 --- a/scheme/guile/geiser/doc.scm +++ b/scheme/guile/geiser/doc.scm @@ -1,6 +1,6 @@ ;;; doc.scm -- procedures providing documentation on scheme objects -;; Copyright (C) 2009, 2010 Jose Antonio Ortega Ruiz +;; Copyright (C) 2009, 2010, 2018 Jose Antonio Ortega Ruiz ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the Modified BSD License. You should @@ -17,6 +17,7 @@ #:use-module (geiser utils) #:use-module (geiser modules) #:use-module (system vm program) + #:use-module (system vm debug) #:use-module (ice-9 session) #:use-module (ice-9 documentation) #:use-module (ice-9 regex) @@ -75,11 +76,13 @@ ((macro? obj) default-macro-args) (else 'variable))) +(define (program-arities prog) + (let ((addrs (program-address-range prog))) + (when (pair? addrs) (find-program-arities (car addrs))))) + (define (arguments proc) (define (p-args prog) - (let ((as (map (lambda (a) - ((@@ (system vm program) arity->arguments-alist) prog a)) - (or (program-arities prog) '())))) + (let ((as (map arity-arguments-alist (or (program-arities prog) '())))) (and (not (null? as)) as))) (define (clist f) (lambda (x) (let ((y (f x))) (and y (list y))))) (cond ((is-a? proc <generic>) (generic-args proc)) diff --git a/scheme/guile/geiser/modules.scm b/scheme/guile/geiser/modules.scm index 780d39e..32b0f1f 100644 --- a/scheme/guile/geiser/modules.scm +++ b/scheme/guile/geiser/modules.scm @@ -1,6 +1,6 @@ ;;; modules.scm -- module metadata -;; Copyright (C) 2009, 2010, 2011 Jose Antonio Ortega Ruiz +;; Copyright (C) 2009, 2010, 2011, 2018 Jose Antonio Ortega Ruiz ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the Modified BSD License. You should @@ -11,6 +11,7 @@ (define-module (geiser modules) #:export (symbol-module + program-module module-name? module-path find-module @@ -19,10 +20,36 @@ module-location) #:use-module (geiser utils) #:use-module (system vm program) + #:use-module (system vm debug) #:use-module (ice-9 regex) #:use-module (ice-9 session) #:use-module (srfi srfi-1)) +;; Return hash table mapping filename to list of modules defined in that +;; file. H/t andy wingo. +(define (fill-file->module-mapping! ret) + (define (record-module m) + (let ((f (module-filename m))) + (hash-set! ret f (cons m (hash-ref ret f '()))))) + (define (visit-module m) + (record-module m) + (hash-for-each (lambda (k v) (visit-module v)) + (module-submodules m))) + (visit-module (resolve-module '() #f)) + ret) + +(define file->modules (fill-file->module-mapping! (make-hash-table))) + +(define (program-file p) + (let ((src (program-source p 0))) + (and (pair? src) (cadr src)))) + +(define (program-module p) + (let* ((f (program-file p)) + (mods (or (hash-ref file->modules f) + (hash-ref (fill-file->module-mapping! file->modules) f)))) + (and (pair? mods) (not (null? mods)) (car mods)))) + (define (module-name? module-name) (and (list? module-name) (not (null? module-name)) |