Add methods to StringMap to erase entries by key.

[oota-llvm.git] / include / llvm / Debugger / SourceFile.h

diff --git a/include/llvm/Debugger/SourceFile.h b/include/llvm/Debugger/SourceFile.h
index 86a7f36b10a2ba019fb7d06047b1f586cc2b844c..249435af8b179945c50915f41f63244491071b36 100644 (file)
--- a/include/llvm/Debugger/SourceFile.h
+++ b/include/llvm/Debugger/SourceFile.h
@@ -1,10 +1,10 @@
 //===- SourceFile.h - Class to represent a source code file -----*- C++ -*-===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
 // This file defines the SourceFile class which is used to represent a single
@@ -16,16 +16,18 @@
 #ifndef LLVM_DEBUGGER_SOURCEFILE_H
 #define LLVM_DEBUGGER_SOURCEFILE_H
 
-#include <string>
+#include "llvm/System/Path.h"
+#include "llvm/ADT/OwningPtr.h"
 #include <vector>
 
 namespace llvm {
   class GlobalVariable;
+  class MemoryBuffer;
 
   class SourceFile {
     /// Filename - This is the full path of the file that is loaded.
     ///
-    std::string Filename;
+    sys::Path Filename;
 
     /// Descriptor - The debugging descriptor for this source file.  If there
     /// are multiple descriptors for the same file, this is just the first one
@@ -33,10 +35,8 @@ namespace llvm {
     ///
     const GlobalVariable *Descriptor;
 
-    /// FileStart, FileEnd - These pointers point to the start and end of the
-    /// file data for this file.  If there was an error loading the file, these
-    /// pointers will both be null.
-    const char *FileStart, *FileEnd;
+    /// This is the memory mapping for the file so we can gain access to it.
+    OwningPtr<MemoryBuffer> File;
 
     /// LineOffset - This vector contains a mapping from source line numbers to
     /// their offsets in the file.  This data is computed lazily, the first time
@@ -50,22 +50,18 @@ namespace llvm {
     /// NOT throw an exception if the file is not found, if there is an error
     /// reading it, or if the user cancels the operation.  Instead, it will just
     /// be an empty source file.
-    SourceFile(const std::string &fn, const GlobalVariable *Desc)
-      : Filename(fn), Descriptor(Desc), FileStart(0), FileEnd(0) {
-      readFile();
-    }
-    ~SourceFile() {
-      delete[] FileStart;
-    }
+    SourceFile(const std::string &fn, const GlobalVariable *Desc);
+    
+    ~SourceFile();
 
     /// getDescriptor - Return the debugging decriptor for this source file.
     ///
     const GlobalVariable *getDescriptor() const { return Descriptor; }
-    
+
     /// getFilename - Return the fully resolved path that this file was loaded
     /// from.
-    const std::string &getFilename() const { return Filename; }
-    
+    const std::string &getFilename() const { return Filename.toString(); }
+
     /// getSourceLine - Given a line number, return the start and end of the
     /// line in the file.  If the line number is invalid, or if the file could
     /// not be loaded, null pointers are returned for the start and end of the
@@ -73,19 +69,15 @@ namespace llvm {
     /// any newlines from the end of the line, to ease formatting of the text.
     void getSourceLine(unsigned LineNo, const char *&LineStart,
                        const char *&LineEnd) const;
-  
+
     /// getNumLines - Return the number of lines the source file contains.
     ///
     unsigned getNumLines() const {
       if (LineOffset.empty()) calculateLineOffsets();
-      return LineOffset.size();
+      return static_cast<unsigned>(LineOffset.size());
     }
 
   private:
-    /// readFile - Load Filename into FileStart and FileEnd.
-    ///
-    void readFile();
-    
     /// calculateLineOffsets - Compute the LineOffset vector for the current
     /// file.
     void calculateLineOffsets() const;