X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FAssembly%2FParser.h;h=966abaaa2067a5bccf6c5a05b5579f580ec069dd;hb=104cf9e02b0ed94d4173869a598af6c6972a8660;hp=edca08c46fb622b65d7b277192b33759dd32554d;hpb=4aefd6b7d4dadf8109221a89742725c116d8f8e0;p=oota-llvm.git

diff --git a/include/llvm/Assembly/Parser.h b/include/llvm/Assembly/Parser.h
index edca08c46fb..966abaaa206 100644
--- a/include/llvm/Assembly/Parser.h
+++ b/include/llvm/Assembly/Parser.h
@@ -19,79 +19,35 @@
 namespace llvm {
 
 class Module;
-class ParseError;
+class SMDiagnostic;
+class raw_ostream;
+class LLVMContext;
 
-
-/// This function is the main interface to the LLVM Assembly Parse. It parses 
-/// an ascii file that (presumably) contains LLVM Assembly code. It returns a
+/// 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
 /// Module (intermediate representation) with the corresponding features. Note
 /// that this does not verify that the generated Module is valid, so you should
 /// run the verifier after parsing the file to check that it is okay.
 /// @brief Parse LLVM Assembly from a file
 Module *ParseAssemblyFile(
   const std::string &Filename, ///< The name of the file to parse
-  ParseError* Error = 0        ///< 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 Parse. It parses 
-/// an ascii string that (presumably) contains LLVM Assembly code. It returns a
+/// The function is a secondary interface to the LLVM Assembly Parser. It parses
+/// an ASCII string that (presumably) contains LLVM Assembly code. It returns a
 /// Module (intermediate representation) with the corresponding features. Note
 /// that this does not verify that the generated Module is valid, so you should
 /// run the verifier after parsing the file to check that it is okay.
 /// @brief Parse LLVM Assembly from a string
 Module *ParseAssemblyString(
-  const char * AsmString, ///< The string containing assembly
-  Module * M,             ///< A module to add the assembly too.
-  ParseError* Error = 0   ///< If not null, an object to return errors in.
+  const char *AsmString, ///< The string containing assembly
+  Module *M,             ///< A module to add the assembly too.
+  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);
-
-  // getMessage - Return the message passed in at construction time plus extra
-  // information extracted from the options used to parse with...
-  //
-  const std::string getMessage() const;
-
-  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 &filename, const std::string &message,
-                 int LineNo = -1, int ColNo = -1);
-
-  // 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;
-  }
-
-private :
-  std::string Filename;
-  std::string Message;
-  int LineNo, ColumnNo;                               // -1 if not relevant
-
-  ParseError &operator=(const ParseError &E); // objects by reference
-};
-
 } // End llvm namespace
 
 #endif