Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-08 08:32:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
187,706 Commits 13 Branches 0 Tags
Commit Graph

944 Commits

Author SHA1 Message Date
Daniel Jasper
3219e43c94 clang-format: Add option to suppress operator alignment. 
With alignment:
  int aaaaaa = aa
               + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
                     * cccccccccccccccccccccccccccccccc;

Without alignment:
  int aaaaaa = aa
      + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
          * cccccccccccccccccccccccccccccccc;

This fixes llvm.org/PR21666.

llvm-svn: 223117
 2014-12-02 13:24:51 +00:00
Daniel Jasper
8c6e9ef676 clang-format: precedence-based indentation when breaking before operators. 
Before:
  bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
               + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
               + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
               == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                  * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
                  + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
               && aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                  * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                  > ccccccccccccccccccccccccccccccccccccccccc;

After:
  bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                       + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                       + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                   == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                              * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
                          + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
               && aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                          * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
                      > ccccccccccccccccccccccccccccccccccccccccc;

Not particularly pretty, but can probably help to uncover bugs. And if this
bugs somebody, parentheses can help.

llvm-svn: 223111
 2014-12-02 09:46:56 +00:00
Daniel Jasper
9e709351c5 clang-format: Add SFS_Empty to only empty functions on a single line. 
Activated for and tested by Google's Java style.

This fixes llvm.org/PR21667.

llvm-svn: 222819
 2014-11-26 10:43:58 +00:00
Daniel Jasper
79f226e780 clang-format: Make short case labels work with #ifs 
Before:
  switch (a) {
  #if FOO
  case 0: return 0; #endif
  }

After:
  switch (a) {
  #if FOO
  case 0: return 0;
  #endif
  }

This fixed llvm.org/PR21544.

llvm-svn: 222642
 2014-11-23 21:45:03 +00:00
Daniel Jasper
bb86d847ba clang-format: Improve ObjC blocks with return type. 
Before:
  Block b = ^int * (A * a, B * b) {}

After:
  Block b = ^int *(A *a, B *b) {}

This fixed llvm.org/PR21619.

llvm-svn: 222639
 2014-11-23 19:15:35 +00:00
Daniel Jasper
bcb55eec3a clang-format: Understand more lambda return types. 
Before:
  auto a = [&b, c ](D * d) -> D * {}

After:
 auto a = [&b, c](D* d) -> D* {}

llvm-svn: 222534
 2014-11-21 14:08:38 +00:00
Daniel Jasper
4b444495ed clang-format: Use nested block special case for all languages. 
Previously this was only used for JavaScript.

Before:
  functionCall({
                 int i;
                 int j;
               },
               aaaa, bbbb, cccc);

After:
  functionCall({
    int i;
    int j;
  }, aaaa, bbbb, cccc);

llvm-svn: 222531
 2014-11-21 13:38:53 +00:00
Daniel Jasper
d081e88e79 clang-format: Handle comments in short case labels. 
With AllowShortCaseLabelsOnASingleLine set to true:
This gets now left unchanged:
  case 1:
    // comment
    return;

Whereas before it was changed into:
  case 1: // comment return;

This fixes llvm.org/PR21630.

llvm-svn: 222529
 2014-11-21 12:36:25 +00:00
Daniel Jasper
3aa9a6a126 clang-format: Add option to disable alignment after opening brackets 
Before:
  SomeFunction(parameter,
               parameter);

After:
  SomeFunction(parameter,
      parameter);

Patch by Harry Terkelsen, thank you!

llvm-svn: 222284
 2014-11-18 23:55:27 +00:00
Daniel Jasper
e1e348b857 clang-format: Fix more incorrect pointer detection. 
Before:
  Constructor() : a(a), b(c, d *e) {}

After:
  Constructor() : a(a), b(c, d * e) {}

llvm-svn: 222158
 2014-11-17 18:42:22 +00:00
Daniel Jasper
6a3fd8361f clang-format: Fix regression introduced in r221609. 
Before:
  void f() { f(a, c *d); }

After:
  void f() { f(a, c * d); }

llvm-svn: 222128
 2014-11-17 13:55:04 +00:00
Daniel Jasper
d127e3b6af clang-format: Correctly detect multiplication in ctor initializer. 
Before:
  Constructor() : a(a), area(width *height) {}

After:
  Constructor() : a(a), area(width * height) {}

llvm-svn: 222010
 2014-11-14 17:26:49 +00:00
