Unified line endings.

include/crt.h

@@ -7,5 +7,5 @@
 #include <stdlib.h>
 #include <crtdbg.h>
 
-#endif // _DEBUG
+#endif // _DEBUG
-
+

include/exceptions.h

@@ -10,7 +10,7 @@ namespace YAML
 	public:
 		ParserException(int line_, int column_, const std::string& msg_)
 			: line(line_), column(column_), msg(msg_) {}
-		virtual ~ParserException() throw () {}
+		virtual ~ParserException() throw () {}
 
 		int line, column;
 		std::string msg;

include/yaml.h

@@ -4,5 +4,5 @@
 #include "parser.h"
 #include "node.h"
 #include "iterator.h"
-#include "exceptions.h"
+#include "exceptions.h"
-
+

src/map.cpp

@@ -3,7 +3,7 @@
 #include "node.h"
 #include "scanner.h"
 #include "token.h"
-#include "exceptions.h"
+#include "exceptions.h"
 #include <iostream>
 
 namespace YAML

src/node.cpp

@@ -148,13 +148,13 @@ namespace YAML
 	{
 		if(!m_pContent)
 			return CT_NONE;
-
+
-		if(m_pContent->IsScalar())
+		if(m_pContent->IsScalar())
-			return CT_SCALAR;
+			return CT_SCALAR;
-		else if(m_pContent->IsSequence())
+		else if(m_pContent->IsSequence())
-			return CT_SEQUENCE;
+			return CT_SEQUENCE;
-		else if(m_pContent->IsMap())
+		else if(m_pContent->IsMap())
-			return CT_MAP;
+			return CT_MAP;
 			
 		return CT_NONE;
 	}

src/parser.cpp

@@ -121,7 +121,7 @@ namespace YAML
 	}
 
 	void Parser::PrintTokens(std::ostream& out)
-	{
+	{
 		while(1) {
 			if(m_pScanner->empty())
 				break;

src/regex.cpp

@@ -1,6 +1,6 @@
 #include "crt.h"
-#include "regex.h"
+#include "regex.h"
-#include "stream.h"
+#include "stream.h"
 #include <iostream>
 
 namespace YAML
@@ -92,8 +92,8 @@ namespace YAML
 	bool RegEx::Matches(std::istream& in) const
 	{
 		return Match(in) >= 0;
-	}
+	}
-	
+	
 	bool RegEx::Matches(Stream& in) const
 	{
 		return Match(in) >= 0;
@@ -113,12 +113,12 @@ namespace YAML
 		return m_pOp->Match(str, *this);
 	}
 
-	// Match
+	// Match
 	int RegEx::Match(Stream& in) const
-	{
+	{
 		return Match(in.stream());
-	}
+	}
-	
+	
 	// Match
 	// . The stream version does the same thing as the string version;
 	//   REMEMBER that we only match from the start of the stream!

src/sequence.cpp

@@ -2,7 +2,7 @@
 #include "sequence.h"
 #include "node.h"
 #include "scanner.h"
-#include "token.h"
+#include "token.h"
 #include <iostream>
 
 namespace YAML

src/stream.cpp

@@ -1,24 +1,24 @@
 #include "crt.h"
-#include "stream.h"
+#include "stream.h"
 #include <iostream>
 
 namespace YAML
 {
-	int Stream::pos() const
+	int Stream::pos() const
-	{
+	{
-		return input.tellg();
+		return input.tellg();
-	}
-	
-	char Stream::peek()
-	{
-		return input.peek();
-	}
-	
-	Stream::operator bool()
-	{
-		return input.good();
 	}
-
+	
+	char Stream::peek()
+	{
+		return input.peek();
+	}
+	
+	Stream::operator bool()
+	{
+		return input.good();
+	}
+
 	// get
 	// . Extracts a character from the stream and updates our position
 	char Stream::get()
@@ -48,6 +48,6 @@ namespace YAML
 	{
 		for(int i=0;i<n;i++)
 			get();
-	}
+	}
-
+
 }

yaml-reader/main.cpp

@@ -14,7 +14,7 @@ void run()
 	std::ifstream fin("tests/test.yaml");
 
 	try {
-		YAML::Parser parser(fin);
+		YAML::Parser parser(fin);
 		parser.PrintTokens(std::cout);
 	} catch(YAML::Exception&) {
 		std::cout << "Error parsing the yaml!\n";
@@ -22,15 +22,15 @@ void run()
 }
 
 int main(int argc, char **argv)
-{
+{
-	bool verbose = false;
+	bool verbose = false;
-	for(int i=1;i<argc;i++) {
+	for(int i=1;i<argc;i++) {
-		if(strcmp(argv[i], "-v") == 0)
+		if(strcmp(argv[i], "-v") == 0)
-			verbose = true;
+			verbose = true;
-	}
+	}
-
+
 #ifdef WINDOWS
-	_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
+	_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
 #endif // WINDOWS
 	Test::RunAll(verbose);
 	run();

yaml-reader/tests.cpp

@@ -22,7 +22,7 @@ namespace Test
 			if(!Inout(files[i], verbose)) {
 				std::cout << "Inout test failed on " << files[i] << "\n";
 				passed = false;
-			} else
+			} else
 				std::cout << "Inout test passed: " << files[i] << "\n";
 		}
 
@@ -34,7 +34,7 @@ namespace Test
 	// outputs again, and makes sure that the two outputs are the same
 	bool Inout(const std::string& file, bool verbose)
 	{
-		std::ifstream fin(file.c_str());
+		std::ifstream fin(file.c_str());
 
 		try {
 			// read and output
@@ -71,14 +71,14 @@ namespace Test
 			fout << "---\n";
 			fout << secondTry << std::endl;
 		} catch(YAML::ParserException& e) {
-			std::cout << file << " (line " << e.line + 1 << ", col " << e.column + 1 << "): " << e.msg << std::endl;
+			std::cout << file << " (line " << e.line + 1 << ", col " << e.column + 1 << "): " << e.msg << std::endl;
-			
+			
-			if(verbose) {
+			if(verbose) {
-				std::cout << "Token queue:\n";
+				std::cout << "Token queue:\n";
-				std::ifstream f(file.c_str());
+				std::ifstream f(file.c_str());
-				YAML::Parser p(f);
+				YAML::Parser p(f);
-				p.PrintTokens(std::cout);
+				p.PrintTokens(std::cout);
-			}
+			}
 			
 			return false;
 		}

yaml-reader/tests/test.yaml

@@ -1,3 +1,3 @@
 - it's just
 - one thing
-- after another
+- after another