[llvm-commits] CVS: llvm/utils/TableGen/CodeEmitterGen.cpp CodeGenWrappers.cpp InstrInfoEmitter.cpp InstrSelectorEmitter.cpp Record.cpp RegisterInfoEmitter.cpp TableGen.cpp TableGenBackend.cpp
Chris Lattner
lattner at cs.uiuc.edu
Sat Jul 31 20:55:49 PDT 2004
Changes in directory llvm/utils/TableGen:
CodeEmitterGen.cpp updated: 1.29 -> 1.30
CodeGenWrappers.cpp updated: 1.7 -> 1.8
InstrInfoEmitter.cpp updated: 1.8 -> 1.9
InstrSelectorEmitter.cpp updated: 1.38 -> 1.39
Record.cpp updated: 1.34 -> 1.35
RegisterInfoEmitter.cpp updated: 1.15 -> 1.16
TableGen.cpp updated: 1.30 -> 1.31
TableGenBackend.cpp updated: 1.5 -> 1.6
---
Log message:
Finegrainify namespacification
---
Diffs of the changes: (+21 -41)
Index: llvm/utils/TableGen/CodeEmitterGen.cpp
diff -u llvm/utils/TableGen/CodeEmitterGen.cpp:1.29 llvm/utils/TableGen/CodeEmitterGen.cpp:1.30
--- llvm/utils/TableGen/CodeEmitterGen.cpp:1.29 Tue Nov 11 16:41:34 2003
+++ llvm/utils/TableGen/CodeEmitterGen.cpp Sat Jul 31 22:55:38 2004
@@ -14,8 +14,7 @@
#include "CodeEmitterGen.h"
#include "Record.h"
#include "Support/Debug.h"
-
-namespace llvm {
+using namespace llvm;
void CodeEmitterGen::run(std::ostream &o) {
std::vector<Record*> Insts = Records.getAllDerivedDefinitions("Instruction");
@@ -226,5 +225,3 @@
EmitSourceFileTail(o);
}
-
-} // End llvm namespace
Index: llvm/utils/TableGen/CodeGenWrappers.cpp
diff -u llvm/utils/TableGen/CodeGenWrappers.cpp:1.7 llvm/utils/TableGen/CodeGenWrappers.cpp:1.8
--- llvm/utils/TableGen/CodeGenWrappers.cpp:1.7 Fri Jun 4 09:59:42 2004
+++ llvm/utils/TableGen/CodeGenWrappers.cpp Sat Jul 31 22:55:38 2004
@@ -16,16 +16,15 @@
#include "CodeGenWrappers.h"
#include "Record.h"
-
-namespace llvm {
+using namespace llvm;
/// getValueType - Return the MCV::ValueType that the specified TableGen record
/// corresponds to.
-MVT::ValueType getValueType(Record *Rec) {
+MVT::ValueType llvm::getValueType(Record *Rec) {
return (MVT::ValueType)Rec->getValueAsInt("Value");
}
-std::string getName(MVT::ValueType T) {
+std::string llvm::getName(MVT::ValueType T) {
switch (T) {
case MVT::Other: return "UNKNOWN";
case MVT::i1: return "i1";
@@ -43,7 +42,7 @@
}
}
-std::string getEnumName(MVT::ValueType T) {
+std::string llvm::getEnumName(MVT::ValueType T) {
switch (T) {
case MVT::Other: return "Other";
case MVT::i1: return "i1";
@@ -62,12 +61,11 @@
}
-std::ostream &operator<<(std::ostream &OS, MVT::ValueType T) {
+std::ostream &llvm::operator<<(std::ostream &OS, MVT::ValueType T) {
return OS << getName(T);
}
-
/// getTarget - Return the current instance of the Target class.
///
CodeGenTarget::CodeGenTarget() : PointerType(MVT::Other) {
@@ -99,4 +97,3 @@
return TargetRec->getValueAsDef("InstructionSet");
}
-} // End llvm namespace
Index: llvm/utils/TableGen/InstrInfoEmitter.cpp
diff -u llvm/utils/TableGen/InstrInfoEmitter.cpp:1.8 llvm/utils/TableGen/InstrInfoEmitter.cpp:1.9
--- llvm/utils/TableGen/InstrInfoEmitter.cpp:1.8 Fri Jul 30 21:07:26 2004
+++ llvm/utils/TableGen/InstrInfoEmitter.cpp Sat Jul 31 22:55:38 2004
@@ -15,8 +15,7 @@
#include "InstrInfoEmitter.h"
#include "CodeGenWrappers.h"
#include "Record.h"
-
-namespace llvm {
+using namespace llvm;
// runEnums - Print out enum values for all of the instructions.
void InstrInfoEmitter::runEnums(std::ostream &OS) {
@@ -175,4 +174,3 @@
throw "In record '" + R->getName() + "' for TSFlag emission.";
}
-} // End llvm namespace
Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.38 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.39
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.38 Sat Jan 24 03:23:46 2004
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp Sat Jul 31 22:55:38 2004
@@ -18,8 +18,7 @@
#include "Support/Debug.h"
#include "Support/StringExtras.h"
#include <set>
-
-namespace llvm {
+using namespace llvm;
NodeType::ArgResultTypes NodeType::Translate(Record *R) {
const std::string &Name = R->getName();
@@ -104,7 +103,7 @@
return New;
}
-std::ostream &operator<<(std::ostream &OS, const TreePatternNode &N) {
+std::ostream &llvm::operator<<(std::ostream &OS, const TreePatternNode &N) {
if (N.isLeaf())
return OS << N.getType() << ":" << *N.getValue();
OS << "(" << N.getType() << ":";
@@ -359,7 +358,7 @@
-std::ostream &operator<<(std::ostream &OS, const Pattern &P) {
+std::ostream &llvm::operator<<(std::ostream &OS, const Pattern &P) {
switch (P.getPatternType()) {
case Pattern::Nonterminal: OS << "Nonterminal pattern "; break;
case Pattern::Instruction: OS << "Instruction pattern "; break;
@@ -1296,4 +1295,3 @@
EmitSourceFileTail(OS);
}
-} // End llvm namespace
Index: llvm/utils/TableGen/Record.cpp
diff -u llvm/utils/TableGen/Record.cpp:1.34 llvm/utils/TableGen/Record.cpp:1.35
--- llvm/utils/TableGen/Record.cpp:1.34 Mon Jul 26 20:01:21 2004
+++ llvm/utils/TableGen/Record.cpp Sat Jul 31 22:55:38 2004
@@ -11,13 +11,12 @@
//===----------------------------------------------------------------------===//
#include "Record.h"
+using namespace llvm;
//===----------------------------------------------------------------------===//
// Type implementations
//===----------------------------------------------------------------------===//
-namespace llvm {
-
void RecTy::dump() const { print(std::cerr); }
Init *BitRecTy::convertValue(BitsInit *BI) {
@@ -568,7 +567,7 @@
void Record::dump() const { std::cerr << *this; }
-std::ostream &operator<<(std::ostream &OS, const Record &R) {
+std::ostream &llvm::operator<<(std::ostream &OS, const Record &R) {
OS << R.getName();
const std::vector<std::string> &TArgs = R.getTemplateArgs();
@@ -730,7 +729,7 @@
void RecordKeeper::dump() const { std::cerr << *this; }
-std::ostream &operator<<(std::ostream &OS, const RecordKeeper &RK) {
+std::ostream &llvm::operator<<(std::ostream &OS, const RecordKeeper &RK) {
OS << "------------- Classes -----------------\n";
const std::map<std::string, Record*> &Classes = RK.getClasses();
for (std::map<std::string, Record*>::const_iterator I = Classes.begin(),
@@ -764,4 +763,3 @@
return Defs;
}
-} // End llvm namespace
Index: llvm/utils/TableGen/RegisterInfoEmitter.cpp
diff -u llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.15 llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.16
--- llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.15 Tue Nov 11 16:41:34 2003
+++ llvm/utils/TableGen/RegisterInfoEmitter.cpp Sat Jul 31 22:55:38 2004
@@ -18,8 +18,7 @@
#include "Record.h"
#include "Support/StringExtras.h"
#include <set>
-
-namespace llvm {
+using namespace llvm;
// runEnums - Print out enum values for all of the registers.
void RegisterInfoEmitter::runEnums(std::ostream &OS) {
@@ -246,5 +245,3 @@
OS << " 0\n };\n return CalleeSaveRegs;\n}\n\n";
EmitSourceFileTail(OS);
}
-
-} // End llvm namespace
Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.30 llvm/utils/TableGen/TableGen.cpp:1.31
--- llvm/utils/TableGen/TableGen.cpp:1.30 Thu Jul 22 16:32:38 2004
+++ llvm/utils/TableGen/TableGen.cpp Sat Jul 31 22:55:38 2004
@@ -26,8 +26,7 @@
#include <algorithm>
#include <cstdio>
#include <fstream>
-
-namespace llvm {
+using namespace llvm;
enum ActionType {
PrintRecords,
@@ -79,10 +78,12 @@
cl::value_desc("directory"), cl::init(""));
}
+namespace llvm {
+ void ParseFile(const std::string &Filename,
+ const std::string &IncludeDir);
+}
-void ParseFile(const std::string &Filename, const std::string & IncludeDir);
-
-RecordKeeper Records;
+RecordKeeper llvm::Records;
static Init *getBit(Record *R, unsigned BitNo) {
const std::vector<RecordVal> &V = R->getValues();
@@ -408,10 +409,6 @@
}
}
-} // End llvm namespace
-
-using namespace llvm;
-
int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv);
ParseFile(InputFilename, IncludeDir);
Index: llvm/utils/TableGen/TableGenBackend.cpp
diff -u llvm/utils/TableGen/TableGenBackend.cpp:1.5 llvm/utils/TableGen/TableGenBackend.cpp:1.6
--- llvm/utils/TableGen/TableGenBackend.cpp:1.5 Tue Nov 11 16:41:34 2003
+++ llvm/utils/TableGen/TableGenBackend.cpp Sat Jul 31 22:55:39 2004
@@ -14,8 +14,7 @@
#include "TableGenBackend.h"
#include "Record.h"
#include <iostream>
-
-namespace llvm {
+using namespace llvm;
void TableGenBackend::EmitSourceFileHeader(const std::string &Desc,
std::ostream &OS) const {
@@ -38,4 +37,3 @@
return Namespace + "::" + R->getName();
}
-} // End llvm namespace
More information about the llvm-commits
mailing list