Import LLVM 74788.

1 files changed, 6 insertions, 54 deletions

diff --git a/include/llvm/Assembly/Parser.h b/include/llvm/Assembly/Parser.h
index e4a38e4..966abaa 100644
--- a/include/llvm/Assembly/Parser.h
+++ b/include/llvm/Assembly/Parser.h
@@ -19,8 +19,9 @@
 namespace llvm {
 
 class Module;
-class ParseError;
+class SMDiagnostic;
 class raw_ostream;
+class LLVMContext;
 
 /// This function is the main interface to the LLVM Assembly Parser. It parses
 /// an ASCII file that (presumably) contains LLVM Assembly code. It returns a
@@ -30,7 +31,8 @@ class raw_ostream;
 /// @brief Parse LLVM Assembly from a file
 Module *ParseAssemblyFile(
   const std::string &Filename, ///< The name of the file to parse
-  ParseError &Error            ///< If not null, an object to return errors in.
+  SMDiagnostic &Error,         ///< Error result info.
+  LLVMContext &Context         ///< Context in which to allocate globals info.
 );
 
 /// The function is a secondary interface to the LLVM Assembly Parser. It parses
@@ -42,60 +44,10 @@ Module *ParseAssemblyFile(
 Module *ParseAssemblyString(
   const char *AsmString, ///< The string containing assembly
   Module *M,             ///< A module to add the assembly too.
-  ParseError &Error      ///< If not null, an object to return errors in.
+  SMDiagnostic &Error,   ///< Error result info.
+  LLVMContext &Context
 );
 
-//===------------------------------------------------------------------------===
-//                              Helper Classes
-//===------------------------------------------------------------------------===
-
-/// An instance of this class can be passed to ParseAssemblyFile or 
-/// ParseAssemblyString functions in order to capture error information from
-/// the parser.  It provides a standard way to print out the error message
-/// including the file name and line number where the error occurred.
-/// @brief An LLVM Assembly Parsing Error Object
-class ParseError {
-public:
-  ParseError() : Filename("unknown"), Message("none"), LineNo(0), ColumnNo(0) {}
-  ParseError(const ParseError &E);
-
-  void setFilename(const std::string &F) { Filename = F; }
-  
-  inline const std::string &getRawMessage() const {   // Just the raw message.
-    return Message;
-  }
-
-  inline const std::string &getFilename() const {
-    return Filename;
-  }
-
-  void setError(const std::string &message, int lineNo = -1, int ColNo = -1,
-                const std::string &FileContents = "") {
-    Message = message;
-    LineNo = lineNo; ColumnNo = ColNo;
-    LineContents = FileContents;
-  }
-
-  // getErrorLocation - Return the line and column number of the error in the
-  // input source file.  The source filename can be derived from the
-  // ParserOptions in effect.  If positional information is not applicable,
-  // these will return a value of -1.
-  //
-  inline void getErrorLocation(int &Line, int &Column) const {
-    Line = LineNo; Column = ColumnNo;
-  }
-  
-  void PrintError(const char *ProgName, raw_ostream &S);
-
-private :
-  std::string Filename;
-  std::string Message;
-  int LineNo, ColumnNo;                               // -1 if not relevant
-  std::string LineContents;
-
-  void operator=(const ParseError &E); // DO NOT IMPLEMENT
-};
-
 } // End llvm namespace
 
 #endif