projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix buglet reading spreadsheets with only one row.
[pspp-builds.git]
/
src
/
language
/
data-io
/
get.c
diff --git
a/src/language/data-io/get.c
b/src/language/data-io/get.c
index e34ea79923191761b46edc2cc085e37992aca419..b861aca52ffef7df758d3eabfc506718795081eb 100644
(file)
--- a/
src/language/data-io/get.c
+++ b/
src/language/data-io/get.c
@@
-45,6
+45,8
@@
#include <libpspp/str.h>
#include <libpspp/taint.h>
#include <libpspp/str.h>
#include <libpspp/taint.h>
+#include "get-data.h"
+
#include "xalloc.h"
#include "gettext.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;
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, '/');
for (;;)
{
lex_match (lexer, '/');
@@
-564,10
+571,10
@@
rename_variables (struct lexer *lexer, struct dictionary *dict)
goto done;
if (nn != nv)
{
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."),
"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, ')'))
goto done;
}
if (!lex_force_match (lexer, ')'))