mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-05-08 16:06:07 +00:00
Code Issues Projects Releases Wiki Activity
173,993 Commits 1,258 Branches 288 Tags
Commit Graph

164 Commits

Author SHA1 Message Date
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
c03e16a7bc clang-format: [JS] support closures in container literals. 
Before:
  return {body: {setAttribute: function(key, val) {this[key] = val;
  }
  , getAttribute : function(key) { return this[key]; }
  , style : {
  direction:
    ''
  }
  }
  }
  ;

After:
  return {
    body: {
      setAttribute: function(key, val) { this[key] = val; },
      getAttribute: function(key) { return this[key]; },
      style: {direction: ''}
    }
  };

llvm-svn: 208292
 2014-05-08 09:25:39 +00:00
Daniel Jasper
4a39c84c91 clang-format: [JS] Don't indent in goog.scope blocks. 
Before:
  goog.scope(function() {
    var x = a.b;
    var y = c.d;
  });  // goog.scope

After:
  goog.scope(function() {
  var x = a.b;
  var y = c.d;
  });  // goog.scope

llvm-svn: 208088
 2014-05-06 13:54:10 +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
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
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
Manuel Klimek
1fcbe675fa Correctly handle escaped newlines when the next token starts without a space. 
We will need this to correctly handle conflict markers inside macro
definitions.

llvm-svn: 206029
 2014-04-11 12:27:47 +00:00
Daniel Jasper
220c0d1f5e clang-format: Fix false positive in braced list detection in protos. 
llvm-svn: 205954
 2014-04-10 07:27:12 +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
240dfda352 clang-format: Solve issues found and fixed by clang-tidy. 
llvm-svn: 205193
 2014-03-31 14:23:49 +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
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
Craig Topper
fb6b25b5e4 [C++11] Add 'override' keyword to virtual methods that override their base class. 
llvm-svn: 203999
 2014-03-15 04:29:04 +00:00
Alexander Kornienko
c2ee9cf861 Remove an unnecessary check for FormatTok not being null. 
Summary:
This check hints clang analyzer, that FormatTok may be null, and it
reports a null pointer dereference error:
http://buildd-clang.debian.net/scan-build/report-827c64.html#Path28

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

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

llvm-svn: 203800
 2014-03-13 13:59:48 +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
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
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
Ahmed Charles
9a16beb8bc Change OwningPtr::take() to OwningPtr::release(). 
This is a precursor to moving to std::unique_ptr.

llvm-svn: 203275
 2014-03-07 19:33:25 +00:00
Daniel Jasper
1067ab0a1a clang-format: Support lambdas with namespace-qualified return types. 
E.g.:
  Foo([]()->std::vector<int> { return { 2 }; }());

llvm-svn: 201139
 2014-02-11 10:16:55 +00:00
Daniel Jasper
a88f80a1be clang-format: Support ObjC's NS_ENUMs. 
Before:
  typedef NS_ENUM(NSInteger, MyType) {
      /// Information about someDecentlyLongValue.
      someDecentlyLongValue,
      /// Information about anotherDecentlyLongValue.
      anotherDecentlyLongValue,
      /// Information about aThirdDecentlyLongValue.
      aThirdDecentlyLongValue};

After:
  typedef NS_ENUM(NSInteger, MyType) {
    /// Information about someDecentlyLongValue.
    someDecentlyLongValue,
    /// Information about anotherDecentlyLongValue.
    anotherDecentlyLongValue,
    /// Information about aThirdDecentlyLongValue.
    aThirdDecentlyLongValue
  };

llvm-svn: 200469
 2014-01-30 14:38:37 +00:00
Manuel Klimek
14bd917470 Fix crash on unmatched #endif's. 
The following snippet would crash:
  #endif
  #if A

llvm-svn: 200381
 2014-01-29 08:49:02 +00:00
Manuel Klimek
421147ec65 Get rid of special parsing for return statements. 
This was done when we were not able to parse lambdas to handle some
edge cases for block formatting different in return statements, but is
not necessary any more.

llvm-svn: 199982
 2014-01-24 09:25:23 +00:00
Daniel Jasper
6b70ec0d46 clang-format: Fix incorrect lambda recognition. 
Before:
  std::unique_ptr<int[]> foo() {}

