[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp doc/q2c.texi src/language/data-io/ChangeLo...
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] pspp doc/q2c.texi src/language/data-io/ChangeLo... |
Date: |
Wed, 05 Jul 2006 05:14:31 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 06/07/05 05:14:31
Modified files:
doc : q2c.texi
src/language/data-io: ChangeLog list.q
src/language/lexer: ChangeLog q2c.c
src/language/stats: ChangeLog correlations.q crosstabs.q
examine.q frequencies.q means.q oneway.q
rank.q regression.q t-test.q
Log message:
Fix bug #11612, "q2c documentation does not agree with code".
Thanks to John Darrington for review.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/q2c.texi?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/ChangeLog?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/list.q?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/ChangeLog?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/q2c.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/correlations.q?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/examine.q?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/frequencies.q?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/means.q?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/oneway.q?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/rank.q?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/regression.q?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/t-test.q?cvsroot=pspp&r1=1.8&r2=1.9
Patches:
Index: doc/q2c.texi
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/q2c.texi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/q2c.texi 6 May 2005 02:08:37 -0000 1.4
+++ doc/q2c.texi 5 Jul 2006 05:14:30 -0000 1.5
@@ -123,11 +123,10 @@
(@samp{.}).
@example
-subcommand ::= sbc-options ID sbc-defn
-sbc-options ::=
- ::= sbc-option
- ::= sbc-options sbc-options
-sbc-option ::= *
+subcommand ::= default-opt arity-opt ID sbc-defn
+default-opt ::=
+ ::= *
+arity-opt ::=
::= +
::= ^
sbc-defn ::= opt-prefix = specifiers
@@ -137,16 +136,16 @@
::= ( ID )
@end example
-Each subcommand can be prefixed with one or more option characters. An
-asterisk (@samp{*}) is used to indicate the default subcommand; the
-keyword used for the default subcommand can be omitted in the PSPP
-syntax file. A plus sign (@samp{+}) is used to indicate that a
-subcommand can appear more than once; if it is not present then that
-subcommand can appear no more than once.
-A carat sign (@samp{^}) is used to indicate that a subcommand must appear
-at least once.
+A subcommand that begins with an asterisk (@samp{*}) is the default
+subcommand. The keyword used for the default subcommand can be omitted
+in the PSPP syntax file.
+
+A plus sign (@samp{+}) indicates that a subcommand can appear more than
+once. A caret (@samp{^}) indicate that a subcommand must appear exactly
+once. A subcommand marked with neither character may appear once or not
+at all, but not more than once.
-The subcommand name appears after the option characters.
+The subcommand name appears after the leading option characters.
There are three forms of subcommands. The first and most common form
simply gives an equals sign (@samp{=}) and a list of specifiers, which
Index: src/language/data-io/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/language/data-io/ChangeLog 2 Jul 2006 04:25:12 -0000 1.23
+++ src/language/data-io/ChangeLog 5 Jul 2006 05:14:30 -0000 1.24
@@ -1,3 +1,10 @@
+Sat Jul 1 17:39:40 2006 Ben Pfaff <address@hidden>
+
+ Fix bug #11612, "q2c documentation does not agree with code".
+
+ * list.q: Audit use of q2c "+" prefixes that indicate that a
+ command may appear multiple times.
+
Sat Jul 1 20:44:22 2006 Ben Pfaff <address@hidden>
Fix bug #15786: System File Creation crashes if directoy is
Index: src/language/data-io/list.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/list.q,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/language/data-io/list.q 28 Jun 2006 02:21:28 -0000 1.13
+++ src/language/data-io/list.q 5 Jul 2006 05:14:30 -0000 1.14
@@ -52,7 +52,7 @@
list (lst_):
*variables=varlist("PV_NO_SCRATCH");
cases=:from n:first,"%s>0"/by n:step,"%s>0"/ *to n:last,"%s>0";
- format=numbering:numbered/!unnumbered,
+ +format=numbering:numbered/!unnumbered,
wrap:!wrap/single,
weight:weight/!noweight.
*/
Index: src/language/lexer/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/language/lexer/ChangeLog 5 Jul 2006 02:52:35 -0000 1.11
+++ src/language/lexer/ChangeLog 5 Jul 2006 05:14:31 -0000 1.12
@@ -1,3 +1,10 @@
+Sat Jul 1 17:40:38 2006 Ben Pfaff <address@hidden>
+
+ Fix bug #11612, "q2c documentation does not agree with code".
+
+ * q2c.c (parse_subcommand): Make "+" mean ARITY_MANY, absence
+ mean ARITY_ONCE_ONLY.
+
Tue Jul 4 09:45:12 2006 Ben Pfaff <address@hidden>
Fix bug #15766 (/KEEP subcommand on SAVE doesn't fully support
Index: src/language/lexer/q2c.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/q2c.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/language/lexer/q2c.c 28 Jun 2006 02:21:28 -0000 1.12
+++ src/language/lexer/q2c.c 5 Jul 2006 05:14:31 -0000 1.13
@@ -739,8 +739,6 @@
static void
parse_subcommand (subcommand *sbc)
{
- sbc->arity = ARITY_MANY;
-
if (match_token ('*'))
{
if (def)
@@ -748,8 +746,9 @@
def = sbc;
}
+ sbc->arity = ARITY_ONCE_ONLY;
if ( match_token('+'))
- sbc->arity = ARITY_ONCE_ONLY ;
+ sbc->arity = ARITY_MANY;
else if (match_token('^'))
sbc->arity = ARITY_ONCE_EXACTLY ;
Index: src/language/stats/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/language/stats/ChangeLog 23 Jun 2006 21:30:11 -0000 1.25
+++ src/language/stats/ChangeLog 5 Jul 2006 05:14:31 -0000 1.26
@@ -1,3 +1,18 @@
+Sat Jul 1 17:41:46 2006 Ben Pfaff <address@hidden>
+
+ Fix bug #11612, "q2c documentation does not agree with code".
+
+ * examine.q: Audit use of q2c "+" prefixes that indicate that a
+ command may appear multiple times.
+
+ * frequencies.q: Ditto.
+
+ * oneway.q: Ditto.
+
+ * regression.q: Ditto.
+
+ * t-test.q: Ditto.
+
Fri Jun 23 14:18:22 2006 Ben Pfaff <address@hidden>
Support long string variables on FREQUENCIES, as
Index: src/language/stats/correlations.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/correlations.q,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/language/stats/correlations.q 28 Jun 2006 02:21:28 -0000 1.9
+++ src/language/stats/correlations.q 5 Jul 2006 05:14:31 -0000 1.10
@@ -59,7 +59,7 @@
/* (specification)
"CORRELATIONS" (cor_):
*variables=custom;
- +missing=miss:!pairwise/listwise,
+ missing=miss:!pairwise/listwise,
inc:include/exclude;
+print=tail:!twotail/onetail,
sig:!sig/nosig;
Index: src/language/stats/crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/language/stats/crosstabs.q 28 Jun 2006 02:21:28 -0000 1.11
+++ src/language/stats/crosstabs.q 5 Jul 2006 05:14:31 -0000 1.12
@@ -68,7 +68,7 @@
crosstabs (crs_):
*^tables=custom;
+variables=custom;
- +missing=miss:!table/include/report;
+ missing=miss:!table/include/report;
+write[wr_]=none,cells,all;
+format=fmt:!labels/nolabels/novallabs,
val:!avalue/dvalue,
Index: src/language/stats/examine.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/examine.q,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/stats/examine.q 28 Jun 2006 02:21:28 -0000 1.8
+++ src/language/stats/examine.q 5 Jul 2006 05:14:31 -0000 1.9
@@ -64,7 +64,7 @@
*^variables=custom;
+total=custom;
+nototal=custom;
- +missing=miss:pairwise/!listwise,
+ missing=miss:pairwise/!listwise,
rep:report/!noreport,
incl:include/!exclude;
+compare=cmp:variables/!groups;
Index: src/language/stats/frequencies.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/frequencies.q,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/language/stats/frequencies.q 28 Jun 2006 02:21:28 -0000 1.11
+++ src/language/stats/frequencies.q 5 Jul 2006 05:14:31 -0000 1.12
@@ -68,8 +68,8 @@
/* (specification)
FREQUENCIES (frq_):
- *variables=custom;
- format=cond:condense/onepage(*n:onepage_limit,"%s>=0")/!standard,
+ *+variables=custom;
+ +format=cond:condense/onepage(*n:onepage_limit,"%s>=0")/!standard,
table:limit(n:limit,"%s>0")/notable/!table,
labels:!labels/nolabels,
sort:!avalue/dvalue/afreq/dfreq,
@@ -92,10 +92,10 @@
scale:freq(*n:freq,"%s>0")/percent(*n:pcnt,"%s>0"),
norm:!nonormal/normal,
incr:increment(d:inc,"%s>0");
- grouped=custom;
- ntiles=integer;
+ +grouped=custom;
+ +ntiles=integer;
+percentiles = double list;
- statistics[st_]=1|mean,2|semean,3|median,4|mode,5|stddev,6|variance,
+ +statistics[st_]=1|mean,2|semean,3|median,4|mode,5|stddev,6|variance,
7|kurtosis,8|skewness,9|range,10|minimum,11|maximum,12|sum,
13|default,14|seskewness,15|sekurtosis,all,none.
*/
Index: src/language/stats/means.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/means.q,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/language/stats/means.q 28 Jun 2006 02:21:28 -0000 1.6
+++ src/language/stats/means.q 5 Jul 2006 05:14:31 -0000 1.7
@@ -44,7 +44,7 @@
name:!names/nonames,
val:!values/novalues,
fmt:!table/tree;
- +missing=miss:!table/include/dependent;
+ missing=miss:!table/include/dependent;
+cells[cl_]=default,count,sum,mean,stddev,variance,all;
+statistics[st_]=anova,linearity,all,none.
*/
Index: src/language/stats/oneway.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/oneway.q,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/stats/oneway.q 28 Jun 2006 02:21:28 -0000 1.8
+++ src/language/stats/oneway.q 5 Jul 2006 05:14:31 -0000 1.9
@@ -57,10 +57,10 @@
/* (specification)
"ONEWAY" (oneway_):
*^variables=custom;
- +missing=miss:!analysis/listwise,
+ missing=miss:!analysis/listwise,
incl:include/!exclude;
- contrast= double list;
- statistics[st_]=descriptives,homogeneity.
+ +contrast= double list;
+ +statistics[st_]=descriptives,homogeneity.
*/
/* (declarations) */
/* (functions) */
Index: src/language/stats/rank.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/rank.q,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/language/stats/rank.q 28 Jun 2006 02:21:28 -0000 1.9
+++ src/language/stats/rank.q 5 Jul 2006 05:14:31 -0000 1.10
@@ -47,7 +47,7 @@
+n=custom;
+savage=custom;
+print=print:!yes/no;
- +missing=miss:!exclude/include.
+ missing=miss:!exclude/include.
*/
/* (declarations) */
/* (functions) */
Index: src/language/stats/regression.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/regression.q,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/language/stats/regression.q 28 Jun 2006 02:21:28 -0000 1.27
+++ src/language/stats/regression.q 5 Jul 2006 05:14:31 -0000 1.28
@@ -57,7 +57,7 @@
/* (specification)
"REGRESSION" (regression_):
*variables=custom;
- statistics[st_]=r,
+ +statistics[st_]=r,
coeff,
anova,
outs,
@@ -76,8 +76,8 @@
all;
export=custom;
^dependent=varlist;
- save[sv_]=resid,pred;
- method=enter.
+ +save[sv_]=resid,pred;
+ +method=enter.
*/
/* (declarations) */
/* (functions) */
Index: src/language/stats/t-test.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/t-test.q,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/stats/t-test.q 28 Jun 2006 02:21:28 -0000 1.8
+++ src/language/stats/t-test.q 5 Jul 2006 05:14:31 -0000 1.9
@@ -59,11 +59,11 @@
"T-TEST" (tts_):
+groups=custom;
testval=double;
- variables=varlist("PV_NO_SCRATCH | PV_NUMERIC");
- pairs=custom;
- +missing=miss:!analysis/listwise,
+ +variables=varlist("PV_NO_SCRATCH | PV_NUMERIC");
+ +pairs=custom;
+ missing=miss:!analysis/listwise,
incl:include/!exclude;
- format=fmt:!labels/nolabels;
+ +format=fmt:!labels/nolabels;
criteria=:cin(d:criteria,"%s > 0. && %s < 1.").
*/
/* (declarations) */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp doc/q2c.texi src/language/data-io/ChangeLo...,
Ben Pfaff <=