changeset 776:f69bf0213445

Updated the uncrustify ini file to support version 0.59 git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1053 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Tue, 27 Dec 2011 10:48:25 +0000
parents 6691df78dd5c
children f55b7f34a3e1
files indenters/uigui_uncrustify.ini
diffstat 1 files changed, 158 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/indenters/uigui_uncrustify.ini	Tue Dec 27 10:47:33 2011 +0000
+++ b/indenters/uigui_uncrustify.ini	Tue Dec 27 10:48:25 2011 +0000
@@ -15,7 +15,7 @@
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
-version=0.57
+version=0.59
 
 [Newlines]
 Category=0
@@ -66,6 +66,39 @@
 MaxVal=255
 ValueDefault=0
 
+[Tok Split Gte]
+Category=0
+Description="<html>Allow interpreting '&gt;=' and '&gt;&gt;=' as part of a template in 'void f(list&lt;list&lt;B&gt;&gt;=val);'.<BR>If true (default), 'assert(x&lt;0 &amp;&amp; y&gt;=3)' will be broken.<BR>Improvements to template detection may make this option obsolete.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=tok_split_gte=true|tok_split_gte=false
+ValueDefault=0
+
+[Utf8 Bom]
+Category=0
+Description="<html>Control what to do with the UTF-8 BOM (recommed 'remove')</html>"
+Enabled=false
+EditorType=multiple
+Choices="utf8_bom=ignore|utf8_bom=add|utf8_bom=remove|utf8_bom=force"
+ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
+ValueDefault=0
+
+[Utf8 Byte]
+Category=0
+Description="<html>If the file only contains chars between 128 and 255 and is not UTF-8, then output as UTF-8</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=utf8_byte=true|utf8_byte=false
+ValueDefault=0
+
+[Utf8 Force]
+Category=0
+Description="<html>Force the output encoding to UTF-8</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=utf8_force=true|utf8_force=false
+ValueDefault=0
+
 [Indent Columns]
 Category=1
 Description="<html>The number of columns to indent per level.<BR>Usually 2, 3, 4, or 8.</html>"
@@ -223,6 +256,16 @@
 TrueFalse=indent_class_colon=true|indent_class_colon=false
 ValueDefault=0
 
+[Indent Ctor Init]
+Category=1
+Description="<html>Additional indenting for constructor initializer list</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_ctor_init="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Indent Else If]
 Category=1
 Description="<html>False=treat 'else\nif' as 'else if' for indenting purposes<BR>True=indent the 'if' one level<BR></html>"
@@ -945,7 +988,7 @@
 
 [Sp Inside Square]
 Category=2
-Description="<html>Add or remove space inside '[' and ']'</html>"
+Description="<html>Add or remove space inside a non-empty '[' and ']'</html>"
 Enabled=false
 EditorType=multiple
 Choices="sp_inside_square=ignore|sp_inside_square=add|sp_inside_square=remove|sp_inside_square=force"
@@ -1249,6 +1292,33 @@
 ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
 ValueDefault=0
 
+[Sp Catch Paren]
+Category=2
+Description="<html>Add or remove space between 'catch' and '(' in 'catch (something) { }'<BR>If set to ignore, sp_before_sparen is used.</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_catch_paren=ignore|sp_catch_paren=add|sp_catch_paren=remove|sp_catch_paren=force"
+ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
+ValueDefault=0
+
+[Sp Version Paren]
+Category=2
+Description="<html>Add or remove space between 'version' and '(' in 'version (something) { }' (D language)<BR>If set to ignore, sp_before_sparen is used.</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_version_paren=ignore|sp_version_paren=add|sp_version_paren=remove|sp_version_paren=force"
+ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
+ValueDefault=0
+
+[Sp Scope Paren]
+Category=2
+Description="<html>Add or remove space between 'scope' and '(' in 'scope (something) { }' (D language)<BR>If set to ignore, sp_before_sparen is used.</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_scope_paren=ignore|sp_scope_paren=add|sp_scope_paren=remove|sp_scope_paren=force"
+ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
+ValueDefault=0
+
 [Sp Macro]
 Category=2
 Description="<html>Add or remove space between macro and value</html>"
@@ -1609,6 +1679,34 @@
 ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
 ValueDefault=0
 
