prune #includes in TargetAsmParser.h

Pass in SMLoc of instr opcode into ParseInstruction.
Make AsmToken be a class, not a struct.

llvm-svn: 93457

3 files changed, 8 insertions, 6 deletions

diff --git a/llvm/include/llvm/MC/MCAsmLexer.h b/llvm/include/llvm/MC/MCAsmLexer.h
index da471d284cc..e9a6e3fda4a 100644
--- a/llvm/include/llvm/MC/MCAsmLexer.h
+++ b/llvm/include/llvm/MC/MCAsmLexer.h
@@ -20,7 +20,8 @@ class SMLoc;
 class Target;
 
 /// AsmToken - Target independent representation for an assembler token.
-struct AsmToken {
+class AsmToken {
+public:
   enum TokenKind {
     // Markers
     Eof, Error,
diff --git a/llvm/include/llvm/MC/MCParsedAsmOperand.h b/llvm/include/llvm/MC/MCParsedAsmOperand.h
index 7c9e9e65c1e..847ab43f44d 100644
--- a/llvm/include/llvm/MC/MCParsedAsmOperand.h
+++ b/llvm/include/llvm/MC/MCParsedAsmOperand.h
@@ -18,8 +18,8 @@ namespace llvm {
 /// between parsing an asm instruction and recognizing it.
 class MCParsedAsmOperand {
 public:  
-  MCParsedAsmOperand();
-  virtual ~MCParsedAsmOperand() = 0;
+  MCParsedAsmOperand() {}
+  virtual ~MCParsedAsmOperand() {}
   // TODO: Out of line vfun.
 };
 
diff --git a/llvm/include/llvm/Target/TargetAsmParser.h b/llvm/include/llvm/Target/TargetAsmParser.h
index ef1fc49cefe..a265610f2f2 100644
--- a/llvm/include/llvm/Target/TargetAsmParser.h
+++ b/llvm/include/llvm/Target/TargetAsmParser.h
@@ -10,13 +10,13 @@
 #ifndef LLVM_TARGET_TARGETPARSER_H
 #define LLVM_TARGET_TARGETPARSER_H
 
-#include "llvm/MC/MCAsmLexer.h"
-
 namespace llvm {
 class MCAsmParser;
 class MCInst;
 class StringRef;
 class Target;
+class SMLoc;
+class AsmToken;
 
 /// TargetAsmParser - Generic interface to target specific assembly parsers.
 class TargetAsmParser {
@@ -45,7 +45,8 @@ public:
   /// \param Name - The instruction name.
   /// \param Inst [out] - On success, the parsed instruction.
   /// \return True on failure.
-  virtual bool ParseInstruction(const StringRef &Name, MCInst &Inst) = 0;
+  virtual bool ParseInstruction(const StringRef &Name, SMLoc NameLoc,
+                                MCInst &Inst) = 0;
 
   /// ParseDirective - Parse a target specific assembler directive
   ///