GOP-PROP 3: C++ formatting (done)

2011-07-20 Thread Graham Percival
The updated fixcc.py was pushed in ce4579d52589eea2d01717ee8362fe851fb9a295 An initial update of the CG was made in fda5ce3457daa5326985d032b9b8bf191cf6e129 but we'll probably need to fix up a few loose ends (IIRC we discuss formatting in 2-3 different places in the CG; I'll have a look at

GOP-PROP 3: C++ formatting (probable decision 2)

2011-07-14 Thread Graham Percival
Updated proposal: http://lilypond.org/~graham/gop/gop_3.html ** Proposal summary Speaking academically, C++ code style is a solved problem. Let’s pick one of the existing solutions, and let a computer deal with this. Humans should not waste their time, energy, and creativity manually adding

Re: GOP-PROP 3 - C++ formatting (probable decision)

2011-07-06 Thread Jan Warchoł
2011/7/4 Graham Percival gra...@percival-music.ca: I propose that we use a modified fixcc.py using astyle internally.    * the final script will be run blindly on the lilypond source      code. We will accept whatever formatting the final version      of this script produces, with no manual

Re: GOP-PROP 3 - C++ formatting (probable decision)

2011-07-06 Thread Keith OHara
Karl Hammar karl at aspodata.se writes: Graham: ... I'm going to make the bold step of assuming that we will eliminate tabs in all C++ files. That implies that tabs in strings should be replaced with \t, is that what you want? I think we want this very much, because a literal tab in

Re: GOP-PROP 3 - C++ formatting (probable decision)

2011-07-05 Thread Karl Hammar
Graham: ... ** Eliminate tabs I'm going to make the bold step of assuming that we will eliminate tabs in all C++ files. ... That implies that tabs in strings should be replaced with \t, is that what you want? Regards, /Karl Hammar

GOP-PROP 3 - C++ formatting (probable decision)

2011-07-04 Thread Graham Percival
http://lilypond.org/~graham/gop/gop_3.html ** Proposal summary Speaking academically, C++ code style is a solved problem. Let’s pick one of the existing solutions, and let a computer deal with this. Humans should not waste their time, energy, and creativity manually adding tabs or spaces to

Re: GOP-PROP 3: C++ formatting (update)

2011-07-03 Thread Jan Warchoł
2011/7/3 Graham Percival gra...@percival-music.ca: On Sat, Jul 02, 2011 at 03:13:05PM -0700, Keith OHara wrote: On Sat, 02 Jul 2011 13:19:23 -0700, Graham Percival gra...@percival-music.ca wrote: [...] but I'd still want to run fixcc.py on the entire repo. Why run an indenter over the

Re: GOP-PROP 3: C++ formatting (update)

2011-07-02 Thread Graham Percival
On Wed, Jun 29, 2011 at 11:53:34PM +, Keith OHara wrote: Pre-filtering works well, assuming we drop the corresponding astyle options: # add space before (, except in macro definitions sed -i -e '/#\s*define/!s/\([)_[:alnum:]]\)(/\1 (/g' $* Hmm. This line gives me control characters,

Re: GOP-PROP 3: C++ formatting (update)

