Add extra parenthesis around || statements to pacify compiler.

Also fix up some 80col violations while I'm there.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@71833 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2009-05-15 03:03:14 +00:00
parent bc0d23afae
commit aa0b3df5a0

View File

@ -639,7 +639,8 @@ public:
class StringInit : public TypedInit { class StringInit : public TypedInit {
std::string Value; std::string Value;
public: public:
explicit StringInit(const std::string &V) : TypedInit(new StringRecTy), Value(V) {} explicit StringInit(const std::string &V)
: TypedInit(new StringRecTy), Value(V) {}
const std::string &getValue() const { return Value; } const std::string &getValue() const { return Value; }
@ -774,7 +775,8 @@ public:
// Clone - Clone this operator, replacing arguments with the new list // Clone - Clone this operator, replacing arguments with the new list
virtual OpInit *clone(std::vector<Init *> &Operands) { virtual OpInit *clone(std::vector<Init *> &Operands) {
assert(Operands.size() == 1 && "Wrong number of operands for unary operation"); assert(Operands.size() == 1 &&
"Wrong number of operands for unary operation");
return new UnOpInit(getOpcode(), *Operands.begin(), getType()); return new UnOpInit(getOpcode(), *Operands.begin(), getType());
} }
@ -811,13 +813,14 @@ public:
// Clone - Clone this operator, replacing arguments with the new list // Clone - Clone this operator, replacing arguments with the new list
virtual OpInit *clone(std::vector<Init *> &Operands) { virtual OpInit *clone(std::vector<Init *> &Operands) {
assert(Operands.size() == 2 && "Wrong number of operands for binary operation"); assert(Operands.size() == 2 &&
"Wrong number of operands for binary operation");
return new BinOpInit(getOpcode(), Operands[0], Operands[1], getType()); return new BinOpInit(getOpcode(), Operands[0], Operands[1], getType());
} }
int getNumOperands(void) const { return 2; } int getNumOperands(void) const { return 2; }
Init *getOperand(int i) { Init *getOperand(int i) {
assert(i == 0 || i == 1 && "Invalid operand id for binary operator"); assert((i == 0 || i == 1) && "Invalid operand id for binary operator");
if (i == 0) { if (i == 0) {
return getLHS(); return getLHS();
} }
@ -854,13 +857,16 @@ public:
// Clone - Clone this operator, replacing arguments with the new list // Clone - Clone this operator, replacing arguments with the new list
virtual OpInit *clone(std::vector<Init *> &Operands) { virtual OpInit *clone(std::vector<Init *> &Operands) {
assert(Operands.size() == 3 && "Wrong number of operands for ternary operation"); assert(Operands.size() == 3 &&
return new TernOpInit(getOpcode(), Operands[0], Operands[1], Operands[2], getType()); "Wrong number of operands for ternary operation");
return new TernOpInit(getOpcode(), Operands[0], Operands[1], Operands[2],
getType());
} }
int getNumOperands(void) const { return 3; } int getNumOperands(void) const { return 3; }
Init *getOperand(int i) { Init *getOperand(int i) {
assert(i == 0 || i == 1 || i == 2 && "Invalid operand id for ternary operator"); assert((i == 0 || i == 1 || i == 2) &&
"Invalid operand id for ternary operator");
if (i == 0) { if (i == 0) {
return getLHS(); return getLHS();
} }