projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dict: Make dict_make_unique_var_name() return an allocated string.
[pspp-builds.git]
/
src
/
language
/
data-io
/
print.c
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index 3308629edec7e3ff1663e42dda0082587faea2ef..96ac15e15298aae2b3624dc560c148f47327a188 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-150,11
+150,11
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
tmp_pool = pool_create_subpool (trns->pool);
/* Parse the command options. */
tmp_pool = pool_create_subpool (trns->pool);
/* Parse the command options. */
- while (lex_token (lexer) !=
'/' && lex_token (lexer) != '.'
)
+ while (lex_token (lexer) !=
T_SLASH && lex_token (lexer) != T_ENDCMD
)
{
if (lex_match_id (lexer, "OUTFILE"))
{
{
if (lex_match_id (lexer, "OUTFILE"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
fh = fh_parse (lexer, FH_REF_FILE);
if (fh == NULL)
fh = fh_parse (lexer, FH_REF_FILE);
if (fh == NULL)
@@
-162,13
+162,13
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
}
else if (lex_match_id (lexer, "RECORDS"))
{
}
else if (lex_match_id (lexer, "RECORDS"))
{
- lex_match (lexer,
'='
);
- lex_match (lexer,
'('
);
+ lex_match (lexer,
T_EQUALS
);
+ lex_match (lexer,
T_LPAREN
);
if (!lex_force_int (lexer))
goto error;
trns->record_cnt = lex_integer (lexer);
lex_get (lexer);
if (!lex_force_int (lexer))
goto error;
trns->record_cnt = lex_integer (lexer);
lex_get (lexer);
- lex_match (lexer,
')'
);
+ lex_match (lexer,
T_RPAREN
);
}
else if (lex_match_id (lexer, "TABLE"))
print_table = true;
}
else if (lex_match_id (lexer, "TABLE"))
print_table = true;
@@
-239,13
+239,13
@@
parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
int record = 0;
int column = 1;
int record = 0;
int column = 1;
- if (lex_token (lexer) ==
'.'
)
+ if (lex_token (lexer) ==
T_ENDCMD
)
{
trns->record_cnt = 1;
return true;
}
{
trns->record_cnt = 1;
return true;
}
- while (lex_token (lexer) !=
'.'
)
+ while (lex_token (lexer) !=
T_ENDCMD
)
{
bool ok;
{
bool ok;
@@
-260,7
+260,7
@@
parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
if (!ok)
return 0;
if (!ok)
return 0;
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
@@
-280,7
+280,7
@@
parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record,
spec->type = PRT_LITERAL;
spec->record = record;
spec->first_column = *column;
spec->type = PRT_LITERAL;
spec->record = record;
spec->first_column = *column;
- ds_init_s
tring (&spec->string, lex_tokstr
(lexer));
+ ds_init_s
ubstring (&spec->string, lex_tokss
(lexer));
ds_register_pool (&spec->string, trns->pool);
lex_get (lexer);
ds_register_pool (&spec->string, trns->pool);
lex_get (lexer);
@@
-323,7
+323,7
@@
parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
&vars, &var_cnt, PV_DUPLICATE))
return false;
&vars, &var_cnt, PV_DUPLICATE))
return false;
- if (lex_is_number (lexer) || lex_token (lexer) ==
'('
)
+ if (lex_is_number (lexer) || lex_token (lexer) ==
T_LPAREN
)
{
if (!parse_var_placements (lexer, tmp_pool, var_cnt, false,
&formats, &format_cnt))
{
if (!parse_var_placements (lexer, tmp_pool, var_cnt, false,
&formats, &format_cnt))
@@
-334,7
+334,7
@@
parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
{
size_t i;
{
size_t i;
- lex_match (lexer,
'*'
);
+ lex_match (lexer,
T_ASTERISK
);
formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
format_cnt = var_cnt;
formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
format_cnt = var_cnt;