From: Sean Silva <silvas@purdue.edu>
Date: Wed, 3 Oct 2012 21:31:08 +0000 (+0000)
Subject: tblgen: Remove last traces of old TableGenMain API.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b336c96f1d519f040204beb0924726008eb38a33;p=platform%2Fupstream%2Fllvm.git

tblgen: Remove last traces of old TableGenMain API.

llvm-svn: 165168
---

diff --git a/llvm/include/llvm/TableGen/Main.h b/llvm/include/llvm/TableGen/Main.h
index 663779f..7ef249e 100644
--- a/llvm/include/llvm/TableGen/Main.h
+++ b/llvm/include/llvm/TableGen/Main.h
@@ -16,11 +16,6 @@
 
 namespace llvm {
 
-class TableGenAction;
-
-/// Run the table generator, performing the specified Action on parsed records.
-int TableGenMain(char *argv0, TableGenAction &Action);
-
 class RecordKeeper;
 class raw_ostream;
 typedef bool TableGenMainFn(raw_ostream &OS, RecordKeeper &Records);
diff --git a/llvm/include/llvm/TableGen/TableGenAction.h b/llvm/include/llvm/TableGen/TableGenAction.h
deleted file mode 100644
index 733ae62..0000000
--- a/llvm/include/llvm/TableGen/TableGenAction.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//===- llvm/TableGen/TableGenAction.h - defines TableGenAction --*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the TableGenAction base class to be derived from by
-// tblgen tools.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TABLEGEN_TABLEGENACTION_H
-#define LLVM_TABLEGEN_TABLEGENACTION_H
-
-namespace llvm {
-
-class raw_ostream;
-class RecordKeeper;
-
-class TableGenAction {
-  virtual void anchor();
-public:
-  virtual ~TableGenAction() {}
-
-  /// Perform the action using Records, and write output to OS.
-  /// @returns true on error, false otherwise
-  virtual bool operator()(raw_ostream &OS, RecordKeeper &Records) = 0;
-};
-
-}
-
-#endif
diff --git a/llvm/lib/TableGen/CMakeLists.txt b/llvm/lib/TableGen/CMakeLists.txt
index ba7bf14..28240f4 100644
--- a/llvm/lib/TableGen/CMakeLists.txt
+++ b/llvm/lib/TableGen/CMakeLists.txt
@@ -7,7 +7,6 @@ add_llvm_library(LLVMTableGen
   Main.cpp
   Record.cpp
   StringMatcher.cpp
-  TableGenAction.cpp
   TableGenBackend.cpp
   TGLexer.cpp
   TGParser.cpp
diff --git a/llvm/lib/TableGen/Main.cpp b/llvm/lib/TableGen/Main.cpp
index 83bc66f..2c37aa7 100644
--- a/llvm/lib/TableGen/Main.cpp
+++ b/llvm/lib/TableGen/Main.cpp
@@ -24,7 +24,6 @@
 #include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/Main.h"
 #include "llvm/TableGen/Record.h"
-#include "llvm/TableGen/TableGenAction.h"
 #include <algorithm>
 #include <cstdio>
 using namespace llvm;
@@ -48,27 +47,9 @@ namespace {
               cl::value_desc("directory"), cl::Prefix);
 }
 
-namespace {
-// XXX: this is a crutch for transitioning to the new TableGenMain API
-// (with a TableGenMainFn* instead of a pointless class).
-class StubTransitionalTableGenAction : public TableGenAction {
-  TableGenMainFn *MainFn;
-public:
-  StubTransitionalTableGenAction(TableGenMainFn *M) : MainFn(M) {}
-  bool operator()(raw_ostream &OS, RecordKeeper &Records) {
-    return MainFn(OS, Records);
-  }
-};
-}
-
 namespace llvm {
 
 int TableGenMain(char *argv0, TableGenMainFn *MainFn) {
-  StubTransitionalTableGenAction Action(MainFn);
-  return TableGenMain(argv0, Action);
-}
-
-int TableGenMain(char *argv0, TableGenAction &Action) {
   RecordKeeper Records;
 
   try {
@@ -123,7 +104,7 @@ int TableGenMain(char *argv0, TableGenAction &Action) {
       DepOut.keep();
     }
 
-    if (Action(Out.os(), Records))
+    if (MainFn(Out.os(), Records))
       return 1;
 
     // Declare success.
diff --git a/llvm/lib/TableGen/TableGenAction.cpp b/llvm/lib/TableGen/TableGenAction.cpp
deleted file mode 100644
index 54e5083..0000000
--- a/llvm/lib/TableGen/TableGenAction.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//===- TableGenAction.cpp - defines TableGenAction --------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/TableGen/TableGenAction.h"
-
-using namespace llvm;
-
-void TableGenAction::anchor() { }
-