mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 02:20:21 -08:00
* lisp/subr.el (forward-word-strictly, backward-word-strictly): New functions. (word-move-empty-char-table): New variable. * etc/NEWS: Mention 'forward-word-strictly' and 'backward-word-strictly'. * doc/lispref/positions.texi (Word Motion): Document 'find-word-boundary-function-table', 'forward-word-strictly', and 'backward-word-strictly'. (Bug#22560) * src/syntax.c (syms_of_syntax) <find-word-boundary-function-table>: Doc fix. * lisp/wdired.el (wdired-xcase-word): * lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name) (texinfo-copy-section-title, texinfo-start-menu-description) (texinfo-copy-menu-title, texinfo-specific-section-type) (texinfo-insert-node-lines, texinfo-copy-next-section-title): * lisp/textmodes/texinfo.el (texinfo-clone-environment) (texinfo-insert-@end): * lisp/textmodes/texinfmt.el (texinfo-format-scan) (texinfo-anchor, texinfo-multitable-widths) (texinfo-multitable-item): * lisp/textmodes/tex-mode.el (latex-env-before-change): * lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify): * lisp/skeleton.el (skeleton-insert): * lisp/simple.el (count-words): * lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit) (vhdl-beginning-of-defun, vhdl-beginning-of-statement-1) (vhdl-update-sensitivity-list, vhdl-template-block) (vhdl-template-break, vhdl-template-case, vhdl-template-default) (vhdl-template-default-indent, vhdl-template-for-loop) (vhdl-template-if-then-use, vhdl-template-bare-loop) (vhdl-template-nature, vhdl-template-procedural) (vhdl-template-process, vhdl-template-selected-signal-asst) (vhdl-template-type, vhdl-template-variable) (vhdl-template-while-loop, vhdl-beginning-of-block) (vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func): * lisp/progmodes/verilog-mode.el (verilog-backward-sexp) (verilog-forward-sexp, verilog-beg-of-statement) (verilog-set-auto-endcomments, verilog-backward-token) (verilog-do-indent): * lisp/progmodes/vera-mode.el (vera-guess-basic-syntax) (vera-indent-block-closing): * lisp/progmodes/simula.el (simula-context) (simula-backward-up-level, simula-forward-down-level) (simula-previous-statement, simula-next-statement) (simula-skip-comment-backward, simula-calculate-indent) (simula-find-if, simula-electric-keyword): * lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p): * lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p) (ruby-smie--forward-token, ruby-smie--backward-token) (ruby-singleton-class-p, ruby-calculate-indent) (ruby-forward-sexp, ruby-backward-sexp): * lisp/progmodes/ps-mode.el (ps-run-goto-error): * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function) (perl-syntax-propertize-special-constructs) (perl-backward-to-start-of-continued-exp): * lisp/progmodes/pascal.el (pascal-indent-declaration): * lisp/progmodes/octave.el (octave-function-file-p): * lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax): * lisp/progmodes/js.el (js--forward-function-decl): * lisp/progmodes/idlwave.el (idlwave-show-begin-check) (idlwave-beginning-of-block, idlwave-end-of-block) (idlwave-block-jump-out, idlwave-determine-class): * lisp/progmodes/icon.el (icon-is-continuation-line) (icon-backward-to-start-of-continued-exp, end-of-icon-defun): * lisp/progmodes/hideif.el (hide-ifdef-define): * lisp/progmodes/f90.el (f90-change-keywords): * lisp/progmodes/cperl-mode.el (cperl-electric-pod) (cperl-linefeed, cperl-electric-terminator) (cperl-find-pods-heres, cperl-fix-line-spacing) (cperl-invert-if-unless): * lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): * lisp/progmodes/cc-align.el (c-lineup-java-inher): * lisp/progmodes/ada-mode.el (ada-compile-goto-error) (ada-adjust-case-skeleton, ada-create-case-exception) (ada-create-case-exception-substring) (ada-case-read-exceptions-from-file, ada-after-keyword-p) (ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end) (ada-get-indent-if, ada-get-indent-block-start) (ada-get-indent-loop, ada-get-indent-type) (ada-search-prev-end-stmt, ada-check-defun-name) (ada-goto-decl-start, ada-goto-matching-start) (ada-goto-matching-end, ada-looking-at-semi-or) (ada-looking-at-semi-private, ada-in-paramlist-p) (ada-search-ignore-complex-boolean, ada-move-to-start) (ada-move-to-end, ada-which-function, ada-gen-treat-proc): * lisp/net/quickurl.el (quickurl-grab-url): * lisp/mail/sendmail.el (mail-do-fcc): * lisp/mail/rmail.el (rmail-resend): * lisp/mail/mailabbrev.el (mail-abbrev-complete-alias): * lisp/mail/mail-extr.el (mail-extract-address-components): * lisp/json.el (json-read-keyword): * lisp/files.el (insert-directory): * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * lisp/completion.el (symbol-under-point, symbol-before-point) (symbol-before-point-for-complete, next-cdabbrev) (add-completions-from-c-buffer): * lisp/cedet/semantic/texi.el (semantic-up-context) (semantic-beginning-of-context): * lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables): use 'forward-word-strictly' and 'backward-word-strictly' instead of 'forward-word' and 'backward-word'. [This reapplies commitc1d32a6537, which was inadvertently lost by merge commitc71e7cc113.]
204 lines
7.6 KiB
EmacsLisp
204 lines
7.6 KiB
EmacsLisp
;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output
|
|
|
|
;; Copyright (C) 1996, 2001-2016 Free Software Foundation, Inc.
|
|
|
|
;; Author: Tom Houlder <thoulder@icor.fr>
|
|
;; Created: 10 Dec 1996
|
|
;; Keywords: g++, templates
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; The following is a typical error message from g++ using STL (here
|
|
;; with split lines):
|
|
;;
|
|
;; AFile.o(.text+0x2d5): undefined reference to
|
|
;; `vector<double>::begin(void)'
|
|
;; AFile.o(.text+0x2e7): undefined reference to
|
|
;; `vector<double>::insert(double *, unsigned int, double const &)'
|
|
;; AnotherFile.o(.text+0x226b8): undefined reference to
|
|
;; `operator!=(rb_tree<basic_string<char>, pair<basic_string<char>
|
|
;; const, AClass *>, select1st<pair<basic_string<char> const, AClass
|
|
;; *>, basic_string<char> >, less<basic_string<char> > >::iterator
|
|
;; const &, rb_tree<basic_string<char>, pair<basic_string<char>
|
|
;; const, AClass *>, select1st<pair<basic_string<char> const, AClass
|
|
;; *>, basic_string<char> >, less<basic_string<char> > >::iterator
|
|
;; const &)'
|
|
;;
|
|
;; The message means that in the object file AFile.o there is one
|
|
;; uninstantiated template class, vector<double>, and in AnotherFile.o
|
|
;; there is one uninstantiated template function, operator!=(...). To
|
|
;; turn this output into manual template instantiations, copy from the
|
|
;; first name of an objective file (here this is AFile.o) to right
|
|
;; after the very last `'' of the output. Put this in a buffer and
|
|
;; call `mantemp-make-mantemps-buffer' with the point in the buffer.
|
|
;; You can also use `mantemp-make-mantemps-region' directly on the
|
|
;; region if the output is already in Emacs.
|
|
;;
|
|
;; The resulting buffer yields (connect the three output lines above
|
|
;; if you want to try):
|
|
;;
|
|
;; template operator!=(rb_tree<basic_string<char>,
|
|
;; pair<basic_string<char> const, AClass *>,
|
|
;; select1st<pair<basic_string<char> const, AClass *>,
|
|
;; basic_string<char> >, less<basic_string<char> > >::iterator const
|
|
;; &, rb_tree<basic_string<char>, pair<basic_string<char> const,
|
|
;; AClass *>, select1st<pair<basic_string<char> const, AClass *>,
|
|
;; basic_string<char> >, less<basic_string<char> > >::iterator const
|
|
;; &);
|
|
;; template class vector<double>;
|
|
;;
|
|
;; which can be included in your C++ program. However, its probably
|
|
;; better to include the necessary header files in the buffer and
|
|
;; compile it as a stand alone implementation file.
|
|
;;
|
|
;; Sometimes, an uninstantiated template may cause a message like the
|
|
;; following
|
|
;;
|
|
;; main.cc:66: invalid use of undefined type
|
|
;; `struct valarray<double,arrayminusopclass<double,c_array<double> > >'
|
|
;;
|
|
;; Follow the same procedure as above and the line is changed to
|
|
;;
|
|
;; template struct valarray<double,
|
|
;; arrayminusopclass<double,c_array<double> > >;
|
|
|
|
;; g++ does not output the templates that are needed by the
|
|
;; uninstantiated templates. Therefore you will often get new error
|
|
;; messages after the first instantiations have been included and you
|
|
;; must repeat the operation.
|
|
|
|
;;; Code:
|
|
|
|
(defun mantemp-remove-comments ()
|
|
"Remove g++ comments surrounding each function and member function."
|
|
(save-excursion
|
|
(goto-char (point-min))
|
|
(message "Removing comments")
|
|
(while (re-search-forward "^[A-z.()+0-9: ]*`\\|'.*$" nil t)
|
|
(replace-match ""))))
|
|
|
|
(defun mantemp-remove-memfuncs ()
|
|
"Remove member function extensions so that only class names remain."
|
|
(save-excursion
|
|
;; Remove conversion operator extensions.
|
|
(goto-char (point-min))
|
|
(message "Removing member function extensions")
|
|
(while (re-search-forward
|
|
"^[A-z :&*<>~=,0-9+]*>::operator " nil t nil)
|
|
(progn
|
|
(backward-char 11)
|
|
(delete-region (point) (line-end-position))))
|
|
;; Remove other member function extensions.
|
|
(goto-char (point-min))
|
|
(message "Removing member function extensions")
|
|
(while (re-search-forward "^[A-z :&*<>~=,0-9+]*>::" nil t nil)
|
|
(progn
|
|
(backward-char 2)
|
|
(delete-region (point) (line-end-position))))))
|
|
|
|
(defun mantemp-sort-and-unique-lines ()
|
|
"Eliminate all consecutive duplicate lines in the buffer."
|
|
(save-excursion
|
|
(message "Sorting")
|
|
(sort-regexp-fields nil "^.*$" "\\&"
|
|
(point-min)
|
|
(point-max))
|
|
(goto-char (point-min))
|
|
(message "Removing consecutive duplicate lines")
|
|
(while (re-search-forward "\\(^.+\\)\n\\1" nil t nil)
|
|
(progn
|
|
(forward-line -1)
|
|
(beginning-of-line)
|
|
(delete-region (point) (progn (forward-line 1) (point)))))))
|
|
|
|
(defun mantemp-insert-cxx-syntax ()
|
|
"Insert C++ syntax around each template class and function.
|
|
Insert `template class' for classes, `template' for
|
|
functions and add the statement delimiter `;' at the end of
|
|
the lines."
|
|
(save-excursion
|
|
;; Insert ';' at the end of each nonempty line.
|
|
(goto-char (point-min))
|
|
(message "Inserting `;' at the ends")
|
|
(while (re-search-forward ".+$" nil t)
|
|
(progn
|
|
(insert ";")
|
|
(if (not (equal (point) (point-max)))
|
|
(forward-char))))
|
|
;; We first insert 'template class' at each nonempty line and
|
|
;; subsequently remove 'class' for functions so we don't need to
|
|
;; both scan for classes and functions.
|
|
(goto-char (point-min))
|
|
(message "Inserting 'template class' for classes")
|
|
(while (re-search-forward "^.+" nil t)
|
|
(progn
|
|
(beginning-of-line)
|
|
(if (looking-at "struct[\\t ]+\\|class[\\t ]+")
|
|
(insert "template ")
|
|
(insert "template class "))))
|
|
(goto-char (point-min))
|
|
(message "Inserting 'template' for functions")
|
|
(while (re-search-forward
|
|
"^template class [A-z :&*<>~=,0-9+!]*(" nil t nil)
|
|
(progn
|
|
(beginning-of-line)
|
|
(forward-word-strictly 1)
|
|
(delete-region (point) (progn (forward-word-strictly 1) (point)))))))
|
|
|
|
(defun mantemp-make-mantemps ()
|
|
"Gathering interface to the functions modifying the buffer."
|
|
(mantemp-remove-comments)
|
|
(mantemp-remove-memfuncs)
|
|
(mantemp-sort-and-unique-lines)
|
|
(mantemp-insert-cxx-syntax))
|
|
|
|
(defun mantemp-make-mantemps-buffer ()
|
|
"Make manual template instantiations from g++ error messages in the buffer.
|
|
Scan the output of g++ describing uninstantiated template
|
|
classes and functions and generate the corresponding C++
|
|
manual template instantiations. The output is supposed to
|
|
have been placed in the current buffer and the current buffer
|
|
should otherwise be empty.
|
|
|
|
See the commentary in file mantemp.el for an example of use."
|
|
(interactive)
|
|
(mantemp-make-mantemps)
|
|
(message "Done"))
|
|
|
|
(defun mantemp-make-mantemps-region ()
|
|
"Make manual template instantiations from g++ error messages in the region.
|
|
This function does the same thing as `mantemp-make-mantemps-buffer',
|
|
but operates on the region."
|
|
(interactive)
|
|
(let ((cur-buf (current-buffer))
|
|
(mantemp-buffer (generate-new-buffer "*mantemp*"))
|
|
(str (buffer-substring (mark) (point))))
|
|
;; Copy the region to a temporary buffer, make the C++ code there
|
|
;; and copy the result back to the current buffer.
|
|
(set-buffer mantemp-buffer)
|
|
(insert str)
|
|
(mantemp-make-mantemps)
|
|
(setq str (buffer-string))
|
|
(set-buffer cur-buf)
|
|
(insert str)
|
|
(kill-buffer mantemp-buffer))
|
|
(message "Done"))
|
|
|
|
(provide 'mantemp)
|
|
|
|
;;; mantemp.el ends here
|