Daniel Jasper
6c0ee17b89 clang-format: Improve function parameter packing. 
Before:
  void SomeLoooooooooooongFunction(
      std::unique_ptr<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>
          aaaaaaaaaaaaaaaaaaaaaaaaaa, int bbbbbbbbbbbbb);

After:
  void SomeLoooooooooooongFunction(
      std::unique_ptr<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>
          aaaaaaaaaaaaaaaaaaaaaaaaaa,
      int bbbbbbbbbbbbb);

llvm-svn: 221989
 2014-11-14 13:14:45 +00:00
Daniel Jasper
6c22c44e12 clang-format: Support assignments as conditional operands. 
Before:
  return a != b
             // comment
             ? a
             : a = a != b
                   // comment
         ? a =
               b : a;
After:
  return a != b
             // comment
             ? a
             : a = a != b
                       // comment
                       ? a = b
                       : a;

llvm-svn: 221987
 2014-11-14 13:03:40 +00:00
Daniel Jasper
119ff533e4 clang-format: Improve indentation of comments in expressions. 
Before:
  int i = (a)
              // comment
          + b;
  return aaaa == bbbb
                 // comment
             ? aaaa
             : bbbb;
After:
  int i = (a)
          // comment
          + b;
  return aaaa == bbbb
             // comment
             ? aaaa
             : bbbb;

llvm-svn: 221985
 2014-11-14 12:31:14 +00:00
Nico Weber
34272657de clang-format: Format extern "C" blocks like namespace blocks. 
namespace blocks act as if KeepEmptyLinesAtTheStartOfBlocks is always true,
and aren't collapsed to a single line even if they would fit. Do the same
for extern "C" blocks.

Before,

  extern "C" {

  void ExternCFunction();

  }

was collapsed into `extern "C" { void ExternCFunction(); }`. Now it stays like
it was.

Fixes http://crbug.com/432640 and part of PR21419.

llvm-svn: 221897
 2014-11-13 16:25:37 +00:00
Daniel Jasper
3eb341c478 clang-format: Improve handling of comments in binary expressions. 
Before:
  b = a &&
      // Comment
      b.c &&
      d;

After:
  b = a &&
      // Comment
      b.c && d;

This fixes llvm.org/PR21535.

llvm-svn: 221727
 2014-11-11 23:04:51 +00:00
Daniel Jasper
64a328e96f clang-format: Preserve trailing-comma logic even with comments. 
Before:
  vector<int> SomeVector = {// aaa
                            1, 2,
  };

After:
  vector<int> SomeVector = {
      // aaa
      1, 2,
  };

llvm-svn: 221699
 2014-11-11 19:34:57 +00:00
Daniel Jasper
0bd9a19b28 clang-format: Fix pointer formatting. 
Before:
  void f(Bar* a = nullptr, Bar * b);
After:
  void f(Bar* a = nullptr, Bar* b);

llvm-svn: 221609
 2014-11-10 16:57:30 +00:00
Daniel Jasper
e551bb70a3 Revert "clang-format: [js] Updates to Google's JavaScript style." 
This reverts commit eefd2eaad43c5c2b17953ae7ed1e72b28e696f7b.

Apparently, this change was a bit premature.

llvm-svn: 221365
 2014-11-05 17:22:31 +00:00
Daniel Jasper
502fac38e9 clang-format: Add test to prevent regression in r221125. 
llvm-svn: 221339
 2014-11-05 10:55:36 +00:00
Daniel Jasper
680b09ba88 clang-format: Improve free-standing macro detection. 
Before:
  SOME_WEIRD_LOG_MACRO
  << "Something long enough to cause a line break";

After:
  SOME_WEIRD_LOG_MACRO
      << "Something long enough to cause a line break";

llvm-svn: 221338
 2014-11-05 10:48:04 +00:00
Daniel Jasper
8022226db7 clang-format: Fix false positive in lambda detection. 
Before:
  delete [] a -> b;

After:
  delete[] a->b;

This fixes part of llvm.org/PR21419.

llvm-svn: 221114
 2014-11-02 22:46:42 +00:00
Daniel Jasper
f739b0dbfa clang-format: [js] Updates to Google's JavaScript style. 
The style guide is changing..

llvm-svn: 220977
 2014-10-31 17:50:40 +00:00
Daniel Jasper
ac29eaccd2 clang-format: Format line if invoked on the trailing newline. 
llvm-svn: 220883
 2014-10-29 23:40:50 +00:00