After:
  std::unique_ptr<int []> foo() {}

Also, the formatting could go severely wrong after such a function
before.

llvm-svn: 199817
 2014-01-22 17:01:47 +00:00
Daniel Jasper
cb51cf409b clang-format: Enable formatting of lambdas with explicit return type. 
So clang-format can now format:

  int c = []()->int { return 2; }();
  int c = []()->vector<int> { return { 2 }; }();

llvm-svn: 199368
 2014-01-16 09:11:55 +00:00
Benjamin Kramer
e21cb74224 clang-format: Don't hang forever when encountering a stray "}" in an @implementation block. 
PR18406.

llvm-svn: 198770
 2014-01-08 15:59:42 +00:00
Daniel Jasper
352dae199a clang-format: Recognize single-line macro usages inside macros. 
Before:
  #define LIST(L)                                                     \
    L(FirstElement) L(SecondElement) L(ThirdElement) L(FourthElement) \
        L(FifthElement)

After:
  #define LIST(L)    \
    L(FirstElement)  \
    L(SecondElement) \
    L(ThirdElement)  \
    L(FourthElement) \
    L(FifthElement)

llvm-svn: 198407
 2014-01-03 11:50:46 +00:00
Daniel Jasper
b88b25feec clang-format: Fix various problems in formatting ObjC blocks. 
Among other things, this fixes llvm.org/PR15269.

llvm-svn: 197900
 2013-12-23 07:29:06 +00:00
Alexander Kornienko
3a33f0292b Implemented GNU-style formatting for compound statements. 
Summary:
Added BraceBreakingStyle::BS_GNU. I'm not sure about the correctness of
static initializer formatting, but compound statements should be fine.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

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

llvm-svn: 197138
 2013-12-12 09:49:52 +00:00
Daniel Jasper
1556b59338 clang-format: Correctly handle Qt's Q_SLOTS. 
This should fix llvm.org/PR17241. Maybe it sticks this time :-).

llvm-svn: 195953
 2013-11-29 08:51:56 +00:00
Daniel Jasper
84c47a1074 clang-format: Support Qt's slot access specifiers. 
This fixes llvm.org/PR17241.

llvm-svn: 195555
 2013-11-23 17:53:41 +00:00
Daniel Jasper
b631d5e6f3 clang-format: Recognize braced lists with trailing function call. 
Before:
  int count = set<int> { f(), g(), h() }
      .size();

After:
  int count = set<int>{f(), g(), h()}.size();

llvm-svn: 195417
 2013-11-22 07:26:53 +00:00
Alexander Kornienko
3cfa973978 Added an option to allow short function bodies be placed on a single line. 
Summary:
The AllowShortFunctionsOnASingleLine option now controls short function
body placement on a single line independent of the BreakBeforeBraces option.
Updated tests using BreakBeforeBraces other than BS_Attach.

Addresses http://llvm.org/PR17888

Reviewers: klimek, djasper

Reviewed By: klimek

CC: cfe-commits, klimek

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

llvm-svn: 195256
 2013-11-20 16:33:05 +00:00
Manuel Klimek
f6fd3d3fcf Remove incorrect assert. 
If we run into the second preprocessor branch chain, the first branch
chain might have already set the maximum branch count on that level to
something > 0.

Fixes PR17645.

llvm-svn: 193153
 2013-10-22 08:27:19 +00:00
Manuel Klimek
b212f3baa1 Automatically munch semicolons after blocks. 
While it is mostly a user error to have the extra semicolon,
formatting it graciously will correctly format in the cases
where we do not fully understand the code (macros).

llvm-svn: 192543
 2013-10-12 22:46:56 +00:00
Daniel Jasper
53bd167c60 clang-format: Fix assertion on unterminated #ifs. 
llvm-svn: 192535
 2013-10-12 13:32:56 +00:00
Manuel Klimek
71814b4465 Support formatting of preprocessor branches. 
We now correctly format:
  void SomeFunction(int param1,
  #ifdef X
                    NoTemplate param2,
  #else
                    template <
  #ifdef A
                        MyType<Some> >
  #else
                        Type1, Type2>
  #endif
                    param2,
  #endif
                    param3) {
    f();
  }

