��> 2003-06-07�� Anthony Green�� <green@redhat.com> ��>...

��> 2003-06-07�� Anthony Green�� <green@redhat.com>
��>
��>������������* parse.y (patch_cast): Fix conversions from floating-point to
��>������������integral types.

From-SVN: r67631

gcc/java/ChangeLog

+2003-06-08  Anthony Green  <green@redhat.com>
+
+	* parse.y (patch_cast): Fix conversions from floating-point to
+	integral types.
+
 2003-06-08  Neil Booth  <neil@daikokuya.co.uk>
 
 	* Make-lang.in: Update.

gcc/java/parse.y

@@ -14224,12 +14224,13 @@ patch_cast (tree node, tree wfl_op)
       if (cast_type == op_type)
 	return node;
 
-      /* float and double type are converted to the original type main
-	 variant and then to the target type. */
-      if (JFLOAT_TYPE_P (op_type) && TREE_CODE (cast_type) == CHAR_TYPE)
+      /* A narrowing conversion from a floating-point number to an
+	 integral type requires special handling (5.1.3).  */
+      if (JFLOAT_TYPE_P (op_type) && JINTEGRAL_TYPE_P (cast_type))
+	if (cast_type != long_type_node)
 	  op = convert (integer_type_node, op);
 
-      /* Try widening/narowwing convertion. Potentially, things need
+      /* Try widening/narrowing convertion.  Potentially, things need
 	 to be worked out in gcc so we implement the extreme cases
 	 correctly.  fold_convert() needs to be fixed.  */
       return convert (cast_type, op);