bug#32808: 25.2; Indentation after initializer list C++

bug#32808: 25.2; Indentation after initializer list C++

[richard]

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*/					  }




In GNU Emacs 25.2.2 (x86_64-pc-linux-gnu, GTK+ Version 3.22.21)
 of 2017-09-22, modified by Debian built on lgw01-amd64-050
Windowing system distributor 'The X.Org Foundation', version 11.0.11905000
System Description:	Ubuntu 17.10

Configured using:
 'configure --build x86_64-linux-gnu --prefix=/usr
 --sharedstatedir=/var/lib --libexecdir=/usr/lib
 --localstatedir=/var/lib --infodir=/usr/share/info
 --mandir=/usr/share/man --with-pop=yes
 --enable-locallisppath=/etc/emacs25:/etc/emacs:/usr/local/share/emacs/25.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/25.2/site-lisp:/usr/share/emacs/site-lisp
 --with-sound=alsa --without-gconf --build x86_64-linux-gnu
 --prefix=/usr --sharedstatedir=/var/lib --libexecdir=/usr/lib
 --localstatedir=/var/lib --infodir=/usr/share/info
 --mandir=/usr/share/man --with-pop=yes
 --enable-locallisppath=/etc/emacs25:/etc/emacs:/usr/local/share/emacs/25.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/25.2/site-lisp:/usr/share/emacs/site-lisp
 --with-sound=alsa --without-gconf --with-x=yes --with-x-toolkit=gtk3
 --with-toolkit-scroll-bars 'CFLAGS=-g -O2
 -fdebug-prefix-map=/build/emacs25-jYekUr/emacs25-25.2+1=. -fstack-protector-strong
 -Wformat -Werror=format-security -Wall' 'CPPFLAGS=-Wdate-time
 -D_FORTIFY_SOURCE=2' 'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro''

Configured features:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GSETTINGS NOTIFY
ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB
TOOLKIT_SCROLL_BARS GTK3 X11

Important settings:
  value of $LANG: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: C++/l

Minor modes in effect:
  diff-auto-refine-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t
  abbrev-mode: t

Recent messages:
Loading /usr/share/emacs25/site-lisp/haskell-mode/haskell-mode-autoloads.el (source)...done
Loading /etc/emacs/site-start.d/50haskell-mode.el (source)...done
Loading /etc/emacs/site-start.d/50irony-mode.el (source)...done
Loading /etc/emacs/site-start.d/50php-elisp.el (source)...done
Loading /etc/emacs/site-start.d/60agda-stdlib.el (source)...done
For information about GNU Emacs and the GNU system, type C-h C-a.
funcall-interactively: Beginning of buffer
Mark set [4 times]
Auto-saving...done
Making completion list...

Load-path shadows:
/usr/share/emacs25/site-lisp/cmake-data/cmake-mode hides /usr/share/emacs/site-lisp/cmake-mode
/usr/share/emacs/25.2/site-lisp/debian-startup hides /usr/share/emacs/site-lisp/debian-startup

Features:
(shadow sort mail-extr emacsbug message dired format-spec rfc822 mml
mml-sec password-cache epg gnus-util mm-decode mm-bodies mm-encode
mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047
rfc2045 ietf-drums mm-util help-fns mail-prsvr mail-utils vc-git
diff-mode easy-mmode cc-mode cc-fonts cc-guess cc-menus cc-cmds
cc-styles cc-align cc-engine cc-vars cc-defs wheatgrass-theme finder-inf
go-mode-autoloads package epg-config seq byte-opt gv bytecomp
byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib
haskell-mode-autoloads devhelp time-date mule-util tooltip eldoc
electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win
term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list newcomment elisp-mode lisp-mode prog-mode register page
menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock
syntax facemenu font-core frame cl-generic cham georgian utf-8-lang
misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms
cp51932 hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese charscript case-table epa-hook jka-cmpr-hook help
simple abbrev minibuffer cl-preloaded nadvice loaddefs button faces
cus-face macroexp files text-properties overlay sha1 md5 base64 format
env code-pages mule custom widget hashtable-print-readable backquote
dbusbind inotify dynamic-setting system-font-setting font-render-setting
move-toolbar gtk x-toolkit x multi-tty make-network-process emacs)

Memory information:
((conses 16 122586 4894)
 (symbols 48 23758 0)
 (miscs 40 66 229)
 (strings 32 25836 5164)
 (string-bytes 1 875386)
 (vectors 16 16999)
 (vector-slots 8 490112 3548)
 (floats 8 203 48)
 (intervals 56 663 23)
 (buffers 976 19))

bug#32808: 25.2; Indentation after initializer list C++

[Alan Mackenzie]

Hello, Richard.

In article <mailman.1141.1537636151.1284.bug-gnu-emacs@gnu.org> 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*/                                        }

Would you please be explicit about what is wrong with the indentation.
Is it the position of the closing brace on line 3, or the indentation of
"c{" on line 2, or something else?

Thanks!

[ .... ]

-- 
Alan Mackenzie (Nuremberg, Germany).

bug#32808: 25.2; Indentation after initializer list C++

[Richard Case]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

Hello Alan,

It is the position of the closing brace on the third line.

Thank you.

On Sat, Sep 22, 2018, 2:51 PM Alan Mackenzie <acm@muc.de> wrote:

> Hello, Richard.
>
> In article <mailman.1141.1537636151.1284.bug-gnu-emacs@gnu.org> 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*/
>           }
>
> Would you please be explicit about what is wrong with the indentation.
> Is it the position of the closing brace on line 3, or the indentation of
> "c{" on line 2, or something else?
>
> Thanks!
>
> [ .... ]
>
> --
> Alan Mackenzie (Nuremberg, Germany).
>
>

[-- Attachment #2: Type: text/html, Size: 1503 bytes --]

bug#32808: 25.2; Indentation after initializer list C++

[Alan Mackenzie]

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 <acm@muc.de> wrote:

> > Hello, Richard.

> > In article <mailman.1141.1537636151.1284.bug-gnu-emacs@gnu.org> 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).

bug#32808: 25.2; Indentation after initializer list C++

[Alan Mackenzie]

Bug fixed in master.

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.

> Thank you.

> On Sat, Sep 22, 2018, 2:51 PM Alan Mackenzie <acm@muc.de> wrote:

> > Hello, Richard.

> > In article <mailman.1141.1537636151.1284.bug-gnu-emacs@gnu.org> 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*/
> >           }

> > Would you please be explicit about what is wrong with the indentation.
> > Is it the position of the closing brace on line 3, or the indentation of
> > "c{" on line 2, or something else?

> > Thanks!

> > [ .... ]

> > --
> > Alan Mackenzie (Nuremberg, Germany).