diff options
author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-05-24 00:03:30 +0200 |
---|---|---|
committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-05-24 00:03:30 +0200 |
commit | 2d30daecad657d692a7f3cb66deb496630362600 (patch) | |
tree | 6b4f7e2cc66633465715696ec89f018dcb2b2f20 | |
parent | 0b491101472741c3728b6ccf80c121d66e90f94e (diff) | |
download | geiser-chez-2d30daecad657d692a7f3cb66deb496630362600.tar.gz geiser-chez-2d30daecad657d692a7f3cb66deb496630362600.tar.bz2 |
Racket: PLT implementation renamed to Racket.
-rw-r--r-- | elisp/geiser-impl.el | 2 | ||||
-rw-r--r-- | elisp/geiser-racket.el (renamed from elisp/geiser-plt.el) | 137 | ||||
-rw-r--r-- | elisp/geiser.el | 10 | ||||
-rw-r--r-- | scheme/Makefile.am | 20 | ||||
-rw-r--r-- | scheme/racket/geiser.rkt (renamed from scheme/plt/geiser.rkt) | 0 | ||||
-rw-r--r-- | scheme/racket/geiser/autodoc.rkt (renamed from scheme/plt/geiser/autodoc.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/completions.rkt (renamed from scheme/plt/geiser/completions.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/enter.rkt (renamed from scheme/plt/geiser/enter.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/eval.rkt (renamed from scheme/plt/geiser/eval.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/locations.rkt (renamed from scheme/plt/geiser/locations.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/main.rkt (renamed from scheme/plt/geiser/main.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/modules.rkt (renamed from scheme/plt/geiser/modules.rkt) | 2 | ||||
-rw-r--r-- | scheme/racket/geiser/user.rkt (renamed from scheme/plt/geiser/user.rkt) | 3 | ||||
-rw-r--r-- | scheme/racket/geiser/utils.rkt (renamed from scheme/plt/geiser/utils.rkt) | 2 |
14 files changed, 94 insertions, 94 deletions
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el index e5bff0a..1c3347c 100644 --- a/elisp/geiser-impl.el +++ b/elisp/geiser-impl.el @@ -26,7 +26,7 @@ :type 'symbol :group 'geiser-implementation) -(geiser-custom--defcustom geiser-active-implementations '(guile plt) +(geiser-custom--defcustom geiser-active-implementations '(guile racket) "List of active installed Scheme implementations." :type '(repeat symbol) :group 'geiser-implementation) diff --git a/elisp/geiser-plt.el b/elisp/geiser-racket.el index 64b770d..dd086a5 100644 --- a/elisp/geiser-plt.el +++ b/elisp/geiser-racket.el @@ -1,4 +1,4 @@ -;; geiser-plt.el -- geiser support for PLT scheme +;; geiser-racket.el -- geiser support for Racket scheme ;; Copyright (C) 2009, 2010 Jose Antonio Ortega Ruiz @@ -21,53 +21,55 @@ ;;; Customization: -(defgroup geiser-plt nil - "Customization for Geiser's PLT flavour." +(defgroup geiser-racket nil + "Customization for Geiser's Racket flavour." :group 'geiser) -(geiser-custom--defcustom geiser-plt-binary +(geiser-custom--defcustom geiser-racket-binary (cond ((eq system-type 'windows-nt) "Racket.exe") ((eq system-type 'darwin) "racket") (t "racket")) "Name to use to call the mzscheme executable when starting a REPL." :type '(choice string (repeat string)) - :group 'geiser-plt) + :group 'geiser-racket) -(geiser-custom--defcustom geiser-plt-collects nil +(geiser-custom--defcustom geiser-racket-collects nil "A list of paths to be added to mzscheme's collection directories." :type '(repeat file) - :group 'geiser-plt) + :group 'geiser-racket) -(geiser-custom--defcustom geiser-plt-init-file "~/.plt-geiser" +(geiser-custom--defcustom geiser-racket-init-file "~/.racket-geiser" "Initialization file with user code for the mzscheme REPL." :type 'string - :group 'geiser-plt) + :group 'geiser-racket) ;;; REPL support: -(defun geiser-plt--binary () - (if (listp geiser-plt-binary) (car geiser-plt-binary) geiser-plt-binary)) +(defun geiser-racket--binary () + (if (listp geiser-racket-binary) + (car geiser-racket-binary) + geiser-racket-binary)) -(defun geiser-plt--parameters () +(defun geiser-racket--parameters () "Return a list with all parameters needed to start mzscheme. -This function uses `geiser-plt-init-file' if it exists." - (let ((init-file (and (stringp geiser-plt-init-file) - (expand-file-name geiser-plt-init-file)))) +This function uses `geiser-racket-init-file' if it exists." + (let ((init-file (and (stringp geiser-racket-init-file) + (expand-file-name geiser-racket-init-file)))) `("-i" "-q" - "-S" ,(expand-file-name "plt/" geiser-scheme-dir) - ,@(apply 'append (mapcar (lambda (p) (list "-S" p)) geiser-plt-collects)) - ,@(and (listp geiser-plt-binary) (cdr geiser-plt-binary)) + "-S" ,(expand-file-name "racket/" geiser-scheme-dir) + ,@(apply 'append (mapcar (lambda (p) (list "-S" p)) geiser-racket-collects)) + ,@(and (listp geiser-racket-binary) (cdr geiser-racket-binary)) ,@(and init-file (file-readable-p init-file) (list "-f" init-file)) - "-f" ,(expand-file-name "plt/geiser.rkt" geiser-scheme-dir)))) + "-f" ,(expand-file-name "racket/geiser.rkt" geiser-scheme-dir)))) -(defconst geiser-plt--prompt-regexp "^=?\\(mzscheme\\|racket\\)@[^ ]*?> ") +(defconst geiser-racket--prompt-regexp "^=?\\(mzscheme\\|racket\\)@[^ ]*?> ") ;;; Evaluation support: -(defun geiser-plt--language () +(defun geiser-racket--language () (save-excursion (goto-char (point-min)) (if (re-search-forward @@ -75,74 +77,76 @@ This function uses `geiser-plt-init-file' if it exists." (car (geiser-syntax--read-from-string (match-string-no-properties 1))) :f))) -(defun geiser-plt--geiser-procedure (proc) +(defun geiser-racket--geiser-procedure (proc) (if (memq proc '(eval compile)) - `((dynamic-require 'geiser 'geiser:eval) ',(geiser-plt--language)) + `((dynamic-require 'geiser 'geiser:eval) ',(geiser-racket--language)) `(dynamic-require 'geiser ',(intern (format "geiser:%s" proc))))) -(defconst geiser-plt--module-re +(defconst geiser-racket--module-re "^(module +\\([^ ]+\\)") -(defun geiser-plt--explicit-module () +(defun geiser-racket--explicit-module () (save-excursion (goto-char (point-min)) - (and (re-search-forward geiser-plt--module-re nil t) + (and (re-search-forward geiser-racket--module-re nil t) (ignore-errors (car (geiser-syntax--read-from-string (match-string-no-properties 1))))))) -(defsubst geiser-plt--implicit-module () +(defsubst geiser-racket--implicit-module () (save-excursion (goto-char (point-min)) (if (re-search-forward "^#lang " nil t) (buffer-file-name) :f))) -(defun geiser-plt--get-module (&optional module) +(defun geiser-racket--get-module (&optional module) (cond ((and (null module) (buffer-file-name))) - ;; (geiser-plt--explicit-module) - ((null module) (geiser-plt--implicit-module)) + ;; (geiser-racket--explicit-module) + ((null module) (geiser-racket--implicit-module)) ((symbolp module) module) ((and (stringp module) (file-name-absolute-p module)) module) ((stringp module) (intern module)) (t nil))) -(defun geiser-plt--symbol-begin (module) +(defun geiser-racket--symbol-begin (module) (save-excursion (skip-syntax-backward "^-()>") (point))) -(defun geiser-plt--enter-command (module) +(defun geiser-racket--enter-command (module) (and (stringp module) (format "(enter! (file %S))" module))) -(defconst geiser-plt--binding-forms +(defconst geiser-racket--binding-forms '(for for/list for/hash for/hasheq for/and for/or for/lists for/first for/last for/fold)) -(defconst geiser-plt--binding-forms* +(defconst geiser-racket--binding-forms* '(for* for*/list for*/lists for*/hash for*/hasheq for*/and for*/or for*/first for*/last for*/fold)) ;;; External help -(defsubst geiser-plt--get-help (symbol module) +(defsubst geiser-racket--get-help (symbol module) (geiser-eval--send/wait `(:eval (get-help ',symbol (:module ,module)) geiser/autodoc))) -(defun geiser-plt--external-help (id module) +(defun geiser-racket--external-help (id module) (message "Requesting help for '%s'..." id) - (let ((out (geiser-eval--retort-output (geiser-plt--get-help id module)))) + (let ((out (geiser-eval--retort-output + (geiser-racket--get-help id module)))) (when (and out (string-match " but provided by:\n +\\(.+\\)\n" out)) - (geiser-plt--get-help symbol (match-string 1 out)))) + (geiser-racket--get-help symbol (match-string 1 out)))) (minibuffer-message "%s done" (current-message)) t) ;;; Error display -(defconst geiser-plt--file-rxs '("^\\([^:\n\"]+\\):\\([0-9]+\\):\\([0-9]+\\)" - "path:\"?\\([^>\"\n]+\\)\"?>" - "module: \"\\([^>\"\n]+\\)\"")) +(defconst geiser-racket--file-rxs + '("^\\([^:\n\"]+\\):\\([0-9]+\\):\\([0-9]+\\)" + "path:\"?\\([^>\"\n]+\\)\"?>" + "module: \"\\([^>\"\n]+\\)\"")) -(defun geiser-plt--find-files (rx) +(defun geiser-racket--find-files (rx) (save-excursion (while (re-search-forward rx nil t) (geiser-edit--make-link (match-beginning 1) @@ -151,10 +155,10 @@ This function uses `geiser-plt-init-file' if it exists." (match-string 2) (match-string 3))))) -(defun geiser-plt--display-error (module key msg) +(defun geiser-racket--display-error (module key msg) (when key (insert "Error: ") - (geiser-doc--insert-button key nil 'plt) + (geiser-doc--insert-button key nil 'racket) (newline 2)) (when msg (let ((p (point))) @@ -162,7 +166,7 @@ This function uses `geiser-plt-init-file' if it exists." (when key (let ((end (point))) (goto-char p) - (mapc 'geiser-plt--find-files geiser-plt--file-rxs) + (mapc 'geiser-racket--find-files geiser-racket--file-rxs) (goto-char end) (newline))))) t) @@ -170,39 +174,36 @@ This function uses `geiser-plt-init-file' if it exists." ;;; Trying to ascertain whether a buffer is mzscheme scheme: -(defun geiser-plt--guess () +(defun geiser-racket--guess () (or (save-excursion (goto-char (point-min)) (re-search-forward "#lang " nil t)) - (geiser-plt--explicit-module))) + (geiser-racket--explicit-module))) ;;; Implementation definition: -(define-geiser-implementation plt +(define-geiser-implementation racket (unsupported-procedures '(callers callees generic-methods)) - (binary geiser-plt--binary) - (arglist geiser-plt--parameters) + (binary geiser-racket--binary) + (arglist geiser-racket--parameters) (startup) - (prompt-regexp geiser-plt--prompt-regexp) - (marshall-procedure geiser-plt--geiser-procedure) - (find-module geiser-plt--get-module) - (enter-command geiser-plt--enter-command) - (find-symbol-begin geiser-plt--symbol-begin) - (display-error geiser-plt--display-error) - (display-help geiser-plt--external-help) - (check-buffer geiser-plt--guess) - (binding-forms geiser-plt--binding-forms) - (binding-forms* geiser-plt--binding-forms*)) + (prompt-regexp geiser-racket--prompt-regexp) + (marshall-procedure geiser-racket--geiser-procedure) + (find-module geiser-racket--get-module) + (enter-command geiser-racket--enter-command) + (find-symbol-begin geiser-racket--symbol-begin) + (display-error geiser-racket--display-error) + (display-help geiser-racket--external-help) + (check-buffer geiser-racket--guess) + (binding-forms geiser-racket--binding-forms) + (binding-forms* geiser-racket--binding-forms*)) (geiser-impl--add-to-alist 'regexp - "\\.\\(mzscheme\\|racket\\)\\.sl?s$" 'plt t) -(geiser-impl--add-to-alist 'regexp "\\.ss$" 'plt t) -(geiser-impl--add-to-alist 'regexp "\\.rkt$" 'plt t) - -(defalias 'run-racket 'run-plt) -(defalias 'switch-to-racket 'switch-to-plt) + "\\.\\(mzscheme\\|racket\\)\\.sl?s$" 'racket t) +(geiser-impl--add-to-alist 'regexp "\\.ss$" 'racket t) +(geiser-impl--add-to-alist 'regexp "\\.rkt$" 'racket t) -(provide 'geiser-plt) -;;; geiser-plt.el ends here +(provide 'geiser-racket) +;;; geiser-racket.el ends here diff --git a/elisp/geiser.el b/elisp/geiser.el index 4389652..b241b78 100644 --- a/elisp/geiser.el +++ b/elisp/geiser.el @@ -47,11 +47,11 @@ (autoload 'switch-to-guile "geiser-guile.el" "Start a Geiser Guile REPL, or switch to a running one." t) -(autoload 'run-plt "geiser-plt.el" - "Start a Geiser MzScheme REPL, or switch to a running one." t) +(autoload 'run-racket "geiser-racket.el" + "Start a Geiser Racket REPL, or switch to a running one." t) -(autoload 'switch-to-plt "geiser-guile.el" - "Start a Geiser MzScheme REPL, or switch to a running one." t) +(autoload 'switch-to-racket "geiser-guile.el" + "Start a Geiser Racket REPL, or switch to a running one." t) (autoload 'geiser-mode "geiser-mode.el" "Minor mode adding Geiser REPL interaction to Scheme buffers." t) @@ -72,7 +72,7 @@ geiser-faces geiser-mode geiser-guile - geiser-plt + geiser-racket geiser-implementation geiser-xref)) diff --git a/scheme/Makefile.am b/scheme/Makefile.am index adb25f8..d437bb6 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -7,13 +7,13 @@ nobase_dist_pkgdata_DATA = \ guile/geiser/modules.scm \ guile/geiser/utils.scm \ guile/geiser/xref.scm \ - plt/geiser.ss \ - plt/geiser/autodoc.ss \ - plt/geiser/completions.ss \ - plt/geiser/enter.ss \ - plt/geiser/eval.ss \ - plt/geiser/locations.ss \ - plt/geiser/main.ss \ - plt/geiser/modules.ss \ - plt/geiser/user.ss \ - plt/geiser/utils.ss + racket/geiser.rkt \ + racket/geiser/autodoc.rkt \ + racket/geiser/completions.rkt \ + racket/geiser/enter.rkt \ + racket/geiser/eval.rkt \ + racket/geiser/locations.rkt \ + racket/geiser/main.rkt \ + racket/geiser/modules.rkt \ + racket/geiser/user.rkt \ + racket/geiser/utils.rkt diff --git a/scheme/plt/geiser.rkt b/scheme/racket/geiser.rkt index 45d1289..45d1289 100644 --- a/scheme/plt/geiser.rkt +++ b/scheme/racket/geiser.rkt diff --git a/scheme/plt/geiser/autodoc.rkt b/scheme/racket/geiser/autodoc.rkt index d6fffbb..0bb850d 100644 --- a/scheme/plt/geiser/autodoc.rkt +++ b/scheme/racket/geiser/autodoc.rkt @@ -9,7 +9,7 @@ ;; Start date: Sun May 03, 2009 14:45 -#lang scheme +#lang racket (provide autodoc update-signature-cache get-help) diff --git a/scheme/plt/geiser/completions.rkt b/scheme/racket/geiser/completions.rkt index e0ff239..4cbc09f 100644 --- a/scheme/plt/geiser/completions.rkt +++ b/scheme/racket/geiser/completions.rkt @@ -9,7 +9,7 @@ ;; Start date: Sun Apr 26, 2009 19:02 -#lang scheme +#lang racket (provide symbol-completions module-completions) diff --git a/scheme/plt/geiser/enter.rkt b/scheme/racket/geiser/enter.rkt index 705482d..eff37f6 100644 --- a/scheme/plt/geiser/enter.rkt +++ b/scheme/racket/geiser/enter.rkt @@ -9,7 +9,7 @@ ;; Start date: Wed Mar 31, 2010 21:53 -#lang scheme/base +#lang racket/base (require syntax/modcode (for-syntax scheme/base)) diff --git a/scheme/plt/geiser/eval.rkt b/scheme/racket/geiser/eval.rkt index cef6130..e0bcffa 100644 --- a/scheme/plt/geiser/eval.rkt +++ b/scheme/racket/geiser/eval.rkt @@ -9,7 +9,7 @@ ;; Start date: Sun Apr 26, 2009 00:44 -#lang scheme +#lang racket (provide eval-in compile-in diff --git a/scheme/plt/geiser/locations.rkt b/scheme/racket/geiser/locations.rkt index bae7122..b4c0f37 100644 --- a/scheme/plt/geiser/locations.rkt +++ b/scheme/racket/geiser/locations.rkt @@ -9,7 +9,7 @@ ;; Start date: Sun Apr 26, 2009 19:43 -#lang scheme +#lang racket (provide symbol-location symbol-location* diff --git a/scheme/plt/geiser/main.rkt b/scheme/racket/geiser/main.rkt index d6ff332..de1c21c 100644 --- a/scheme/plt/geiser/main.rkt +++ b/scheme/racket/geiser/main.rkt @@ -9,7 +9,7 @@ ;; Start date: Wed Mar 31, 2010 21:14 -#lang scheme/base +#lang racket/base (provide geiser:eval geiser:compile diff --git a/scheme/plt/geiser/modules.rkt b/scheme/racket/geiser/modules.rkt index 2de8e35..0de316c 100644 --- a/scheme/plt/geiser/modules.rkt +++ b/scheme/racket/geiser/modules.rkt @@ -9,7 +9,7 @@ ;; Start date: Wed May 06, 2009 02:35 -#lang scheme +#lang racket (provide load-module ensure-module-spec diff --git a/scheme/plt/geiser/user.rkt b/scheme/racket/geiser/user.rkt index 19b1e1b..3c1d93e 100644 --- a/scheme/plt/geiser/user.rkt +++ b/scheme/racket/geiser/user.rkt @@ -9,7 +9,7 @@ ;; Start date: Wed Mar 31, 2010 22:24 -#lang scheme/base +#lang racket/base (provide enter!) @@ -54,4 +54,3 @@ (init) ;;; user.rkt ends here - diff --git a/scheme/plt/geiser/utils.rkt b/scheme/racket/geiser/utils.rkt index f6c739c..730a396 100644 --- a/scheme/plt/geiser/utils.rkt +++ b/scheme/racket/geiser/utils.rkt @@ -9,7 +9,7 @@ ;; Start date: Sun May 03, 2009 03:09 -#lang scheme +#lang racket (provide pair->list keyword->symbol |