maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Update the code to the fact that StringSet now lives in llvm/ADT. 

llvm-svn: 51730
This commit is contained in:
Mikhail Glushenkov 2008-05-30 06:11:18 +00:00
parent f1c87ff378
commit a06c516cad
3 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/tools/llvmc2/CompilationGraph.h
View File

@ -16,13 +16,13 @@
#include "AutoGenerated.h"
#include "Tool.h"
#include "StringSet.h"
#include "llvm/ADT/GraphTraits.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/iterator.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/System/Path.h"
#include <cassert>
@ -30,7 +30,7 @@
namespace llvmc {
typedef StringSet<> InputLanguagesSet;
typedef llvm::StringSet<> InputLanguagesSet;
/// Edge - Represents an edge of the compilation graph.
class Edge : public llvm::RefCountedBaseVPTR<Edge> {

40
llvm/tools/llvmc2/StringSet.h
View File

@ -1,40 +0,0 @@
//===--- StringSet.h - The LLVM Compiler Driver -----------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open
// Source License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// StringSet - A set-like wrapper for the StringMap.
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_TOOLS_LLVMC2_STRINGSET_H
#define LLVM_TOOLS_LLVMC2_STRINGSET_H
#include "llvm/ADT/StringMap.h"
#include <cassert>
namespace llvmc {
/// StringSet - A wrapper for StringMap that provides set-like
/// functionality. Only insert() and count() methods are used by my
/// code.
template <class AllocatorTy = llvm::MallocAllocator>
class StringSet : public llvm::StringMap<char, AllocatorTy> {
typedef llvm::StringMap<char, AllocatorTy> base;
public:
void insert (const std::string& InLang) {
assert(!InLang.empty());
const char* KeyStart = &InLang[0];
const char* KeyEnd = KeyStart + InLang.size();
base::insert(llvm::StringMapEntry<char>::
Create(KeyStart, KeyEnd, base::getAllocator(), '+'));
}
};
}
#endif //LLVM_TOOLS_LLVMC2_STRINGSET_H

9
llvm/tools/llvmc2/Tool.h
View File

@ -15,9 +15,9 @@
#define LLVM_TOOLS_LLVMC2_TOOL_H
#include "Action.h"
#include "StringSet.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/System/Path.h"
#include <string>
@ -26,6 +26,7 @@
namespace llvmc {
typedef std::vector<llvm::sys::Path> PathVector;
typedef llvm::StringSet<> InputLanguagesSet;
/// Tool - A class
class Tool : public llvm::RefCountedBaseVPTR<Tool> {
@ -35,11 +36,11 @@ namespace llvmc {
virtual Action GenerateAction (const PathVector& inFiles,
const llvm::sys::Path& outFile,
const StringSet<>& InLangs) const = 0;
const InputLanguagesSet& InLangs) const = 0;
virtual Action GenerateAction (const llvm::sys::Path& inFile,
const llvm::sys::Path& outFile,
const StringSet<>& InLangs) const = 0;
const InputLanguagesSet& InLangs) const = 0;
virtual const char* Name() const = 0;
virtual const char* InputLanguage() const = 0;
@ -58,7 +59,7 @@ namespace llvmc {
bool JoinListEmpty() const { return JoinList_.empty(); }
Action GenerateAction(const llvm::sys::Path& outFile,
const StringSet<>& InLangs) const {
const InputLanguagesSet& InLangs) const {
return GenerateAction(JoinList_, outFile, InLangs);
}
// We shouldn't shadow base class's version of GenerateAction.