Daniel Jasper
f0c809a19b clang-format: Improve && detection as binary operator. 
Before:
  template <class T,
            class = typename ::std::enable_if<
                ::std::is_array<T>{}&& ::std::is_array<T>{}>::type>
  void F();

After:
  template <class T,
            class = typename ::std::enable_if<
                ::std::is_array<T>{} && ::std::is_array<T>{}>::type>
  void F();

llvm-svn: 220813
 2014-10-28 18:28:22 +00:00
Daniel Jasper
acb7e25d5f clang-format: Fix test. 
llvm-svn: 220807
 2014-10-28 18:18:02 +00:00
Daniel Jasper
13a7f469be clang-format: Improve && detection as binary operators. 
Before:
  template <class T, class = typename std::enable_if<std::is_integral<
                         T>::value &&(sizeof(T) > 1 || sizeof(T) < 8)>::type>
  void F();

After:
  template <class T, class = typename std::enable_if<
                         std::is_integral<T>::value &&
                         (sizeof(T) > 1 || sizeof(T) < 8)>::type>
  void F();

llvm-svn: 220805
 2014-10-28 18:11:52 +00:00
Daniel Jasper
2ad0aba610 clang-format: Improve function declaration detection. 
Before:
  ReturnType MACRO
      FunctionName() {}

After:
  ReturnType MACRO
  FunctionName() {}

This fixes llvm.org/PR21404.

I wonder what the motivation for that if-condition was. But as no test
breaks, ...

llvm-svn: 220801
 2014-10-28 17:06:04 +00:00
Daniel Jasper
50d634b343 clang-format: [ObjC] Add separate flag to control indentation in blocks 
Apparently, people are very much divided on what the "correct"
indentation is. So, best to give them a choice.

The new flag is called ObjCBlockIndentWidth and the default is now set
to the same value as IndentWidth for the pre-defined styles.

llvm-svn: 220784
 2014-10-28 16:53:38 +00:00
Daniel Jasper
e068ac77a2 clang-format: Don't break after very short return types. 
Before:
  void
  SomeFunction(int parameter);

After:
  void SomeFunction(
      int parameter);

(Unless AlwaysBreakAfterDefinitionReturnType after type is set).

llvm-svn: 220686
 2014-10-27 17:13:59 +00:00
Daniel Jasper
5634619389 clang-format: Fix bad merging of lines in nested blocks. 
Before:
  SomeFunction([]() {
  #define A a
    return 43; });

After:
  SomeFunction([]() {
  #define A a
    return 43;
  });

llvm-svn: 220684
 2014-10-27 16:31:46 +00:00
Daniel Jasper
f322eb5c45 clang-format: Fix incorrect space after "<". 
Before:
  bool a = 2 <::SomeFunction();

After:
  bool a = 2 < ::SomeFunction();

llvm-svn: 220505
 2014-10-23 20:22:22 +00:00
Daniel Jasper
76284683f1 clang-format: Use AllowShortBlocksOnASingleLine for ObjC blocks, too. 
llvm-svn: 220375
 2014-10-22 09:12:44 +00:00
Daniel Jasper
b52c69e567 clang-format: Fix broken test. 
llvm-svn: 220374
 2014-10-22 09:01:12 +00:00
Daniel Jasper
e8a4939b77 clang-format: Fix incorrect trailing return arrow detection. 
Before:
  auto doSomething(Aaaaaa* aaaaaa) -> decltype(aaaaaa -> f()) {}

After:
  auto doSomething(Aaaaaa* aaaaaa) -> decltype(aaaaaa->f()) {}

llvm-svn: 220373
 2014-10-22 08:42:58 +00:00
Daniel Jasper
f1f267b447 clang-format: [ObjC] Fix spacing in block variable parameters. 
Before:
  { void (^block)(Object * x); }

After:
  { void (^block)(Object *x); }

llvm-svn: 220270
 2014-10-21 07:57:50 +00:00
Daniel Jasper
38efc13191 clang-format: Fix space in direct destructor calls. 
Before:
  void F(int& i) { i. ~int(); }

After:
  void F(int& i) { i.~int(); }

Also, some cleanups.

llvm-svn: 220269
 2014-10-21 07:51:54 +00:00
Daniel Jasper
8835a32078 clang-format: Fix overloaded operator edge case. 
Before:
  template <class F>
  void Call(F f) {
    f.template operator() <int>();
  }

