summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-10 23:33:21 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-10 23:33:21 +0100
commit7d50479898c1b8cac46dd177867f2bc40d0e5ace (patch)
treed87b4be18d275d153c38cf925155b4b7a8d7e799
downloadgeiser-guile-7d50479898c1b8cac46dd177867f2bc40d0e5ace.tar.gz
geiser-guile-7d50479898c1b8cac46dd177867f2bc40d0e5ace.tar.bz2
Guile scheme files moved to scheme/guile.
-rw-r--r--geiser/emacs.scm37
-rw-r--r--geiser/eval.scm69
-rw-r--r--geiser/introspection.scm79
3 files changed, 185 insertions, 0 deletions
diff --git a/geiser/emacs.scm b/geiser/emacs.scm
new file mode 100644
index 0000000..318b07a
--- /dev/null
+++ b/geiser/emacs.scm
@@ -0,0 +1,37 @@
+;; emacs.scm -- procedures for emacs interaction
+
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+
+;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
+;; Start date: Sun Feb 08, 2009 18:39
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Comentary:
+
+;; Re-exports of procedures used by Emacs.
+
+;;; Code:
+
+(define-module (geiser emacs)
+ #:re-export (ge:proc-args
+ ge:completions
+ ge:compile-file)
+ #:use-module ((geiser introspection)
+ :renamer (symbol-prefix-proc 'ge:))
+ #:use-module ((geiser eval)
+ :select ((comp-file . ge:compile-file))))
+
+
+;;; emacs.scm ends here
diff --git a/geiser/eval.scm b/geiser/eval.scm
new file mode 100644
index 0000000..7d82f7d
--- /dev/null
+++ b/geiser/eval.scm
@@ -0,0 +1,69 @@
+;; eval.scm -- evaluation procedures
+
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+
+;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
+;; Start date: Fri Feb 06, 2009 22:54
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Comentary:
+
+;; Module defining evaluation procedures called from the Emacs side.
+
+;;; Code:
+
+(define-module (geiser eval)
+ #:export (eval-in comp-file)
+ #:use-module (srfi srfi-1))
+
+(define (eval-in form module-name)
+ "Evals @var{form} in the module designated by @var{module-name}.
+If @var{module-name} is @var{#f} or resolution fails, the current module is used instead.
+The result is a list of the form ((RESULT . <form-value>) (OUTPUT . <string>))
+if no evaluation error happens, or ((ERROR (KEY . <error-key>) <error-arg>...))
+in case of errors. Each error arg is a cons (NAME . VALUE), where NAME includes
+SUBR, MSG and REST."
+ (let ((module (or (and module-name (resolve-module module-name))
+ (current-module))))
+ (catch #t
+ (lambda ()
+ (let* ((result #f)
+ (output
+ (with-output-to-string
+ (lambda ()
+ (save-module-excursion
+ (lambda ()
+ (set-current-module module)
+ (set! result (compile form))))))))
+ (list (cons 'result result) (cons 'output output))))
+ (lambda (key . args)
+ (list (cons 'error (apply parse-error (cons key args))))))))
+
+(define (parse-error key . args)
+ (let* ((len (length args))
+ (subr (and (> len 0) (first args)))
+ (msg (and (> len 1) (second args)))
+ (margs (and (> len 2) (third args)))
+ (rest (and (> len 3) (fourth args))))
+ (list (cons 'key key)
+ (cons 'subr (or subr '()))
+ (cons 'msg (if msg (apply format (cons #f (cons msg margs))) '()))
+ (cons 'rest (or rest '())))))
+
+(define (comp-file path)
+ "Compile and load file, given its full @var{path}."
+ (compile-file path))
+
+;;; eval.scm ends here
diff --git a/geiser/introspection.scm b/geiser/introspection.scm
new file mode 100644
index 0000000..4565464
--- /dev/null
+++ b/geiser/introspection.scm
@@ -0,0 +1,79 @@
+;; introspection.scm -- name says it all
+
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+
+;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
+;; Start date: Sun Feb 08, 2009 18:44
+
+;; This file is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Comentary:
+
+;; Procedures introspecting on scheme objects and their properties.
+
+;;; Code:
+
+(define-module (geiser introspection)
+ #:export (proc-args completions)
+ #:use-module (system vm program)
+ #:use-module (ice-9 session)
+ #:use-module (srfi srfi-1))
+
+(define (proc-args proc)
+ (let ((proc (and (symbol? proc)
+ (module-bound? (current-module) proc)
+ (eval proc (current-module)))))
+ (cond ((not proc) #f)
+ ((program? proc) (program-args proc))
+ ((procedure? proc) (procedure-args proc))
+ ((macro? proc) (macro-args proc))
+ (else #f))))
+
+(define (program-args program)
+ (let* ((arity (program-arity program))
+ (arg-no (first arity))
+ (opt (> (second arity) 0))
+ (args (map first (take (program-bindings program) arg-no))))
+ (format-args (if opt (drop-right args 1) args)
+ (and opt (last args))
+ (program-module program))))
+
+(define (procedure-args proc)
+ (let* ((arity (procedure-property proc 'arity))
+ (req (first arity))
+ (opt (third arity))
+ (env (procedure-environment proc)))
+ (format-args (map (lambda (n)
+ (string->symbol (format "arg~A" (+ 1 n))))
+ (iota req))
+ (and opt 'rest)
+ (and (not (null? env)) env))))
+
+(define (macro-args macro)
+ (let ((prog (macro-transformer macro)))
+ (if prog
+ (program-args prog)
+ (format-args '(...) #f #f))))
+
+(define (format-args args opt module)
+ (list (cons 'required args)
+ (cons 'optional (or opt '()))
+ (cons 'module (if module (module-name module) '()))))
+
+(define (completions prefix)
+ (sort! (map symbol->string
+ (apropos-internal (string-append "^" prefix)))
+ string<?))
+
+;;; introspection.scm ends here