Merge pull request #130 from abroder/master

C++ snippets tweaks

snippets/cpp.snippets

@@ -1,28 +1,17 @@
-# Read File Into Vector
-snippet readfile
-	std::vector<char> v;
-	if (FILE *${2:fp} = fopen(${1:"filename"}, "r")) {
-		char buf[1024];
-		while (size_t len = fread(buf, 1, sizeof(buf), $2))
-			v.insert(v.end(), buf, buf + len);
-		fclose($2);
-	}${3}
-
+# std::vector
+snippet vector
+	std::vector<${1:char}> ${2};
 # std::map
 snippet map
 	std::map<${1:key}, ${2:value}> ${3};
 
-# std::vector
-snippet vector
-	std::vector<${1:char}> ${2};
-
-# Namespace
-snippet ns
-	namespace ${1:`Filename('', 'my')`} {
-		${2}
-	} /* namespace $1 */
-
-# Class
+# std::cout
+snippet cout
+	std::cout << ${1} << std::endl;
+# std::cin
+snippet cin
+	std::cin >> ${1};
+# class
 snippet class
 	class ${1:`Filename('$1', 'name')`} 
 	{
@@ -34,33 +23,47 @@ snippet class
 		${3:/* data */}
 	};
 
+# member function implementations
+snippet mfun
+	${4:void} ${1:`Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
+		${5:return};
+	}
+# namespace
+snippet ns
+	namespace ${1:`Filename('', 'my')`} {
+		${2}
+	} /* namespace $1 */
+
+# for i loop
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4:/* code */}
 	}
 
+# foreach
+snippet fore
+	for (${1:auto} ${2:i} : ${3:container}) {
+		${4:/* code */}
+	}
+# iterator
+snippet iter
+	for (${1:std::vector}<${2:type}>::${3:const_iterator} ${4:i} = ${5:container}.begin(); $4 != $5.end(); ++$4) {
+		${6}
+	}
+
 # auto iterator
 snippet itera
 	for (auto ${1:i} = $1.begin(); $1 != $1.end(); ++$1) {
 		${2:std::cout << *$1 << std::endl;}
 	}
 
-# iterator
-snippet iter
-	for (${1:std::vector}<${2:type}>::${3:const_iterator} ${4:i} = ${5:container}.begin(); $4 != $5.end(); ++$4) {
-		${6}
-	}
+# read file into vector
+snippet readfile
+	std::vector<char> v;
+	if (FILE *${2:fp} = fopen(${1:"filename"}, "r")) {
+		char buf[1024];
+		while (size_t len = fread(buf, 1, sizeof(buf), $2))
+			v.insert(v.end(), buf, buf + len);
+		fclose($2);
+	}${3}
 
-# member function implementations
-snippet mfun
-	${4:void} ${1:`Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
-		${5:return};
-	}
-snippet scout
-	std::cout << ${1} << std::endl;
-snippet cout
-	cout << ${1} << endl;
-snippet scin
-	std::cin >> ${1};
-snippet cin
-	cin >> ${1};