projects
/
pspp
/ 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]
/
src
/
language
/
tests
/
float-format.c
diff --git
a/src/language/tests/float-format.c
b/src/language/tests/float-format.c
index 9e6f777cfc5eb75bf965a25338b6e24c828c0dc2..554b2c33c782987255139125172946946922784d 100644
(file)
--- a/
src/language/tests/float-format.c
+++ b/
src/language/tests/float-format.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 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
@@
-112,21
+112,22
@@
parse_fp (struct lexer *lexer, struct fp *fp)
size_t length;
if (!parse_float_format (lexer, &fp->format)
size_t length;
if (!parse_float_format (lexer, &fp->format)
- || !lex_force_match (lexer,
'('
)
+ || !lex_force_match (lexer,
T_LPAREN
)
|| !lex_force_string (lexer))
return false;
|| !lex_force_string (lexer))
return false;
- length =
ds_length (lex_tokstr
(lexer));
+ length =
ss_length (lex_tokss
(lexer));
if (fp->format != FLOAT_HEX)
{
if (length != float_get_size (fp->format))
{
if (fp->format != FLOAT_HEX)
{
if (length != float_get_size (fp->format))
{
- msg (SE, _("%d-byte string needed but %d-byte string supplied."),
- (int) float_get_size (fp->format), (int) length);
+ msg (SE, _("%zu-byte string needed but %zu-byte string "
+ "supplied."),
+ float_get_size (fp->format), length);
return false;
}
assert (length <= sizeof fp->data);
return false;
}
assert (length <= sizeof fp->data);
- memcpy (fp->data,
ds_data (lex_tokstr
(lexer)), length);
+ memcpy (fp->data,
ss_data (lex_tokss
(lexer)), length);
}
else
{
}
else
{
@@
-135,11
+136,11
@@
parse_fp (struct lexer *lexer, struct fp *fp)
msg (SE, _("Hexadecimal floating constant too long."));
return false;
}
msg (SE, _("Hexadecimal floating constant too long."));
return false;
}
- strncpy (
(char *) fp->data, ds_cstr (lex_tokstr (lexer)
), sizeof fp->data);
+ strncpy (
CHAR_CAST_BUG (char *,fp->data), lex_tokcstr (lexer
), sizeof fp->data);
}
lex_get (lexer);
}
lex_get (lexer);
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
return false;
}
else
return false;
}
else
@@
-249,14
+250,14
@@
cmd_debug_float_format (struct lexer *lexer, struct dataset *ds UNUSED)
if (!parse_fp (lexer, &fp[fp_cnt++]))
return CMD_FAILURE;
if (!parse_fp (lexer, &fp[fp_cnt++]))
return CMD_FAILURE;
- if (lex_token (lexer) ==
'.'
&& fp_cnt > 1)
+ if (lex_token (lexer) ==
T_ENDCMD
&& fp_cnt > 1)
break;
break;
- else if (!lex_force_match (lexer,
'='
))
+ else if (!lex_force_match (lexer,
T_EQUALS
))
return CMD_FAILURE;
if (fp_cnt == 1)
{
return CMD_FAILURE;
if (fp_cnt == 1)
{
- if (lex_match (lexer,
'='
))
+ if (lex_match (lexer,
T_EQUALS
))
bijective = true;
else if (lex_match (lexer, T_GT))
bijective = false;
bijective = true;
else if (lex_match (lexer, T_GT))
bijective = false;
@@
-268,7
+269,7
@@
cmd_debug_float_format (struct lexer *lexer, struct dataset *ds UNUSED)
}
else
{
}
else
{
- if ((bijective && !lex_force_match (lexer,
'='
))
+ if ((bijective && !lex_force_match (lexer,
T_EQUALS
))
|| (!bijective && !lex_force_match (lexer, T_GT)))
return CMD_FAILURE;
}
|| (!bijective && !lex_force_match (lexer, T_GT)))
return CMD_FAILURE;
}