X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Ftests%2Ffloat-format.c;h=e1d91168b0cac391f788fd87d09738355c1a0cd5;hb=22e7c4db280afc956a2059f228040bf6e1b01fce;hp=fab8d81653dfcabf0ad435455165794aaef3657d;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp

diff --git a/src/language/tests/float-format.c b/src/language/tests/float-format.c
index fab8d81653..e1d91168b0 100644
--- a/src/language/tests/float-format.c
+++ b/src/language/tests/float-format.c
@@ -1,35 +1,33 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2006, 2010 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
-#include <libpspp/float-format.h>
+#include "libpspp/float-format.h"
 
-#include "gettext.h"
 #include <inttypes.h>
+#include <limits.h>
+#include <unistr.h>
 
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#define _(msgid) gettext (msgid)
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
 /* Maximum supported size of a floating-point number, in bytes. */
 #define FP_MAX_SIZE 32
@@ -42,14 +40,14 @@ struct fp
   };
 
 /* Associates a format name with its identifier. */
-struct assoc 
+struct assoc
   {
     char name[4];
     enum float_format format;
   };
 
 /* List of floating-point formats. */
-static const struct assoc fp_formats[] = 
+static const struct assoc fp_formats[] =
   {
     {"ISL", FLOAT_IEEE_SINGLE_LE},
     {"ISB", FLOAT_IEEE_SINGLE_BE},
@@ -63,17 +61,17 @@ static const struct assoc fp_formats[] =
     {"X", FLOAT_HEX},
     {"FP", FLOAT_FP},
   };
-static const size_t format_cnt = sizeof fp_formats / sizeof *fp_formats;
+static const size_t n_formats = sizeof fp_formats / sizeof *fp_formats;
 
 /* Parses a floating-point format name into *FORMAT,
    and returns success. */
 static bool
