projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug 19581
[pspp]
/
src
/
language
/
lexer
/
lexer.h
diff --git
a/src/language/lexer/lexer.h
b/src/language/lexer/lexer.h
index 792788c5bb0bafeab52c45048a38b4bfa3b3b3c7..4f9259250dadbd3fe5985afeef259ff584b64df6 100644
(file)
--- a/
src/language/lexer/lexer.h
+++ b/
src/language/lexer/lexer.h
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-20,20
+19,20
@@
#if !lexer_h
#define lexer_h 1
#if !lexer_h
#define lexer_h 1
-#include <data/variable.h>
#include <ctype.h>
#include <stdbool.h>
#include <ctype.h>
#include <stdbool.h>
-#include <data/identifier.h>
-
#include <stddef.h>
#include <stddef.h>
+#include <data/identifier.h>
+#include <data/variable.h>
+#include <libpspp/getl.h>
-struct lexer
;
+struct lexer;
/* Initialization. */
/* Initialization. */
-struct lexer * lex_create (
bool (*)(struct string *, bool*)
);
+struct lexer * lex_create (
struct source_stream *
);
void lex_destroy (struct lexer *);
void lex_destroy (struct lexer *);
-
+struct source_stream * lex_get_source_stream (const struct lexer *);
/* Common functions. */
/* Common functions. */
@@
-71,12
+70,15
@@
void lex_put_back_id (struct lexer *, const char *tokid);
const char *lex_entire_line (struct lexer *);
const struct string *lex_entire_line_ds (struct lexer *);
const char *lex_rest_of_line (struct lexer *, int *end_dot);
const char *lex_entire_line (struct lexer *);
const struct string *lex_entire_line_ds (struct lexer *);
const char *lex_rest_of_line (struct lexer *, int *end_dot);
+void lex_preprocess_line (struct string *, enum getl_syntax,
+ bool *line_starts_command,
+ bool *line_ends_command);
void lex_discard_line (struct lexer *);
void lex_discard_rest_of_command (struct lexer *);
/* Weird line reading functions. */
bool lex_get_line (struct lexer *);
void lex_discard_line (struct lexer *);
void lex_discard_rest_of_command (struct lexer *);
/* Weird line reading functions. */
bool lex_get_line (struct lexer *);
-bool lex_get_line_raw (struct lexer *);
+bool lex_get_line_raw (struct lexer *
, enum getl_syntax *
);
/* Token names. */
const char *lex_token_name (int);
/* Token names. */
const char *lex_token_name (int);
@@
-90,7
+92,6
@@
const struct string *lex_tokstr (const struct lexer *);
/* Really weird functions. */
void lex_negative_to_dash (struct lexer *);
/* Really weird functions. */
void lex_negative_to_dash (struct lexer *);
-void lex_reset_eof (struct lexer *);
void lex_skip_comment (struct lexer *);
#endif /* !lexer_h */
void lex_skip_comment (struct lexer *);
#endif /* !lexer_h */