SCM Repository

[smlnj] Diff of /sml/trunk/sml-mode/sml-proc.el

[smlnj] / sml / trunk / sml-mode / sml-proc.el

Diff of /sml/trunk/sml-mode/sml-proc.el

-revision 1477, Wed Apr 21 21:26:58 2004 UTC
+revision 1478, Wed Apr 21 22:46:05 2004 UTC
 Line 1
  ;;; sml-proc.el --- Comint based interaction mode for Standard ML.
- ;; Copyright (C) 1989       Lars Bo Nielsen
- ;; Copyright (C) 1994-1997  Matthew J. Morley
  ;; Copyright (C) 1999,2000,03,04  Stefan Monnier
+ ;; Copyright (C) 1994-1997  Matthew J. Morley
+ ;; Copyright (C) 1989       Lars Bo Nielsen
  ;; $Revision$
  ;; $Date$
 Line 207
    :type '(regexp))
  (defvar sml-error-regexp-alist
-   '(;; Poly/ML messages
+   `( ;; Poly/ML messages
      ("\\(Error\\|Warning:\\) in '\\(.+\\)', line \\([0-9]+\\)" 2 3)
      ;; Moscow ML
      ("File \"\\([^\"]+\\)\", line \\([0-9]+\\)\\(-\\([0-9]+\\)\\)?, characters \\([0-9]+\\)-\\([0-9]+\\):" 1 2 5)
+     ,@(if (not (fboundp 'compilation-fake-loc))
      ;; SML/NJ:  the file-pattern is anchored to avoid
      ;; pathological behavior with very long lines.
+           '(
      ("^[-= ]*\\(.*[^\n)]\\)\\( (.*)\\)?:\\([0-9]+\\)\\.\\([0-9]+\\)\\(-\\([0-9]+\\)\\.\\([0-9]+\\)\\)? \\(Error\\|Warning\\): .*" 1 sml-make-error 3 4 6 7)
-     ;; SML/NJ's exceptions:  see above.
      ("^ +\\(raised at: \\)?\\(.+\\):\\([0-9]+\\)\\.\\([0-9]+\\)\\(-\\([0-9]+\\)\\.\\([0-9]+\\)\\)" 2 sml-make-error 3 4 6 7))
+         '(("^[-= ]*\\(.*[^\n)]\\)\\( (.*)\\)?:\\([0-9]+\\)\\.\\([0-9]+\\)\\(-\\([0-9]+\\)\\.\\([0-9]+\\)\\)? \\(Error\\|Warnin\\(g\\)\\): .*" 1 (3 . 6) (4 . 7) (9))
+           ;; SML/NJ's exceptions:  see above.
+           ("^ +\\(raised at: \\)?\\(.+\\):\\([0-9]+\\)\\.\\([0-9]+\\)\\(-\\([0-9]+\\)\\.\\([0-9]+\\)\\)" 2 (3 . 6) (4 . 7)))))
    "Alist that specifies how to match errors in compiler output.
  See `compilation-error-regexp-alist' for a description of the format.")
-Line 449
+Line 453
    (if (= start end)
        (message "The region is zero (ignored)")
      (let* ((buf (sml-proc-buffer))
-            (file (buffer-file-name))
             (marker (copy-marker start))
             (tmp (make-temp-file "sml")))
        (write-region start end tmp nil 'silently)
-Line 502
+Line 505
    (interactive)
    (sml-send-function t))
- ;;; H A C K   A T T A C K !   X E M A C S   V E R S U S   E M A C S
- (defun sml-drag-region (event)
-   "Highlight the text the mouse is dragged over, and send it to ML.
- This must be bound to a button-down mouse EVENT, currently \\[sml-drag-region].
- If you drag the mouse (ie, keep the mouse button depressed) the
- program text sent to the complier is delimited by where you started
- dragging the mouse, and where you release the mouse button.
- If you only click the mouse, the program text sent to the compiler is
- delimited by the current position of point and the place where you
- click the mouse.
- In either event, the values of both point and mark are left
- undisturbed once this operation is completed."
-   (interactive "e")
-   (let ((mark-ring)                     ;BAD: selection start gets cons'd
-         (pmark (point)))                ;where point is now
-     (if (fboundp 'mouse-track-default)
-         ;; Assume this is XEmacs, otherwise assume its Emacs
-         (save-excursion
-           (let ((zmacs-regions))
-             (set-marker (mark-marker) nil)
-             (mouse-track-default event)
-             (if (not (region-exists-p)) (push-mark pmark nil t))
-             (call-interactively 'sml-send-region)))
-       ;; Emacs: making this buffer-local ought to happen in sml-mode
-       (make-local-variable 'transient-mark-mode)
-       (save-excursion
-         (let ((transient-mark-mode 1))
-           (mouse-drag-region event)
-           (if (not mark-active) (push-mark pmark nil t))
-           (call-interactively 'sml-send-region))))))
  ;;; LOADING AND IMPORTING SOURCE FILES:
  (defvar sml-prev-dir/file nil
-Line 653
+Line 620
  (defvar sml-endof-error-alist nil)
  (defun sml-update-cursor ()
-   ;; update buffer local variable
+   ;; Update buffer local variable.
    (set-marker sml-error-cursor (1- (process-mark (sml-proc))))
    (setq sml-endof-error-alist nil)
    (compilation-forget-errors)
+   (if (fboundp 'compilation-fake-loc)
+       (compilation-fake-loc (cdr sml-temp-file) (car sml-temp-file)))
    (if (markerp compilation-parsing-end)
        (set-marker compilation-parsing-end sml-error-cursor)
      (setq compilation-parsing-end sml-error-cursor)))
-Line 696
+Line 665
        ;; taken from compile.el
        (list err filename linenum column))))
+ (unless (fboundp 'compilation-fake-loc)
  (defadvice compilation-goto-locus (after sml-endof-error activate)
    (let* ((next-error (ad-get-arg 0))
           (err (car next-error))
-Line 711
+Line 681
            (forward-char coldiff))
          (sml-error-overlay nil pos (point))
          (push-mark nil t (not sml-error-overlay))
-         (goto-char pos)))))
+         (goto-char pos))))))
  (defun sml-error-overlay (undo &optional beg end)
    "Move `sml-error-overlay' to the text region in the current buffer.
-Line 736
+Line 706
              (end (or end (region-end))))
          (move-overlay sml-error-overlay beg end (current-buffer))))))
- ;;; H A C K   A T T A C K !   X E M A C S   /   E M A C S   K E Y S
- ;;(define-key sml-mode-map [(meta shift down-mouse-1)] 'sml-drag-region)
  (provide 'sml-proc)
  ;;; sml-proc.el ends here

 Legend:



Removed from v.1477
 


changed lines


 
Added in v.1478
 Legend:



Removed from v.1477
 


changed lines


 
Added in v.1478
-Removed from v.1477
+Added in v.1478

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0