* token classes
*/
-# define END 0
-# define NAME 1
-# define OPEN 2
-# define CLOSE 3
-# define QUOTE 4
-# define STRING 5
-# define NUM 6
-# define DOT 7
-# define BOOL 8
+# define END 0
+# define NAME 1
+# define OPEN 2
+# define CLOSE 3
+# define QUOTE 4
+# define QUASIQUOTE 5
+# define UNQUOTE 6
+# define UNQUOTE_SPLICING 7
+# define STRING 8
+# define NUM 9
+# define FLOAT 10
+# define DOT 11
+# define BOOL 12
/*
* character classes
*/
-# define PRINTABLE 0x0001 /* \t \n ' ' - '~' */
-# define QUOTED 0x0002 /* \ anything */
-# define SPECIAL 0x0004 /* ( [ { ) ] } ' . */
+# define PRINTABLE 0x0001 /* \t \n ' ' - ~ */
+# define SPECIAL 0x0002 /* ( [ { ) ] } ' ` , */
+# define DOTC 0x0004 /* . */
# define WHITE 0x0008 /* ' ' \t \n */
# define DIGIT 0x0010 /* [0-9] */
# define SIGN 0x0020 /* +- */
-# define ENDOFFILE 0x0040 /* end of file */
-# define COMMENT 0x0080 /* ; */
-# define IGNORE 0x0100 /* \0 - ' ' */
-# define BACKSLASH 0x0200 /* \ */
-# define VBAR 0x0400 /* | */
-# define TWIDDLE 0x0800 /* ~ */
-# define STRINGC 0x1000 /* " */
-# define POUND 0x2000 /* # */
+# define FLOATC 0x0040 /* . e E */
+# define ENDOFFILE 0x0080 /* end of file */
+# define COMMENT 0x0100 /* ; */
+# define IGNORE 0x0200 /* \0 - ' ' */
+# define BACKSLASH 0x0400 /* \ */
+# define STRINGC 0x0800 /* " */
+# define POUND 0x1000 /* # */
-# define NOTNAME (STRINGC|TWIDDLE|VBAR|COMMENT|ENDOFFILE|WHITE|SPECIAL)
-# define NUMBER (DIGIT|SIGN)
+# define NOTNAME (STRINGC|COMMENT|ENDOFFILE|WHITE|SPECIAL)
+# define INTEGER (DIGIT|SIGN)
+# define NUMBER (INTEGER|FLOATC)
#endif /* _AO_LISP_READ_H_ */