Skip to content

Commit

Permalink
* Clean up some comments
Browse files Browse the repository at this point in the history
* Move code out of header file to .cpp files, to make future changes easier
* Add arguments to classes so that they can be automatically inserted into their
  parent structure upon creation.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3604 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
lattner committed Sep 6, 2002
1 parent 82f2f95 commit fab8c79
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 21 deletions.
14 changes: 7 additions & 7 deletions include/llvm/Argument.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//===-- llvm/Argument.h - Definition of the Argument class -------*- C++ -*--=//
//
// This file defines the Argument class, which represents and incoming formal
// argument to a function.
// argument to a Function.
//
//===----------------------------------------------------------------------===//

Expand All @@ -10,20 +10,20 @@

#include "llvm/Value.h"

class Argument : public Value { // Defined in the InstrType.cpp file
class Argument : public Value { // Defined in the Function.cpp file
Function *Parent;

Argument *Prev, *Next; // Next and Prev links for our intrusive linked list
void setNext(Argument *N) { Next = N; }
void setPrev(Argument *N) { Prev = N; }
friend class SymbolTableListTraits<Argument, Function, Function>;
inline void setParent(Function *parent) { Parent = parent; }
void setParent(Function *parent);

public:
Argument(const Type *Ty, const std::string &Name = "")
: Value(Ty, Value::ArgumentVal, Name) {
Parent = 0;
}
/// Argument ctor - If Function argument is specified, this argument is
/// inserted at the end of the argument list for the function.
///
Argument(const Type *Ty, const std::string &Name = "", Function *F = 0);

/// setName - Specialize setName to handle symbol table majik...
virtual void setName(const std::string &name, SymbolTable *ST = 0);
Expand Down
15 changes: 9 additions & 6 deletions include/llvm/BasicBlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private :
InstListType InstList;
BasicBlock *Prev, *Next; // Next and Prev links for our intrusive linked list

void setParent(Function *parent) { InstList.setParent(parent); }
void setParent(Function *parent);
void setNext(BasicBlock *N) { Next = N; }
void setPrev(BasicBlock *N) { Prev = N; }
friend class SymbolTableListTraits<BasicBlock, Function, Function>;
Expand All @@ -53,20 +53,23 @@ private :
void operator=(const BasicBlock &); // Do not implement

public:
// Instruction iterators...
/// Instruction iterators...
typedef InstListType::iterator iterator;
typedef InstListType::const_iterator const_iterator;
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
typedef std::reverse_iterator<iterator> reverse_iterator;

// Ctor, dtor
/// BasicBlock ctor - If the function parameter is specified, the basic block
/// is automatically inserted at the end of the function.
///
BasicBlock(const std::string &Name = "", Function *Parent = 0);
~BasicBlock();

// Specialize setName to take care of symbol table majik
virtual void setName(const std::string &name, SymbolTable *ST = 0);

// getParent - Return the enclosing method, or null if none
/// getParent - Return the enclosing method, or null if none
///
const Function *getParent() const { return InstList.getParent(); }
Function *getParent() { return InstList.getParent(); }

Expand Down Expand Up @@ -94,8 +97,8 @@ private :


//===--------------------------------------------------------------------===//
// Instruction iterator methods
//
/// Instruction iterator methods
///
inline iterator begin() { return InstList.begin(); }
inline const_iterator begin() const { return InstList.begin(); }
inline iterator end () { return InstList.end(); }
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Function.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ template<> struct ilist_traits<BasicBlock>
: public SymbolTableListTraits<BasicBlock, Function, Function> {

// createNode is used to create a node that marks the end of the list...
static BasicBlock *createNode() { return new BasicBlock(); }
static BasicBlock *createNode();

static iplist<BasicBlock> &getList(Function *F);
};
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/GlobalValue.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//===-- llvm/GlobalValue.h - Class to represent a global value ---*- C++ -*--=//
//
// This file is a common base class of all globally definable objects. As such,
// it is subclassed by GlobalVariable and by Method. This is used because you
// it is subclassed by GlobalVariable and by Function. This is used because you
// can do certain things with these global objects that you can't do to anything
// else. For example, use the address of one as a constant.
//
Expand Down
9 changes: 6 additions & 3 deletions include/llvm/GlobalVariable.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,20 @@ template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
class GlobalVariable : public GlobalValue {
friend class SymbolTableListTraits<GlobalVariable, Module, Module,
ilist_traits<GlobalVariable> >;
void setParent(Module *parent) { Parent = parent; }
void setParent(Module *parent);

GlobalVariable *Prev, *Next;
void setNext(GlobalVariable *N) { Next = N; }
void setPrev(GlobalVariable *N) { Prev = N; }

bool isConstantGlobal; // Is this a global constant?
public:
/// GlobalVariable ctor - If a parent module is specified, the global is
/// automatically inserted into the end of the specified modules global list.
///
GlobalVariable(const Type *Ty, bool isConstant, bool isInternal,
Constant *Initializer = 0, const std::string &Name = "");
~GlobalVariable() {}
Constant *Initializer = 0, const std::string &Name = "",
Module *Parent = 0);

// Specialize setName to handle symbol table majik...
virtual void setName(const std::string &name, SymbolTable *ST = 0);
Expand Down
6 changes: 3 additions & 3 deletions include/llvm/Instruction.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//===-- llvm/Instruction.h - Instruction class definition --------*- C++ -*--=//
//
// This file contains the declaration of the Instruction class, which is the
// base class for all of the VM instructions.
// base class for all of the LLVM instructions.
//
//===----------------------------------------------------------------------===//

Expand All @@ -22,9 +22,9 @@ class Instruction : public User {

friend class SymbolTableListTraits<Instruction, BasicBlock, Function,
ilist_traits<Instruction> >;
inline void setParent(BasicBlock *P) { Parent = P; }
void setParent(BasicBlock *P);
protected:
unsigned iType; // InstructionType
unsigned iType; // InstructionType: The opcode of the instruction
public:
Instruction(const Type *Ty, unsigned iType, const std::string &Name = "");
virtual ~Instruction() {
Expand Down

0 comments on commit fab8c79

Please sign in to comment.