This is an archive of the discontinued LLVM Phabricator instance.

Remove trailing slash from dumping directory FileSpec.
ClosedPublic

Authored by chaoren on May 19 2015, 1:59 PM.

Download Raw Diff

Details

Reviewers

ovyalov
domipheus

Commits

rG70e0cbb3ed7c: Remove trailing slash from dumping directory FileSpec.
rLLDB237741: Remove trailing slash from dumping directory FileSpec.
rL237741: Remove trailing slash from dumping directory FileSpec.

Diff Detail

Event Timeline

chaoren updated this revision to Diff 26090.May 19 2015, 1:59 PM

chaoren retitled this revision from to Remove trailing slash from dumping directory FileSpec..

chaoren updated this object.

chaoren edited the test plan for this revision. (Show Details)

chaoren added reviewers: domipheus, ovyalov.

chaoren added a subscriber: Unknown Object (MLST).

Some things depend on Dump having the trailing slash.

m_directory could be empty.

Looks good.

This revision is now accepted and ready to land.May 19 2015, 4:07 PM

Closed by commit rL237741: Remove trailing slash from dumping directory FileSpec. (authored by chaoren). · Explain WhyMay 19 2015, 4:15 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

include/

lldb/

Host/

FileSpec.h

6 lines

source/

Host/

common/

FileSpec.cpp

7 lines

Diff 26099

include/lldb/Host/FileSpec.h

Show First 20 Lines • Show All 253 Lines • ▼ Show 20 Lines	public:
/// Dump this object to a Stream.		/// Dump this object to a Stream.
///		///
/// Dump the object to the supplied stream \a s. If the object		/// Dump the object to the supplied stream \a s. If the object
/// contains a valid directory name, it will be displayed followed		/// contains a valid directory name, it will be displayed followed
/// by a directory delimiter, and the filename.		/// by a directory delimiter, and the filename.
///		///
/// @param[in] s		/// @param[in] s
/// The stream to which to dump the object description.		/// The stream to which to dump the object description.
		///
		/// @param[in] trailing_slash
		/// If true and the file is a non root directory, then a trailing slash
		/// will be added.
//------------------------------------------------------------------		//------------------------------------------------------------------
void		void
Dump (Stream *s) const;		Dump(Stream *s, bool trailing_slash = true) const;

//------------------------------------------------------------------		//------------------------------------------------------------------
/// Existence test.		/// Existence test.
///		///
/// @return		/// @return
/// \b true if the file exists on disk, \b false otherwise.		/// \b true if the file exists on disk, \b false otherwise.
//------------------------------------------------------------------		//------------------------------------------------------------------
bool		bool
▲ Show 20 Lines • Show All 518 Lines • Show Last 20 Lines

source/Host/common/FileSpec.cpp

Show First 20 Lines • Show All 603 Lines • ▼ Show 20 Lines
}		}

//------------------------------------------------------------------		//------------------------------------------------------------------
// Dump the object to the supplied stream. If the object contains		// Dump the object to the supplied stream. If the object contains
// a valid directory name, it will be displayed followed by a		// a valid directory name, it will be displayed followed by a
// directory delimiter, and the filename.		// directory delimiter, and the filename.
//------------------------------------------------------------------		//------------------------------------------------------------------
void		void
FileSpec::Dump(Stream *s) const		FileSpec::Dump(Stream *s, bool trailing_slash) const
{		{
if (s)		if (s)
{		{
m_directory.Dump(s);		m_directory.Dump(s);
if (m_directory && m_directory.GetStringRef().back() != '/')		if ((m_filename \|\| trailing_slash) &&
		!m_directory.GetStringRef().endswith("/"))
s->PutChar('/');		s->PutChar('/');
m_filename.Dump(s);		m_filename.Dump(s);
}		}
}		}

//------------------------------------------------------------------		//------------------------------------------------------------------
// Returns true if the file exists.		// Returns true if the file exists.
//------------------------------------------------------------------		//------------------------------------------------------------------
▲ Show 20 Lines • Show All 185 Lines • ▼ Show 20 Lines	FileSpec::GetPath(bool denormalize) const
GetPath(result, denormalize);		GetPath(result, denormalize);
return std::string(result.begin(), result.end());		return std::string(result.begin(), result.end());
}		}

void		void
FileSpec::GetPath(llvm::SmallVectorImpl<char> &path, bool denormalize) const		FileSpec::GetPath(llvm::SmallVectorImpl<char> &path, bool denormalize) const
{		{
StreamString stream;		StreamString stream;
Dump(&stream);		Dump(&stream, false);
path.append(stream.GetString().begin(), stream.GetString().end());		path.append(stream.GetString().begin(), stream.GetString().end());
Normalize(path, m_syntax);		Normalize(path, m_syntax);
if (denormalize && !path.empty())		if (denormalize && !path.empty())
DeNormalize(path, m_syntax);		DeNormalize(path, m_syntax);
}		}

ConstString		ConstString
FileSpec::GetFileNameExtension () const		FileSpec::GetFileNameExtension () const
▲ Show 20 Lines • Show All 585 Lines • Show Last 20 Lines