--- parser3/src/main/compile_tools.h	2001/07/26 12:25:37	1.47
+++ parser3/src/main/compile_tools.h	2001/12/15 21:28:20	1.52
@@ -2,23 +2,21 @@
 	Parser: compiler support helper functions decls.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: compile_tools.h,v 1.47 2001/07/26 12:25:37 parser Exp $
+	$Id: compile_tools.h,v 1.52 2001/12/15 21:28:20 paf Exp $
 */
 
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
-#include "pa_config_includes.h"
 #include "pa_opcode.h"
 #include "pa_types.h"
 #include "pa_vstring.h"
 #include "pa_request.h"
 
 enum lexical_state {
-	LS_USER,
+	LS_USER, LS_NAME_SQUARE_PART,
 	LS_COMMENT,
 	LS_DEF_NAME,
 	LS_DEF_PARAMS,
@@ -27,10 +25,9 @@ enum lexical_state {
 	LS_DEF_SPECIAL_BODY,
 	LS_EXPRESSION_STRING_QUOTED,
 	LS_EXPRESSION_STRING_APOSTROFED,
-	LS_EXPRESSION_VAR_NAME,
-	LS_VAR_NAME_SIMPLE,
+	LS_EXPRESSION_VAR_NAME_WITH_COLON, LS_EXPRESSION_VAR_NAME_WITHOUT_COLON,
+	LS_VAR_NAME_SIMPLE_WITH_COLON, LS_VAR_NAME_SIMPLE_WITHOUT_COLON,
 	LS_VAR_NAME_CURLY,
-	LS_VAR_NAME_NO_COLON,
 	LS_VAR_ROUND,
 	LS_VAR_SQUARE,
 	LS_VAR_CURLY,