projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp-builds.git]
/
src
/
language
/
dictionary
/
missing-values.c
diff --git
a/src/language/dictionary/missing-values.c
b/src/language/dictionary/missing-values.c
index 819b0a9021cfe5821b4060e02b9932830b2a6120..4a14ee195b8c91f26cf0e589497f2d607bfb325c 100644
(file)
--- a/
src/language/dictionary/missing-values.c
+++ b/
src/language/dictionary/missing-values.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009
, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,7
+29,6
@@
#include <language/lexer/value-parser.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/message.h>
#include <language/lexer/value-parser.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
#include "gettext.h"
#include <libpspp/str.h>
#include "gettext.h"
@@
-38,29
+37,26
@@
int
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
{
int
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
{
- struct variable **v;
+ struct variable **v
= NULL
;
size_t nv;
int retval = CMD_FAILURE;
bool deferred_errors = false;
size_t nv;
int retval = CMD_FAILURE;
bool deferred_errors = false;
- while (lex_token (lexer) !=
'.'
)
+ while (lex_token (lexer) !=
T_ENDCMD
)
{
size_t i;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
goto done;
{
size_t i;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
goto done;
- if (!lex_match (lexer, '('))
- {
- lex_error (lexer, _("expecting `('"));
- goto done;
- }
+ if (!lex_force_match (lexer, T_LPAREN))
+ goto done;
for (i = 0; i < nv; i++)
var_clear_missing_values (v[i]);
for (i = 0; i < nv; i++)
var_clear_missing_values (v[i]);
- if (!lex_match (lexer,
')'
))
+ if (!lex_match (lexer,
T_RPAREN
))
{
struct missing_values mv;
{
struct missing_values mv;
@@
-78,7
+74,7
@@
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
if (var_is_numeric (v[0]))
{
mv_init (&mv, 0);
if (var_is_numeric (v[0]))
{
mv_init (&mv, 0);
- while (!lex_match (lexer,
')'
))
+ while (!lex_match (lexer,
T_RPAREN
))
{
enum fmt_type type = var_get_print_format (v[0])->type;
double x, y;
{
enum fmt_type type = var_get_print_format (v[0])->type;
double x, y;
@@
-93,13
+89,13
@@
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
if (!ok)
deferred_errors = true;
if (!ok)
deferred_errors = true;
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
}
}
else
{
mv_init (&mv, MV_MAX_STRING);
}
}
else
{
mv_init (&mv, MV_MAX_STRING);
- while (!lex_match (lexer,
')'
))
+ while (!lex_match (lexer,
T_RPAREN
))
{
uint8_t value[MV_MAX_STRING];
size_t length;
{
uint8_t value[MV_MAX_STRING];
size_t length;
@@
-110,7
+106,7
@@
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
break;
}
break;
}
- length =
ds_length (lex_tokstr
(lexer));
+ length =
ss_length (lex_tokss
(lexer));
if (length > MV_MAX_STRING)
{
msg (SE, _("Truncating missing value to maximum "
if (length > MV_MAX_STRING)
{
msg (SE, _("Truncating missing value to maximum "
@@
-119,13
+115,13
@@
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
length = MV_MAX_STRING;
}
memset (value, ' ', MV_MAX_STRING);
length = MV_MAX_STRING;
}
memset (value, ' ', MV_MAX_STRING);
- memcpy (value,
ds_data (lex_tokstr
(lexer)), length);
+ memcpy (value,
ss_data (lex_tokss
(lexer)), length);
if (!mv_add_str (&mv, value))
deferred_errors = true;
lex_get (lexer);
if (!mv_add_str (&mv, value))
deferred_errors = true;
lex_get (lexer);
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
}
}
}
}
@@
-145,7
+141,7
@@
cmd_missing_values (struct lexer *lexer, struct dataset *ds)
mv_destroy (&mv);
}
mv_destroy (&mv);
}
- lex_match (lexer,
'/'
);
+ lex_match (lexer,
T_SLASH
);
free (v);
v = NULL;
}
free (v);
v = NULL;
}