projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include hash-functions.h instead of hash.h
[pspp]
/
src
/
language
/
lexer
/
q2c.c
diff --git
a/src/language/lexer/q2c.c
b/src/language/lexer/q2c.c
index cf8aab1ba27bea153e8dab2cae5ab557ea64c2bc..cf8e53ee5cb881529ead693e0328f66e520a300b 100644
(file)
--- a/
src/language/lexer/q2c.c
+++ b/
src/language/lexer/q2c.c
@@
-106,8
+106,8
@@
hcf (void)
exit (EXIT_FAILURE);
}
exit (EXIT_FAILURE);
}
-int fail (const char *, ...) PRINTF_FORMAT (1, 2);
-int error (const char *, ...) PRINTF_FORMAT (1, 2);
+int fail (const char *, ...) PRINTF_FORMAT (1, 2)
NO_RETURN
;
+int error (const char *, ...) PRINTF_FORMAT (1, 2)
NO_RETURN
;
/* Output an error message and terminate unsuccessfully. */
int
/* Output an error message and terminate unsuccessfully. */
int
@@
-225,11
+225,11
@@
st_upper (const char *s)
/* Returns the address of the first non-whitespace character in S, or
the address of the null terminator if none. */
static char *
/* Returns the address of the first non-whitespace character in S, or
the address of the null terminator if none. */
static char *
-skip_ws (c
onst c
har *s)
+skip_ws (char *s)
{
while (isspace ((unsigned char) *s))
s++;
{
while (isspace ((unsigned char) *s))
s++;
- return
(char *)
s;
+ return s;
}
/* Read one line from the input file into buf. Lines having special
}
/* Read one line from the input file into buf. Lines having special
@@
-1534,7
+1534,7
@@
dump_specifier_parse (const specifier *spec, const subcommand *sbc)
else if (s->value == VAL_STRING)
{
dump (1, "if (lex_token (lexer) != T_ID "
else if (s->value == VAL_STRING)
{
dump (1, "if (lex_token (lexer) != T_ID "
- "&&
lex_token (lexer) != T_STRING
)");
+ "&&
!lex_is_string (lexer)
)");
dump (1, "{");
dump (0, "msg (SE, _(\"%s specifier of %s subcommand "
"requires a string argument.\"));",
dump (1, "{");
dump (0, "msg (SE, _(\"%s specifier of %s subcommand "
"requires a string argument.\"));",