mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 05:50:26 +02:00
Code Activity

Bug fixes.

Browse source
This commit is contained in:
Keisuke Nishida 2001-04-25 13:24:45 +00:00
parent 2d857fb1ac
commit 37052e6073
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
emacs/guile-emacs.scm
View file

@ -84,9 +84,13 @@
(define (procedure-call name args)
(let ((restp (memq '&rest args))
(args (delq '&rest (delq '&optional args))))
(args (map (lambda (a) `(let ((_t ,a))
(if (guile-tokenp _t)
(cadr _t)
(list 'quote _t))))
(delq '&rest (delq '&optional args)))))
(if restp
`(list* ',name ,@args)
`(list 'apply ',name ,@args)
`(list ',name ,@args))))
(let ((name (procedure-name proc))

14
emacs/guile.el
View file

@ -23,8 +23,6 @@
;;; Low level interface
;;;
(defvar guile-token "<guile>")
(defvar gulie-emacs-file
(catch 'return
(mapc (lambda (dir)
@ -45,6 +43,10 @@
(put 'guile-error 'error-conditions '(guile-error error))
(put 'guile-error 'error-message "Guile error")
(defvar guile-token-tag "<guile>")
(defun guile-tokenp (x) (and (consp x) (eq (car x) guile-token-tag)))
(defun guile:eval (string adapter)
(let ((output (guile-process-require adapter (concat "eval " string "\n")
"channel> ")))
@ -58,7 +60,7 @@
(car (read-from-string (substring output (match-end 0)))))
;; token
((match-beginning 3)
(cons guile-token
(cons guile-token-tag
(car (read-from-string (substring output (match-end 0))))))
;; exception
((match-beginning 4)
@ -88,10 +90,12 @@
(defun guile-lisp-convert (x)
(cond
((or (eq x true) (eq x false)) x)
((null x) "'()")
((stringp x) (prin1-to-string x))
((guile-tokenp x) (cadr x))
((consp x)
(if (eq (car x) guile-token)
(cadr x)
(if (null (cdr x))
(list (guile-lisp-convert (car x)))
(cons (guile-lisp-convert (car x)) (guile-lisp-convert (cdr x)))))
(t x)))