projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace "sed" with "$(SED)" in Makefiles
[pspp]
/
src
/
language
/
lexer
/
lexer.h
diff --git
a/src/language/lexer/lexer.h
b/src/language/lexer/lexer.h
index b0787e8f44eb4f55a4da4799aa62fdec96a7f223..03202e260b64e4386af93b429d39f99b29bce5e7 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. */
@@
-52,6
+53,7
@@
struct lex_reader
const struct lex_reader_class *class;
enum lex_syntax_mode syntax;
enum lex_error_mode error;
const struct lex_reader_class *class;
enum lex_syntax_mode syntax;
enum lex_error_mode error;
+ char *encoding;
char *file_name; /* NULL if not associated with a file. */
int line_number; /* 1-based initial line number, 0 if none. */
};
char *file_name; /* NULL if not associated with a file. */
int line_number; /* 1-based initial line number, 0 if none. */
};
@@
-84,10
+86,10
@@
struct lex_reader *lex_reader_for_file (const char *file_name,
const char *encoding,
enum lex_syntax_mode syntax,
enum lex_error_mode error);
const char *encoding,
enum lex_syntax_mode syntax,
enum lex_error_mode error);
-struct lex_reader *lex_reader_for_string (const char *);
-struct lex_reader *lex_reader_for_format (const char *, ...)
- PRINTF_FORMAT (1,
2
);
-struct lex_reader *lex_reader_for_substring_nocopy (struct substring);
+struct lex_reader *lex_reader_for_string (const char *
, const char *encoding
);
+struct lex_reader *lex_reader_for_format (const char *,
const char *,
...)
+ PRINTF_FORMAT (1,
3
);
+struct lex_reader *lex_reader_for_substring_nocopy (struct substring
, const char *encoding
);
/* Initialization. */
struct lexer *lex_create (void);
/* Initialization. */
struct lexer *lex_create (void);
@@
-128,6
+130,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 *);
@@
-148,6
+151,7
@@
int lex_get_last_line_number (const struct lexer *, int n);
int lex_get_first_column (const struct lexer *, int n);
int lex_get_last_column (const struct lexer *, int n);
const char *lex_get_file_name (const struct lexer *);
int lex_get_first_column (const struct lexer *, int n);
int lex_get_last_column (const struct lexer *, int n);
const char *lex_get_file_name (const struct lexer *);
+const char *lex_get_encoding (const struct lexer *);
/* Issuing errors. */
void lex_error (struct lexer *, const char *, ...) PRINTF_FORMAT (2, 3);
/* Issuing errors. */
void lex_error (struct lexer *, const char *, ...) PRINTF_FORMAT (2, 3);
@@
-158,7
+162,12
@@
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_error_expecting (struct lexer *, const char *, ...) SENTINEL(0);
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);