[Pspp-cvs] pspp/src ChangeLog command.c data-in.c main.c v...

[John Darrington]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     John Darrington <address@hidden>        06/01/07 07:29:38

Modified files:
        src            : ChangeLog command.c data-in.c main.c 
                         value-labels.c value-labels.h vars-atr.c 

Log message:
        Fixed bug in getl separation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ChangeLog.diff?tr1=1.256&tr2=1.257&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/command.c.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data-in.c.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/main.c.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/value-labels.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/value-labels.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/vars-atr.c.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.256 pspp/src/ChangeLog:1.257
--- pspp/src/ChangeLog:1.256    Fri Dec 23 13:02:55 2005
+++ pspp/src/ChangeLog  Sat Jan  7 07:29:38 2006
@@ -1,3 +1,10 @@
+Sat Jan  7 13:30:54 WST 2006 John Darrington <address@hidden>
+
+        * command.c data-in.c main.c: Fixed bug which crept in when 
+          separating getl from readline.
+
+        * vars-atr.c value-labels.h: Fixed constness of  val_labs_count.
+
 Fri Dec 23 20:59:01 WST 2005 John Darrington <address@hidden>
 
        * getl.c error.c: Separated file_loc functionality from error.c
Index: pspp/src/command.c
diff -u pspp/src/command.c:1.29 pspp/src/command.c:1.30
--- pspp/src/command.c:1.29     Wed Dec 14 06:59:06 2005
+++ pspp/src/command.c  Sat Jan  7 07:29:38 2006
@@ -618,7 +618,7 @@
 int
 cmd_exit (void)
 {
-  if (getl_reading_script)
+  if (getl_reading_script())
     {
       msg (SE, _("This command is not accepted in a syntax file.  "
           "Instead, use FINISH to terminate a syntax file."));
Index: pspp/src/data-in.c
diff -u pspp/src/data-in.c:1.23 pspp/src/data-in.c:1.24
--- pspp/src/data-in.c:1.23     Tue Oct 25 04:28:17 2005
+++ pspp/src/data-in.c  Sat Jan  7 07:29:38 2006
@@ -57,7 +57,7 @@
     return;
 
   ds_init (&title, 64);
-  if (!getl_reading_script)
+  if (!getl_reading_script())
     ds_puts (&title, _("data-file error: "));
   if (i->f1 == i->f2)
     ds_printf (&title, _("(column %d"), i->f1);
Index: pspp/src/main.c
diff -u pspp/src/main.c:1.20 pspp/src/main.c:1.21
--- pspp/src/main.c:1.20        Mon Dec 19 06:42:32 2005
+++ pspp/src/main.c     Sat Jan  7 07:29:38 2006
@@ -217,7 +217,7 @@
       assert (0);
     }
 
-  if (getl_reading_script)
+  if (getl_reading_script())
     {
       err_break ();
       while (token != T_STOP && token != '.')
Index: pspp/src/value-labels.c
diff -u pspp/src/value-labels.c:1.12 pspp/src/value-labels.c:1.13
--- pspp/src/value-labels.c:1.12        Sat Nov 26 22:49:57 2005
+++ pspp/src/value-labels.c     Sat Jan  7 07:29:38 2006
@@ -111,7 +111,7 @@
 
 /* Returns the number of value labels in VLS. */
 size_t
-val_labs_count (struct val_labs *vls) 
+val_labs_count (const struct val_labs *vls) 
 {
   assert (vls != NULL);
 
Index: pspp/src/value-labels.h
diff -u pspp/src/value-labels.h:1.4 pspp/src/value-labels.h:1.5
--- pspp/src/value-labels.h:1.4 Fri Apr 29 01:02:16 2005
+++ pspp/src/value-labels.h     Sat Jan  7 07:29:38 2006
@@ -36,7 +36,7 @@
 void val_labs_set_width (struct val_labs *, int new_width);
 void val_labs_destroy (struct val_labs *);
 void val_labs_clear (struct val_labs *);
-size_t val_labs_count (struct val_labs *);
+size_t val_labs_count (const struct val_labs *);
 
 int val_labs_add (struct val_labs *, union value, const char *);
 int val_labs_replace (struct val_labs *, union value, const char *);
Index: pspp/src/vars-atr.c
diff -u pspp/src/vars-atr.c:1.29 pspp/src/vars-atr.c:1.30
--- pspp/src/vars-atr.c:1.29    Sat Nov  5 03:45:28 2005
+++ pspp/src/vars-atr.c Sat Jan  7 07:29:38 2006
@@ -171,7 +171,7 @@
   if (lex_id_to_token (name, strlen (name)) != T_ID) 
     {
       if (issue_error)
-        msg (SE, _("%s may not be used as a variable name because it "
+        msg (SE, _("`%s' may not be used as a variable name because it "
                    "is a reserved word."), name);
       return false;
     }