@@ -43,15 +43,15 @@ object JavaCode {
4343 def literal (v : String , dataType : DataType ): LiteralValue = dataType match {
4444 case BooleanType if v == " true" => TrueLiteral
4545 case BooleanType if v == " false" => FalseLiteral
46- case _ => new LiteralExpr (v, CodeGenerator .javaClass(dataType))
46+ case _ => new LiteralValue (v, CodeGenerator .javaClass(dataType))
4747 }
4848
4949 /**
5050 * Create a default literal. This is null for reference types, false for boolean types and
5151 * -1 for other primitive types.
5252 */
5353 def defaultLiteral (dataType : DataType ): LiteralValue = {
54- new LiteralExpr (
54+ new LiteralValue (
5555 CodeGenerator .defaultValue(dataType, typedNull = true ),
5656 CodeGenerator .javaClass(dataType))
5757 }
@@ -304,8 +304,7 @@ case class GlobalValue(value: String, javaType: Class[_]) extends ExprValue {
304304/**
305305 * A literal java expression.
306306 */
307- abstract class LiteralValue (val value : String , val javaType : Class [_])
308- extends ExprValue with Serializable {
307+ class LiteralValue (val value : String , val javaType : Class [_]) extends ExprValue with Serializable {
309308 override def code : String = value
310309
311310 override def equals (arg : Any ): Boolean = arg match {
@@ -316,8 +315,5 @@ abstract class LiteralValue(val value: String, val javaType: Class[_])
316315 override def hashCode (): Int = value.hashCode() * 31 + javaType.hashCode()
317316}
318317
319- case class LiteralExpr (override val value : String , override val javaType : Class [_])
320- extends LiteralValue (value, javaType)
321-
322318case object TrueLiteral extends LiteralValue (" true" , JBool .TYPE )
323319case object FalseLiteral extends LiteralValue (" false" , JBool .TYPE )
0 commit comments