llvm-svn: 192503
 2013-10-11 21:25:45 +00:00
Manuel Klimek
91e48586ae Fix incorrect detection of class definitions with alignas specification. 
llvm-svn: 192094
 2013-10-07 09:15:41 +00:00
Daniel Jasper
f3d977979c clang-format: Detect braced lists in subscript expressions. 
Before (even with Style.Cpp11BracedListStyle):
  f(MyMap[{ composite, key }]);

After:
  f(MyMap[{composite, key}]);

llvm-svn: 190678
 2013-09-13 10:55:31 +00:00
Daniel Jasper
015ed028cf clang-format: Fix incorrect enum parsing / layouting. 
Before:
  enum {
    Bar = Foo < int,
    int > ::value
  };

After:
  enum {
    Bar = Foo<int, int>::value
  };

llvm-svn: 190674
 2013-09-13 09:20:45 +00:00
Daniel Jasper
786a550b9f clang-format: Format typed enums with nested names. 
The explicit type specified for an enum can actually have a nested name
specifier.

This fixes llvm.org/PR17125.

llvm-svn: 190208
 2013-09-06 21:32:35 +00:00
Daniel Jasper
b4b9998713 clang-format: Don't confuse operator[] with lambdas. 
Before:
  double &operator[](int i) { return 0; } int i;

After:
  double &operator[](int i) { return 0; }
  int i;

This fixes llvm.org/PR17134.

llvm-svn: 190207
 2013-09-06 21:25:51 +00:00
Daniel Jasper
3b203a65c2 Add ATTRIBUTE_UNUSED to silence unused-function warning in release 
builds.

llvm-svn: 190061
 2013-09-05 16:05:56 +00:00
Manuel Klimek
9a53c7f40d Fixes PR 17106 (explicitly typed enums are formatted differently). 
Before:
 enum X : int { A, B, C };

After:
 enum X : int {
   A,
   B,
   C
 };

llvm-svn: 190054
 2013-09-05 15:34:55 +00:00
Daniel Jasper
bf02b2c186 clang-format: Quickfix for braced init lists detected as lambdas. 
Before:
  constexpr char hello [] { "hello" };

After:
  constexpr char hello[]{ "hello" };

llvm-svn: 190046
 2013-09-05 11:49:39 +00:00
Daniel Jasper
9a8d48b5e1 clang-format: Fix parsing and indenting lambdas. 
Before:
  void f() {
    other(x.begin(), x.end(), //
                         [&](int, int) { return 1; });
  }

After:
  void f() {
    other(x.begin(), x.end(), //
          [&](int, int) { return 1; });
  }

llvm-svn: 190039
 2013-09-05 10:04:31 +00:00
Daniel Jasper
9fe0e8dacd clang-format: Enable formatting of nested blocks. 
Among other things, this enables (better) formatting lambdas and
constructs like:
  MACRO({
          long_statement();
          long_statement_2();
        },
        {
          long_statement();
          long_statement_2();
        },
        { short_statement(); }, "");

This fixes llvm.org/PR15381.

llvm-svn: 190038
 2013-09-05 09:29:45 +00:00
Manuel Klimek
f017dc0156 Remove code duplication in unwrapped line parser. 
llvm-svn: 189933
 2013-09-04 13:34:14 +00:00
Manuel Klimek
516e054c05 Implement parsing of blocks (^{ ... }) in the unwrapped line parser. 
This patch makes sure we produce the right number of unwrapped lines,
a follow-up patch will make the whitespace formatting consistent.

Before:
 void f() {
   int i = {[operation setCompletionBlock : ^{ [self onOperationDone];
 }]
 }
 ;
 }

After:
 void f() {
   int i = {[operation setCompletionBlock : ^{
     [self onOperationDone];
   }] };
 }

llvm-svn: 189932
 2013-09-04 13:25:30 +00:00
Manuel Klimek
bab25fdfa5 Fix layout of lambda captures. 
Before:
 int c = [ &, &a, a]{
   [ =, c, &d]{
     return b++;
   }();
 }();

After:
 int c = [&, &a, a] {
   [=, c, &d] {
     return b++;
   }();
 }();

llvm-svn: 189924
 2013-09-04 08:20:47 +00:00