From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.bugs Subject: bug#32808: 25.2; Indentation after initializer list C++ Date: Sun, 23 Sep 2018 13:27:45 +0000 Message-ID: <20180923132745.GA5462@ACM> References: <20180922195154.44232.qmail@mail.muc.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1537709468 14865 195.159.176.226 (23 Sep 2018 13:31:08 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 23 Sep 2018 13:31:08 +0000 (UTC) User-Agent: Mutt/1.10.1 (2018-07-13) Cc: 32808@debbugs.gnu.org To: Richard Case Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Sep 23 15:31:04 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g44TY-0003mZ-8g for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Sep 2018 15:31:04 +0200 Original-Received: from localhost ([::1]:40620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g44Ve-0004nq-Bt for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Sep 2018 09:33:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g44VV-0004nl-Fu for bug-gnu-emacs@gnu.org; Sun, 23 Sep 2018 09:33:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g44VS-00054n-QD for bug-gnu-emacs@gnu.org; Sun, 23 Sep 2018 09:33:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g44VS-00054f-Ll for bug-gnu-emacs@gnu.org; Sun, 23 Sep 2018 09:33:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g44VS-0001p8-Bm for bug-gnu-emacs@gnu.org; Sun, 23 Sep 2018 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Alan Mackenzie Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Sep 2018 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32808 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32808-submit@debbugs.gnu.org id=B32808.15377095356955 (code B ref 32808); Sun, 23 Sep 2018 13:33:02 +0000 Original-Received: (at 32808) by debbugs.gnu.org; 23 Sep 2018 13:32:15 +0000 Original-Received: from localhost ([127.0.0.1]:50385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g44Uh-0001o6-J8 for submit@debbugs.gnu.org; Sun, 23 Sep 2018 09:32:15 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:32376 helo=mail.muc.de) by debbugs.gnu.org with smtp (Exim 4.84_2) (envelope-from ) id 1g44Ug-0001ny-9w for 32808@debbugs.gnu.org; Sun, 23 Sep 2018 09:32:14 -0400 Original-Received: (qmail 48706 invoked by uid 3782); 23 Sep 2018 13:32:12 -0000 Original-Received: from acm.muc.de (p5B1467D2.dip0.t-ipconnect.de [91.20.103.210]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sun, 23 Sep 2018 15:32:11 +0200 Original-Received: (qmail 5471 invoked by uid 1000); 23 Sep 2018 13:27:45 -0000 Content-Disposition: inline In-Reply-To: X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:150573 Archived-At: Hello again, Richard. On Sat, Sep 22, 2018 at 15:00:02 -0500, Richard Case wrote: > Hello Alan, > It is the position of the closing brace on the third line. OK. Thanks for reporting this bug! The problem is a low level CC Mode routine, c-beginning-of-statement-1 (which does what it says) starting at the last open brace on line 2 was only going back as far as the d of d{""}, being confused by the initialiser list's brace blocks into thinking that a new statement began there. Would you please apply the following patch to your Emacs-25.2 (Note: this patch likely won't apply cleanly to later versions of Emacs), to the file ...../emacs/lisp/progmodes/cc-engine.el. Then please byte compile that file and try it out with your real source code. (If you want any help applying the patch or byte compiling, feel free to send me private email.) Finally, please confirm to me that the bug is fixed, or tell me what's still wrong. The plan is then to install the fix into the Emacs master and emacs-26 branch. Thanks! --- cc-engine.el~ 2017-02-03 10:25:44.000000000 +0000 +++ cc-engine.el 2018-09-23 13:01:07.642868851 +0000 @@ -1012,12 +1012,15 @@ (let ((before-sws-pos (point)) ;; The end position of the area to search for statement ;; barriers in this round. - (maybe-after-boundary-pos pos)) + (maybe-after-boundary-pos pos) + comma-delimited) ;; Go back over exactly one logical sexp, taking proper ;; account of macros and escaped EOLs. (while (progn + (setq comma-delimited (and (not comma-delim) + (eq (char-before) ?\,))) (unless (c-safe (c-backward-sexp) t) ;; Give up if we hit an unbalanced block. Since the ;; stack won't be empty the code below will report a @@ -1053,10 +1056,23 @@ ;; Just gone back over a brace block? ((and (eq (char-after) ?{) + (not comma-delimited) (not (c-looking-at-inexpr-block lim nil t)) (save-excursion (c-backward-token-2 1 t nil) - (not (looking-at "=\\([^=]\\|$\\)")))) + (not (looking-at "=\\([^=]\\|$\\)"))) + (or + (not c-opt-block-decls-with-vars-key) + (save-excursion + (c-backward-token-2 1 t nil) + (if (and (looking-at c-symbol-start) + (not (looking-at c-keywords-regexp))) + (c-backward-token-2 1 t nil)) + (and + (not (looking-at + c-opt-block-decls-with-vars-key)) + (or comma-delim + (not (eq (char-after) ?\,))))))) (save-excursion (c-forward-sexp) (point))) ;; Just gone back over some paren block? @@ -10987,7 +11003,7 @@ (if (eq (point) (c-point 'boi)) (c-add-syntax 'brace-list-intro (point)) (setq lim (c-most-enclosing-brace c-state-cache (point))) - (c-beginning-of-statement-1 lim) + (c-beginning-of-statement-1 lim nil nil t) (c-add-stmt-syntax 'brace-list-intro nil t lim paren-state))) ;; CASE 9D: this is just a later brace-list-entry or > Thank you. > On Sat, Sep 22, 2018, 2:51 PM Alan Mackenzie wrote: > > Hello, Richard. > > In article you wrote: > > > While creating a constructor for my class, I have a multiline > > > initializer list. For the constructor, the indentation matches that of > > > the list. Here's an example: > > > Test::Test(const std::string &a) : a{a}, b{0}, > > > c{"..."}, d{""} { > > > /*notice the indentation*/ > > > } [ .... ] -- Alan Mackenzie (Nuremberg, Germany).