X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=871fa69ef4db6369fcda469e77eb81c1c9adae90;hb=c9a3c45e44c1c03d13d4eb186e3817bc836f75f8;hp=614fa1271e71b5ed3180e2f4e98e1b454745b769;hpb=41009f9ff6541a025357fd8e06fcdaf5220e48fa;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 614fa127..871fa69e 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -56,8 +56,7 @@ *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, - wrap:!wrap/single, - weight:weight/!noweight. + wrap:!wrap/single. */ /* (declarations) */ /* (functions) */ @@ -191,30 +190,6 @@ cmd_list (struct lexer *lexer, struct dataset *ds) cmd.step = 1; } - /* Weighting variable. */ - if (cmd.weight == LST_WEIGHT) - { - if (dict_get_weight (dict) != NULL) - { - size_t i; - - for (i = 0; i < cmd.n_variables; i++) - if (cmd.v_variables[i] == dict_get_weight (dict)) - break; - if (i >= cmd.n_variables) - { - /* Add the weight variable to the end of the variable list. */ - cmd.n_variables++; - cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables, - sizeof *cmd.v_variables); - cmd.v_variables[cmd.n_variables - 1] - = dict_get_weight (dict); - } - } - else - msg (SW, _("`/FORMAT WEIGHT' specified, but weighting is not on.")); - } - /* Case number. */ if (cmd.numbering == LST_NUMBERED) { @@ -224,7 +199,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds) casenum_var = var_create ("Case#", 0); var_set_both_formats (casenum_var, &format); - /* Add the weight variable at the beginning of the variable list. */ + /* Add the case-number variable at the beginning of the variable list. */ cmd.n_variables++; cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables, sizeof *cmd.v_variables);