diff options
author | Chris Lattner <sabre@nondot.org> | 2007-01-15 02:27:26 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2007-01-15 02:27:26 +0000 |
commit | 42a75517250017a52afb03a0ade03cbd49559fe5 (patch) | |
tree | ce6335dd133d9e2af752f558d4edd8f9d1fedefe /lib/AsmParser/llvmAsmParser.y | |
parent | b25c4ca9d8c838c2f18009221b11cd5170c47702 (diff) | |
download | external_llvm-42a75517250017a52afb03a0ade03cbd49559fe5.zip external_llvm-42a75517250017a52afb03a0ade03cbd49559fe5.tar.gz external_llvm-42a75517250017a52afb03a0ade03cbd49559fe5.tar.bz2 |
rename Type::isIntegral to Type::isInteger, eliminating the old Type::isInteger.
rename Type::getIntegralTypeMask to Type::getIntegerTypeMask.
This makes naming much more consistent. For example, there are now no longer any
instances of IntegerType that are not considered isInteger! :)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33225 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser/llvmAsmParser.y')
-rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index 2aae3fa..59aaf25 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1274,7 +1274,7 @@ Types const llvm::Type* ElemTy = $4->get(); if ((unsigned)$2 != $2) GEN_ERROR("Unsigned result not equal to signed result"); - if (!ElemTy->isFloatingPoint() && !ElemTy->isIntegral()) + if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger()) GEN_ERROR("Element type of a PackedType must be primitive"); if (!isPowerOf2_32($2)) GEN_ERROR("Vector length should be a power of 2!"); @@ -1756,9 +1756,9 @@ ConstExpr: CastOps '(' ConstVal TO Types ')' { | LogicalOps '(' ConstVal ',' ConstVal ')' { if ($3->getType() != $5->getType()) GEN_ERROR("Logical operator types must match!"); - if (!$3->getType()->isIntegral()) { + if (!$3->getType()->isInteger()) { if (!isa<PackedType>($3->getType()) || - !cast<PackedType>($3->getType())->getElementType()->isIntegral()) + !cast<PackedType>($3->getType())->getElementType()->isInteger()) GEN_ERROR("Logical operator requires integral operands!"); } $$ = ConstantExpr::get($1, $3, $5); @@ -1777,7 +1777,7 @@ ConstExpr: CastOps '(' ConstVal TO Types ')' { | ShiftOps '(' ConstVal ',' ConstVal ')' { if ($5->getType() != Type::Int8Ty) GEN_ERROR("Shift count for shift constant must be i8 type!"); - if (!$3->getType()->isIntegral()) + if (!$3->getType()->isInteger()) GEN_ERROR("Shift constant expression requires integer operand!"); CHECK_FOR_ERROR; $$ = ConstantExpr::get($1, $3, $5); @@ -2573,7 +2573,7 @@ OptTailCall : TAIL CALL { InstVal : ArithmeticOps Types ValueRef ',' ValueRef { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription()); - if (!(*$2)->isIntegral() && !(*$2)->isFloatingPoint() && + if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() && !isa<PackedType>((*$2).get())) GEN_ERROR( "Arithmetic operator requires integer, FP, or packed operands!"); @@ -2594,9 +2594,9 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { | LogicalOps Types ValueRef ',' ValueRef { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*$2)->getDescription()); - if (!(*$2)->isIntegral()) { + if (!(*$2)->isInteger()) { if (!isa<PackedType>($2->get()) || - !cast<PackedType>($2->get())->getElementType()->isIntegral()) + !cast<PackedType>($2->get())->getElementType()->isInteger()) GEN_ERROR("Logical operator requires integral operands!"); } Value* tmpVal1 = getVal(*$2, $3); @@ -2637,7 +2637,7 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { | ShiftOps ResolvedVal ',' ResolvedVal { if ($4->getType() != Type::Int8Ty) GEN_ERROR("Shift amount must be i8 type!"); - if (!$2->getType()->isIntegral()) + if (!$2->getType()->isInteger()) GEN_ERROR("Shift constant expression requires integer operand!"); CHECK_FOR_ERROR; $$ = new ShiftInst($1, $2, $4); |