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

diff --git a/include/llvm/Assembly/Parser.h b/include/llvm/Assembly/Parser.h
index 011594d1322..966abaaa206 100644
--- a/include/llvm/Assembly/Parser.h
+++ b/include/llvm/Assembly/Parser.h
@@ -1,6 +1,13 @@
-//===-- llvm/assembly/Parser.h - Parser for VM assembly files ----*- C++ -*--=//
+//===-- llvm/Assembly/Parser.h - Parser for VM assembly files ---*- C++ -*-===//
 //
-//  These classes are implemented by the lib/AssemblyParser library.
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  These classes are implemented by the lib/AsmParser library.
 //
 //===----------------------------------------------------------------------===//
 
@@ -9,57 +16,38 @@
 
 #include <string>
 
-class Module;
-class ParseException;
-
-
-// The useful interface defined by this file... Parse an ascii file, and return
-// the internal representation in a nice slice'n'dice'able representation.
-//
-Module *ParseAssemblyFile(const string &Filename);// throw (ParseException);
-
-//===------------------------------------------------------------------------===
-//                              Helper Classes
-//===------------------------------------------------------------------------===
+namespace llvm {
 
-// ParseException - For when an exceptional event is generated by the parser.
-// This class lets you print out the exception message
-//
-class ParseException {
-public:
-  ParseException(const string &filename, const string &message, 
-		 int LineNo = -1, int ColNo = -1);
-
-  ParseException(const ParseException &E);
-
-  // getMessage - Return the message passed in at construction time plus extra 
-  // information extracted from the options used to parse with...
-  //
-  const string getMessage() const;
-
-  inline const string getRawMessage() const {    // Just the raw message...
-    return Message;
-  }
-
-  inline const string &getFilename() const {
-    return Filename;
-  }
-
-  // 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 const void getErrorLocation(int &Line, int &Column) const {
-    Line = LineNo; Column = ColumnNo;
-  }
-
-private :
-  string Filename;
-  string Message;
-  int LineNo, ColumnNo;                               // -1 if not relevant
-
-  ParseException &operator=(const ParseException &E); // objects by reference
-};
+class Module;
+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
+/// 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
+  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
+/// 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.
+  SMDiagnostic &Error,   ///< Error result info.
+  LLVMContext &Context
+);
+
+} // End llvm namespace
 
 #endif