Gericom/teak-llvm
1
Fork 0
mirror of https://github.com/Gericom/teak-llvm.git synced 2025-06-25 14:28:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
183,260 Commits 1 Branch 0 Tags 875 MiB
7533b4dada
Commit Graph

895 Commits

Author SHA1 Message Date
Daniel Jasper
a2fb50f9b3 clang-format: Understand that breaking before lambdas is fine. 
Before:
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa([](
      const aaaaaaaaaa &a) { return a; });

After:
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(
      [](const aaaaaaaaaa &a) { return a; });

llvm-svn: 211575
 2014-06-24 09:15:49 +00:00
Daniel Jasper
32ccb03871 clang-format: Fix corner case in pointer/reference detection. 
llvm-svn: 211487
 2014-06-23 07:36:18 +00:00
Daniel Jasper
553d4878da clang-format: Introduce style with spaces on both sides of */&. 
Patch by Janusz Sobczak (slightly extended).
This fixes llvm.org/19929.

llvm-svn: 211098
 2014-06-17 12:40:34 +00:00
Rafael Espindola
1f24317d87 Fix msvc unittest build. 
Looks like msvc has an asymmetrical operator ==.

llvm-svn: 210768
 2014-06-12 11:35:17 +00:00
Rafael Espindola
d0136707a9 Give clang-format its own error category. 
The posix errno values are probably to the best thing to use for
describing parse errors.

This should also fix the mingw build.

llvm-svn: 210739
 2014-06-12 02:50:04 +00:00
Rafael Espindola
96b033006d Use std::error_code instead of llvm::error_code. 
This is an update for a llvm api change.

llvm-svn: 210688
 2014-06-11 19:05:55 +00:00
Daniel Jasper
4ac7de7199 clang-format: Fix pointer/reference detection after decltype. 
Before:
  [](const decltype(*a) & value) {}

After:
  [](const decltype(*a)& value) {}

llvm-svn: 210643
 2014-06-11 07:35:16 +00:00
Daniel Jasper
ecaba17996 clang-format: Increase penalty for wrapping array subscript expressions 
Before:
  aaaaaaaaaaa aaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaa->aaaaaaaaa[0].aaaaaaa
                                    [0].aaaaaaaaaaaaaaaaaaaaaa();

After:
  aaaaaaaaaaa aaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaa->aaaaaaaaa[0]
                                    .aaaaaaa[0]
                                    .aaaaaaaaaaaaaaaaaaaaaa();

llvm-svn: 210529
 2014-06-10 13:27:57 +00:00
Daniel Jasper
908180574e clang-format: Fix enum formatting with specific comment. 
Before:
  enum Fruit {  //
    APPLE,
    PEAR };

After:
  enum Fruit {  //
    APPLE,
    PEAR
  };

llvm-svn: 210522
 2014-06-10 10:42:26 +00:00
Daniel Jasper
da18fd86c7 clang-format: Support variadic lambda captures. 
Before:
  return [ i, args... ]{};

After:
  return [i, args...] {};

llvm-svn: 210514
 2014-06-10 06:39:03 +00:00
Daniel Jasper
3251fff0e3 clang-format: Handle multiline strings inside ternary expressions. 
With AlwaysSplitBeforeMultilineStrings, clang-format would not find any
valid solution.

llvm-svn: 210513
 2014-06-10 06:27:23 +00:00
Daniel Jasper
a69ca9be12 clang-format: Leave empty lines within UnwrappedLines. 
These are commonly used to structure things like enums or long braced
lists. There doesn't seem to be a good reason to have the behavior in
such structures be different from the behavior between statements.

llvm-svn: 210183
 2014-06-04 12:40:57 +00:00
Daniel Jasper
7d028298ce clang-format: Fix special case of binary operator detection. 
There is a pattern where evaluation order is used as control flow.
This patch special-cases a commonly occuring version of this pattern.

Before:
  Aaaaa *aaa = nullptr;
  // ...
  aaa &&aaa->f();

After:
  Aaaaa *aaa = nullptr;
  // ...
  aaa && aaa->f();

llvm-svn: 210017
 2014-06-02 11:54:20 +00:00
Daniel Jasper
4afc6b3e16 clang-format: No space between ")" and braced init list. 
Before:
  auto j = decltype(i) {};

After:
  auto j = decltype(i){};

This fixes llvm.org/PR19892.

llvm-svn: 210013
 2014-06-02 10:57:55 +00:00
