projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Value Label Dialog: Do not attempt to read selection if there is none.
[pspp]
/
src
/
language
/
lexer
/
lexer.h
diff --git
a/src/language/lexer/lexer.h
b/src/language/lexer/lexer.h
index 0a3e6c37c03de317a25f107820dd313ef8f4bd7e..01c4e91501350cba83aaedab7931fc6434d144a1 100644
(file)
--- a/
src/language/lexer/lexer.h
+++ b/
src/language/lexer/lexer.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2010, 2011
, 2013, 2014
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
@@
-19,6
+19,7
@@
#include <stdbool.h>
#include <stddef.h>
#include <stdbool.h>
#include <stddef.h>
+#include <unistd.h>
#include "data/identifier.h"
#include "data/variable.h"
#include "data/identifier.h"
#include "data/variable.h"
@@
-38,7
+39,7
@@
enum lex_syntax_mode
/* Handling of errors. */
enum lex_error_mode
{
/* Handling of errors. */
enum lex_error_mode
{
- LEX_ERROR_
INTERACTIVE, /* Always continue to next command
. */
+ LEX_ERROR_
TERMINAL, /* Discard input line and continue reading
. */
LEX_ERROR_CONTINUE, /* Continue to next command, except for
cascading failures. */
LEX_ERROR_STOP /* Stop processing. */
LEX_ERROR_CONTINUE, /* Continue to next command, except for
cascading failures. */
LEX_ERROR_STOP /* Stop processing. */
@@
-128,6
+129,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 *);
@@
-155,8
+157,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);