X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_read.h;h=8f6bf130a542100afaad4368433f62180dcd85b6;hb=cd0bd9791a77868c226d285bf4d57e8c321755d5;hp=30dcac3f4bf10e7102763ada337340e304ff4b46;hpb=bd881a5b85d7cd4fb82127f92f32e089499b50cb;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_read.h b/src/lisp/ao_lisp_read.h
index 30dcac3f..8f6bf130 100644
--- a/src/lisp/ao_lisp_read.h
+++ b/src/lisp/ao_lisp_read.h
@@ -15,37 +15,44 @@
 #ifndef _AO_LISP_READ_H_
 #define _AO_LISP_READ_H_
 
-# define END	0
-# define NAME	1
-# define OPEN  	2
-# define CLOSE	3
-# define QUOTE	4
-# define STRING	5
-# define NUM	6
-# define DOT	7
+/*
+ * token classes
+ */
+
+# 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	0x00000001	/* \t \n ' ' - '~' */
-# define QUOTED		0x00000002	/* \ anything */
-# define BRA		0x00000004	/* ( [ { */
-# define KET		0x00000008	/* ) ] } */
-# define WHITE		0x00000010	/* ' ' \t \n */
-# define DIGIT		0x00000020	/* [0-9] */
-# define SIGN		0x00000040	/* +- */
-# define ENDOFFILE	0x00000080	/* end of file */
-# define COMMENT	0x00000100	/* ; # */
-# define IGNORE		0x00000200	/* \0 - ' ' */
-# define QUOTEC		0x00000400	/* ' */
-# define BACKSLASH	0x00000800	/* \ */
-# define VBAR		0x00001000	/* | */
-# define TWIDDLE	0x00002000	/* ~ */
-# define STRINGC	0x00004000	/* " */
-# define DOTC		0x00008000	/* . */
+# 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 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|QUOTEC|COMMENT|ENDOFFILE|WHITE|KET|BRA|DOTC)
-# define NUMBER		(DIGIT|SIGN)
+# define NOTNAME	(STRINGC|COMMENT|ENDOFFILE|WHITE|SPECIAL)
+# define INTEGER	(DIGIT|SIGN)
+# define NUMBER		(INTEGER|FLOATC)
 
 #endif /* _AO_LISP_READ_H_ */