PLT: geiser is now a regular module.

5 files changed, 70 insertions, 53 deletions

diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el
index 58c38a5..6a804f2 100644
--- a/elisp/geiser-plt.el
+++ b/elisp/geiser-plt.el
@@ -60,8 +60,7 @@ This function uses `geiser-plt-init-file' if it exists."
       ,@(apply 'append (mapcar (lambda (p) (list "-S" p)) geiser-plt-collects))
       ,@(and (listp geiser-plt-binary) (cdr geiser-plt-binary))
       ,@(and init-file (file-readable-p init-file) (list "-f" init-file))
-      "-f" ,(expand-file-name "plt/geiser.ss" geiser-scheme-dir)
-      "-e" "(require 'geiser)")))
+      "-f" ,(expand-file-name "plt/geiser.ss" geiser-scheme-dir))))
 
 (defconst geiser-plt--prompt-regexp "^=?mzscheme@[^ ]*?> ")
 
@@ -78,8 +77,8 @@ This function uses `geiser-plt-init-file' if it exists."
 
 (defun geiser-plt--geiser-procedure (proc)
   (if (memq proc '(eval compile))
-      `((dynamic-require ''geiser 'geiser:eval) ',(geiser-plt--language))
-    `(dynamic-require ''geiser ',(intern (format "geiser:%s" proc)))))
+      `((dynamic-require 'geiser 'geiser:eval) ',(geiser-plt--language))
+    `(dynamic-require 'geiser ',(intern (format "geiser:%s" proc)))))
 
 (defconst geiser-plt--module-re
   "^(module +\\([^ ]+\\)")
diff --git a/scheme/plt/geiser.ss b/scheme/plt/geiser.ss
index 4df9b51..9590377 100644
--- a/scheme/plt/geiser.ss
+++ b/scheme/plt/geiser.ss
@@ -11,49 +11,13 @@
 
 ;;; Code:
 
-(module geiser scheme
-
-  (require version/utils)
-  (unless (version<=? "4.2" (version))
-    (error 'geiser
-           "Mzscheme version 4.2 or better required (found ~a)"
-           (version)))
-
-  (provide geiser:eval
-           geiser:compile
-           geiser:load-file
-           geiser:compile-file
-           geiser:macroexpand
-           geiser:completions
-           geiser:module-completions
-           geiser:symbol-location
-           geiser:module-location
-           geiser:module-exports
-           geiser:autodoc
-           geiser:help)
-
-  (compile-enforce-module-constants #f)
-  (require geiser/eval
-           geiser/modules
-           geiser/completions
-           geiser/locations
-           geiser/autodoc)
-
-  (define (geiser:eval lang)
-    (lambda (form spec) (eval-in form spec lang)))
-  (define geiser:compile compile-in)
-  (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-exports module-exports)
-  (define geiser:macroexpand macroexpand)
-
-  (current-prompt-read (compose (make-repl-reader (current-prompt-read))
-                                current-namespace)))
+(require version/utils)
+(unless (version<=? "4.2" (version))
+  (error 'geiser
+         "Mzscheme version 4.2 or better required (found ~a)"
+         (version)))
+
+(require geiser)
+(geiser:init)
 
 ;;; geiser.ss ends here
diff --git a/scheme/plt/geiser/autodoc.ss b/scheme/plt/geiser/autodoc.ss
index 7e64c89..c317d5c 100644
--- a/scheme/plt/geiser/autodoc.ss
+++ b/scheme/plt/geiser/autodoc.ss
@@ -11,7 +11,7 @@
 
 #lang scheme
 
-(provide autodoc update-module-cache get-help)
+(provide autodoc update-signature-cache get-help)
 
 (require geiser/utils geiser/modules geiser/locations scheme/help)
 
@@ -176,7 +176,7 @@
         ((list? arity) (map arity->signature arity))
         (else (list (arity->signature arity)))))
 
-(define (update-module-cache path . form)
+(define (update-signature-cache path . form)
   (when (and (string? path)
              (or (null? form)
                  (and (list? (car form))
diff --git a/scheme/plt/geiser/eval.ss b/scheme/plt/geiser/eval.ss
index d432daa..e806138 100644
--- a/scheme/plt/geiser/eval.ss
+++ b/scheme/plt/geiser/eval.ss
@@ -1,6 +1,6 @@
 ;;; eval.ss -- evaluation
 
-;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010 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
@@ -53,7 +53,7 @@
 (define (eval-in form spec lang)
   (call-with-result
    (lambda ()
-     (update-module-cache spec form)
+     (update-signature-cache spec form)
      (eval form (module-spec->namespace spec lang)))))
 
 (define compile-in eval-in)
@@ -62,7 +62,7 @@
   (call-with-result
    (lambda ()
      (load-module file (current-output-port) (last-namespace))
-     (update-module-cache file))))
+     (update-signature-cache file))))
 
 (define compile-file load-file)
 
diff --git a/scheme/plt/geiser/main.ss b/scheme/plt/geiser/main.ss
new file mode 100644
index 0000000..d342b15
--- /dev/null
+++ b/scheme/plt/geiser/main.ss
@@ -0,0 +1,54 @@
+;;; main.ss -- exported interface for emacs
+
+;; Copyright (C) 2010 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
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
+
+;; Start date: Wed Mar 31, 2010 21:14
+
+;;; main.ss ends here
+
+#lang scheme/base
+
+(provide geiser:init
+         geiser:eval
+         geiser:compile
+         geiser:load-file
+         geiser:compile-file
+         geiser:macroexpand
+         geiser:completions
+         geiser:module-completions
+         geiser:symbol-location
+         geiser:module-location
+         geiser:module-exports
+         geiser:autodoc
+         geiser:help)
+
+(require geiser/eval
+         geiser/modules
+         geiser/completions
+         geiser/locations
+         geiser/autodoc)
+
+(define (geiser:eval lang)
+  (lambda (form spec) (eval-in form spec lang)))
+(define geiser:compile compile-in)
+(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-exports module-exports)
+(define geiser:macroexpand macroexpand)
+
+(define (geiser:init)
+  (compile-enforce-module-constants #f)
+  (current-prompt-read (compose (make-repl-reader (current-prompt-read))
+                                current-namespace)))
+