minor edits

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

diff --git a/src/lexer.h b/src/lexer.h
index 3250704ca73055f81a43e195386ff8619d895b62..816b4317f9bb8318d4d1a4a7232c6a73231d01b0 100644 (file)
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -14,13 +14,15 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !lexer_h
 #define lexer_h 1
 
-#include "bool.h"
+#include "var.h"
+#include <ctype.h>
+#include <stdbool.h>
 
 /* Returns nonzero if character CH may be the first character in an
    identifier. */
@@ -71,10 +73,9 @@ enum
     T_N_KEYWORDS = T_LAST_KEYWORD - T_FIRST_KEYWORD + 1
   };
 
-
 extern int token;
 extern double tokval;
-extern char tokid[9];
+extern char tokid[LONG_NAME_LEN + 1];
 extern struct string tokstr;
 
 #include <stddef.h>
@@ -86,6 +87,8 @@ void lex_done (void);
 /* Common functions. */
 void lex_get (void);
 void lex_error (const char *, ...);
+void lex_sbc_only_once (const char *);
+void lex_sbc_missing (const char *);
 int lex_end_of_command (void);
 
 /* Token testing functions. */
@@ -111,6 +114,7 @@ int lex_force_string (void);
 int lex_id_match_len (const char *keyword_string, size_t keyword_len,
                      const char *token_string, size_t token_len);
 int lex_id_match (const char *keyword_string, const char *token_string);
+int lex_id_to_token (const char *id, size_t len);
        
 /* Weird token functions. */
 int lex_look_ahead (void);