Skip to content

Commit

Permalink
更新CPP内核
Browse files Browse the repository at this point in the history
  • Loading branch information
@akof1314
akof1314 committed Mar 11, 2017
1 parent ca9e706 commit 65ae210
Show file tree
Hide file tree
Showing 11 changed files with 3,464 additions and 2,231 deletions.
4 changes: 3 additions & 1 deletion CoolFormat/FormatterHelp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ BOOL CFormatterHelp::DoFormatter(UINT nLanguage, const CString &strTextIn, CStri
case SYN_VERILOG:
{
pTidy = new CCFVerilogTidy();
strTidy = CT2A(g_GlobalTidy.m_TidyVerilog);
CString strNewTidy(g_GlobalTidy.m_TidyVerilog);
strNewTidy.Replace(_T("-"), _T(" -"));
strTidy = CT2A(strNewTidy);
}
break;
default:
Expand Down
121 changes: 109 additions & 12 deletions CoolFormat/res/SetConfig/Cpp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@
<SHORT>A15</SHORT>
<PREVIEW>int Foo(bool isFoo)\r\n{\r\n if (isFoo)\r\n {\r\n bar();\r\n return 1;\r\n }\r\n else\r\n return 0;\r\n}</PREVIEW>
</ITEM>
<ITEM>
<VALUE>Mozilla</VALUE>
<SHORT>A16</SHORT>
<PREVIEW>int Foo(bool isBar)\r\n{\r\n if (isBar) {\r\n bar();\r\n return 1;\r\n } else\r\n return 0;\r\n}</PREVIEW>
</ITEM>
<ITEM>
<VALUE>None</VALUE>
</ITEM>
Expand Down Expand Up @@ -245,6 +250,14 @@
<PREVIEW>namespace foospace\r\n{\r\nclass Foo\r\n{\r\n public:\r\n Foo();\r\n virtual ~Foo();\r\n};\r\n}</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Indent continuation</NAME>
<TYPE>Number</TYPE>
<VALUE>1</VALUE>
<RANGE>0, 4</RANGE>
<SHORT>xt</SHORT>
<PREVIEW>isLongVariable =\r\n foo1 ||\r\n foo2;\r\n\r\nisLongFunction(\r\n bar1,\r\n bar2);\r\nbecomes (with indent-continuation=3):\r\n\r\nisLongVariable =\r\n foo1 ||\r\n foo2;\r\n\r\nisLongFunction(\r\n bar1,\r\n bar2);</PREVIEW>
</PROPERTY>
<PROPERTY>
<NAME>Indent labels</NAME>
<TYPE>Combo</TYPE>
Expand Down Expand Up @@ -394,6 +407,20 @@
<PREVIEW>if (foo==2)\r\n a=bar((b-c)*a,d--);</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Pad comma</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xg</SHORT>
<PREVIEW>if (isFoo(a, b)\r\n bar(a, b);</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>if (isFoo(a,b)\r\n bar(a,b);</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Pad parens</NAME>
<TYPE>Combo</TYPE>
Expand Down Expand Up @@ -591,6 +618,20 @@
<PREVIEW>if (isFoo) {\r\n bar();\r\n}\r\nelse if (isFoo1()) {\r\n bar1();\r\n}\r\nelse if (isFoo2()) }\r\n bar2;\r\n}</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Break one line headers</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xb</SHORT>
<PREVIEW>void Foo(bool isFoo)\r\n{\r\n if (isFoo1)\r\n bar1();\r\n\r\n if (isFoo2) {\r\n bar2();\r\n }\r\n}</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>void Foo(bool isFoo)\r\n{\r\n if (isFoo1) bar1();\r\n\r\n if (isFoo2) { bar2(); }\r\n}</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Add brackets</NAME>
<TYPE>Combo</TYPE>
Expand Down Expand Up @@ -744,45 +785,101 @@
<GROUP>TRUE</GROUP>
</PROPERTY>
<PROPERTY>
<NAME>Align method colon</NAME>
<NAME>Pad method prefix</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xM</SHORT>
<PREVIEW>-(void)deleteKey:(id)key\r\n atIndex:(int)index\r\n ofNode:(Node*)node;</PREVIEW>
<SHORT>xQ</SHORT>
<PREVIEW>- (void)foo1;\r\n- (void)foo2;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>-(void)deleteKey:(id)key\r\n atIndex:(int)index\r\n ofNode:(Node*)node;</PREVIEW>
<PREVIEW>-(void)foo1;\r\n- (void)foo2;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Pad method prefix</NAME>
<NAME>Unpad method prefix</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xQ</SHORT>
<PREVIEW>- (void)foo1;\r\n+ (void)foo2;</PREVIEW>
<SHORT>xR</SHORT>
<PREVIEW>-(void) foo1;\r\n-(void) foo2;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>-(void)foo1;\r\n+(void)foo2;</PREVIEW>
<PREVIEW>- (void) foo1;\r\n- (void) foo2;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Unpad method prefix</NAME>
<NAME>Pad return type</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xR</SHORT>
<PREVIEW>-(void)foo1;\r\n+(void)foo2;</PREVIEW>
<SHORT>xq</SHORT>
<PREVIEW>-(void) foo1;\r\n-(void) foo2;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>- (void)foo1;\r\n+ (void)foo2;</PREVIEW>
<PREVIEW>-(void)foo1;\r\n-(void) foo2;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Unpad return type</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xr</SHORT>
<PREVIEW>-(void)foo1;\r\n-(void)foo2;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>-(void) foo1;\r\n-(void) foo2;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Pad param type</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xS</SHORT>
<PREVIEW>-(void)foo1: (bool) barArg1;\r\n-(void)foo2: (bool) barArg2;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>-(void)foo1:(bool)barArg1;\r\n-(void)foo2: (bool) barArg2;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Unpad param type</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xs</SHORT>
<PREVIEW>-(void)foo1:(bool)barArg1;\r\n-(void)foo2:(bool)barArg2;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>-(void)foo1: (bool) barArg1;\r\n-(void)foo2: (bool) barArg2;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
<NAME>Align method colon</NAME>
<TYPE>Combo</TYPE>
<VALUE>No</VALUE>
<ITEM>
<VALUE>Yes</VALUE>
<SHORT>xM</SHORT>
<PREVIEW>-(void)deleteKey:(id)key\r\n atIndex:(int)index\r\n ofNode:(Node*)node;</PREVIEW>
</ITEM>
<ITEM>
<VALUE>No</VALUE>
<PREVIEW>-(void)deleteKey:(id)key\r\n atIndex:(int)index\r\n ofNode:(Node*)node;</PREVIEW>
</ITEM>
</PROPERTY>
<PROPERTY>
Expand Down
Loading

0 comments on commit 65ae210

Please sign in to comment.