merge

sources_non_forked/vim-snippets/snippets/c.snippets

@@ -25,7 +25,7 @@ snippet Inc
 snippet ndef
 	#ifndef $1
 	#define ${1:SYMBOL} ${2:value}
-	#endif
+	#endif /* ifndef $1 */
 # define
 snippet def
 	#define
@@ -37,7 +37,7 @@ snippet ifdef
 # if
 snippet #if
 	#if ${1:FOO}
-		${0}
+		${0:${VISUAL}}
 	#endif
 # header include guard
 snippet once
@@ -52,22 +52,28 @@ snippet once
 ## Control Statements
 # if
 snippet if
-	if (${1:/* condition */}) {
-		${2}
+	if (${1:true}) {
+		${0:${VISUAL}}
+	}
+snippet ife
+	if (${1:true}) {
+		${2:${VISUAL}}
+	} else {
+		${0}
 	}
 # else
 snippet el
 	else {
-		${1}
+		${0:${VISUAL}}
 	}
 # else if
 snippet elif
-	else if (${1:/* condition */}) {
-		${2}
+	else if (${1:true}) {
+		${0:${VISUAL}}
 	}
 # ifi
 snippet ifi
-	if (${1:/* condition */}) ${2};
+	if (${1:true}) ${0};
 # ternary
 snippet t
 	${1:/* condition */} ? ${2:a} : ${3:b}
@@ -92,27 +98,29 @@ snippet case
 	case ${1:/* variable case */}:
 		${2}
 		${3:break;}
+snippet ret
+	return ${0};
 ##
 ## Loops
 # for
 snippet for
-	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
 	}
 # for (custom)
 snippet forr
-	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+	for (int ${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
 		${5}
 	}
 # while
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0:${VISUAL}}
 	}
 # do... while
 snippet do
 	do {
-		${2}
+		${0:${VISUAL}}
 	} while (${1:/* condition */});
 ##
 ## Functions
@@ -122,6 +130,84 @@ snippet fun
 	{
 		${4}
 	}
+# function definition with zero parameters
+snippet fun0
+	${1:void} ${2:function_name}()
+	{
+		${3}
+	}
+# function definition with Doxygen documentation
+snippet dfun0
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \return ${3:Return parameter description}
+	 */
+	${4:void} ${5:function_name}()
+	{
+		${6}
+	}
+# function definition with one parameter
+snippet fun1
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter})
+	{
+		${5}
+	}
+# function definition with one parameter with  Doxygen documentation
+snippet dfun1
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \param $3 ${4:Parameter description}
+	 * \return ${5:Return parameter description}
+	 */
+	${6:void} ${7:function_name}(${8:Type} ${3:Parameter})
+	{
+		${9}
+	}
+# function definition with two parameters
+snippet fun2
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter})
+	{
+		${7}
+	}
+# function definition with two parameters with  Doxygen documentation
+snippet dfun2
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \param $3 ${4:Parameter description}
+	 * \param $5 ${6:Parameter description}
+	 * \return ${7:Return parameter description}
+	 */
+	${8:void} ${9:function_name}(${10:Type} ${3:Parameter}, ${11:Type} ${5:Parameter})
+	{
+		${12}
+	}
+# function definition with two parameters
+snippet fun3
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter}, ${7:Type} ${8:Parameter})
+	{
+		${9}
+	}
+# function definition with two parameters with  Doxygen documentation
+snippet dfun3
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \param $3 ${4:Parameter description}
+	 * \param $5 ${6:Parameter description}
+	 * \param $7 ${8:Parameter description}
+	 * \return ${9:Return parameter description}
+	 */
+	${10:void} ${11:function_name}(${12:Type} ${3:Parameter}, ${13:Type} ${5:Parameter}, ${14:Type} ${7:Parameter})
+	{
+		${15}
+	}
 # function declaration
 snippet fund
 	${1:void} ${2:function_name}(${3});
@@ -132,18 +218,39 @@ snippet td
 	typedef ${1:int} ${2:MyCustomType};
 # struct
 snippet st
+	/*! \struct $1 
+	 *  \brief ${3:Brief struct description}
+	 * 
+	 *  ${4:Detailed description} 	
+	 */
 	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
-		${2:/* data */}
-	}${3: /* optional variable list */};
+		${2:Data} /*!< ${4:Description} */
+	}${5: /* optional variable list */};
 # typedef struct
 snippet tds
+	/*! \struct $2 
+	 *  \brief ${5:Brief struct description}
+	 * 
+	 *  ${6:Detailed description} 	
+	 */
 	typedef struct ${2:_$1 }{
-		${3:/* data */}
+		m_${3:Data} /*!< ${4:Description} */
 	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
+
+snippet enum
+	/*! \enum $1
+	 * 
+	 *  ${2:Detailed description} 	
+	 */
+	enum ${1:name} { ${0} };
 # typedef enum
 snippet tde
+	/*! \enum $2
+	 * 
+	 *  ${4:Detailed description} 	
+	 */
 	typedef enum {
-		${1:/* data */}
+		${1:Data} /*!< ${3:Description} */
 	} ${2:foo};
 ##
 ## Input/Output
@@ -153,6 +260,12 @@ snippet pr
 # fprintf (again, this isn't as nice as TextMate's version, but it works)
 snippet fpr
 	fprintf(${1:stderr}, "${2:%s}\n"${3});
+snippet prd
+	printf("${1:} = %d\n", $1);
+snippet prf
+	printf("${1:} = %f\n", $1);
+snippet prx
+	printf("${1:} = %${2}\n", $1);
 # getopt
 snippet getopt
 	int choice;
@@ -211,27 +324,12 @@ snippet getopt
 		}
 	}
 ##
+# TODO section
+snippet todo
+	/*! TODO: ${1:Todo description here}
+	 *  \todo $1
+	 */
 ## Miscellaneous
 # This is kind of convenient
 snippet .
 	[${1}]
-# GPL
-snippet gpl
-	/*
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License as published by
-	 * the Free Software Foundation; either version 2 of the License, or
-	 * (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, see <http://www.gnu.org/licenses/>.
-	 *
-	 * Copyright (C) ${1:Author}, `strftime("%Y")`
-	 */
-
-	${0}