Added InputStream::GetLine(size);

Former-commit-id: 4c5afc038877bfa9865285d044663df3f7932d58

include/Nazara/Core/File.hpp

@@ -72,7 +72,7 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable
 		NzString GetFileName() const;
 		time_t GetLastAccessTime() const;
 		time_t GetLastWriteTime() const;
-		NzString GetLine(unsigned int lineSize = 0);
+		NzString GetLine(unsigned int lineSize = 0) override;
 		nzUInt64 GetSize() const;
 
 		bool IsOpen() const;

include/Nazara/Core/InputStream.hpp

@@ -9,6 +9,8 @@
 
 #include <Nazara/Prerequesites.hpp>
 
+class NzString;
+
 class NzInputStream
 {
 	public:
@@ -17,6 +19,7 @@ class NzInputStream
 		virtual bool EndOfStream() const = 0;
 
 		virtual nzUInt64 GetCursorPos() const = 0;
+		virtual NzString GetLine(unsigned int lineSize = 0);
 		virtual nzUInt64 GetSize() const = 0;
 
 		virtual std::size_t Read(void* buffer, std::size_t size) = 0;

src/Nazara/Core/File.cpp

@@ -100,7 +100,7 @@ bool NzFile::EndOfFile() const
 	return m_impl->EndOfFile();
 }
 
-bool NzFile::EndOfStream() const;
+bool NzFile::EndOfStream() const
 {
 	return EndOfFile();
 }
@@ -211,50 +211,9 @@ NzString NzFile::GetLine(unsigned int lineSize)
 	}
 	#endif
 
-	NzString line;
+	NzString line = NzInputStream::GetLine(lineSize);
-	if (lineSize == 0) // Taille maximale indéterminée
+	if (m_openMode & Text && !m_impl->EndOfFile() && line.EndsWith('\r'))
-	{
+		line.Resize(-1);
-		while (!m_impl->EndOfFile())
-		{
-			char c;
-			if (m_impl->Read(&c, sizeof(char)) == sizeof(char))
-			{
-				if (c == '\n')
-				{
-					if (m_openMode & Text && line.EndsWith('\r'))
-						line.Resize(-1);
-
-					break;
-				}
-
-				line += c;
-			}
-			else
-				break;
-		}
-	}
-	else
-	{
-		line.Reserve(lineSize);
-		for (unsigned int i = 0; i < lineSize; ++i)
-		{
-			char c;
-			if (m_impl->Read(&c, sizeof(char)) == sizeof(char))
-			{
-				if (c == '\n')
-				{
-					if (m_openMode & Text && line.EndsWith('\r'))
-						line.Resize(-1);
-
-					break;
-				}
-
-				line += c;
-			}
-			else
-				break;
-		}
-	}
 
 	return line;
 }

src/Nazara/Core/InputStream.cpp

@@ -1,8 +1,49 @@
-// Copyright (C) 2012 Jérôme Leclercq
+// Copyright (C) 2012 Jérôme Leclercq
-// This file is part of the "Nazara Engine - Core module"
+// This file is part of the "Nazara Engine - Core module"
-// For conditions of distribution and use, see copyright notice in Config.hpp
+// For conditions of distribution and use, see copyright notice in Config.hpp
-
+
-#include <Nazara/Core/InputStream.hpp>
+#include <Nazara/Core/InputStream.hpp>
-#include <Nazara/Core/Debug.hpp>
+#include <Nazara/Core/String.hpp>
-
+#include <Nazara/Core/Debug.hpp>
-NzInputStream::~NzInputStream() = default;
+
+NzInputStream::~NzInputStream() = default;
+
+NzString NzInputStream::GetLine(unsigned int lineSize)
+{
+	NzString line;
+	if (lineSize == 0) // Taille maximale indéterminée
+	{
+		while (!EndOfStream())
+		{
+			char c;
+			if (Read(&c, sizeof(char)) == sizeof(char))
+			{
+				if (c == '\n')
+					break;
+
+				line += c;
+			}
+			else
+				break;
+		}
+	}
+	else
+	{
+		line.Reserve(lineSize);
+		for (unsigned int i = 0; i < lineSize; ++i)
+		{
+			char c;
+			if (Read(&c, sizeof(char)) == sizeof(char))
+			{
+				if (c == '\n')
+					break;
+
+				line += c;
+			}
+			else
+				break;
+		}
+	}
+
+	return line;
+}