Changeset 12599

Timestamp:

Aug 16, 2009, 9:33:08 PM (15 years ago)

Author:

Gary Byers

Message:

In PARSE-LISP-LINE-INFO, don't create an ignored region for the
character following one with :CHAR-QUOTE syntax (e.g., #
) if the
quoting character is at the end of a line.

In the "Confirm Listener Input" command, don't send (or try to parse)
the input region if it ends in a #
; just append a #\Newline.

(Eventually sending input that contains a quoted #\Newline will likely
cause the REPL to complain that the symbol whose name is #
is unbound;
this is how SLIME, ILisp, and MCL behave in this rather bizarre case.)

This is all intended to fix ticket:570 .

Location:

trunk/source/cocoa-ide/hemlock/src

Files:

• lispmode.lisp (modified) (1 diff)
• listener.lisp (modified) (1 diff)

trunk/source/cocoa-ide/hemlock/src/lispmode.lisp

@@ -327 +327 @@
           (:char-quote
            (mark-after mark)
-           (push-range (cons (mark-charpos mark) (1+ (mark-charpos mark)))
-                       line-info)
+           (let* ((charpos (mark-charpos mark))
+                  (nextpos (1+ charpos))
+                  (linelen (line-length (mark-line mark))))
+             (when (> linelen nextpos)
+               (push-range (cons charpos nextpos)
+                           line-info)))
            (mark-after mark))
           

trunk/source/cocoa-ide/hemlock/src/listener.lisp

@@ -322 +322 @@
   (declare (ignore p))
   (if (point-at-prompt-p)
-      (send-input-region-to-lisp)
+    (progn
+      (if (eq (character-attribute :lisp-syntax (previous-character (buffer-end-mark (current-buffer)))) :char-quote)
+        (let* ((point (current-point))) 
+          (buffer-end point)
+          (insert-character point #\newline))
+        (send-input-region-to-lisp)))
       (if (region-active-p)
           (let ((selected-region (current-region nil nil)))