Daniel Jasper
e18ff37e08 clang-format: Fix Allman brace breaking of enums. 
Before:
  enum Side
  { LEFT,
    RIGHT };

After:
  enum Side
  {
    LEFT,
    RIGHT
  };

This fixes llvm.org/PR19911.

llvm-svn: 210011
 2014-06-02 10:17:32 +00:00
Daniel Jasper
e3f907fded clang-format: Fix trailing const (etc.) with Allman brace style. 
Before:
  void someLongFunction(int someLongParameter)
      const
  {
  }

After:
  void someLongFunction(
      int someLongParameter) const
  {
  }

This fixes llvm.org/PR19912.

llvm-svn: 210010
 2014-06-02 09:52:08 +00:00
Rafael Espindola
3ae0620a45 There is no std::errc:success, remove the llvm one. 
llvm-svn: 209959
 2014-05-31 03:20:52 +00:00
Daniel Jasper
d39312ec84 clang-format: Don't break before a case's colon. 
Before (with just the right line length:
  switch (a) {
  case some_namespace::some_constant
      :
    return;
  }

After:
  switch (a) {
  case some_namespace::
      some_constant:
    return;
  }

llvm-svn: 209725
 2014-05-28 10:09:11 +00:00
Daniel Jasper
335ff26631 clang-format: Format array and dict literals similar to blocks. 
Especially, reduce the amount of indentation if it doesn't increase
readability.

Before:
  NSMutableDictionary* dictionary = [NSMutableDictionary
      dictionaryWithDictionary:@{
                                 aaaaaaaaaaaaaaaaaaaaa : aaaaaaaaaaaaa,
                                 bbbbbbbbbbbbbbbbbb : bbbbb,
                                 cccccccccccccccc : ccccccccccccccc
                               }];

After:
  NSMutableDictionary* dictionary =
      [NSMutableDictionary dictionaryWithDictionary:@{
        aaaaaaaaaaaaaaaaaaaaa : aaaaaaaaaaaaa,
        bbbbbbbbbbbbbbbbbb : bbbbb,
        cccccccccccccccc : ccccccccccccccc
      }];

llvm-svn: 209720
 2014-05-28 09:11:53 +00:00
Daniel Jasper
ba1b6bb667 clang-format: Keep '{' of dict literals on the same line in Allman style 
Before:
  void f()
  {
    [object
        someMethod:@
        { @"a" : @"b" }];
  }

After:
  void f()
  {
    [object someMethod:@{ @"a" : @"b" }];
  }

This fixes llvm.org/PR19854.

llvm-svn: 209615
 2014-05-26 07:24:34 +00:00
Daniel Jasper
565ed5ed08 clang-format: Don't use Allman brace breaking for ObjC blocks. 
It just seems wrong. This fixes llvm.org/PR19736.

llvm-svn: 209440
 2014-05-22 13:53:55 +00:00
Daniel Jasper
bd630737bd clang-format: Fix corner case in AllowShortBlocksOnASingleLine. 
Before:
  template <int> struct A4 { A4() { }
  };

After:
  template <int i> struct A4 {
    A4() {}
  };

This fixes llvm.org/PR19813 (at least the part that isn't working as
intended).

llvm-svn: 209438
 2014-05-22 13:25:26 +00:00
Daniel Jasper
91b032ab55 clang-format: Fix braced list detection. 
Before:
  static_assert(std::is_integral<int> {} + 0, "");
  int a = std::is_integral<int> {}
  + 0;

After:
  static_assert(std::is_integral<int>{} + 0, "");
  int a = std::is_integral<int>{} + 0;

llvm-svn: 209431
 2014-05-22 12:46:38 +00:00
Daniel Jasper
438059e509 clang-format: Fix incorrect braced init identification. 
Before:
  int foo(int i) {
    return fo1 {}
    (i);
  }
  int foo(int i) {
    return fo1 {}
    (i);
  }

After:
  int foo(int i) { return fo1{}(i); }
  int foo(int i) { return fo1{}(i); }

This fixes llvm.org/PR19812.

llvm-svn: 209428
 2014-05-22 12:11:13 +00:00
Daniel Jasper
3948516a03 clang-format: Correctly identify multiplications in braces init lists. 
Before:
  int i{a *b};

After:
  int i{a * b};

Also fix unrelated issue where braced init lists were counted as blocks
and prevented single-line functions.

llvm-svn: 209412
 2014-05-22 09:00:33 +00:00
Daniel Jasper
5f3ea477cf clang-format: Correctly calculate line lenghts for nest blocks. 
If simple (one-statement) blocks can be inlined, the length needs to be
calculated correctly.

Before (in JavaScript but this also affects lambdas, etc.):
  var x = {
    valueOf: function() { return 1; }
  };

After:
  var x = {valueOf: function() { return 1; }};

llvm-svn: 209410
 2014-05-22 08:36:53 +00:00
Daniel Jasper
5ebb2f3625 clang-format: Fix incorrect macro call detection. 
In:
  struct A {
    A()
        noexcept(....) {}
  };

'A()' is not a macro call.
This fixes llvm.org/PR19814.

llvm-svn: 209294
 2014-05-21 13:08:17 +00:00
Daniel Jasper
7f0c517168 clang-format: Don't force line breaks in ObjC calls with ColumnLimit 0. 
Before:
  [self.x a:b c:d];

Got reformatted toi (with ColumnLimit set to 0):
  [self.x a:b
          c:d];

llvm-svn: 209114
 2014-05-19 08:06:34 +00:00
Daniel Jasper
17605d3961 clang-format: Add option to allow short blocks on a single line. 
With AllowShortBlocksOnASingleLine, clang-format allows:
  if (a) { return; }

Based on patch by Gonzalo BG, thank you!

llvm-svn: 208765
 2014-05-14 09:33:35 +00:00
Daniel Jasper
0a1e5ace26 clang-format: Don't break in the middle of ">>". 
Before:
  zzzzzzzzzz = bbbbbbbbbbbbbbbbb >
               > aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa);

