Re: 23.0.50; ielm doesn't handle comments

[Bastien <bzg@altern.org>]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

Lawrence Mitchell <wence@gmx.li> writes:

> Bastien Guerry wrote:
>
>
> [...]
>
>
>>> (defun ielm-trim-comments (string)
>>>  "Trim comments in STRING."
>>>  (let ((pos (previous-single-property-change
>>>	      (length string) 'face string)))
>>>    (if (eq (get-text-property pos 'face)
>>>	    'font-lock-comment-face)
>>>	(substring string 0 pos))))
>
> This breaks if the user doesn't use font-lock.

Right.  I have come up with another solution, not relying on font-lock,
but this one doesn't allow the double-quote character in comments.

Please improve it if you can.  If no objection/suggestion until next
week, I'll apply this one.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ieml.el.patch --]
[-- Type: text/x-diff, Size: 957 bytes --]

--- ielm.el.~1.58.~	2008-01-08 20:44:50.000000000 +0000
+++ ielm.el	2008-02-15 00:35:37.000000000 +0000
@@ -304,6 +304,17 @@
   "Return non-nil if STRING is all whitespace."
   (or (string= string "") (string-match "\\`[ \t\n]+\\'" string)))
 
+(defun ielm-trim-comments (string)
+  "Trim comments out of STRING."
+  ;; FIXME: comments containing a double-quote character will not be
+  ;; recognized as comments.  This is to allow sexp like "&eacute;".
+  (with-temp-buffer
+    (insert string)
+    (buffer-substring
+     (point-min) 
+     (if (looking-back "[; \t]+[^\"]*" nil t)
+	 (match-beginning 0) (point-max)))))
+
 ;;; Evaluation
 
 (defun ielm-eval-input (ielm-string)
@@ -331,6 +342,8 @@
 	(progn
 	  (condition-case err
 	      (let (rout)
+		;; Make sure to get rid of comments
+		(setq ielm-string (ielm-trim-comments ielm-string))
 		(setq rout (read-from-string ielm-string))
 		(setq ielm-form (car rout))
 		(setq ielm-pos (cdr rout)))

[-- Attachment #3: Type: text/plain, Size: 13 bytes --]


-- 
Bastien