+[Sp After New]
+Category=2
+Description="<html>Controls the spaces after 'new', 'delete', and 'delete[]'</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_after_new=ignore|sp_after_new=add|sp_after_new=remove|sp_after_new=force"
+ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
+ValueDefault=0
+
+[Sp Before Tr Emb Cmt]
+Category=2
+Description="<html>Controls the spaces before a trailing or embedded comment</html>"
+Enabled=false
+EditorType=multiple
+Choices="sp_before_tr_emb_cmt=ignore|sp_before_tr_emb_cmt=add|sp_before_tr_emb_cmt=remove|sp_before_tr_emb_cmt=force"
+ChoicesReadable="Ignore Sp Before Tr Emb Cmt|Add Sp Before Tr Emb Cmt|Remove Sp Before Tr Emb Cmt|Force Sp Before Tr Emb Cmt"
+ValueDefault=0
+
+[Sp Num Before Tr Emb Cmt]
+Category=2
+Description="<html>Number of spaces before a trailing or embedded comment</html>"
+Enabled=false
+EditorType=numeric
+CallName="sp_num_before_tr_emb_cmt="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Align Keep Tabs]
 Category=3
 Description="<html>Whether to keep non-indenting tabs</html>"
@@ -2148,7 +2246,7 @@
 
 [Nl Func Var Def Blk]
 Category=4
-Description="<html>The number of blank lines after a block of variable definitions</html>"
+Description="<html>The number of blank lines after a block of variable definitions at the top of a function body.<BR>0=no change (default)</html>"
 Enabled=false
 EditorType=numeric
 CallName="nl_func_var_def_blk="
@@ -2395,6 +2493,15 @@
 TrueFalse=nl_after_case=true|nl_after_case=false
 ValueDefault=0
 
+[Nl Case Colon Brace]
+Category=4
+Description="<html>Add or remove a newline between a case ':' and '{'. Overrides nl_after_case.</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_case_colon_brace=ignore|nl_case_colon_brace=add|nl_case_colon_brace=remove|nl_case_colon_brace=force"
+ChoicesReadable="Ignore Nl Case Colon Brace|Add Nl Case Colon Brace|Remove Nl Case Colon Brace|Force Nl Case Colon Brace"
+ValueDefault=0
+
 [Nl Namespace Brace]
 Category=4
 Description="<html>Newline between namespace and {</html>"
@@ -2968,6 +3075,16 @@
 MaxVal=16
 ValueDefault=0
 
+[Nl After Func Body Class]
+Category=7
+Description="<html>The number of newlines after '}' of a multi-line function body in a class declaration</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_func_body_class="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Nl After Func Body One Liner]
 Category=7
 Description="<html>The number of newlines after '}' of a single line function body</html>"
@@ -3016,6 +3133,26 @@
 TrueFalse=nl_after_multiline_comment=true|nl_after_multiline_comment=false
 ValueDefault=0
 
+[Nl After Struct]
+Category=7
+Description="<html>The number of newlines after '}' or ';' of a struct/enum/union definition</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_struct="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl After Class]
+Category=7
+Description="<html>The number of newlines after '}' or ';' of a class definition</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_after_class="
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
 [Nl Before Access Spec]
 Category=7
 Description="<html>The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.<BR>Will not change the newline count if after a brace open.<BR>0 = No change.</html>"
@@ -3076,6 +3213,15 @@
 MaxVal=16
 ValueDefault=0
 
+[Nl Property Brace]
+Category=7
+Description="<html>Add or remove newline between C# property and the '{'</html>"
+Enabled=false
+EditorType=multiple
+Choices="nl_property_brace=ignore|nl_property_brace=add|nl_property_brace=remove|nl_property_brace=force"
+ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
+ValueDefault=0
+
 [Eat Blanks After Open Brace]
 Category=7
 Description="<html>Whether to remove blank lines after '{'</html>"
@@ -3438,9 +3584,17 @@
 EditorType=string
 ValueDefault=
 
+[Cmt Insert Oc Msg Header]
+Category=9
+Description="<html>The filename that contains text to insert before a Obj-C message specification if the method isn't preceeded with a C/C++ comment.<BR>Will substitute $(message) with the function name and $(javaparam) with the javadoc @param and @return stuff.</html>"
+Enabled=false
+CallName=cmt_insert_oc_msg_header=
+EditorType=string
+ValueDefault=
+
 [Cmt Insert Before Preproc]
 Category=9
-Description="<html>If a preprocessor is encountered when stepping backwards from a function name, then<BR>this option decides whether the comment should be inserted.<BR>Affects cmt_insert_func_header and cmt_insert_class_header.</html>"
+Description="<html>If a preprocessor is encountered when stepping backwards from a function name, then<BR>this option decides whether the comment should be inserted.<BR>Affects cmt_insert_oc_msg_header, cmt_insert_func_header and cmt_insert_class_header.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=cmt_insert_before_preproc=true|cmt_insert_before_preproc=false