whitespace and comment changes, to fix grammar and 80 col violations

llvm-svn: 56776

2 files changed, 5 insertions, 5 deletions

diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp
index 1a072fccaa0..1eed0bc1432 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -71,7 +71,7 @@ SourceManager::createMemBufferContentCache(const MemoryBuffer *Buffer) {
 }
 
 
-/// createFileID - Create a new fileID for the specified ContentCache and 
+/// createFileID - Create a new fileID for the specified ContentCache and
 /// include position.  This works regardless of whether the ContentCache
 /// corresponds to a file or some other input source.
 unsigned SourceManager::createFileID(const ContentCache *File,
@@ -399,14 +399,14 @@ void ContentCache::ReadToSourceManager(llvm::Deserializer& D,
     //  is absolutely needed.
     if (!E)
       D.RegisterPtr(PtrID,NULL);
-    else    
+    else
       // Get the ContextCache object and register it with the deserializer.
       D.RegisterPtr(PtrID,SMgr.getContentCache(E));
   }
   else {
     // Register the ContextCache object with the deserializer.
     SMgr.MemBufferInfos.push_back(ContentCache());
-    ContentCache& Entry = const_cast<ContentCache&>(SMgr.MemBufferInfos.back());    
+    ContentCache& Entry = const_cast<ContentCache&>(SMgr.MemBufferInfos.back());
     D.RegisterPtr(&Entry);
     
     // Create the buffer.
@@ -467,7 +467,7 @@ void SourceManager::Emit(llvm::Serializer& S) const {
   
   S.ExitBlock();
   
-  // Emit: FileIDs  
+  // Emit: FileIDs
   S.EmitInt(FileIDs.size());  
   std::for_each(FileIDs.begin(), FileIDs.end(), S.MakeEmitter<FileIDInfo>());
   
diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp
index fc8cfd715c4..a3fe7350f2a 100644
--- a/clang/lib/Lex/TokenLexer.cpp
+++ b/clang/lib/Lex/TokenLexer.cpp
@@ -334,7 +334,7 @@ void TokenLexer::Lex(Token &Tok) {
 
 /// PasteTokens - Tok is the LHS of a ## operator, and CurToken is the ##
 /// operator.  Read the ## and RHS, and paste the LHS/RHS together.  If there
-/// are is another ## after it, chomp it iteratively.  Return the result as Tok.
+/// are more ## after it, chomp them iteratively.  Return the result as Tok.
 /// If this returns true, the caller should immediately return the token.
 bool TokenLexer::PasteTokens(Token &Tok) {
   llvm::SmallVector<char, 128> Buffer;