After:
  zzzzzzzzzz
      = bbbbbbbbbbbbbbbbb
        >> aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa);

This fixes llvm.org/PR19731.

llvm-svn: 208672
 2014-05-13 08:01:47 +00:00
Daniel Jasper
04a71a45ff clang-format: Initial support for try-catch. 
Most of this patch was created by Alexander Rojas in
http://reviews.llvm.org/D2555
Thank you!

Synced and addressed review comments.

llvm-svn: 208302
 2014-05-08 11:58:24 +00:00
Daniel Jasper
ea2d042f89 clang-format: Fix binary operator detection before lambdas. 
Before:
  bool foo = true&& [] { return false; }();

After:
  bool foo = true && [] { return false; }();

llvm-svn: 208288
 2014-05-08 08:50:10 +00:00
Nikola Smiljanic
e08a91ecd2 Enable alternative tokens by default for clang-format. 
Patch by Bobby Moretti.

llvm-svn: 208269
 2014-05-08 00:05:13 +00:00
Daniel Jasper
8acf822b6f clang-format: Fix corner cases for comments in if conditions. 
Before:
  if ( // a
          x + 3) { ..

After:
  if ( // a
      x + 3) { ..

llvm-svn: 208175
 2014-05-07 09:23:05 +00:00
Daniel Jasper
7a2d60e328 clang-format: Fix bad space before braced initializer. 
Before:
  new int {1};

After:
  new int{1};

llvm-svn: 208168
 2014-05-07 07:59:03 +00:00
Dinesh Dwivedi
2e92e66f66 Fixed one issue with casting 
Before:
(void) SimplifyICmpOperands(Cond, LHS, RHS);

After:
(void)SimplifyICmpOperands(Cond, LHS, RHS);

Differential Revision: http://reviews.llvm.org/D3615

llvm-svn: 208080
 2014-05-06 11:46:49 +00:00
Daniel Jasper
f10a28d705 clang-format: Understand functions with decltype return type. 
Before:
  decltype(long_name_forcing_break)
      f() {}

After:
  decltype(long_name_forcing_break)
  f() {}

llvm-svn: 207965
 2014-05-05 13:48:09 +00:00
Dinesh Dwivedi
76f98f8047 Added some heuristics to identify c style casting 
Before:
void f() { my_int a = (my_int) * b; }
void f() { return P ? (my_int) * P : (my_int)0; }

After:
void f() { my_int a = (my_int)*b; }
void f() { return P ? (my_int)*P : (my_int)0; }

Differential Revision: http://reviews.llvm.org/D3576

llvm-svn: 207964
 2014-05-05 13:14:35 +00:00
Daniel Jasper
0e6c51c889 clang-format: Improve understanding of decltype. 
Before:
  SomeFunction([](decltype(x), A * a) {});

After:
  SomeFunction([](decltype(x), A *a) {});

llvm-svn: 207961
 2014-05-05 12:36:29 +00:00
Dinesh Dwivedi
afe6fb6f05 Fix bug in clang-format while merging short function 
Before:
    #ifdef _DEBUG
    int foo( int i = 0 )
    #else
    int foo( int i = 5 )
    #endif { return i; }

After:
    #ifdef _DEBUG
    int foo( int i = 0 )
    #else
    int foo( int i = 5 )
    #endif
    {
    	return i;
    }

llvm-svn: 207958
 2014-05-05 11:36:35 +00:00
Daniel Jasper
9509f18836 clang-format: Fix import statements with ColumnLimit: 0 
These used to interact badly with AlwaysBreakBeforeMultilineStrings.

llvm-svn: 207955
 2014-05-05 08:08:07 +00:00
Dinesh Dwivedi
ea3aca8b67 Fixes issue with Allman BreakBeforeBraces for Objective C @interface 
Before:
        @interface BSApplicationController () {
    @private
      id _extraIvar;
    }
    @end

After:
    @interface BSApplicationController ()
    {
    @private
      id _extraIvar;
    }
    @end

llvm-svn: 207849
 2014-05-02 17:01:46 +00:00
Daniel Jasper
35995679c6 clang-format: Allow single-line function in WebKit style. 
Before:
  void f() {
      return; }

After:
  void f() { return; }

llvm-svn: 207527
 2014-04-29 14:05:20 +00:00
Daniel Jasper
942d971c84 clang-format: Improve binary operator detection. 
Before:
  *(int *)(p &~3UL) = 0;

After:
  *(int *)(p & ~3UL) = 0;

This fixes llvm.org/PR19464.

llvm-svn: 207405
 2014-04-28 09:19:28 +00:00
Daniel Jasper
031e2409f9 clang-format: Fixes spaces in case statements. 
This fixes llvm.org/PR19482.

Before:
  switch (a) {
    case(B) :
      return;
  }

After:
  switch (a) {
    case (B):
      return;
  }

llvm-svn: 207402
 2014-04-28 07:48:36 +00:00
Daniel Jasper
437c3f5188 clang-format: Don't wrap after @interface. 
This fixes llvm.org/PR19450.

Before:
  @interface
  BookmarkHomeHandsetViewController ()<BookmarkAllCollectionViewDelegate,
                                       BookmarkFolderCollectionViewDelegate,
                                       BookmarkMenuViewControllerDelegate,
                                       BookmarkSearchViewControllerDelegate> {
  }

After:
  @interface aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ()<
      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa> {
  }

llvm-svn: 207400
 2014-04-28 07:34:48 +00:00
Daniel Jasper
66935020c4 clang-format: Fix bug when aligning trailing /**/-comments in macros. 
Previously this could lead to a column limit violation with the
required escaped newlines.

llvm-svn: 207351
 2014-04-27 10:03:19 +00:00
Chandler Carruth
1034666777 [Modules] Fix potential ODR violations by sinking the DEBUG_TYPE 
definition below all of the header #include lines, clang edition.

If you want more details about this, you can see some of the commits to
Debug.h in LLVM recently. This is just the clang section of a cleanup
I've done for all uses of DEBUG_TYPE in LLVM.

llvm-svn: 206849
 2014-04-22 03:17:02 +00:00
Alexander Kornienko
67d9c8c87e Fix alignment of trailing block comments. 
Summary:
This patch ensures that the lines of the block comments retain relative
column offsets. In order to do this WhitespaceManager::Changes representing
continuation of block comments keep a pointer on the change representing the
whitespace change before the block comment, and a relative column offset to this
change, so that the correct column can be reconstructed at the end of alignment
process.

Fixes http://llvm.org/PR19325

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://reviews.llvm.org/D3408

llvm-svn: 206472
 2014-04-17 16:12:46 +00:00
Daniel Jasper
ae8e0d8da9 clang-format: Respect BinPackParameters in Cpp11BracedListStyle. 
With BinPackParameters=false and Cpp11BracedListStyle=true (i.e. mostly
for Chromium):

Before:
  const Aaaaaa aaaaa = {aaaaa, bbbbb,  ccccc,  ddddd,  eeeee, ffffff,
                        ggggg, hhhhhh, iiiiii, jjjjjj, kkkkkk};

After:
  const Aaaaaa aaaaa = {aaaaa,
                        bbbbb,
                        ccccc,
                        ddddd,
                        eeeee,
                        ffffff,
                        ggggg,
                        hhhhhh,
                        iiiiii,
                        jjjjjj,
                        kkkkkk};

This fixes llvm.org/PR19359. I am not sure we'll want this in all cases
in the long run, but I'll guess we'll get feedback on that.

llvm-svn: 206458
 2014-04-17 11:32:02 +00:00
Daniel Jasper
0e61784ae5 clang-format: Add special case to reduce indentaiton in streams. 
This is similar to how we treat assignments and seems to be generally
desirable.

Before:
  llvm::errs() << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(
                      aaaaaaaaaaaaaaaaaaaaaaaaaaaa,
                      aaaaaaaaaaaaaaaaaaaaaaaaaaaa);

After:
  llvm::errs() << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(
      aaaaaaaaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaa);

llvm-svn: 206384
 2014-04-16 12:26:54 +00:00
Alexander Kornienko
64a42b8dd2 Fix assertion when breaking string literals with tab characters. 
Summary: Fixes http://llvm.org/PR19368

Reviewers: djasper, klimek

Reviewed By: klimek

CC: cfe-commits, klimek

Differential Revision: http://reviews.llvm.org/D3379

llvm-svn: 206295
 2014-04-15 14:52:43 +00:00
Daniel Jasper
20fd3c6ff7 clang-format: Basic support for C++1y. 
Before:
  int bi{1 '000' 000};
After:
  int bi{1'000'000};

This fixes llvm.org/PR19342.

llvm-svn: 206263
 2014-04-15 08:49:21 +00:00
Daniel Jasper
866468ae4d clang-format: Fix regression caused by r206165. 
llvm-svn: 206173
 2014-04-14 13:15:29 +00:00
Daniel Jasper
72ab43b28b clang-format: Fix incorrect &&-detection in macros. 
Before:
  #define A(a, b) (a &&b)

After:
  #define A(a, b) (a && b)

This fixes llvm.org/PR19343.

llvm-svn: 206165
 2014-04-14 12:50:02 +00:00
Daniel Jasper
db8804b32b clang-format: Improve array literal formatting fix in r206161. 
Instead of choosing based on the number of elements, simply respect the
user's choice of where to wrap array literals.

llvm-svn: 206162
 2014-04-14 12:11:07 +00:00
Daniel Jasper
af4fee2636 clang-format: With ColumnLimit=0, keep short array literals on a line. 
Before:
    NSArray* a = [[NSArray alloc] initWithArray:@[
                                                   @"a"
                                                ]
                                      copyItems:YES];

After:
    NSArray* a = [[NSArray alloc] initWithArray:@[ @"a" ]
                                      copyItems:YES];

This fixed llvm.org/PR19080.

llvm-svn: 206161
 2014-04-14 12:05:05 +00:00
Daniel Jasper
c0d606a584 clang-format: Don't allow hanging indentation for operators on new lines 
Before:
  if (aaaaaaaa && bbbbbbbbbbbbbbb // need to wrap
                  == cccccccccccccc) ...

After:
  if (aaaaaaaa
      && bbbbbbbbbbbbbbb // need to wrap
         == cccccccccccccc) ...

The same rule has already be implemented for BreakBeforeBinaryOperators
set to false in r205527.

llvm-svn: 206159
 2014-04-14 11:08:45 +00:00
Manuel Klimek
68b03049e0 Format code around VCS conflict markers. 
Now correctly formats:
  {
    int a;
    void f() {
      callme(some(parameter1,
  <<<<<<< text by the vcs
                  parameter2),
  ||||||| text by the vcs
                  parameter2),
             parameter3,
  ======= text by the vcs
                  parameter2, parameter3),
  >>>>>>> text by the vcs
             otherparameter);
    }
  }

