@@ -35,13 +35,13 @@ import scala.language.implicitConversions"""
35
35
else coercionComment.linesIterator.toList ++ coercions
36
36
}
37
37
38
- def isCardinal : Boolean = isIntegerType(this )
38
+ def isInteger : Boolean = isIntegerType(this )
39
39
def unaryOps = {
40
40
val ops = List (
41
41
Op (" +" , " /** Returns this value, unmodified. */" ),
42
42
Op (" -" , " /** Returns the negation of this value. */" ))
43
43
44
- if (isCardinal )
44
+ if (isInteger )
45
45
Op (" ~" , " /**\n " +
46
46
" * Returns the bitwise negation of this value.\n " +
47
47
" * @example {{{\n " +
@@ -54,7 +54,7 @@ import scala.language.implicitConversions"""
54
54
}
55
55
56
56
def bitwiseOps =
57
- if (isCardinal )
57
+ if (isInteger )
58
58
List (
59
59
Op (" |" , " /**\n " +
60
60
" * Returns the bitwise OR of this value and `x`.\n " +
@@ -89,7 +89,7 @@ import scala.language.implicitConversions"""
89
89
else Nil
90
90
91
91
def shiftOps =
92
- if (isCardinal )
92
+ if (isInteger )
93
93
List (
94
94
Op (" <<" , " /**\n " +
95
95
" * Returns this value bit-shifted left by the specified number of bits,\n " +
@@ -164,7 +164,7 @@ import scala.language.implicitConversions"""
164
164
val xs1 = List (mkCoercions, mkUnaryOps, mkStringOps, mkShiftOps) map (xs => if (xs.isEmpty) xs else xs :+ " " )
165
165
val xs2 = List (
166
166
mkBinOpsGroup(comparisonOps, numeric, _ => Z ),
167
- mkBinOpsGroup(bitwiseOps, cardinal , this opType _),
167
+ mkBinOpsGroup(bitwiseOps, integer , this opType _),
168
168
mkBinOpsGroup(otherOps, numeric, this opType _)
169
169
)
170
170
xs1 ++ xs2
@@ -179,7 +179,7 @@ import scala.language.implicitConversions"""
179
179
res ++ xs
180
180
}
181
181
def objectLines = {
182
- val comp = if (isCardinal) cardinalCompanion else floatingCompanion
182
+ val comp = if (isInteger) integerCompanion else floatingCompanion
183
183
interpolate(comp + allCompanions + " \n " + nonUnitCompanions).trim.linesIterator.toList ++ (implicitCoercions map interpolate)
184
184
}
185
185
@@ -333,7 +333,7 @@ override def toString = "object scala.@name@"
333
333
334
334
def nonUnitCompanions = " " // todo
335
335
336
- def cardinalCompanion = """
336
+ def integerCompanion = """
337
337
/** The smallest value representable as @article@ @name@. */
338
338
final val MinValue = @[email protected] _VALUE
339
339
@@ -497,7 +497,7 @@ override def getClass(): Class[Boolean] = ???
497
497
def isFloatingType = Set (F , D )
498
498
def isWideType = Set (L , D )
499
499
500
- def cardinal = numeric filter isIntegerType
500
+ def integer = numeric filter isIntegerType
501
501
def numeric = List (B , S , C , I , L , F , D )
502
502
def values = List (U , Z ) ++ numeric
503
503
0 commit comments