From 111deeb1a46382c433369be8ae6a5ac2a3a5a525 Mon Sep 17 00:00:00 2001 From: Iulian Dragos Date: Thu, 14 Oct 2010 06:49:46 +0000 Subject: Fixed wrong tag for Longs, which caused bad jav... Fixed wrong tag for Longs, which caused bad java signatures (and a crash building the Eclipse plugin). No review. --- src/compiler/scala/tools/nsc/symtab/Definitions.scala | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index 14b574cba9..a26ee2c94f 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -85,14 +85,16 @@ trait Definitions extends reflect.generic.StandardDefinitions { lazy val UnitClass = newClass(ScalaPackageClass, nme.Unit, anyvalparam).setFlag(ABSTRACT | FINAL) - lazy val ByteClass = newValueClass(nme.Byte, 'B', 2) - lazy val ShortClass = newValueClass(nme.Short, 'S', 4) - lazy val CharClass = newValueClass(nme.Char, 'C', 3) - lazy val IntClass = newValueClass(nme.Int, 'I', 12) - lazy val LongClass = newValueClass(nme.Long, 'L', 24) - lazy val FloatClass = newValueClass(nme.Float, 'F', 48) - lazy val DoubleClass = newValueClass(nme.Double, 'D', 96) - lazy val BooleanClass = newValueClass(nme.Boolean, 'Z', 0) + import classfile.ClassfileConstants._ + + lazy val ByteClass = newValueClass(nme.Byte, BYTE_TAG, 2) + lazy val ShortClass = newValueClass(nme.Short, SHORT_TAG, 4) + lazy val CharClass = newValueClass(nme.Char, CHAR_TAG, 3) + lazy val IntClass = newValueClass(nme.Int, INT_TAG, 12) + lazy val LongClass = newValueClass(nme.Long, LONG_TAG, 24) + lazy val FloatClass = newValueClass(nme.Float, FLOAT_TAG, 48) + lazy val DoubleClass = newValueClass(nme.Double, DOUBLE_TAG, 96) + lazy val BooleanClass = newValueClass(nme.Boolean, BOOL_TAG, 0) def Boolean_and = getMember(BooleanClass, nme.ZAND) def Boolean_or = getMember(BooleanClass, nme.ZOR) -- cgit v1.2.3