[Pspp-cvs] pspp/src data/ChangeLog data/data-in.c language...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/11/01 02:12:25

Modified files:
        src/data       : ChangeLog data-in.c 
        src/language/lexer: ChangeLog range-parser.c 
        src/language/utilities: set.q 

Log message:
        Fix error messages and comment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/ChangeLog?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/range-parser.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/set.q?cvsroot=pspp&r1=1.14&r2=1.15

Patches:
Index: data/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- data/ChangeLog      29 Oct 2006 00:01:52 -0000      1.67
+++ data/ChangeLog      1 Nov 2006 02:12:25 -0000       1.68
@@ -1,3 +1,7 @@
+Tue Oct 31 18:09:24 2006  Ben Pfaff  <address@hidden>
+
+       * data-in.c (parse_trailer): Fix error message.
+
 Sat Oct 28 11:56:50 2006  Ben Pfaff  <address@hidden>
 
        * format.c (fmt_is_binary): New function.

Index: data/data-in.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/data-in.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- data/data-in.c      20 Oct 2006 11:32:57 -0000      1.14
+++ data/data-in.c      1 Nov 2006 02:12:25 -0000       1.15
@@ -835,7 +835,8 @@
   if (!have_char (i))
     return true;
   
-  dls_error (i, _("Trailing garbage \"%s\" following date."), i->s);
+  dls_error (i, _("Trailing garbage \"%.*s\" following date."),
+             (int) (i->e - i->s), i->s);
   return false;
 }
 

Index: language/lexer/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- language/lexer/ChangeLog    28 Oct 2006 08:31:23 -0000      1.15
+++ language/lexer/ChangeLog    1 Nov 2006 02:12:25 -0000       1.16
@@ -1,3 +1,7 @@
+Tue Oct 31 18:09:32 2006  Ben Pfaff  <address@hidden>
+
+       * range-parser.c (parse_number): Fix error message.
+
 Sat Oct 28 16:17:18 WST 2006 John Darrington <address@hidden>
 
        * lexer.c lexer.h: Added a line_buffer (previously an external

Index: language/lexer/range-parser.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/range-parser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- language/lexer/range-parser.c       15 Mar 2006 03:29:11 -0000      1.2
+++ language/lexer/range-parser.c       1 Nov 2006 02:12:25 -0000       1.3
@@ -95,7 +95,7 @@
       *x = v.f;
       if (*x == SYSMIS)
         {
-          lex_error (_("System-missing value is not valid here."));
+          msg (SE, _("System-missing value is not valid here."));
           return false;
         }
       return true;

Index: language/utilities/set.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/set.q,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- language/utilities/set.q    26 Oct 2006 06:16:36 -0000      1.14
+++ language/utilities/set.q    1 Nov 2006 02:12:25 -0000       1.15
@@ -209,7 +209,7 @@
   int comma_cnt, dot_cnt;
   
   /* Count commas and periods.  There must be exactly three of
-     one or the other, except that an apostrophe acts escapes a
+     one or the other, except that an apostrophe escapes a
      following comma or period. */
   comma_cnt = dot_cnt = 0;
   for (sp = cc_string; *sp; sp++)