;;; cmacexp.el --- expand C macros in a region
-;; Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996, 2000 Free Software Foundation, Inc.
-;; Author: Francesco Potorti` <pot@cnuce.cnr.it>
-;; Version: $Id: cmacexp.el,v 1.19 1995/03/07 15:24:44 pot Exp rms $
+;; Author: Francesco Potorti` <pot@gnu.org>
;; Adapted-By: ESR
;; Keywords: c
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
;; USAGE =============================================================
;; Put the following in your ~/.emacs file.
;; If you want the *Macroexpansion* window to be not higher than
-;; necessary:
+;; necessary:
;;(setq c-macro-shrink-window-flag t)
;;
;; If you use a preprocessor other than /lib/cpp (be careful to set a
;; BUG REPORTS =======================================================
;; Please report bugs, suggestions, complaints and so on to
-;; pot@cnuce.cnr.it (Francesco Potorti`).
+;; pot@gnu.org (Francesco Potorti`).
;; IMPROVEMENTS OVER emacs 18.xx cmacexp.el ==========================
;; If the start point of the region is inside a macro definition the
;; macro expansion is often inaccurate.
+;;; Code:
(require 'cc-mode)
(provide 'cmacexp)
-(defvar c-macro-shrink-window-flag nil
- "*Non-nil means shrink the *Macroexpansion* window to fit its contents.")
-
-(defvar c-macro-prompt-flag nil
- "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments.")
-
-(defvar c-macro-preprocessor "/lib/cpp -C"
+(defgroup c-macro nil
+ "Expand C macros in a region."
+ :group 'c)
+
+
+(defcustom c-macro-shrink-window-flag nil
+ "*Non-nil means shrink the *Macroexpansion* window to fit its contents."
+ :type 'boolean
+ :group 'c-macro)
+
+(defcustom c-macro-prompt-flag nil
+ "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments."
+ :type 'boolean
+ :group 'c-macro)
+
+(defcustom c-macro-preprocessor
+ ;; Cannot rely on standard directory on MS-DOS to find CPP. In
+ ;; fact, cannot rely on having cpp.exe, either, in latest GCC
+ ;; versions.
+ (cond ((eq system-type 'ms-dos) "gcc -E -C -o - -")
+ ;; Solaris has it in an unusual place.
+ ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)"
+ system-configuration)
+ (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp"))
+ "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E")
+ ((file-exists-p "/usr/ccs/lib/cpp") "/usr/ccs/lib/cpp -C")
+ (t "/lib/cpp -C"))
"The preprocessor used by the cmacexp package.
If you change this, be sure to preserve the `-C' (don't strip comments)
-option, or to set an equivalent one.")
+option, or to set an equivalent one."
+ :type 'string
+ :group 'c-macro)
-(defvar c-macro-cppflags ""
- "*Preprocessor flags used by `c-macro-expand'.")
+(defcustom c-macro-cppflags ""
+ "*Preprocessor flags used by `c-macro-expand'."
+ :type 'string
+ :group 'c-macro)
(defconst c-macro-buffer-name "*Macroexpansion*")
+;;;###autoload
(defun c-macro-expand (start end subst)
"Expand C macros in the region, using the C preprocessor.
Normally display output in temp buffer, but
(let ((oldwinheight (window-height))
(alreadythere ;the window was already there
(get-buffer-window (current-buffer)))
- (popped nil)) ;the window popped changing the layout
+ (popped nil)) ;the window popped changing the layout
(or alreadythere
(progn
(display-buffer (current-buffer) t)
(setq minheight (if alreadythere
(window-height)
window-min-height))
- (setq maxheight (/ (screen-height) 2))
+ (setq maxheight (/ (frame-height) 2))
(enlarge-window (- (min maxheight
(max minheight
(+ 2 (vertical-motion (point-max)))))
;; Preprocess the buffer contents, then look for all the lines stored
;; in linelist starting from end of buffer. The last line so found is
;; where START was, so return the substring from point to end of
-;; buffer.
+;; buffer.
(let ((inbuf (current-buffer))
(outbuf (get-buffer-create " *C Macro Expansion*"))
(filename (if (and buffer-file-name
c-macro-preprocessor
(if (string= "" c-macro-cppflags) "" " ")
c-macro-cppflags))
- (uniquestring "???!!!???!!! start of c-macro expansion ???!!!???!!!")
+ (uniquestring "??? !!! ??? start of c-macro expansion ??? !!! ???")
(startlinenum 0)
(linenum 0)
(startstat ())
(startmarker "")
(exit-status 0)
- (tempname (make-temp-name "/tmp/")))
+ (tempname (make-temp-file
+ (expand-file-name "cmacexp"
+ (or small-temporary-file-directory
+ temporary-file-directory)))))
(unwind-protect
(save-excursion
(save-restriction
(widen)
- (set-buffer outbuf)
- (setq buffer-read-only nil)
- (erase-buffer)
- (set-syntax-table c-mode-syntax-table)
+ (let ((in-syntax-table (syntax-table)))
+ (set-buffer outbuf)
+ (setq buffer-read-only nil)
+ (erase-buffer)
+ (set-syntax-table in-syntax-table))
(insert-buffer-substring inbuf 1 end))
;; We have copied inbuf to outbuf. Point is at end of
- ;; outbuf. Insert a space at the end, so cpp can correctly
- ;; parse a token ending at END.
- (insert " ")
+ ;; outbuf. Inset a newline at the end, so cpp can correctly
+ ;; parse a token ending at END.
+ (insert "\n")
;; Save sexp status and line number at START.
(setq startstat (parse-partial-sexp 1 start))
;; Call the preprocessor.
(if display (message mymsg))
(setq exit-status
- (call-process-region 1 (point-max) "sh" t t nil "-c"
- (concat cppcommand " 2>" tempname)))
+ (call-process-region 1 (point-max)
+ shell-file-name
+ t (list t tempname) nil "-c"
+ cppcommand))
(if display (message (concat mymsg "done")))
(if (= (buffer-size) 0)
;; Empty output is normal after a fatal error.
(delete-region beg (point))))
;; If CPP got errors, show them at the beginning.
- (or (eq exit-status 0)
+ ;; MS-DOS shells don't return the exit code of their children.
+ ;; Look at the size of the error message file instead, but
+ ;; don't punish those MS-DOS users who have a shell that does
+ ;; return an error code.
+ (or (and (or (not (boundp 'msdos-shells))
+ (not (member (file-name-nondirectory shell-file-name)
+ msdos-shells)))
+ (eq exit-status 0))
+ (zerop (nth 7 (file-attributes (expand-file-name tempname))))
(progn
(goto-char (point-min))
- (insert (format "Preprocessor terminated with status %s\n"
- exit-status))
- (insert-file-contents tempname)
- (insert "\n")))
+ ;; Put the messages inside a comment, so they won't get in
+ ;; the way of font-lock, highlighting etc.
+ (insert
+ (format "/* Preprocessor terminated with status %s\n\n Messages from `%s\':\n\n"
+ exit-status cppcommand))
+ (goto-char (+ (point)
+ (nth 1 (insert-file-contents tempname))))
+ (insert "\n\n*/\n")))
(delete-file tempname)
;; Compute the return value, keeping in account the space
HCoop / bpt / emacs.git / blobdiff