Mercurial > emacs
view etc/srecode/cpp.srt @ 110305:b10051866f51
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 11 Sep 2010 01:13:42 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; cpp.srt --- SRecode templates for c++-mode ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <eric@siege-engine.com> ;; 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/>. set mode "c++-mode" set comment_start "/**" set comment_end " */" set comment_prefix " *" ;; OVERRIDE THIS in your user or project template file to whatever ;; you use for your project. set HEADEREXT ".h" context file template empty :time :user :file :cpp ---- {{>:filecomment}} {{#NOTHEADER}} {{^}} {{/NOTHEADER}} {{#HEADER}} {{>:header_guard}} {{/HEADER}} ---- template header_guard :file :blank ---- #ifndef {{FILENAME_SYMBOL}} #define {{FILENAME_SYMBOL}} 1 {{^}} #endif // {{FILENAME_SYMBOL}} ---- context misc template arglist "Insert an argument list for a function. @todo - Support smart CR in a buffer for not too long lines." ---- ({{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}}) ---- context declaration prompt TYPE "Return Type: " template function :indent :blank "Insert a function declaration." ---- {{?TYPE}} {{?NAME}}{{>:misc:arglist}} {{#INITIALIZERS}}{{>B:initializers}}{{/INITIALIZERS}} { {{^}} } ---- bind "f" template function-prototype :indent :blank "Insert a function declaration." ---- {{?TYPE}} {{?NAME}}{{>:misc:arglist}}; ---- prompt TYPE "Data Type: " template variable :indent :blank "Insert a variable declaration." ---- {{?TYPE}} {{?NAME}}{{#HAVEDEFAULT}} = {{DEFAULT}}{{/HAVEDEFAULT}}; ---- bind "v" template variable-prototype :indent :blank "Insert a variable declaration." ---- {{?TYPE}} {{?NAME}}; ---- bind "v" template class :indent :blank "Insert a C++ class. For use by user insertion. Override this template to change contents of a class. Override `class-tag' to override the outer structure of the class." ---- {{<A:class-tag}} public: {{>CONSTRUCTOR:classdecl:constructor-tag}} {{>DESTRUCTOR:classdecl:destructor-tag}} private: {{^}} {{/A}} ---- template subclass :indent :blank "Insert a C++ subclass of some other class." sectiondictionary "PARENTS" set NAME "?PARENTNAME" ---- {{>A:class}} ---- template class-tag :indent :blank "Insert a C++ class with the expectation of it being used by a tag inserter. Override this to affect applications, or the outer class structure for the user-facing template." ---- class {{?NAME}} {{#PARENTS}}{{#FIRST}}: {{/FIRST}}public {{NAME}}{{/PARENTS}} { {{^}} }; ---- bind "c" template method :indent :blank "Method belonging to some class, declared externally." ---- {{?TYPE}} {{?PARENT}}::{{?NAME}}{{>:misc:arglist}} {{#INITIALIZERS}}{{>B:initializers}}{{/INITIALIZERS}} { {{^}} } ---- template include :blank "An include statement." ---- #include "{{?NAME}}" ---- bind "i" template label :blank :indent ---- {{?NAME}}: ---- context classdecl template constructor-tag :indent :blank ---- {{?NAME}}{{>:misc:arglist}} { {{^}} } ---- ;; This one really sucks. How can I finish it? template initializers :indent ---- {{#FIRST}}: {{/FIRST}}{{INITNAME}}(){{#NOTLAST}},{{/NOTLAST}} ---- template destructor-tag :indent :blank ---- ~{{?NAME}}{{>:misc:arglist}} { {{^}} } ---- ;;; Base Comment functions for overriding. context classdecl template comment-function-group-start :indent :blank "Used for putting comments in front of a functional group of declarations. Override this with your own preference to avoid using doxygen." ---- {{>A:classdecl:doxygen-function-group-start}} ---- template comment-function-group-end :indent :blank "Used for putting comments in front of a functional group of declarations. Override this with your own preference to avoid using doxygen." ---- {{>A:classdecl:doxygen-function-group-end}} ---- context declaration template comment-function :indent :blank "Used to put a nice comment in front of a function. Override this with your own preference to avoid using doxygen" ---- {{>A:declaration:doxygen-function}} ---- ;;; DOXYGEN FEATURES ;; ;; context classdecl prompt GROUPNAME "Name of declaration group: " template doxygen-function-group-start :indent :blank ---- /** * {{?GROUPNAME}} * @{ */ ---- template doxygen-function-group-end :indent :blank ---- /** * @} */ ---- context declaration template doxygen-function :indent :blank ---- /** * @name {{NAME}} - {{DOC}}{{^}}{{#ARGS}} * @param {{NAME}} - {{DOC}}{{/ARGS}} * @return {{TYPE}} */ ---- template doxygen-variable-same-line ---- /**< {{DOC}}{{^}} */ ---- template doxygen-section-comment :blank :indent "Insert a comment that separates sections of an Emacs Lisp file." ---- /** {{?TITLE}} * * {{^}} */ ---- ;; end