2011-07-02 Thread Graham Percival
On Thu, Jun 30, 2011 at 12:04:11AM -0700, Keith OHara wrote: On Wed, 29 Jun 2011 21:05:51 -0700, Carl Sorensen c_soren...@byu.edu wrote: Do you have the ability to easily test a change that doesn't pad a parenthesis if it's following the same character, ie. (( won't get an extra space? It

Re: GOP-PROP 3: C++ formatting (update)

2011-07-02 Thread Keith OHara
On Sat, 02 Jul 2011 13:19:23 -0700, Graham Percival gra...@percival-music.ca wrote: On Thu, Jun 30, 2011 at 12:04:11AM -0700, Keith OHara wrote: We could use a regexp pre-filter to add space where gnu-style wants it, and use that as a model to support the request for a new option in astyle.

Re: GOP-PROP 3: C++ formatting (update)

2011-07-02 Thread Graham Percival
On Sat, Jul 02, 2011 at 03:13:05PM -0700, Keith OHara wrote: On Sat, 02 Jul 2011 13:19:23 -0700, Graham Percival gra...@percival-music.ca wrote: [...] but I'd still want to run fixcc.py on the entire repo. Why run an indenter over the entire repository? Simply having the indenter tool

Re: GOP-PROP 3: C++ formatting (update)

2011-07-02 Thread Keith OHara
On Sat, 02 Jul 2011 15:57:38 -0700, Graham Percival gra...@percival-music.ca wrote: On Sat, Jul 02, 2011 at 03:13:05PM -0700, Keith OHara wrote: Why run an indenter over the entire repository? 1. newbies tend to trust that the existing material shows how they should do things. 2. if we

Re: GOP-PROP 3: C++ formatting (update)

2011-06-30 Thread Keith OHara
On Wed, 29 Jun 2011 21:05:51 -0700, Carl Sorensen c_soren...@byu.edu wrote: Do you have the ability to easily test a change that doesn't pad a parenthesis if it's following the same character, ie. (( won't get an extra space? It turns out to be very easy to modify astyle so as to skip the

Re: GOP-PROP 3: C++ formatting

2011-06-29 Thread Graham Percival
On Mon, Jun 27, 2011 at 10:45:09PM -0700, Keith OHara wrote: Some indentation is off because fix-astyle-fiddle removes spaces after indentation. Really? I thought the two post-processing rules in fix-astyle-fiddle.py improved the formatting. If they don't, we can certainly remove them.

GOP-PROP 3: C++ formatting (update)

2011-06-29 Thread Graham Percival
This is an update, rather than a probable decision. I don't think we're close enough to have a real proposal. http://lilypond.org/~graham/gop/gop_3.html At the moment I'm leaning towards using astyle+postprocessing. The script in question is here:

Re: GOP-PROP 3: C++ formatting (update)

2011-06-29 Thread Keith OHara
Graham Percival graham at percival-music.ca writes: At the moment I'm leaning towards using astyle+postprocessing. The script in question is here: Don't post-process, or you mis-align the indentation that astyle did. Pre-filtering works well, assuming we drop the corresponding astyle

Re: GOP-PROP 3: C++ formatting (update)

2011-06-29 Thread Carl Sorensen
On 6/29/11 6:01 PM, Keith OHara k-ohara5...@oco.net wrote: Graham Percival graham at percival-music.ca writes: At the moment I'm leaning towards using astyle+postprocessing. By coincidence, I just finished looking over astyle alone. The options you first proposed aren't enough for me,

Re: GOP-PROP 3: C++ formatting (update)

2011-06-29 Thread Keith OHara
On Wed, 29 Jun 2011 21:05:51 -0700, Carl Sorensen c_soren...@byu.edu wrote: On 6/29/11 6:01 PM, Keith OHara k-ohara5...@oco.net wrote: Graham Percival graham at percival-music.ca writes: At the moment I'm leaning towards using astyle+postprocessing. padding that can be helpful -

Re: GOP-PROP 3: C++ formatting

2011-06-27 Thread Graham Percival
On Sun, Jun 26, 2011 at 06:12:07PM -0700, Keith OHara wrote: On Sun, 26 Jun 2011 10:48:36 -0700, Graham Percival gra...@percival-music.ca wrote: A few specific problems with astyle: * it doesn’t indent enum in gnu style I can't find gnu instructions for indenting enums, but if there

Re: GOP-PROP 3: C++ formatting

2011-06-27 Thread Keith OHara
On Mon, 27 Jun 2011 05:45:54 -0700, Graham Percival gra...@percival-music.ca wrote: On Sun, Jun 26, 2011 at 06:12:07PM -0700, Keith OHara wrote: On Sun, 26 Jun 2011 10:48:36 -0700, Graham Percival gra...@percival-music.ca wrote: A few specific problems with astyle: * it doesn’t indent

Re: GOP-PROP 3: C++ formatting

2011-06-27 Thread Graham Percival
On Mon, Jun 27, 2011 at 08:46:17AM -0700, Keith OHara wrote: In defense of astyle, I should have written astyle -Udp --unpad-paren --pad-paren-out --pad-oper Huh. and if a human puts a space in context () astyle -Udp leaves it in place. ?! hmm, looks promising. I've added my

Re: GOP-PROP 3: C++ formatting

2011-06-27 Thread Keith OHara
On Mon, 27 Jun 2011 10:37:10 -0700, Graham Percival gra...@percival-music.ca wrote: When I look at git diff origin/dev/gperciva-fixcc origin/dev/gperciva-astyle I'm still leery about some changes. Some indentation is off because fix-astyle-fiddle removes spaces after indentation.

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Graham Percival
On Sat, Jun 25, 2011 at 11:12:25PM +0200, Valentin Villenave wrote: On Wed, Jun 22, 2011 at 1:30 AM, Graham Percival gra...@percival-music.ca wrote: I’m going to make the bold step of assuming that we will eliminate tabs in all C++ files. I personally like the idea of tabs, but from an

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Graham Percival
(re-sending to list) On Sun, Jun 26, 2011 at 03:47:11PM +0200, Jan Warchoł wrote: Ok, since comparing gperciva-fixcc and gperciva-astyle branches didn't work for me, plese verify whether i understood correctly: - we are discussing which program we will use for code formatting, not the actual

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Jan Warchoł
2011/6/22 Graham Percival gra...@percival-music.ca: Speaking academically, C++ code style is a solved problem. Let’s pick one of the existing solutions, and let a computer deal with this. Humans should not waste their time, energy, and creativity manually adding tabs or spaces to source code.

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Jan Warchoł
2011/6/26 Graham Percival gra...@percival-music.ca: On Sun, Jun 26, 2011 at 03:47:11PM +0200, Jan Warchoł wrote: Ok, since comparing gperciva-fixcc and gperciva-astyle branches didn't work for me, plese verify whether i understood correctly: - we are discussing which program we will use for

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Graham Percival
On Sun, Jun 26, 2011 at 04:23:58PM +0200, Jan Warchoł wrote: 2011/6/26 Graham Percival gra...@percival-music.ca: The difference between output of astyle and fixcc is 778Kb, and is 23173 lines long. Let's choose the simplest solution, which doesn't require installing anything and can be

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Graham Percival
On Sun, Jun 26, 2011 at 06:04:41PM +0100, Phil Holmes wrote: - Original Message - From: Graham Percival gra...@percival-music.ca No. fixcc.py will emacs 23.1.1 to be installed. People with an should be will need Lily Ubuntu... My version doesn't appear to have emacs. Interesting,

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Keith OHara
Graham Percival graham at percival-music.ca writes: No. fixcc.py will [need] emacs 23.1.1 to be installed. If the version of emacs matters, then 1) we might have more work when people move to 24 2) it hints that emacs formatting is not stable enough for our purpose astyle 2.02 is the

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Graham Percival
On Sun, Jun 26, 2011 at 05:43:26PM +, Keith OHara wrote: I am surprised you did not turn first to good old indent. Thu gnu guys give an option set for use with indent. indent(1) can't handle C++ code. I forget exactly what made it barf, but I think it was templates. It might have

Re: GOP-PROP 3: C++ formatting

2011-06-26 Thread Keith OHara
On Sun, 26 Jun 2011 10:48:36 -0700, Graham Percival gra...@percival-music.ca wrote: indent(1) can't handle C++ code. That's surprising. Bummer. From earlier, A few specific problems with astyle: * it doesn’t indent enum in gnu style I can't find gnu instructions for indenting enums,

Re: GOP-PROP 3: C++ formatting

2011-06-25 Thread Jan Warchoł
W dniu 23 czerwca 2011 00:03 użytkownik Carl Sorensen c_soren...@byu.edu napisał: For the short term, you can do git pull origin dev/gperciva-fixcc git pull origin dev/gperciva-astyle to get those branches. I understand that i should call these in separate branches, not in master.

Re: GOP-PROP 3: C++ formatting

2011-06-25 Thread Graham Percival
On Sat, Jun 25, 2011 at 09:18:13PM +0200, Jan Warchoł wrote: W dniu 23 czerwca 2011 00:03 użytkownik Carl Sorensen c_soren...@byu.edu napisał: For the short term, you can do git pull origin dev/gperciva-fixcc git pull origin dev/gperciva-astyle to get those branches. I

Re: GOP-PROP 3: C++ formatting

2011-06-25 Thread Jan Warchoł
2011/6/25 Graham Percival gra...@percival-music.ca On Sat, Jun 25, 2011 at 09:18:13PM +0200, Jan Warchoł wrote: I understand that i should call these in separate branches, not in master. janek@janek-lilydev5:~/lilypond-git$ git branch astyle That creates a new branch.  I think you should

Re: GOP-PROP 3: C++ formatting

2011-06-25 Thread Valentin Villenave
On Wed, Jun 22, 2011 at 1:30 AM, Graham Percival gra...@percival-music.ca wrote: I’m going to make the bold step of assuming that we will eliminate tabs in all C++ files. I personally like the idea of tabs, but from an examination of source code styles (both official and unofficial) in various

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Jan Warchoł
2011/6/22 Graham Percival gra...@percival-music.ca: I see three main contenders:    * emacs x.y.z with extra post-processing: our current      “official” style with scripts/auxiliar/fixcc.py    * astyle 2.0.2, possibly with extra post-processing    * uncrustify 0.58 I'm confused. Are we

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread m...@apollinemike.com
On Jun 22, 2011, at 2:54 AM, Keith OHara wrote: Graham Percival graham at percival-music.ca writes: This one will be contentious. Maybe the various opinions will share a small overlapping area of consensus; applying even a small improvement might be enough to make life easier. **

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Trevor Daniels
Graham Percival wrote Wednesday, June 22, 2011 12:30 AM Another problem is that the scripts/auxiliar/fixcc.py depends on emacs, but emacs’ formatting changes between versions. ** Eliminate tabs I’m going to make the bold step of assuming that we will eliminate tabs in all C++ files. I

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Hans Aberg
On 22 Jun 2011, at 01:30, Graham Percival wrote: ** Eliminate tabs I’m going to make the bold step of assuming that we will eliminate tabs in all C++ files. I personally like the idea of tabs, but from an examination of source code styles (both official and unofficial) in various projects,

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Graham Percival
On Wed, Jun 22, 2011 at 12:54:15AM +, Keith OHara wrote: Graham Percival graham at percival-music.ca writes: My preference is just to say let’s just use fixcc.py strictly. Even those of us who fear emacs could probably run that script on changed .cc .hh files before each commit.

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Graham Percival
On Wed, Jun 22, 2011 at 08:10:50AM +0200, Jan Warchoł wrote: 2011/6/22 Graham Percival gra...@percival-music.ca: I see three main contenders: I'm confused. Are we talking about choosing indent style or choosing the tool that will automatically apply whichever style we want? Specifying a

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Jan Warchoł
2011/6/22 Graham Percival gra...@percival-music.ca: On Wed, Jun 22, 2011 at 08:10:50AM +0200, Jan Warchoł wrote: I'm confused.  Are we talking about choosing indent style or choosing the tool that will automatically apply whichever style we want? Specifying a code style would be far too much

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Jan Warchoł
2011/6/22 Graham Percival gra...@percival-music.ca: On Wed, Jun 22, 2011 at 12:54:15AM +, Keith OHara wrote: Graham Percival graham at percival-music.ca writes: My preference is just to say let’s just use fixcc.py strictly. Even those of us who fear emacs could probably run that

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Graham Percival
On Wed, Jun 22, 2011 at 01:34:42PM +0200, Jan Warchoł wrote: 2011/6/22 Graham Percival gra...@percival-music.ca: There are plenty of differences.  If you get the git diff command to work, you'll see. It still doesn't work. I'm in top source directory, on branch master which is up to date

Re: GOP-PROP 3: C++ formatting

2011-06-22 Thread Carl Sorensen
On 6/22/11 3:53 PM, Graham Percival gra...@percival-music.ca wrote: On Wed, Jun 22, 2011 at 01:34:42PM +0200, Jan Warchoł wrote: 2011/6/22 Graham Percival gra...@percival-music.ca: There are plenty of differences.  If you get the git diff command to work, you'll see. It still doesn't work.

GOP-PROP 3: C++ formatting

2011-06-21 Thread Graham Percival
This one will be contentious. ** Proposal summary Speaking academically, C++ code style is a solved problem. Let’s pick one of the existing solutions, and let a computer deal with this. Humans should not waste their time, energy, and creativity manually adding tabs or spaces to source code. I

Re: GOP-PROP 3: C++ formatting

2011-06-21 Thread Keith OHara
Graham Percival graham at percival-music.ca writes: This one will be contentious. Maybe the various opinions will share a small overlapping area of consensus; applying even a small improvement might be enough to make life easier. ** Eliminate tabs That helps (even though editors should