eliminate unimplemented vax and cray floating point formats * mach-info.h * test/io.tst: Delete vaxd, vaxg, and cray from list of architectures in fopen test. # HG changeset patch # User John W. Eaton <jwe@octave.org> # Date 1379028062 14400 # Thu Sep 12 19:21:02 2013 -0400 # Node ID ea2763020ac1aa15ad0d43d787b61ff3b8469209 # Parent e89e86e1a5518c11058930fec5e907e60e31251b eliminate unimplemented vax and cray floating point formats * mach-info.h (oct_mach_info::float_format): Delete flt_fmt_vaxd, flt_fmt_vaxg, and flt_fmt_cray enum values. * ls-mat4.cc (float_format_to_mopt_digit, mopt_digit_to_float_format): Delete cases for vaxd, vaxg, and cray floating point formats. * lo-ieee.cc (octave_ieee_init): Likewise. * mach-info.cc (get_float_format, oct_mach_info::string_to_float_format, oct_mach_info::float_format_as_string): Likewise. * oct-stream.cc: Delete explicit template instantiation for do_write. (octave_stream::write, do_read): Delete checks for vaxd and vaxg floating point formats. * pr-output.cc (pr_any_float): Don't check for cray or unknonwn float formats. * data-conv.cc (VAX_D_double_to_IEEE_little_double, VAX_G_double_to_IEEE_little_double, Cray_to_IEEE_little_double, IEEE_big_float_to_IEEE_little_float, VAX_D_float_to_IEEE_little_float, VAX_G_float_to_IEEE_little_float, Cray_to_IEEE_little_float, IEEE_little_double_to_IEEE_big_double, VAX_D_double_to_IEEE_big_double, VAX_G_double_to_IEEE_big_double, Cray_to_IEEE_big_double, IEEE_little_float_to_IEEE_big_float, VAX_D_float_to_IEEE_big_float, VAX_G_float_to_IEEE_big_float, Cray_to_IEEE_big_float, IEEE_little_double_to_VAX_D_double, IEEE_big_double_to_VAX_D_double, VAX_G_double_to_VAX_D_double, Cray_to_VAX_D_double, IEEE_little_float_to_VAX_D_float, IEEE_big_float_to_VAX_D_float, VAX_G_float_to_VAX_D_float, Cray_to_VAX_D_float, IEEE_little_double_to_VAX_G_double, IEEE_big_double_to_VAX_G_double, VAX_D_double_to_VAX_G_double, Cray_to_VAX_G_double, IEEE_little_float_to_VAX_G_float, IEEE_big_float_to_VAX_G_float, VAX_D_float_to_VAX_G_float, Cray_to_VAX_G_float): Delete. (do_double_format_conversion): Eliminate unimplemented vaxd, vaxg, and cray conversions. * file-io.cc (Ffopen, Ffread): Fix doc strings.

--- a/liboctave/system/mach-info.cc	Thu Sep 12 14:10:41 2013 -0400
+++ b/liboctave/system/mach-info.cc	Thu Sep 12 19:21:02 2013 -0400
@@ -75,14 +75,6 @@
 {
   oct_mach_info::float_format retval = oct_mach_info::flt_fmt_unknown;
 
-#if defined (CRAY)
-
-  // FIXME -- this should be determined automatically.
-
-  native_float_fmt = oct_mach_info::flt_fmt_cray;
-
-#else
-
   float_params fp[5];
 
   INIT_FLT_PAR (fp[0], oct_mach_info::flt_fmt_ieee_big_endian,
@@ -97,18 +89,6 @@
                  0, 1017118720,
                  0, 1018167296);
 
-  INIT_FLT_PAR (fp[2], oct_mach_info::flt_fmt_vax_d,
-                   128,  0,
-                -32769, -1,
-                  9344,  0,
-                  9344,  0);
-
-  INIT_FLT_PAR (fp[3], oct_mach_info::flt_fmt_vax_g,
-                    16,  0,
-                -32769, -1,
-                 15552,  0,
-                 15552,  0);
-
   INIT_FLT_PAR (fp[4], oct_mach_info::flt_fmt_unknown,
                 0, 0,
                 0, 0,
@@ -133,8 +113,6 @@
     }
   while (fp[++i].fp_fmt != oct_mach_info::flt_fmt_unknown);
 
-#endif
-
   return retval;
 }
 
@@ -214,12 +192,6 @@
     retval = oct_mach_info::flt_fmt_ieee_big_endian;
   else if (s == "ieee-le" || s == "l")
     retval = oct_mach_info::flt_fmt_ieee_little_endian;
-  else if (s == "vaxd" || s == "d")
-    retval = oct_mach_info::flt_fmt_vax_d;
-  else if (s == "vaxg" || s == "g")
-    retval = oct_mach_info::flt_fmt_vax_g;
-  else if (s == "cray" || s == "c")
-    retval = oct_mach_info::flt_fmt_cray;
   else if (s == "unknown")
     retval = oct_mach_info::flt_fmt_unknown;
   else
@@ -244,18 +216,6 @@
       retval = "ieee-le";
       break;
 
-    case flt_fmt_vax_d:
-      retval = "vaxd";
-      break;
-
-    case flt_fmt_vax_g:
-      retval = "vaxg";
-      break;
-
-    case flt_fmt_cray:
-      retval = "cray";
-      break;
-
     default:
       break;
     }