X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdata-io%2Fget.c;h=b861aca52ffef7df758d3eabfc506718795081eb;hb=a5a1e8c05118edd5d9fd0dfd1a6f421632779292;hp=e34ea79923191761b46edc2cc085e37992aca419;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index e34ea799..b861aca5 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -45,6 +45,8 @@ #include #include +#include "get-data.h" + #include "xalloc.h" #include "gettext.h" @@ -73,6 +75,11 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command struct dictionary *dict = NULL; struct case_map *map = NULL; + if ( type == GET_CMD && lex_match_id (lexer, "DATA") ) + { + return parse_get_data_command (lexer, ds); + } + for (;;) { lex_match (lexer, '/'); @@ -564,10 +571,10 @@ rename_variables (struct lexer *lexer, struct dictionary *dict) goto done; if (nn != nv) { - msg (SE, _("Number of variables on left side of `=' (%d) does not " - "match number of variables on right side (%d), in " + msg (SE, _("Number of variables on left side of `=' (%zu) does not " + "match number of variables on right side (%zu), in " "parenthesized group %d of RENAME subcommand."), - (unsigned) (nv - old_nv), (unsigned) (nn - old_nv), group); + nv - old_nv, nn - old_nv, group); goto done; } if (!lex_force_match (lexer, ')'))