lexer: Remove unused function lex_put_back_id().

[pspp-builds.git] / src / language / lexer / lexer.h

diff --git a/src/language/lexer/lexer.h b/src/language/lexer/lexer.h
index 53732b49995f5fb60429e96f65e89a61ca108f4c..1abefb6b623fb30acc42ca4c05a6da27227bd8ce 100644 (file)
--- a/src/language/lexer/lexer.h
+++ b/src/language/lexer/lexer.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010 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
@@ -51,13 +51,15 @@ bool lex_is_string (struct lexer *);
 
 
 /* Token matching functions. */
-bool lex_match (struct lexer *, int);
+bool lex_match (struct lexer *, enum token_type);
 bool lex_match_id (struct lexer *, const char *);
 bool lex_match_id_n (struct lexer *, const char *, size_t n);
 bool lex_match_int (struct lexer *, int);
+bool lex_match_hyphenated_word (struct lexer *lexer, const char *s);
+
 
 /* Forcible matching functions. */
-bool lex_force_match (struct lexer *, int);
+bool lex_force_match (struct lexer *, enum token_type);
 bool lex_force_match_id (struct lexer *, const char *);
 bool lex_force_int (struct lexer *);
 bool lex_force_num (struct lexer *);
@@ -65,9 +67,8 @@ bool lex_force_id (struct lexer *);
 bool lex_force_string (struct lexer *);
 
 /* Weird token functions. */
-int lex_look_ahead (struct lexer *);
-void lex_put_back (struct lexer *, int);
-void lex_put_back_id (struct lexer *, const char *tokid);
+enum token_type lex_look_ahead (struct lexer *);
+void lex_put_back (struct lexer *, enum token_type);
 
 /* Weird line processing functions. */
 const char *lex_entire_line (const struct lexer *);
@@ -85,17 +86,16 @@ bool lex_get_line (struct lexer *);
 bool lex_get_line_raw (struct lexer *);
 
 /* Token names. */
-const char *lex_token_name (int);
+const char *lex_token_name (enum token_type);
 char *lex_token_representation (struct lexer *);
 
 /* Token accessors */
-int lex_token (const struct lexer *);
+enum token_type lex_token (const struct lexer *);
 double lex_tokval (const struct lexer *);
-const char *lex_tokid (const struct lexer *);
-const struct string *lex_tokstr (const struct lexer *);
+const char *lex_tokcstr (const struct lexer *);
+struct substring lex_tokss (const struct lexer *);
 
 /* Really weird functions. */
-void lex_negative_to_dash (struct lexer *);
 void lex_skip_comment (struct lexer *);
 
 #endif /* !lexer_h */