projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
encoding-guesser: Fix bug in parsing fallback encodings.
[pspp]
/
src
/
language
/
lexer
/
lexer.h
diff --git
a/src/language/lexer/lexer.h
b/src/language/lexer/lexer.h
index 2a7055a5ce73fdcfa9efafa3ae02905eebac49ad..a6be161fe100ceb5919871b05601f1efd2e03e2f 100644
(file)
--- a/
src/language/lexer/lexer.h
+++ b/
src/language/lexer/lexer.h
@@
-128,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 *);
@@
-160,6
+161,11
@@
void lex_error_expecting (struct lexer *, const char *, ...) SENTINEL(0);
void lex_sbc_only_once (const char *);
void lex_sbc_missing (const char *);
void lex_sbc_only_once (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_next_error_valist (struct lexer *lexer, int n0, int n1,
void lex_error_valist (struct lexer *, const char *, va_list)
PRINTF_FORMAT (2, 0);
void lex_next_error_valist (struct lexer *lexer, int n0, int n1,