-parse_float_format (struct lexer *lexer, enum float_format *format) 
+parse_float_format (struct lexer *lexer, enum float_format *format)
 {
   size_t i;
 
-  for (i = 0; i < format_cnt; i++)
-    if (lex_match_id (lexer, fp_formats[i].name)) 
+  for (i = 0; i < n_formats; i++)
+    if (lex_match_id (lexer, fp_formats[i].name))
       {
         *format = fp_formats[i].format;
         return true;
@@ -84,25 +82,52 @@ parse_float_format (struct lexer *lexer, enum float_format *format)
 
 /* Returns the name for the given FORMAT. */
 static const char *
-get_float_format_name (enum float_format format) 
+get_float_format_name (enum float_format format)
 {
   size_t i;
 
-  for (i = 0; i < format_cnt; i++)
-    if (fp_formats[i].format == format) 
+  for (i = 0; i < n_formats; i++)
+    if (fp_formats[i].format == format)
       return fp_formats[i].name;
 
   NOT_REACHED ();
 }
 
+/* Returns the integer value of (hex) digit C. */
+static int
+digit_value (int c)
+{
+  switch (c)
+    {
+    case '0': return 0;
+    case '1': return 1;
+    case '2': return 2;
+    case '3': return 3;
+    case '4': return 4;
+    case '5': return 5;
+    case '6': return 6;
+    case '7': return 7;
+    case '8': return 8;
+    case '9': return 9;
+    case 'a': case 'A': return 10;
+    case 'b': case 'B': return 11;
+    case 'c': case 'C': return 12;
+    case 'd': case 'D': return 13;
+    case 'e': case 'E': return 14;
+    case 'f': case 'F': return 15;
+    default: return INT_MAX;
+    }
+}
+
 /* Parses a number in the form FORMAT(STRING), where FORMAT is
    the name of the format and STRING gives the number's
    representation.  Also supports ordinary floating-point numbers
    written in decimal notation.  Returns success. */
 static bool
-parse_fp (struct lexer *lexer, struct fp *fp) 
+parse_fp (struct lexer *lexer, struct fp *fp)
 {
-  if (lex_is_number (lexer)) 
+  memset (fp, 0, sizeof *fp);
+  if (lex_is_number (lexer))
     {
       double number = lex_number (lexer);
       fp->format = FLOAT_NATIVE_DOUBLE;
@@ -111,37 +136,51 @@ parse_fp (struct lexer *lexer, struct fp *fp)
     }
   else if (lex_token (lexer) == T_ID)
     {
-      size_t length;
-      
+      struct substring s;
+
       if (!parse_float_format (lexer, &fp->format)
-          || !lex_force_match (lexer, '(')
+          || !lex_force_match (lexer, T_LPAREN)
           || !lex_force_string (lexer))
         return false;
 
-      length = ds_length (lex_tokstr (lexer));
-      if (fp->format != FLOAT_HEX) 
+      s = lex_tokss (lexer);
+      if (fp->format != FLOAT_HEX)
         {
-          if (length != float_get_size (fp->format)) 
+          size_t i;
+
+          if (s.length != float_get_size (fp->format) * 2)
             {
-              msg (SE, _("%d-byte string needed but %d-byte string supplied."),
-                   (int) float_get_size (fp->format), (int) length);
+              msg (SE, "%zu-byte string needed but %zu-byte string "
+                   "supplied.", float_get_size (fp->format), s.length);
               return false;
             }
-          assert (length <= sizeof fp->data);
-          memcpy (fp->data, ds_data (lex_tokstr (lexer)), length); 
+          assert (s.length / 2 <= sizeof fp->data);
+          for (i = 0; i < s.length / 2; i++)
+            {
+              int hi = digit_value (s.string[i * 2]);
+              int lo = digit_value (s.string[i * 2 + 1]);
+
+              if (hi >= 16 || lo >= 16)
+                {
+                  msg (SE, "Invalid hex digit in string.");
+                  return false;
+                }
+
+              fp->data[i] = hi * 16 + lo;
+            }
         }
-      else 
+      else
         {
-          if (length >= sizeof fp->data) 
+          if (s.length >= sizeof fp->data)
             {
-              msg (SE, _("Hexadecimal floating constant too long."));
+              msg (SE, "Hexadecimal floating constant too long.");
               return false;
             }
-          strncpy ((char *) fp->data, ds_cstr (lex_tokstr (lexer)), sizeof fp->data);
+          memcpy (fp->data, s.string, s.length);
         }
 
       lex_get (lexer);
-      if (!lex_force_match (lexer, ')'))
+      if (!lex_force_match (lexer, T_RPAREN))
         return false;
     }
   else
@@ -158,20 +197,20 @@ parse_fp (struct lexer *lexer, struct fp *fp)
    must be be large enough to hold the output. */
 static void
 make_printable (enum float_format format, const void *src_, size_t src_size,
-                char *dst, size_t dst_size) 
+                char *dst, size_t dst_size)
 {
   assert (dst_size >= 2 * src_size + 1);
-  if (format != FLOAT_HEX) 
+  if (format != FLOAT_HEX)
     {
       const uint8_t *src = src_;
-      while (src_size-- > 0) 
+      while (src_size-- > 0)
         {
           sprintf (dst, "%02x", *src++);
           dst += 2;
         }
-      *dst = '\0'; 
+      *dst = '\0';
     }
-  else 
+  else
     strncpy (dst, src_, src_size + 1);
 }
 
@@ -182,7 +221,7 @@ make_printable (enum float_format format, const void *src_, size_t src_size,
    returns true. */
 static bool
 mismatch (const struct fp *from, const struct fp *to, char *result,
-          const char *conversion_type) 
+          const char *conversion_type)
 {
   size_t to_size = float_get_size (to->format);
   if (!memcmp (to->data, result, to_size))
@@ -198,9 +237,8 @@ mismatch (const struct fp *from, const struct fp *to, char *result,
       make_printable (to->format, to->data, to_size, expected,
                       sizeof expected);
       make_printable (to->format, result, to_size, actual, sizeof actual);
-      msg (SE,
-           _("%s conversion of %s from %s to %s should have produced %s "
-             "but actually produced %s."),
+      msg (SE, "%s conversion of %s from %s to %s should have produced %s "
+           "but actually produced %s.",
            conversion_type,
            original, get_float_format_name (from->format),
            get_float_format_name (to->format), expected,
@@ -212,15 +250,15 @@ mismatch (const struct fp *from, const struct fp *to, char *result,
 /* Checks that converting FROM into the format of TO yields
    exactly the data in TO. */
 static bool
-verify_conversion (const struct fp *from, const struct fp *to) 
+verify_conversion (const struct fp *from, const struct fp *to)
 {
   char tmp1[FP_MAX_SIZE], tmp2[FP_MAX_SIZE];
-  
+
   /* First try converting directly. */
   float_convert (from->format, from->data, to->format, tmp1);
   if (mismatch (from, to, tmp1, "Direct"))
     return false;
-  
+
   /* Then convert via FLOAT_FP to prevent short-circuiting that
      float_convert() does for some conversions (e.g. little<->big
      endian for IEEE formats). */
@@ -228,69 +266,69 @@ verify_conversion (const struct fp *from, const struct fp *to)
   float_convert (FLOAT_FP, tmp1, to->format, tmp2);
   if (mismatch (from, to, tmp2, "Indirect"))
     return false;
-  
+
   return true;
 }
 
 /* Executes the DEBUG FLOAT FORMAT command. */
 int
-cmd_debug_float_format (struct lexer *lexer, struct dataset *ds UNUSED) 
+cmd_debug_float_format (struct lexer *lexer, struct dataset *ds UNUSED)
 {
   struct fp fp[16];
-  size_t fp_cnt = 0;
+  size_t n_fps = 0;
   bool bijective = false;
   bool ok;
 
   for (;;)
     {
-      if (fp_cnt >= sizeof fp / sizeof *fp) 
+      if (n_fps >= sizeof fp / sizeof *fp)
         {
-          msg (SE, _("Too many values in single command."));
+          msg (SE, "Too many values in single command.");
           return CMD_FAILURE;
         }
-      if (!parse_fp (lexer, &fp[fp_cnt++]))
+      if (!parse_fp (lexer, &fp[n_fps++]))
         return CMD_FAILURE;
 
-      if (lex_token (lexer) == '.' && fp_cnt > 1)
+      if (lex_token (lexer) == T_ENDCMD && n_fps > 1)
         break;
-      else if (!lex_force_match (lexer, '='))
+      else if (!lex_force_match (lexer, T_EQUALS))
         return CMD_FAILURE;
-      
-      if (fp_cnt == 1) 
+
+      if (n_fps == 1)
         {
-          if (lex_match (lexer, '='))
+          if (lex_match (lexer, T_EQUALS))
             bijective = true;
           else if (lex_match (lexer, T_GT))
             bijective = false;
-          else 
+          else
             {
               lex_error (lexer, NULL);
               return CMD_FAILURE;
             }
         }
-      else 
+      else
         {
-          if ((bijective && !lex_force_match (lexer, '='))
+          if ((bijective && !lex_force_match (lexer, T_EQUALS))
               || (!bijective && !lex_force_match (lexer, T_GT)))
             return CMD_FAILURE;
         }
     }
 
   ok = true;
-  if (bijective) 
+  if (bijective)
     {
       size_t i, j;
 
-      for (i = 0; i < fp_cnt; i++)
-        for (j = 0; j < fp_cnt; j++)
-          if (!verify_conversion (&fp[i], &fp[j])) 
+      for (i = 0; i < n_fps; i++)
+        for (j = 0; j < n_fps; j++)
+          if (!verify_conversion (&fp[i], &fp[j]))
             ok = false;
     }
-  else 
+  else
     {
       size_t i;
 
-      for (i = 1; i < fp_cnt; i++)
+      for (i = 1; i < n_fps; i++)
         if (!verify_conversion (&fp[i - 1], &fp[i]))
           ok = false;
     }