projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GLM: Prepare the lexer to accept nested variables
[pspp-builds.git]
/
src
/
language
/
data-io
/
save-translate.c
diff --git
a/src/language/data-io/save-translate.c
b/src/language/data-io/save-translate.c
index dcfdb83c7c618b0af02c1dc80e679149a6b15dc7..f6487c57932e3faad8a64e45adcf570e9ab7b897 100644
(file)
--- a/
src/language/data-io/save-translate.c
+++ b/
src/language/data-io/save-translate.c
@@
-22,10
+22,10
@@
#include "data/casereader.h"
#include "data/casewriter.h"
#include "data/csv-file-writer.h"
#include "data/casereader.h"
#include "data/casewriter.h"
#include "data/csv-file-writer.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-name.h"
#include "data/format.h"
#include "data/dictionary.h"
#include "data/file-name.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/settings.h"
#include "language/command.h"
#include "language/data-io/file-handle.h"
#include "data/settings.h"
#include "language/command.h"
#include "language/data-io/file-handle.h"
@@
-96,7
+96,7
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_EQUALS);
- handle = fh_parse (lexer, FH_REF_FILE);
+ handle = fh_parse (lexer, FH_REF_FILE
, NULL
);
if (handle == NULL)
goto error;
}
if (handle == NULL)
goto error;
}
@@
-159,13
+159,14
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
goto error;
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
goto error;
- if (ds_length (lex_tokstr (lexer)) != 1)
+ /* XXX should support multibyte UTF-8 delimiters */
+ if (ss_length (lex_tokss (lexer)) != 1)
{
msg (SE, _("The %s string must contain exactly one "
"character."), "DELIMITER");
goto error;
}
{
msg (SE, _("The %s string must contain exactly one "
"character."), "DELIMITER");
goto error;
}
- delimiter =
ds_first (lex_tokstr
(lexer));
+ delimiter =
ss_first (lex_tokss
(lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "QUALIFIER"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "QUALIFIER"))
@@
-173,13
+174,14
@@
cmd_save_translate (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
goto error;
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
goto error;
- if (ds_length (lex_tokstr (lexer)) != 1)
+ /* XXX should support multibyte UTF-8 qualifiers */
+ if (ss_length (lex_tokss (lexer)) != 1)
{
msg (SE, _("The %s string must contain exactly one "
"character."), "QUALIFIER");
goto error;
}
{
msg (SE, _("The %s string must contain exactly one "
"character."), "QUALIFIER");
goto error;
}
- qualifier =
ds_first (lex_tokstr
(lexer));
+ qualifier =
ss_first (lex_tokss
(lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "DECIMAL"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "DECIMAL"))