/[cmucl]/src/hemlock/lispeval.lisp
ViewVC logotype

Diff of /src/hemlock/lispeval.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by ram, Fri Feb 11 21:53:23 1994 UTC revision 1.3 by ram, Fri Sep 30 22:55:35 1994 UTC
# Line 101  Line 101 
101      (setf (note-state note) :pending)      (setf (note-state note) :pending)
102      (message "Sending ~A." (note-context note))      (message "Sending ~A." (note-context note))
103      (case (note-kind note)      (case (note-kind note)
       (:dylan-eval  
        (wire:remote wire  
          (server-eval-dylan-text remote  
                                  (note-package note)  
                                  (note-text note)  
                                  (and ts (ts-data-stream ts)))))  
104        (:eval        (:eval
105         (wire:remote wire         (wire:remote wire
106           (server-eval-text remote           (server-eval-text remote
107                             (note-package note)                             (note-package note)
108                             (note-text note)                             (note-text note)
109                             (and ts (ts-data-stream ts)))))                             (and ts (ts-data-stream ts)))))
       (:dylan-compile  
        (wire:remote wire  
          (server-compile-dylan-text remote  
                                     (note-package note)  
                                     (note-text note)  
                                     (note-input-file note)  
                                     (and ts (ts-data-stream ts))  
                                     (and bg (ts-data-stream bg)))))  
110        (:compile        (:compile
111         (wire:remote wire         (wire:remote wire
112           (server-compile-text remote           (server-compile-text remote
# Line 189  Line 175 
175        (:warning (incf (note-warnings note)))        (:warning (incf (note-warnings note)))
176        (:note (incf (note-notes note))))        (:note (incf (note-notes note))))
177      (let ((region (case (note-kind note)      (let ((region (case (note-kind note)
178                      ((:compile :dylan-compile)                      (:compile
179                       (note-region note))                       (note-region note))
180                      (:compile-file                      (:compile-file
181                       (let ((buff (note-buffer note)))                       (let ((buff (note-buffer note)))
# Line 281  Line 267 
267    (when (server-info-notes server-info)    (when (server-info-notes server-info)
268      (editor-error "Server ~S is currently busy.  See \"List Operations\"."      (editor-error "Server ~S is currently busy.  See \"List Operations\"."
269                    (server-info-name server-info)))                    (server-info-name server-info)))
270    (multiple-value-bind    (multiple-value-bind (values error)
271        (values error)                         (wire:remote-value (server-info-wire server-info)
272        (if (dylan-mode-p)                           (server-eval-form package form))
           (wire:remote-value (server-info-wire server-info)  
             (server-eval-dylan-form package form))  
           (wire:remote-value (server-info-wire server-info)  
             (server-eval-form package form)))  
273      (when error      (when error
274        (editor-error "The server died before finishing"))        (editor-error "The server died before finishing"))
275      values))      values))
# Line 314  Line 296 
296     string.  If package is not supplied, the string is eval'ed in the slave's     string.  If package is not supplied, the string is eval'ed in the slave's
297     current package."     current package."
298    (declare (simple-string string))    (declare (simple-string string))
299    (queue-note (make-note :kind (if (dylan-mode-p) :dylan-eval :eval)    (queue-note (make-note :kind :eval
300                           :context context                           :context context
301                           :package package                           :package package
302                           :text string)                           :text string)
# Line 330  Line 312 
312     is not supplied, the string is eval'ed in the slave's current package."     is not supplied, the string is eval'ed in the slave's current package."
313    (let ((region (region (copy-mark (region-start region) :left-inserting)    (let ((region (region (copy-mark (region-start region) :left-inserting)
314                          (copy-mark (region-end region) :left-inserting))))                          (copy-mark (region-end region) :left-inserting))))
315      (queue-note (make-note :kind (if (dylan-mode-p) :dylan-eval :eval)      (queue-note (make-note :kind :eval
316                             :context context                             :context context
317                             :region region                             :region region
318                             :package package                             :package package
# Line 349  Line 331 
331           (buf (line-buffer (mark-line (region-start region))))           (buf (line-buffer (mark-line (region-start region))))
332           (pn (and buf (buffer-pathname buf)))           (pn (and buf (buffer-pathname buf)))
333           (defined-from (if pn (namestring pn) "unknown")))           (defined-from (if pn (namestring pn) "unknown")))
334      (queue-note (make-note :kind (if (dylan-mode-p) :dylan-compile :compile)      (queue-note (make-note :kind :compile
335                             :context (region-context region "compilation")                             :context (region-context region "compilation")
336                             :buffer (and region                             :buffer (and region
337                                          (region-start region)                                          (region-start region)

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

  ViewVC Help
Powered by ViewVC 1.1.5