shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity
174,557 Commits 1,713 Branches 298 Tags
Commit Graph

932 Commits

Author SHA1 Message Date
Alp Toker
c3f36af8d0 Fix typos 
llvm-svn: 208838
 2014-05-15 01:35:53 +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
fb4333b093 clang-format: [JS] Basic support for escape sequences in regex literals. 
Before:
  var regex = /\\/ g; // This isn't even recognized as regex.

After:
  var regex = /\\/g; // It now is.

llvm-svn: 208539
 2014-05-12 11:29:50 +00:00
Benjamin Kramer
f3ca269839 Decouple ExprCXX.h and DeclCXX.h and clean up includes a bit. 
Required pulling LambdaExpr::Capture into its own header.
No functionality change.

llvm-svn: 208470
 2014-05-10 16:31:55 +00:00
Daniel Jasper
b05a81debb clang-format: Fix bug introduced by r208392. 
Also run clang-format over clang-format's files.

llvm-svn: 208409
 2014-05-09 13:11:16 +00:00
Daniel Jasper
8f83a9072d clang-format: [JS] Allow up to 3 empty lines in Google's JS style. 
llvm-svn: 208404
 2014-05-09 10:28:58 +00:00
Daniel Jasper
8951908218 clang-format: [JS] Fix spacing in dict literals. 
Before:
  someVariable = {'a':[{}]};

After:
  someVariable = {'a': [{}]};

llvm-svn: 208403
 2014-05-09 10:26:08 +00:00
Craig Topper
2145bc0229 [C++11] Use 'nullptr'. 
llvm-svn: 208392
 2014-05-09 08:15:10 +00:00
Daniel Jasper
05cd586863 clang-format: Cleanup redundant calculation of ParenLevel. 
No functional changes intended.

llvm-svn: 208304
 2014-05-08 12:21:30 +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
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
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
Daniel Jasper
f7405c129e clang-format: [JS] Support regex literals after 'return'. 
llvm-svn: 208285
 2014-05-08 07:45:18 +00:00
Daniel Jasper
f9ae312fc0 clang-format: [JS] Initial support for regex literals. 
llvm-svn: 208281
 2014-05-08 07:01:45 +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
79dffb4128 clang-format: Be slightly more aggressive on single-line functions. 
So that JS functions can also be merged into a single line.

Before:
  var func = function() {
    return 1;
  };

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

llvm-svn: 208176
 2014-05-07 09:48:30 +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
Daniel Jasper
484033b188 clang-format: [JS] Keep space after closure style comments. 
Before:
  var x = /** @type {foo} */ (bar);

After:
  var x = /** @type {foo} */(bar);

llvm-svn: 208093
 2014-05-06 14:41:29 +00:00
Daniel Jasper
166c19bd37 clang-format: [JS] Keep space between 'return' and '['. 
llvm-svn: 208090
 2014-05-06 14:12:21 +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
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
Dinesh Dwivedi
13b9b7e0e8 Pulled out cast detection in TokenAnnotator into its own function 
This is to remove FIXME added in r207964.

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

llvm-svn: 208071
 2014-05-06 09:08:34 +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
Dinesh Dwivedi
0db806b7f9 Fix typo (first commit to test commit access). 
llvm-svn: 207775
 2014-05-01 17:19:34 +00:00
Daniel Jasper
883ae9d9a3 clang-format: Don't bin-pack text-proto-formatted options. 
Before:
  repeated double value = 1
      [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,
                              bbbbbbb: BBBB, bbbb: BBB}];

After:
  repeated double value = 1
      [(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,
                              bbbbbbb: BBBB,
                              bbbb: BBB}];

llvm-svn: 207538
 2014-04-29 15:54:14 +00:00
Daniel Jasper
c282e54eb6 clang-format: Remove accidentally added debug output. 
llvm-svn: 207533
 2014-04-29 15:35:28 +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
Chandler Carruth
57f5fbe3b2 [Modules] Update Clang's two files that use DEBUG(...) without defining 
DEBUG_TYPE to do so. LLVM's Debug.h requires this as of r206822.

llvm-svn: 206823
 2014-04-21 22:55:36 +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
NAKAMURA Takumi
2205952150 Format.cpp: Don't use initializer list. 
llvm-svn: 206339
 2014-04-15 23:29:04 +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
783bac6bba clang-format: Understand proto text format without commas. 
Also removed spaces before colons as they don't seem to be used
frequently.

Before:
optional int32 b = 2
    [(foo_options) = {aaaaaaaaaaaaaaaaaaa : 123 bbbbbbbbbbbbbbbbbbbbbbbb :
                          "baz"}];

After:
optional int32 b = 2 [(foo_options) = {aaaaaaaaaaaaaaaaaaa: 123,
                                       bbbbbbbbbbbbbbbbbbbbbbbb:"baz"}];

llvm-svn: 206269
 2014-04-15 09:54:30 +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
98583d522f clang-format: Early cut-off for inlining nested blocks. 
Specifically, for a nested block or lambda, don't try to put the single
statement body inline, if it exceeds the column limit.

This should not change any observable behavior (as those would never
have led to the 'best' solution), but significantly speeds up formatting
time.

This fixes llvm.org/PR18761. Formatting time goes down from ~100s to a
few ms.

llvm-svn: 206260
 2014-04-15 08:28:06 +00:00
Daniel Jasper
c359ad00a6 clang-format: Cache results of formatting nested blocks. 
This somewhat improves the performance problem reported in
llvm.org/PR18761. No other behavior changes intended.

llvm-svn: 206258
 2014-04-15 08:13:47 +00:00
Daniel Jasper
866468ae4d clang-format: Fix regression caused by r206165. 
llvm-svn: 206173
 2014-04-14 13:15:29 +00:00