X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flexer.h;h=0880773390dece125d26d5bfed42a5047e65fa4f;hb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;hp=816b4317f9bb8318d4d1a4a7232c6a73231d01b0;hpb=c9e2bf6cb988f8c00d89ccf191a28388cccbd868;p=pspp

diff --git a/src/lexer.h b/src/lexer.h
index 816b4317f9..0880773390 100644
--- a/src/lexer.h
+++ b/src/lexer.h
@@ -24,54 +24,8 @@
 #include <ctype.h>
 #include <stdbool.h>
 
-/* Returns nonzero if character CH may be the first character in an
-   identifier. */
-#define CHAR_IS_ID1(CH)				\
-	(isalpha ((unsigned char) (CH))		\
-	 || (CH) == '@'				\
-	 || (CH) == '#'				\
-	 || (CH) == '$')
-
-/* Returns nonzero if character CH may be a character in an
-   identifier other than the first. */
-#define CHAR_IS_IDN(CH)				\
-	(CHAR_IS_ID1 (CH)			\
-         || isdigit ((unsigned char) (CH))	\
-	 || (CH) == '.'				\
-	 || (CH) == '_')
-
-/* Token types. */
-/* The order of the enumerals below is important.  Do not change it. */
-enum
-  {
-    T_ID = 256, /* Identifier. */
-    T_POS_NUM,	/* Positive number. */
-    T_NEG_NUM,	/* Negative number. */
-    T_STRING,	/* Quoted string. */
-    T_STOP,	/* End of input. */
-
-    T_AND,	/* AND */
-    T_OR,	/* OR */
-    T_NOT,	/* NOT */
-
-    T_EQ,	/* EQ */
-    T_GE,	/* GE or >= */
-    T_GT,	/* GT or > */
-    T_LE,	/* LE or <= */
-    T_LT,	/* LT or < */
-    T_NE,	/* NE or ~= */
-
-    T_ALL,	/* ALL */
-    T_BY,	/* BY */
-    T_TO,	/* TO */
-    T_WITH,	/* WITH */
-
-    T_EXP,	/* ** */
-
-    T_FIRST_KEYWORD = T_AND,
-    T_LAST_KEYWORD = T_WITH,
-    T_N_KEYWORDS = T_LAST_KEYWORD - T_FIRST_KEYWORD + 1
-  };
+#include "lex-def.h"
+
 
 extern int token;
 extern double tokval;
@@ -109,12 +63,6 @@ int lex_force_int (void);
 int lex_force_num (void);
 int lex_force_id (void);
 int lex_force_string (void);
-
-/* Comparing identifiers. */
-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);