projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Suppress GCC 4.7 warnings by changes to code that make it less clear.
[pspp]
/
src
/
language
/
lexer
/
lexer.h
diff --git
a/src/language/lexer/lexer.h
b/src/language/lexer/lexer.h
index b35ea7f54e05d9da00ffbcc23b18d71ebb174b97..a6be161fe100ceb5919871b05601f1efd2e03e2f 100644
(file)
--- a/
src/language/lexer/lexer.h
+++ b/
src/language/lexer/lexer.h
@@
-20,13
+20,6
@@
#include <stdbool.h>
#include <stddef.h>
#include <stdbool.h>
#include <stddef.h>
-/* The following #include avoids a potential problem when Gnulib substitutes
- * for close() by putting "#define close rpl_close" into <unistd.h>, by
- * ensuring that every source file that includes this one sees the #define.
- * (It would probably be better to rename the 'close' member of struct
- * lex_reader_class.) */
-#include <unistd.h>
-
#include "data/identifier.h"
#include "data/variable.h"
#include "libpspp/compiler.h"
#include "data/identifier.h"
#include "data/variable.h"
#include "libpspp/compiler.h"
@@
-79,7
+72,7
@@
struct lex_reader_class
The caller will free the 'file_name' member of READER, so the
implementation should not do so. */
The caller will free the 'file_name' member of READER, so the
implementation should not do so. */
- void (*
close
) (struct lex_reader *reader);
+ void (*
destroy
) (struct lex_reader *reader);
};
/* Helper functions for lex_reader. */
};
/* Helper functions for lex_reader. */
@@
-135,6
+128,7
@@
bool lex_force_int (struct lexer *);
bool lex_force_num (struct lexer *);
bool lex_force_id (struct lexer *);
bool lex_force_string (struct lexer *);
bool lex_force_num (struct lexer *);
bool lex_force_id (struct lexer *);
bool lex_force_string (struct lexer *);
+bool lex_force_string_or_id (struct lexer *);
/* Token accessors. */
enum token_type lex_token (const struct lexer *);
/* Token accessors. */
enum token_type lex_token (const struct lexer *);
@@
-162,8
+156,15
@@
void lex_next_error (struct lexer *, int n0, int n1, const char *, ...)
PRINTF_FORMAT (4, 5);
int lex_end_of_command (struct lexer *);
PRINTF_FORMAT (4, 5);
int lex_end_of_command (struct lexer *);
+void lex_error_expecting (struct lexer *, const char *, ...) SENTINEL(0);
+
void lex_sbc_only_once (const char *);
void lex_sbc_only_once (const char *);
-void lex_sbc_missing (struct lexer *, const char *);
+void lex_sbc_missing (const char *);
+
+void lex_spec_only_once (struct lexer *, const char *subcommand,
+ const char *specification);
+void lex_spec_missing (struct lexer *, const char *subcommand,
+ const char *specification);
void lex_error_valist (struct lexer *, const char *, va_list)
PRINTF_FORMAT (2, 0);
void lex_error_valist (struct lexer *, const char *, va_list)
PRINTF_FORMAT (2, 0);