From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 6 Jul 2012 12:22:27 +0000 (+0300)
Subject: Reorder Path member functions
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=8552e6a4e4fbc454e08c582d1dbcd55ab58a3c37;p=libs%2Fcore.git

Reorder Path member functions
---

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 784c6eb..90c4d70 100644
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -28,6 +28,22 @@ Path::Path(const char *p)
 	init(p);
 }
 
+void Path::init(const string &p)
+{
+	string::size_type start = 0;
+	if(p[0]=='/' || p[0]=='\\')
+		add_component(string(1, DIRSEP));
+	while(1)
+	{
+		string::size_type slash = p.find_first_of("/\\", start);
+		if(slash>start)
+			add_component(p.substr(start, slash-start));
+		if(slash==string::npos)
+			break;
+		start = slash+1;
+	}
+}
+
 unsigned Path::size() const
 {
 	if(path.empty())
@@ -85,64 +101,6 @@ Path &Path::operator/=(const Path &p)
 	return *this;
 }
 
-string Path::operator[](int n) const
-{
-	if(n>=0)
-	{
-		for(Iterator i=begin(); i!=end(); ++i, --n)
-			if(!n)
-				return *i;
-	}
-	else
-	{
-		for(Iterator i=end(); i!=begin();)
-		{
-			--i;
-			if(!++n)
-				return *i;
-		}
-	}
-
-	throw invalid_argument("Path::operator[]");
-}
-
-bool Path::operator==(const Path &p) const
-{
-#ifdef WIN32
-	return !strcasecmp(path, p.path);
-#else
-	return path==p.path;
-#endif
-}
-
-Path::Iterator Path::begin() const
-{
-	return Iterator(*this);
-}
-
-Path::Iterator Path::end() const
-{
-	Iterator i(*this);
-	i.start=i.end = std::string::npos;
-	return i;
-}
-
-void Path::init(const string &p)
-{
-	string::size_type start = 0;
-	if(p[0]=='/' || p[0]=='\\')
-		add_component(string(1, DIRSEP));
-	while(1)
-	{
-		string::size_type slash = p.find_first_of("/\\", start);
-		if(slash>start)
-			add_component(p.substr(start, slash-start));
-		if(slash==string::npos)
-			break;
-		start = slash+1;
-	}
-}
-
 void Path::add_component(const string &comp)
 {
 	if(comp.empty())
@@ -204,6 +162,48 @@ void Path::add_component(const string &comp)
 	}
 }
 
+string Path::operator[](int n) const
+{
+	if(n>=0)
+	{
+		for(Iterator i=begin(); i!=end(); ++i, --n)
+			if(!n)
+				return *i;
+	}
+	else
+	{
+		for(Iterator i=end(); i!=begin();)
+		{
+			--i;
+			if(!++n)
+				return *i;
+		}
+	}
+
+	throw invalid_argument("Path::operator[]");
+}
+
+bool Path::operator==(const Path &p) const
+{
+#ifdef WIN32
+	return !strcasecmp(path, p.path);
+#else
+	return path==p.path;
+#endif
+}
+
+Path::Iterator Path::begin() const
+{
+	return Iterator(*this);
+}
+
+Path::Iterator Path::end() const
+{
+	Iterator i(*this);
+	i.start = i.end = std::string::npos;
+	return i;
+}
+
 
 Path::Iterator::Iterator(const Path &p):
 	path(p),
diff --git a/source/fs/path.h b/source/fs/path.h
index 6cc14ad..6aa16f6 100644
--- a/source/fs/path.h
+++ b/source/fs/path.h
@@ -48,7 +48,10 @@ public:
 	Path();
 	Path(const std::string &);
 	Path(const char *);
+private:
+	void init(const std::string &);
 
+public:
 	const std::string &str() const { return path; }
 
 	/// Returns the number of components in the path.
@@ -66,6 +69,12 @@ public:
 	Path operator/(const Path &p) const;
 	Path &operator/=(const Path &);
 
+private:
+	/** Adds a component to the path.  It must not contain the directory
+	separator character. */
+	void add_component(const std::string &);
+
+public:
 	/** Extracts a single component from the path.  Negative indices count from
 	the end of the path. */
 	std::string operator[](int) const;
@@ -73,12 +82,6 @@ public:
 	bool operator==(const Path &) const;
 	Iterator begin() const;
 	Iterator end() const;
-private:
-	void init(const std::string &);
-
-	/** Adds a component to the path.  It must not contain the directory
-	separator character. */
-	void add_component(const std::string &);
 };
 
 inline std::ostream &operator<<(std::ostream &o, const Path &p) { o<<p.str(); return o; }