rename ConstantExpression to ConstantNumberExpression
add number and string types