[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp tests/automake.mk tests/ChangeLog src/lang...
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] pspp tests/automake.mk tests/ChangeLog src/lang... |
Date: |
Sun, 16 Mar 2008 22:38:18 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 08/03/16 22:38:18
Modified files:
tests : automake.mk ChangeLog
src/language/dictionary: variable-display.c ChangeLog
Added files:
tests/command : variable-display.sh
Log message:
Patch #6452. Reviewed by John Darrington.
* variable-display.c (cmd_variable_width): Fix parsing bug. Also,
limit variable display widths to within range 1 thru 2 *
MAX_STRING.
* automake.mk: Add new test.
* command/variable-display.sh: New test.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/variable-display.sh?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/variable-display.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/ChangeLog?cvsroot=pspp&r1=1.14&r2=1.15
Patches:
Index: tests/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/automake.mk,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- tests/automake.mk 5 Mar 2008 06:09:54 -0000 1.55
+++ tests/automake.mk 16 Mar 2008 22:38:17 -0000 1.56
@@ -68,6 +68,7 @@
tests/command/trimmed-mean.sh \
tests/command/tabs.sh \
tests/command/use.sh \
+ tests/command/variable-display.sh \
tests/command/vector.sh \
tests/command/very-long-strings.sh \
tests/command/weight.sh \
Index: tests/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- tests/ChangeLog 5 Mar 2008 06:09:54 -0000 1.124
+++ tests/ChangeLog 16 Mar 2008 22:38:17 -0000 1.125
@@ -1,3 +1,11 @@
+2008-03-16 Ben Pfaff <address@hidden>
+
+ Patch #6452. Reviewed by John Darrington.
+
+ * automake.mk: Add new test.
+
+ * command/variable-display.sh: New test.
+
2008-03-04 Ben Pfaff <address@hidden>
Patch #6441. Reviewed by John Darrington.
Index: src/language/dictionary/variable-display.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/variable-display.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/language/dictionary/variable-display.c 12 Oct 2007 04:59:27 -0000
1.15
+++ src/language/dictionary/variable-display.c 16 Mar 2008 22:38:17 -0000
1.16
@@ -29,6 +29,9 @@
#include "xalloc.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* Set variables' alignment
This is the alignment for GUI display only.
It affects nothing but GUIs
@@ -91,23 +94,36 @@
do
{
struct variable **v;
+ long int width;
size_t nv;
size_t i;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match (lexer, '(') )
+ if (!lex_force_match (lexer, '(') || !lex_force_int (lexer))
{
- if ( lex_force_int (lexer))
+ free (v);
+ return CMD_FAILURE;
+ }
+ width = lex_integer (lexer);
lex_get (lexer);
- else
+ if (!lex_force_match (lexer, ')'))
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
+
+ if (width < 0)
+ {
+ msg (SE, _("Variable display width must be a positive integer."));
+ free (v);
return CMD_FAILURE;
- lex_force_match (lexer, ')');
}
+ width = MIN (width, 2 * MAX_STRING);
for( i = 0 ; i < nv ; ++i )
- var_set_display_width (v[i], lex_integer (lexer));
+ var_set_display_width (v[i], width);
while (lex_token (lexer) == '/')
lex_get (lexer);
Index: src/language/dictionary/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/language/dictionary/ChangeLog 12 Nov 2007 00:54:50 -0000 1.14
+++ src/language/dictionary/ChangeLog 16 Mar 2008 22:38:18 -0000 1.15
@@ -1,3 +1,11 @@
+2008-03-16 Ben Pfaff <address@hidden>
+
+ Patch #6452. Reviewed by John Darrington.
+
+ * variable-display.c (cmd_variable_width): Fix parsing bug. Also,
+ limit variable display widths to within range 1 thru 2 *
+ MAX_STRING.
+
2007-11-11 Ben Pfaff <address@hidden>
* sys-file-info.c (display_variables): Fix DISPLAY LABELS. Thanks
Index: tests/command/variable-display.sh
===================================================================
RCS file: tests/command/variable-display.sh
diff -N tests/command/variable-display.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/command/variable-display.sh 16 Mar 2008 22:38:17 -0000 1.1
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# This program tests variable display attribute commands: VARIABLE
+# ALIGNMENT, VARIABLE WIDTH, VARIABLE LEVEL.
+
+TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
+# ensure that top_builddir are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
+
+# ensure that top_srcdir is absolute
+top_srcdir=`cd $top_srcdir; pwd`
+
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+
+
+cleanup()
+{
+ cd /
+ rm -rf $TEMPDIR
+}
+
+
+fail()
+{
+ echo $activity
+ echo FAILED
+ cleanup;
+ exit 1;
+}
+
+
+no_result()
+{
+ echo $activity
+ echo NO RESULT;
+ cleanup;
+ exit 2;
+}
+
+pass()
+{
+ cleanup;
+ exit 0;
+}
+
+mkdir -p $TEMPDIR
+
+cd $TEMPDIR
+
+# Create command file.
+activity="create program"
+cat > $TESTFILE << EOF
+data list free /x y z.
+variable alignment x (left)/y (right)/z (center).
+variable width x (10)/y (12)/z (14).
+variable level x (scale)/y (ordinal)/z (nominal).
+display dictionary.
+EOF
+if [ $? -ne 0 ] ; then no_result ; fi
+
+
+activity="run program"
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
+if [ $? -ne 0 ] ; then fail ; fi
+
+activity="compare output"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
+1.1 DISPLAY.
++--------+-------------------------------------------+--------+
+|Variable|Description |Position|
+#========#===========================================#========#
+|x |Format: F8.2 | 1|
+| |Measure: Scale | |
+| |Display Alignment: Left | |
+| |Display Width: 10 | |
++--------+-------------------------------------------+--------+
+|y |Format: F8.2 | 2|
+| |Measure: Ordinal | |
+| |Display Alignment: Right | |
+| |Display Width: 12 | |
++--------+-------------------------------------------+--------+
+|z |Format: F8.2 | 3|
+| |Measure: Nominal | |
+| |Display Alignment: Center | |
+| |Display Width: 14 | |
++--------+-------------------------------------------+--------+
+EOF
+if [ $? -ne 0 ] ; then fail ; fi
+
+pass;