projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Most basic macros work.
[pspp]
/
src
/
language
/
lexer
/
lexer.h
diff --git
a/src/language/lexer/lexer.h
b/src/language/lexer/lexer.h
index efb909baca1d04a597202fe848ff8c07e7543565..5aa82e75fb19a6398d3669035caf1a68e7b78400 100644
(file)
--- a/
src/language/lexer/lexer.h
+++ b/
src/language/lexer/lexer.h
@@
-23,19
+23,13
@@
#include "data/identifier.h"
#include "data/variable.h"
#include "data/identifier.h"
#include "data/variable.h"
+#include "language/lexer/segment.h"
#include "libpspp/cast.h"
#include "libpspp/compiler.h"
#include "libpspp/prompt.h"
struct lexer;
#include "libpspp/cast.h"
#include "libpspp/compiler.h"
#include "libpspp/prompt.h"
struct lexer;
-
-/* The syntax mode for which a syntax file is intended. */
-enum lex_syntax_mode
- {
- LEX_SYNTAX_AUTO, /* Try to guess intent. */
- LEX_SYNTAX_INTERACTIVE, /* Interactive mode. */
- LEX_SYNTAX_BATCH /* Batch mode. */
- };
+struct macro;
/* Handling of errors. */
enum lex_error_mode
/* Handling of errors. */
enum lex_error_mode
@@
-52,7
+46,7
@@
enum lex_error_mode
struct lex_reader
{
const struct lex_reader_class *class;
struct lex_reader
{
const struct lex_reader_class *class;
- enum
lex_syntax
_mode syntax;
+ enum
segmenter
_mode syntax;
enum lex_error_mode error;
char *encoding;
char *file_name; /* NULL if not associated with a file. */
enum lex_error_mode error;
char *encoding;
char *file_name; /* NULL if not associated with a file. */
@@
-86,7
+80,7
@@
void lex_reader_set_file_name (struct lex_reader *, const char *file_name);
/* Creating various kinds of lex_readers. */
struct lex_reader *lex_reader_for_file (const char *file_name,
const char *encoding,
/* Creating various kinds of lex_readers. */
struct lex_reader *lex_reader_for_file (const char *file_name,
const char *encoding,
- enum
lex_syntax
_mode syntax,
+ enum
segmenter
_mode syntax,
enum lex_error_mode error);
struct lex_reader *lex_reader_for_string (const char *, const char *encoding);
struct lex_reader *lex_reader_for_format (const char *, const char *, ...)
enum lex_error_mode error);
struct lex_reader *lex_reader_for_string (const char *, const char *encoding);
struct lex_reader *lex_reader_for_format (const char *, const char *, ...)
@@
-97,6
+91,9
@@
struct lex_reader *lex_reader_for_substring_nocopy (struct substring, const char
struct lexer *lex_create (void);
void lex_destroy (struct lexer *);
struct lexer *lex_create (void);
void lex_destroy (struct lexer *);
+/* Macros. */
+void lex_define_macro (struct lexer *, struct macro *);
+
/* Files. */
void lex_include (struct lexer *, struct lex_reader *);
void lex_append (struct lexer *, struct lex_reader *);
/* Files. */
void lex_include (struct lexer *, struct lex_reader *);
void lex_append (struct lexer *, struct lex_reader *);
@@
-184,7
+181,7
@@
void lex_next_error_valist (struct lexer *lexer, int n0, int n1,
PRINTF_FORMAT (4, 0);
/* Error handling. */
PRINTF_FORMAT (4, 0);
/* Error handling. */
-enum
lex_syntax
_mode lex_get_syntax_mode (const struct lexer *);
+enum
segmenter
_mode lex_get_syntax_mode (const struct lexer *);
enum lex_error_mode lex_get_error_mode (const struct lexer *);
void lex_discard_rest_of_command (struct lexer *);
void lex_interactive_reset (struct lexer *);
enum lex_error_mode lex_get_error_mode (const struct lexer *);
void lex_discard_rest_of_command (struct lexer *);
void lex_interactive_reset (struct lexer *);