Attachment #21929 for bug #35449

View | Details | Raw Unified | Return to bug 35449
Collapse All | Expand All




#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <sstream>
#include <stdexcept>
#include "support.h"
#include "TodoDB.h"


		while (in.getline(line, 1024)) {
		string str;
		istringstream is(line);

			if (is >> str) {
				if (str[0] == '#') continue;

					// multi-line event ?
					if (str == "{") {
						while (in.getline(line, 1024)) {
						istringstream is(line);

							if (is >> str) {
								if (str[0] == '#') continue;

Lines 5-10 Link Here

(-)devtodo-0.1.17.old/util/CommandArgs.h (+1 lines)
5	#include <string>	5	#include <string>
6	#include <vector>	6	#include <vector>
7	#include <iostream>	7	#include <iostream>
		8	#include <cassert>
8	#include "Strings.h"	9	#include "Strings.h"
9		10
10	using namespace std;	11	using namespace std;

Lines 6-11 Link Here

(-)devtodo-0.1.17.old/util/Regex.h (+1 lines)
6	#include <map>	6	#include <map>
7	#include <utility>	7	#include <utility>
8	#include <stdexcept>	8	#include <stdexcept>
		9	#include <cassert>
9	#include <sys/types.h>	10	#include <sys/types.h>
10	#include "c_regex.h"	11	#include "c_regex.h"
11		12




#include <cerrno>
#include <iostream>
#include <vector>
#include <sstream>
#include <stdexcept>

using namespace std;

	@parameter var Variable to convert.
*/
template <typename T> string stringify(T const &t) {
ostringstream os;
	os << t;
	return os.str();
}


	@parameter str Strings to convert to type T.
*/
template <typename T> T destringify(string const &str) {
istringstream os(str);
T t;

	os >> t;

Return to bug 35449

Lines 2-8 Link Here

(-)devtodo-0.1.17.old/src/support.cc (-3 / +3 lines)
2	#include <cstdlib>	2	#include <cstdlib>
3	#include <cstring>	3	#include <cstring>
4	#include <cstdio>	4	#include <cstdio>
5	#include <strstream>	5	#include <sstream>
6	#include <stdexcept>	6	#include <stdexcept>
7	#include "support.h"	7	#include "support.h"
8	#include "TodoDB.h"	8	#include "TodoDB.h"
Lines 814-820 Link Here
814		814
815	while (in.getline(line, 1024)) {	815	while (in.getline(line, 1024)) {
816	string str;	816	string str;
817	istrstream is(line);	817	istringstream is(line);
818		818
819	if (is >> str) {	819	if (is >> str) {
820	if (str[0] == '#') continue;	820	if (str[0] == '#') continue;
Lines 837-843 Link Here
837	// multi-line event ?	837	// multi-line event ?
838	if (str == "{") {	838	if (str == "{") {
839	while (in.getline(line, 1024)) {	839	while (in.getline(line, 1024)) {
840	istrstream is(line);	840	istringstream is(line);
841		841
842	if (is >> str) {	842	if (is >> str) {
843	if (str[0] == '#') continue;	843	if (str[0] == '#') continue;

Lines 7-13 Link Here

(-)devtodo-0.1.17.old/util/Strings.h (-4 / +4 lines)
7	#include <cerrno>	7	#include <cerrno>
8	#include <iostream>	8	#include <iostream>
9	#include <vector>	9	#include <vector>
10	#include <strstream>	10	#include <sstream>
11	#include <stdexcept>	11	#include <stdexcept>
12		12
13	using namespace std;	13	using namespace std;
Lines 118-125 Link Here
118	@parameter var Variable to convert.	118	@parameter var Variable to convert.
119	*/	119	*/
120	template <typename T> string stringify(T const &t) {	120	template <typename T> string stringify(T const &t) {
121	ostrstream os;	121	ostringstream os;
122	os << t << '\0';	122	os << t;
123	return os.str();	123	return os.str();
124	}	124	}
125		125
Lines 135-141 Link Here
135	@parameter str Strings to convert to type T.	135	@parameter str Strings to convert to type T.
136	*/	136	*/
137	template <typename T> T destringify(string const &str) {	137	template <typename T> T destringify(string const &str) {
138	istrstream os(str.c_str());	138	istringstream os(str);
139	T t;	139	T t;
140		140
141	os >> t;	141	os >> t;