--- parser3/src/main/compile_tools.h	2001/07/02 12:56:33	1.42
+++ parser3/src/main/compile_tools.h	2002/02/08 07:27:46	1.57
@@ -1,24 +1,22 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 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.42 2001/07/02 12:56:33 parser Exp $
+	$Id: compile_tools.h,v 1.57 2002/02/08 07:27:46 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,
@@ -50,19 +47,22 @@ struct parse_control {
 #ifndef NO_CSTRING_ORIGIN
 	const char *source;
 	const char *file;
-	int line, col;
 #endif
+	int line, col;
 	//@}
 	//@{
 	/// @name state; initially
+	bool trim_bof;
 	int pending_state; ///< i=0
 	String *string; ///< =new(pool) String(pool)
 	
 #define MAX_LEXICAL_STATES 100
 	enum lexical_state ls; ///< =LS_USER;
-	int sp; ///< =0
-	enum lexical_state stack[MAX_LEXICAL_STATES];
+	int ls_sp; ///< =0
+	enum lexical_state ls_stack[MAX_LEXICAL_STATES];
 	int brackets_nestages[MAX_LEXICAL_STATES]; ///< brackets nestage on each state
+
+	bool in_call_value;
 	//@}
 	
 	/// output: filled input 'methods' and 'error' if any
@@ -80,11 +80,6 @@ inline void O(Array/*<Operation>*/ *resu
 	*result+=op.cast;
 }
 
-/// Argument Eval_expression // append eval_expression to ops
-inline void AE(Array/*<Operation>*/ *result, char *eval_expression) {
-	*result+=eval_expression;
-}
-
 /// aPpend 'code_array' to 'result'
 inline void P(Array/*<Operation>*/ *result, Array *code_array) {
 	result->append_array(*code_array);
@@ -93,12 +88,17 @@ inline void P(Array/*<Operation>*/ *resu
 inline void P(Array/*<Operation>*/ *result, Array *code_array, int offset) {
 	result->append_array(*code_array, offset);
 }
+
 /// aPpend 'vstring' to 'result'
 void PV(Array/*<Operation>*/ *result, VString *vstring);
-/// aPpend 'simple Code_Array' to result
+/// Parameter 'simple Code_Array'
 void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);
-/// aPpend 'expression Code_Array' to result
+/// Parameter 'Expression code_Array'
 void PEA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);
+/// Construct 'simple Code_Array'
+void CCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);
+/// aPpend Nested Code
+void PNC(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);
 
 /**
 	Value Literal // returns array with