From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Font-lock does not fontify const pointer declaration Date: Thu, 17 Apr 2008 08:49:18 +0000 Message-ID: <20080417084918.GA2019__36396.6713114225$1208421497$gmane$org@muc.de> References: <81CCA6588E60BB42BE68BD029ED482600A82C2AF@wimex2.wim.midas-kapiti.com> Reply-To: bug-cc-mode@gnu.org NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1208421457 20467 80.91.229.12 (17 Apr 2008 08:37:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Apr 2008 08:37:37 +0000 (UTC) Cc: "'bug-cc-mode@gnu.org'" , "'emacs-pretest-bug@gnu.org'" To: "Marshall, Simon" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 17 10:38:10 2008 connect(): Connection refused Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JmPdB-0005Mp-B6 for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2008 10:38:09 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JmPcW-0002FP-L0 for ged-emacs-devel@m.gmane.org; Thu, 17 Apr 2008 04:37:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JmPcS-0002F0-2h for emacs-devel@gnu.org; Thu, 17 Apr 2008 04:37:24 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JmPcR-0002Ek-42 for emacs-devel@gnu.org; Thu, 17 Apr 2008 04:37:23 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JmPcR-0002Eh-0c for emacs-devel@gnu.org; Thu, 17 Apr 2008 04:37:23 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JmPcQ-00040p-Kw for emacs-devel@gnu.org; Thu, 17 Apr 2008 04:37:22 -0400 Original-Received: from mail.gnu.org ([199.232.76.166] helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1JmPcQ-0001gN-AF for emacs-pretest-bug@gnu.org; Thu, 17 Apr 2008 04:37:22 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1JmPX9-0002w1-F8 for emacs-pretest-bug@gnu.org; Thu, 17 Apr 2008 04:32:01 -0400 Original-Received: from colin.muc.de ([193.149.48.1] helo=mail.muc.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JmPX8-0002vJ-QV for emacs-pretest-bug@gnu.org; Thu, 17 Apr 2008 04:31:55 -0400 Original-Received: (qmail 60225 invoked by uid 3782); 17 Apr 2008 08:31:52 -0000 Original-Received: from acm.muc.de (p57AF6B74.dip.t-dialin.net [87.175.107.116]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Thu, 17 Apr 2008 10:31:49 +0200 Original-Received: (qmail 2237 invoked by uid 1000); 17 Apr 2008 08:49:19 -0000 Content-Disposition: inline In-Reply-To: <81CCA6588E60BB42BE68BD029ED482600A82C2AF@wimex2.wim.midas-kapiti.com> User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-detected-kernel: by monty-python.gnu.org: FreeBSD 4.6-4.9 X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:95394 Archived-At: Good Morning, Simon! On Thu, Sep 14, 2006 at 03:32:38PM +0100, Marshall, Simon wrote: > Emacs 19-21 fontifies the following C/C++ snippet: > int *p; // ok > const int *p; // ok > int *const p; // not ok in CVS emacs > const int *const p; // not ok in CVS emacs > so that "p" is in font-lock-variable-name-face. > In Emacs CVS, it does not fontify "p" when p is declared as a const pointer. This was a bug in one of the regexps parsing declarators, namely c-type-decl-prefix-key. It was recognising "const" as an identifier, because the explicit check for "const\|throw\|volatile" came later in the regexp than "[[:alpha:]_]....". Please apply the following patch, which fixes it, and let me know if it works or not. PLEASE NOTE: because a macro in cc-langs has changed, you need to recompile cc-{mode,engine}.el. Here's a recipe for this, after patching the files: M-x byte-compile-file cc-langs.el M-x load-file cc-langs.elc M-x byte-compile-file cc-mode.el M-x load-file cc-mode.elc M-x byte-compile-file cc-engine.el M-x load-file cc-engine.el M-x c++-mode Index: cc-langs.el =================================================================== RCS file: /cvsroot/cc-mode/cc-mode/cc-langs.el,v retrieving revision 5.267.2.16 diff -c -r5.267.2.16 cc-langs.el *** cc-langs.el 15 Apr 2008 20:05:59 -0000 5.267.2.16 --- cc-langs.el 17 Apr 2008 08:12:30 -0000 *************** *** 2596,2610 **** c++ (concat "\\(" "[*\(&]" "\\|" ! (concat "\\(" ; 2 ;; If this matches there's special treatment in ;; `c-font-lock-declarators' and ;; `c-font-lock-declarations' that check for a ;; complete name followed by ":: *". (c-lang-const c-identifier-start) "\\)") - "\\|" - (c-lang-const c-type-decl-prefix-key) "\\)" "\\([^=]\\|$\\)") pike "\\(\\*\\)\\([^=]\\|$\\)") --- 2596,2610 ---- c++ (concat "\\(" "[*\(&]" "\\|" ! (c-lang-const c-type-decl-prefix-key) ! "\\|" ! (concat "\\(" ; 3 ;; If this matches there's special treatment in ;; `c-font-lock-declarators' and ;; `c-font-lock-declarations' that check for a ;; complete name followed by ":: *". (c-lang-const c-identifier-start) "\\)") "\\)" "\\([^=]\\|$\\)") pike "\\(\\*\\)\\([^=]\\|$\\)") Index: cc-engine.el =================================================================== RCS file: /cvsroot/cc-mode/cc-mode/cc-engine.el,v retrieving revision 5.539.2.17 diff -c -r5.539.2.17 cc-engine.el *** cc-engine.el 15 Apr 2008 20:05:59 -0000 5.539.2.17 --- cc-engine.el 17 Apr 2008 08:12:35 -0000 *************** *** 5399,5406 **** ;; `c-font-lock-declarators'.) (while (and (looking-at c-type-decl-prefix-key) (if (and (c-major-mode-is 'c++-mode) ! (match-beginning 2)) ! ;; If the second submatch matches in C++ then ;; we're looking at an identifier that's a ;; prefix only if it specifies a member pointer. (when (setq got-identifier (c-forward-name)) --- 5400,5407 ---- ;; `c-font-lock-declarators'.) (while (and (looking-at c-type-decl-prefix-key) (if (and (c-major-mode-is 'c++-mode) ! (match-beginning 3)) ! ;; If the third submatch matches in C++ then ;; we're looking at an identifier that's a ;; prefix only if it specifies a member pointer. (when (setq got-identifier (c-forward-name)) Index: cc-fonts.el =================================================================== RCS file: /cvsroot/cc-mode/cc-mode/cc-fonts.el,v retrieving revision 5.205.2.6 diff -c -r5.205.2.6 cc-fonts.el *** cc-fonts.el 15 Apr 2008 18:31:12 -0000 5.205.2.6 --- cc-fonts.el 17 Apr 2008 08:12:36 -0000 *************** *** 866,873 **** ;; `c-forward-decl-or-cast-1'.) (while (and (looking-at c-type-decl-prefix-key) (if (and (c-major-mode-is 'c++-mode) ! (match-beginning 2)) ! ;; If the second submatch matches in C++ then ;; we're looking at an identifier that's a ;; prefix only if it specifies a member pointer. (progn --- 866,873 ---- ;; `c-forward-decl-or-cast-1'.) (while (and (looking-at c-type-decl-prefix-key) (if (and (c-major-mode-is 'c++-mode) ! (match-beginning 3)) ! ;; If the third submatch matches in C++ then ;; we're looking at an identifier that's a ;; prefix only if it specifies a member pointer. (progn > Simon. -- Alan Mackenzie (Nuremberg, Germany).