llvm-svn: 206157
 2014-04-14 09:14:11 +00:00
Daniel Jasper
35ec2b244a clang-format: Improve formatting of annotated variables. 
Before:
  bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa GUARDED_BY(
      aaaaaaaaaaaa) = aaaaaaaa::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;

After:
  bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa GUARDED_BY(aaaaaaaaaaaa) =
      aaaaaaaa::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;

llvm-svn: 206155
 2014-04-14 08:15:20 +00:00
Daniel Jasper
f9fc215f82 clang-format: Treat a trailing comment like a trailing comma in braced lists. 
Before:
  static StructInitInfo module = {MODULE_BUILTIN, /* type */
                                  "streams" /* name */
  };

After:
  static StructInitInfo module = {
      MODULE_BUILTIN, /* type */
      "streams"       /* name */
  };

This fixes llvm.org/PR19378.

llvm-svn: 205851
 2014-04-09 13:18:49 +00:00
Daniel Jasper
21397a3232 clang-format: Fix bug where clang-format would break the code. 
Before, it would turn:
  SomeFunction([]() { // Cool function..
    return 43;
  });

Into this:
  SomeFunction([]() { // Cool function.. return 43; });

llvm-svn: 205849
 2014-04-09 12:21:48 +00:00
Daniel Jasper
3ae6f5a47b clang-format: Improve format of calls with several lambdas. 
Before:
  SomeFunction([]() {
                 int i = 42;
                 return i;
               },
               []() {
    int j = 43;
    return j;
  });

After:
  SomeFunction([]() {
                 int i = 42;
                 return i;
               },
               []() {
                 int j = 43;
                 return j;
               });

llvm-svn: 205848
 2014-04-09 12:08:39 +00:00
Daniel Jasper
f9a0906b98 clang-format: Allow breaking between trailing annotations in more cases. 
Before:
  void aaaaaaaaaaaaaa(aaaaaaaa aaa) override AAAAAAAAAAAAAAAAAAAAAAAA(
      aaaaaaaaaaaaaaa);

After:
  void aaaaaaaaaaaaaa(aaaaaaaa aaa) override
      AAAAAAAAAAAAAAAAAAAAAAAA(aaaaaaaaaaaaaaa);

llvm-svn: 205846
 2014-04-09 10:29:11 +00:00
Daniel Jasper
b48d3afcd5 clang-format: Keep more trailing annotations on the same line. 
More precisely keep all short annotations (<10 characters) on the same
line if possible. Previously, clang-format would only prefer to do so
for "const", "override" and "final". However, it seems to be generally
preferable, especially because some codebases have to wrap those in
macros for backwards compatibility.

Before:
  void someLongFunction(int someLongParameter)
      OVERRIDE {}

After:
  void someLongFunction(
      int someLongParameter) OVERRIDE {}

This fixes llvm.org/PR19363.

llvm-svn: 205845
 2014-04-09 10:01:49 +00:00
Daniel Jasper
b175d57edc clang-format: Recognize lists ending in trailing commas correctly. 
Previously, this did not look through trailing comments leading to a few
formatting oddities.

llvm-svn: 205843
 2014-04-09 09:53:23 +00:00
Daniel Jasper
b77105d2ce clang-format: Fix incorrect multi-block-parameter computation. 
llvm-svn: 205763
 2014-04-08 14:04:31 +00:00
Daniel Jasper
139d4a3875 clang-format: Correctly understand arrays of pointers. 
Before:
  A<int * []> a;

After:
  A<int *[]> a;

This fixes llvm.org/PR19360.

llvm-svn: 205761
 2014-04-08 13:07:41 +00:00
Daniel Jasper
d74cf40386 clang-format: Extend AllowShortFunctions.. to only merge inline functions. 
Before AllowShortFunctionsOnASingleLine could either be true, merging
all functions, or false, merging no functions. This patch adds a third
value "Inline", which can be used to only merge short functions defined
inline in a class, i.e.:

  void f() {
    return 42;
  }

  class C {
    void f() { return 42; }
  };

llvm-svn: 205760
 2014-04-08 12:46:38 +00:00
Daniel Jasper
922349cdba clang-format: Don't merge simple blocks in case statements. 
Before:
  switch (a) {
  case 1: { return 'a'; }
  }

After:
  switch (a) {
  case 1: {
    return 'a';
  }
  }

llvm-svn: 205611
 2014-04-04 06:46:23 +00:00
Daniel Jasper
5c33265c9e clang-format: Prefer an additional line-break over hanging indent. 
Don't allow the RHS of an operator to be split over multiple
lines unless there is a line-break right after the operator.

Before:
  if (aaaa && bbbbb || // break
                  cccc) {
  }

After:
  if (aaaa &&
      bbbbb || // break
          cccc) {
  }

In most cases, this seems to increase readability.

llvm-svn: 205527
 2014-04-03 12:00:33 +00:00
Daniel Jasper
cc7bf7fda1 clang-format: Understand that "auto" is a type. 
Before:
  MACRO(auto * a);

After:
  MACRO(auto *a);

llvm-svn: 205517
 2014-04-03 09:00:49 +00:00
Aaron Ballman
2b9036d54d Fixing the MSVC 2012 build bot, which cannot do initializer lists yet. Amends r205307. 
llvm-svn: 205325
 2014-04-01 16:30:35 +00:00
Daniel Jasper
e1e4319ab7 clang-format: Support configurable list of foreach-macros. 
This fixes llvm.org/PR17242.

Patch by Brian Green, thank you!

llvm-svn: 205307
 2014-04-01 12:55:11 +00:00
Daniel Jasper
03b1bc7a2a clang-format: Fix aligning of comments and escaped newlines in macros. 
Before:
  #define A      \
    int i;   /*a*/ \
    int jjj; /*b*/

After:
  #define A        \
    int i;   /*a*/ \
    int jjj; /*b*/

llvm-svn: 205011
 2014-03-28 15:06:01 +00:00
Daniel Jasper
395193c7a0 clang-format: Recognize more ObjC blocks with parameters/return type. 
llvm-svn: 204990
 2014-03-28 07:48:59 +00:00
Manuel Klimek
1f9d80ac66 Improve handling of bool expressions in template arguments. 
Now correctly formats:
  foo<true && false>();

llvm-svn: 204950
 2014-03-27 19:00:52 +00:00
Daniel Jasper
5d2587daa2 clang-format: Avoid line-breaks that increase the current column. 
While these might make sense for some rule (e.g. break after multi-line
operand), they generally appear ugly and confusing.

Before:
  fffffffffff(R\"x(
  multiline raw string literal xxxxxxxxxxxxxx
  )x\" + bbbbbb)

After:
  fffffffffff(R\"x(
  multiline raw string literal xxxxxxxxxxxxxx
  )x\" +
              bbbbbb)

llvm-svn: 204937
 2014-03-27 16:14:13 +00:00
Manuel Klimek
f81e5c0e50 Fix bool expression special case. 
Clang-format now correctly formats:
  some_type<a * b> v;
  template <bool a, bool b> typename enabled_if<a && b>::type f() {}

llvm-svn: 204913
 2014-03-27 11:17:36 +00:00
Daniel Jasper
c13ee34378 clang-format: Correctly identify ObjC Block with return type. 
llvm-svn: 204905
 2014-03-27 09:43:54 +00:00
Daniel Jasper
a65e887587 clang-format: Fix incorrect &/* detection. 
Before:
  STATIC_ASSERT((a &b) == 0);

After:
  STATIC_ASSERT((a & b) == 0);

llvm-svn: 204709
 2014-03-25 10:52:45 +00:00
Daniel Jasper
a26fc5c9db clang-format: Add flag for removing empty lines at the start of blocks. 
This unbreaks polly-formatting-tests and we can make a decision for
LLVM style independently.

llvm-svn: 204467
 2014-03-21 13:43:14 +00:00
Daniel Jasper
01b35482e5 clang-format: Don't remove empty lines at the start of namespaces. 
llvm-svn: 204462
 2014-03-21 13:03:33 +00:00
Daniel Jasper
11164bdaf5 clang-format: Remove empty lines at the beginning of blocks. 
They very rarely aid readability.

Formatting:
  void f() {

    if (a) {

      f();

    }

  }

Now leads to:
  void f() {
    if (a) {
      f();
    }
  }

llvm-svn: 204460
 2014-03-21 12:58:53 +00:00
Daniel Jasper
a125d53a7b clang-format: Let a trailing comma in braced lists enforce linebreaks. 
Before:
  vector<int> x{1, 2, 3, 4, };

After:
  vector<int> x{
      1, 2, 3, 4,
  };

This fixes llvm.org/PR18519.

llvm-svn: 204458
 2014-03-21 12:38:57 +00:00
Daniel Jasper
28df0a356e clang-format: Fix for r204456. 
llvm-svn: 204457
 2014-03-21 12:15:40 +00:00
Daniel Jasper
14e58e5290 clang-format: Preserve meaning of trailing comments on parameters. 
Formatting:
  SomeFunction(a,
            b, // comment
            c);

Before:
  SomeFunction(a, b, // comment
               c);

After:
  SomeFunction(a,
               b, // comment
               c);

llvm-svn: 204456
 2014-03-21 11:58:45 +00:00
Alexander Kornienko
ce08126733 clang-format: Detect function-like macros only when upper case is used. 
Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D3110

llvm-svn: 204156
 2014-03-18 14:35:20 +00:00
Manuel Klimek
819788da83 Fix crasher bug. 
Due to not resetting the fake rparen data on the token when iterating
over annotated lines, we would pop the last element of the paren stack.

This patch fixes the underlying root cause, and makes the code more
robust against similar problems in the future:
- reset the first token when iterating on the same annotated lines due
  to preprocessor branches
- never pop the last element from the paren stack, so we do not crash,
  but rather incorrectly format
- add assert()s so we can figure out if our assumptions are violated

llvm-svn: 204140
 2014-03-18 11:22:45 +00:00
Daniel Jasper
1fd6f1f8d6 clang-format: Indent from dict literal labels. 
Before:
  @{
    NSFontAttributeNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee :
    regularFont,
  };

After:
  @{
    NSFontAttributeNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee :
        regularFont,
  };

llvm-svn: 204041
 2014-03-17 14:32:47 +00:00
Daniel Jasper
ac7e34e778 clang-format: Prevent ObjC code from confusing the braced-init detection 
This was leading to bad formatting, e.g.:
Before:
  f(^{
      @autoreleasepool {
        if (a) {
          g();
  }
  }
  });

After:
  f(^{
      @autoreleasepool {
        if (a) {
          g();
        }
      }
  });

llvm-svn: 203777
 2014-03-13 10:11:17 +00:00
Daniel Jasper
da353cd5f1 clang-format: Fix crasher. 
Caused by unknown tokens (e.g. "\n") not properly updating the state.

Example:
  const char* c = STRINGIFY(
  \na : b);

llvm-svn: 203645
 2014-03-12 08:24:47 +00:00
Daniel Jasper
8f59ae537c clang-format: Avoid unnecessary break before lambda return type. 
Before:
  auto aaaaaaaa = [](int i,  // break
                     int j)
                      -> int {
    return fffffffffffffffffffffffffffffffffffffff(i * j);
  };

After:
  auto aaaaaaaa = [](int i,  // break
                     int j) -> int {
    return fffffffffffffffffffffffffffffffffffffff(i * j);
  };

llvm-svn: 203562
 2014-03-11 11:03:26 +00:00
Daniel Jasper
a58dd5db29 clang-format: Fix another false positive in the lambda detection. 
Before:
  int i = (*b)[a] -> f();

After:
  int i = (*b)[a]->f();

llvm-svn: 203557
 2014-03-11 10:03:33 +00:00
Daniel Jasper
d3c7ab975f clang-format: Fix incorrect lambda recognition exposed by r203452. 
Before:
  int i = a[a][a] -> f();

After:
  int i = a[a][a]->f();

llvm-svn: 203556
 2014-03-11 09:59:36 +00:00
Daniel Jasper
c580af96fa clang-format: Detect weird macro lambda usage. 
Before:
  void f() {
    MACRO((const AA & a) { return 1; });
  }

After:
  void f() {
    MACRO((const AA &a) { return 1; });
  }

llvm-svn: 203551
 2014-03-11 09:29:46 +00:00
Daniel Jasper
84a12e18d3 clang-format: Add spaces between lambdas and comments. 
Before:
  void f() {
    bar([]() {}// Does not respect SpacesBeforeTrailingComments
        );
  }

After:
  void f() {
    bar([]() {} // Does not respect SpacesBeforeTrailingComments
        );
  }

This fixes llvm.org/PR19017.

llvm-svn: 203466
 2014-03-10 15:06:25 +00:00
Alexander Kornienko
4504f93901 Preserve hanging indent when breaking line comments. 
Summary:
If we need to break the second line here:
// something: aaaaa aaaaa aaaaaa aaaaa aaaaa
//            aaaaa aaaaa aaaaaa aaaaa aaaaa aaaaa

with the patch it will be turned to

// something: aaaaa aaaaa aaaaaa aaaaa aaaaa
//            aaaaa aaaaa aaaaaa aaaaa aaaaa
//            aaaaa

instead of

// something: aaaaa aaaaa aaaaaa aaaaa aaaaa
//            aaaaa aaaaa aaaaaa aaaaa aaaaa
// aaaaa

Reviewers: djasper, klimek

Reviewed By: klimek

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D2988

llvm-svn: 203458
 2014-03-10 13:14:56 +00:00
Daniel Jasper
81a20787db clang-format: Add spaces around trailing/lambda return types. 
Before:
  int c = []()->int { return 2; }();

After:
  int c = []() -> int { return 2; }();

llvm-svn: 203452
 2014-03-10 10:02:02 +00:00
Alexander Kornienko
86b2dfdc3b Fix operator<< recognition (PR19064). 
llvm-svn: 203123
 2014-03-06 15:13:08 +00:00