Mercurial > emacs
comparison lisp/progmodes/cc-langs.el @ 90734:e4e4a56ef723
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 583-585)
- Update from CVS
- Fix admin/quick-install-emacs to work with recent versions of autoconf
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-160
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 02 Jan 2007 02:34:44 +0000 |
parents | 6588c6259dfb 9f636bd65206 |
children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
90733:99e0a3426753 | 90734:e4e4a56ef723 |
---|---|
683 "[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?" | 683 "[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?" |
684 "\\([ \t]\\|\\\\\n\\)*"))) | 684 "\\([ \t]\\|\\\\\n\\)*"))) |
685 (c-lang-defvar c-opt-cpp-macro-define-start | 685 (c-lang-defvar c-opt-cpp-macro-define-start |
686 (c-lang-const c-opt-cpp-macro-define-start)) | 686 (c-lang-const c-opt-cpp-macro-define-start)) |
687 | 687 |
688 (c-lang-defconst c-opt-cpp-macro-define-id | |
689 ;; Regexp matching everything up to the end of the identifier defined | |
690 ;; by a cpp define. | |
691 t (if (c-lang-const c-opt-cpp-macro-define) | |
692 (concat (c-lang-const c-opt-cpp-prefix) ; # | |
693 (c-lang-const c-opt-cpp-macro-define) ; define | |
694 "[ \t]+\\(\\sw\\|_\\)+"))) | |
695 (c-lang-defvar c-opt-cpp-macro-define-id | |
696 (c-lang-const c-opt-cpp-macro-define-id)) | |
697 | |
688 (c-lang-defconst c-cpp-expr-directives | 698 (c-lang-defconst c-cpp-expr-directives |
689 "List if cpp directives (without the prefix) that are followed by an | 699 "List if cpp directives (without the prefix) that are followed by an |
690 expression." | 700 expression." |
691 t (if (c-lang-const c-opt-cpp-prefix) | 701 t (if (c-lang-const c-opt-cpp-prefix) |
692 '("if" "elif"))) | 702 '("if" "elif"))) |
880 ;; The operators as a flat list (without duplicates). | 890 ;; The operators as a flat list (without duplicates). |
881 t (c-filter-ops (c-lang-const c-operators) t t)) | 891 t (c-filter-ops (c-lang-const c-operators) t t)) |
882 | 892 |
883 (c-lang-defconst c-overloadable-operators | 893 (c-lang-defconst c-overloadable-operators |
884 "List of the operators that are overloadable, in their \"identifier | 894 "List of the operators that are overloadable, in their \"identifier |
885 form\". See also `c-op-identitier-prefix'." | 895 form\". See also `c-op-identifier-prefix'." |
886 t nil | 896 t nil |
887 c++ '("new" "delete" ;; Can be followed by "[]" but we ignore that. | 897 c++ '("new" "delete" ;; Can be followed by "[]" but we ignore that. |
888 "+" "-" "*" "/" "%" | 898 "+" "-" "*" "/" "%" |
889 "^" "??'" "xor" "&" "bitand" "|" "??!" "bitor" "~" "??-" "compl" | 899 "^" "??'" "xor" "&" "bitand" "|" "??!" "bitor" "~" "??-" "compl" |
890 "!" "=" "<" ">" "+=" "-=" "*=" "/=" "%=" "^=" | 900 "!" "=" "<" ">" "+=" "-=" "*=" "/=" "%=" "^=" |
903 t nil | 913 t nil |
904 c++ (c-make-keywords-re nil (c-lang-const c-overloadable-operators))) | 914 c++ (c-make-keywords-re nil (c-lang-const c-overloadable-operators))) |
905 (c-lang-defvar c-overloadable-operators-regexp | 915 (c-lang-defvar c-overloadable-operators-regexp |
906 (c-lang-const c-overloadable-operators-regexp)) | 916 (c-lang-const c-overloadable-operators-regexp)) |
907 | 917 |
908 (c-lang-defconst c-opt-op-identitier-prefix | 918 (c-lang-defconst c-opt-op-identifier-prefix |
909 "Regexp matching the token before the ones in | 919 "Regexp matching the token before the ones in |
910 `c-overloadable-operators' when operators are specified in their | 920 `c-overloadable-operators' when operators are specified in their |
911 \"identifier form\". This typically matches \"operator\" in C++ where | 921 \"identifier form\". This typically matches \"operator\" in C++ where |
912 operator functions are specified as e.g. \"operator +\". It's nil in | 922 operator functions are specified as e.g. \"operator +\". It's nil in |
913 languages without operator functions or where the complete operator | 923 languages without operator functions or where the complete operator |
914 identifier is listed in `c-overloadable-operators'. | 924 identifier is listed in `c-overloadable-operators'. |
915 | 925 |
916 This regexp is assumed to not match any non-operator identifier." | 926 This regexp is assumed to not match any non-operator identifier." |
917 t nil | 927 t nil |
918 c++ (c-make-keywords-re t '("operator"))) | 928 c++ (c-make-keywords-re t '("operator"))) |
919 (c-lang-defvar c-opt-op-identitier-prefix | 929 (c-lang-defvar c-opt-op-identifier-prefix |
920 (c-lang-const c-opt-op-identitier-prefix)) | 930 (c-lang-const c-opt-op-identifier-prefix)) |
931 | |
932 ;; Note: the following alias is an old name which was a mis-spelling. It has | |
933 ;; been corrected above and throughout cc-engine.el. It will be removed at | |
934 ;; some release very shortly in the future. ACM, 2006-04-14. | |
935 (defalias 'c-opt-op-identitier-prefix 'c-opt-op-identifier-prefix) | |
936 (make-obsolete-variable 'c-opt-op-identitier-prefix 'c-opt-op-identifier-prefix | |
937 "CC Mode 5.31.4, 2006-04-14") | |
921 | 938 |
922 (c-lang-defconst c-other-op-syntax-tokens | 939 (c-lang-defconst c-other-op-syntax-tokens |
923 "List of the tokens made up of characters in the punctuation or | 940 "List of the tokens made up of characters in the punctuation or |
924 parenthesis syntax classes that have uses other than as expression | 941 parenthesis syntax classes that have uses other than as expression |
925 operators." | 942 operators." |