/* 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
#include <ctype.h>
#include <stdbool.h>
-#include <sys/types.h>
-#include <libpspp/str.h>
+#include <unitypes.h>
+#include "libpspp/str.h"
/* Token types. */
-enum
+enum token_type
{
- T_ID = 256, /* Identifier. */
+ T_ID = 1, /* Identifier. */
T_POS_NUM, /* Positive number. */
T_NEG_NUM, /* Negative number. */
T_STRING, /* Quoted string. */
T_STOP, /* End of input. */
+ T_ENDCMD, /* End of command (e.g. '.'). */
+
+ T_PLUS, /* + */
+ T_DASH, /* - */
+ T_ASTERISK, /* * */
+ T_SLASH, /* / */
+ T_EQUALS, /* = */
+ T_LPAREN, /* ( */
+ T_RPAREN, /* ) */
+ T_LBRACK, /* [ */
+ T_RBRACK, /* ] */
+ T_COMMA, /* , */
+
T_AND, /* AND */
T_OR, /* OR */
T_NOT, /* NOT */
};
/* Tokens. */
-bool lex_is_keyword (int token);
+bool lex_is_keyword (enum token_type);
/* Recognizing identifiers. */
bool lex_is_id1 (char);
bool lex_is_idn (char);
+bool lex_uc_is_id1 (ucs4_t);
+bool lex_uc_is_idn (ucs4_t);
+bool lex_uc_is_space (ucs4_t);
size_t lex_id_get_length (struct substring);
/* Comparing identifiers. */
bool lex_id_match (struct substring keyword, struct substring token);
+bool lex_id_match_n (struct substring keyword, struct substring token,
+ size_t n);
int lex_id_to_token (struct substring);
/* Identifier names. */
-const char *lex_id_name (int);
+const char *lex_id_name (enum token_type);
#endif /* !data/identifier.h */