"An alist mapping from program name to exit handler.
Exit handlers are called once when \"# exit\" line arrives.
Use `riece-ruby-set-exit-handler' to set this variable.")
+(defvar riece-ruby-property-alist nil
+ "An alist mapping from program name to the property list.
+Use `riece-ruby-set-property' to set this variable.")
+
+(defvar riece-ruby-enabled nil)
+
+(defconst riece-ruby-description
+ "Evaluate an input string as Ruby program.")
(defun riece-ruby-substitute-variables (program alist)
(setq program (copy-sequence program))
(if (looking-at "D \\(.*\\)\r")
(setq riece-ruby-escaped-data (cons (match-string 1)
riece-ruby-escaped-data))
- (if (looking-at "S \\(.*\\) \\(.*\\)\r")
+ (if (looking-at "S \\([^ ]*\\) \\(.*\\)\r")
(progn
(setq riece-ruby-status-alist (cons (cons (match-string 1)
(match-string 2))
'("finished" "exited"))
(riece-ruby-run-exit-handler
(cdr (car riece-ruby-status-alist)))))
- (if (looking-at "# output \\(.*\\) \\(.*\\)\r")
+ (if (looking-at "# output \\([^ ]*\\) \\(.*\\)\r")
(let ((entry (assoc (match-string 1)
riece-ruby-output-handler-alist)))
(if entry
- (funcall (car entry) (cdr entry) (match-string 2))))
+ (funcall (cdr entry) (car entry) (match-string 2))))
(if (looking-at "# exit \\(.*\\)\r")
(riece-ruby-run-exit-handler (match-string 1))))))))
(forward-line))
(let ((entry (assoc name riece-ruby-exit-handler-alist)))
(if entry
(progn
- (funcall (cdr entry) (car entry))
- (setq riece-ruby-exit-handler-alist (delq entry))))))
+ (setq riece-ruby-exit-handler-alist
+ (delq entry riece-ruby-exit-handler-alist))
+ (funcall (cdr entry) (car entry))))))
(defun riece-ruby-sentinel (process status)
(kill-buffer (process-buffer process)))
(expand-file-name
riece-ruby-server-program
(file-name-directory
- (symbol-file 'riece-ruby-execute))))))
+ (locate-library
+ (symbol-file 'riece-ruby-execute)))))))
(set-process-filter riece-ruby-process #'riece-ruby-filter)
(set-process-sentinel riece-ruby-process #'riece-ruby-sentinel)))
(save-excursion
(make-local-variable 'riece-ruby-lock)
(setq riece-ruby-lock t)
(riece-ruby-send-poll name)
- (while (null riece-ruby-response)
+ (while riece-ruby-lock
(accept-process-output riece-ruby-process))
(list riece-ruby-response
riece-ruby-data
(make-local-variable 'riece-ruby-lock)
(setq riece-ruby-lock t)
(riece-ruby-send-exit name)
- (while (null riece-ruby-response)
- (accept-process-output riece-ruby-process))))
+ (while riece-ruby-lock
+ (accept-process-output riece-ruby-process)))
+ (let ((entry (assoc name riece-ruby-property-alist)))
+ (if entry
+ (delq entry riece-ruby-property-alist))))
(defun riece-ruby-set-exit-handler (name handler)
(let ((entry (assoc name riece-ruby-exit-handler-alist)))
- (if entry
- (setcdr entry handler)
- (setq riece-ruby-exit-handler-alist
- (cons (cons name handler)
- riece-ruby-exit-handler-alist)))
- ;;check if the program already exited
- (riece-ruby-inspect)))
+ (if handler
+ (progn
+ (if entry
+ (setcdr entry handler)
+ (setq riece-ruby-exit-handler-alist
+ (cons (cons name handler)
+ riece-ruby-exit-handler-alist)))
+ ;;check if the program already exited
+ (riece-ruby-inspect name))
+ (if entry
+ (setq riece-ruby-exit-handler-alist
+ (delq entry riece-ruby-exit-handler-alist))))))
(defun riece-ruby-set-output-handler (name handler)
(let ((entry (assoc name riece-ruby-output-handler-alist)))
- (if entry
- (setcdr entry handler)
- (setq riece-ruby-output-handler-alist
- (cons (cons name handler)
- riece-ruby-output-handler-alist)))))
+ (if handler
+ (progn
+ (if entry
+ (setcdr entry handler)
+ (setq riece-ruby-output-handler-alist
+ (cons (cons name handler)
+ riece-ruby-output-handler-alist))))
+ (if entry
+ (setq riece-ruby-output-handler-alist
+ (delq entry riece-ruby-output-handler-alist))))))
+
+(defun riece-ruby-set-property (name property value)
+ (let ((entry (assoc name riece-ruby-property-alist))
+ property-entry)
+ (unless entry
+ (setq entry (list name)
+ riece-ruby-property-alist (cons entry riece-ruby-property-alist)))
+ (if (setq property-entry (assoc property (cdr entry)))
+ (setcdr property-entry value)
+ (setcdr entry (cons (cons property value) (cdr entry))))))
+
+(defun riece-ruby-property (name property)
+ (cdr (assoc property (cdr (assoc name riece-ruby-property-alist)))))
+
+(defun riece-ruby-exit-handler (name)
+ (riece-ruby-inspect name)
+ (let* ((data (copy-sequence riece-ruby-data))
+ (length (length data))
+ (index 0))
+ (while (< index length)
+ (if (eq (aref data index) ?\n)
+ (aset data index ? ))
+ (setq index (1+ index)))
+ (riece-send-string
+ (format "NOTICE %s :%s\r\n"
+ (riece-identity-prefix
+ (riece-ruby-property name 'riece-ruby-target))
+ data))
+ (riece-display-message
+ (riece-make-message (riece-current-nickname)
+ (riece-ruby-property name 'riece-ruby-target)
+ data
+ 'notice))
+ (riece-ruby-clear name)))
+
+(defun riece-ruby-display-message-function (message)
+ (if (and riece-ruby-enabled
+ (riece-message-own-p message)
+ (string-match "^,ruby\\s-+" (riece-message-text message)))
+ (let ((name (riece-ruby-execute
+ (substring (riece-message-text message)
+ (match-end 0)))))
+ (riece-ruby-set-property name
+ 'riece-ruby-target
+ (riece-message-target message))
+ (riece-ruby-set-exit-handler name
+ #'riece-ruby-exit-handler))))
+
+(defun riece-ruby-insinuate ()
+ (add-hook 'riece-after-display-message-functions
+ 'riece-ruby-display-message-function))
+
+(defun riece-ruby-enable ()
+ (setq riece-ruby-enabled t))
+
+(defun riece-ruby-disable ()
+ (setq riece-ruby-enabled nil))
(provide 'riece-ruby)
projects / riece / blobdiff