After:
  template <class F>
  void Call(F f) {
    f.template operator()<int>();
  }

llvm-svn: 220202
 2014-10-20 13:56:30 +00:00
Daniel Jasper
7858079246 clang-format: [ObjC] Fix using selector names as macro arguments. 
Before:
  [self aaaaa:MACRO(a, b :, c :)];

After:
  [self aaaaa:MACRO(a, b:, c:)];

llvm-svn: 220197
 2014-10-20 12:01:45 +00:00
Daniel Jasper
86296e36d7 clang-format: Fix indentation of struct definitions with array init. 
Before:
  struct {
    int x;
    int y;
  } points[] = {
        {1, 2}, {2, 3},
  };

After:
  struct {
    int x;
    int y;
  } points[] = {
      {1, 2}, {2, 3},
  };

llvm-svn: 220195
 2014-10-20 11:12:51 +00:00
Daniel Jasper
da07a72928 clang-format: Prefer breaking before trailing return arrows. 
Before:
  auto SomeFunction(
      A aaaaaaaaaaaaaaaaaaaaa) const -> decltype(f(aaaaaaaaaaaaaaaaaaaaa)) {}

After:
  auto SomeFunction(A aaaaaaaaaaaaaaaaaaaaa) const
      -> decltype(f(aaaaaaaaaaaaaaaaaaaaa)) {}

llvm-svn: 220043
 2014-10-17 14:37:40 +00:00
Daniel Jasper
1a31bab301 clang-format: Fix behavior with comments before conditional expressions 
Before:
  SomeFunction(aaaaaaaaaaaaaaaaa,
               // comment.
                   ccccccccccccccccc ? aaaaaaaaaaaaaaaaaaaa
                                     : bbbbbbbbbbbbbbbbbbbb);

After:
  SomeFunction(aaaaaaaaaaaaaaaaa,
               // comment.
               ccccccccccccccccc ? aaaaaaaaaaaaaaaaaaaa : bbbbbbbbbbbbbbbbbbbb);

llvm-svn: 219921
 2014-10-16 09:10:11 +00:00
Daniel Jasper
ea772b4df2 clang-format: [ObjC] Fix method expression detection. 
Before:
  return (a)[foo bar : baz];

After:
  return (a)[foo bar:baz];

llvm-svn: 219919
 2014-10-16 08:38:51 +00:00
Daniel Jasper
ec8e838baa clang-format: [ObjC] Wrap ObjC method declarations before annotations. 
Before:
  - (instancetype)initXxxxxxxxxxxxxxxxxxxxxxxxx:(id<x>)x
                                              y:(id<yyyyyyyyyyyyyyyyyyyy>)
                                                    y NS_DESIGNATED_INITIALIZER;
After:
  - (instancetype)initXxxxxxxxxxxxxxxxxxxxxxxxx:(id<x>)x
                                              y:(id<yyyyyyyyyyyyyyyyyyyy>)y
      NS_DESIGNATED_INITIALIZER;

llvm-svn: 219564
 2014-10-11 08:24:56 +00:00
Daniel Jasper
18210d7d2f clang-format: Add option to control call argument bin-packing separately 
This is desirable for the Chromium style guide:
http://www.chromium.org/developers/coding-style

llvm-svn: 219400
 2014-10-09 09:52:05 +00:00
Daniel Jasper
4281c5ae01 clang-format: Fix bug with comments between non-trival parameters. 
Before:
  SomeFunction(a, a,
               // comment
                      b + x);

After:
  SomeFunction(a, a,
               // comment
               b + x);

llvm-svn: 219209
 2014-10-07 14:45:34 +00:00
Daniel Jasper
a45eb4c000 clang-format: If in doubt, assume '+' is a binary operator. 
Before:
  #define LENGTH(x, y) (x) - (y)+1

After:
  #define LENGTH(x, y) (x) - (y) + 1

llvm-svn: 219119
 2014-10-06 13:16:43 +00:00
Daniel Jasper
91881d99f7 clang-format: Fix GCC warning about implicit bool pointer conversion. 
Introduced in r217880.

llvm-svn: 218597
 2014-09-29 08:07:46 +00:00
Nico Weber
7533b4dada clang-format: Don't let -style=Chromium imply c++03 template formatting. 
Chromium's now using some c++11 language features, so it's now fine that
clang-format produces vector<vector<int>>.

llvm-svn: 218392
 2014-09-24 17:17:32 +00:00