Make the expression code a little nicer and fix bugs found

[pspp] / src / lexer.h

diff --git a/src/lexer.h b/src/lexer.h
index 83bfa825c3073fb2eaa084c81e70b6dae24c9827..23ce64bf2154b20098dfd2a44e7cde9e6d469aa3 100644 (file)
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -88,7 +88,7 @@ int lex_end_of_command (void);
 int lex_integer_p (void);
 long lex_integer (void);
 int lex_double_p (void);
-long lex_double (void);
+double lex_double (void);
 
 /* Token matching functions. */
 int lex_match (int);
@@ -111,11 +111,11 @@ int lex_id_match (const char *keyword_string, const char *token_string);
 /* Weird token functions. */
 int lex_look_ahead (void);
 void lex_put_back (int);
-void lex_put_forward (int);
+void lex_put_back_id (const char *tokid);
 
 /* Weird line processing functions. */
-char *lex_entire_line (void);
-char *lex_rest_of_line (int *had_dot);
+const char *lex_entire_line (void);
+const char *lex_rest_of_line (int *end_dot);
 void lex_discard_line (void);
 void lex_set_prog (char *p);