--- parser3/src/main/compile_tools.h	2001/04/26 14:55:28	1.38
+++ parser3/src/main/compile_tools.h	2001/09/12 09:53:38	1.47.4.1
@@ -5,29 +5,32 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile_tools.h,v 1.38 2001/04/26 14:55:28 paf Exp $
+	$Id: compile_tools.h,v 1.47.4.1 2001/09/12 09:53:38 parser Exp $
 */
 
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
-#include "code.h"
+#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,
 	LS_DEF_LOCALS,
 	LS_DEF_COMMENT,
 	LS_DEF_SPECIAL_BODY,
-	LS_EXPRESSION_STRING,
+	LS_EXPRESSION_STRING_QUOTED,
+	LS_EXPRESSION_STRING_APOSTROFED,
 	LS_EXPRESSION_VAR_NAME,
 	LS_VAR_NAME_SIMPLE,
 	LS_VAR_NAME_CURLY,
+	LS_VAR_NAME_NO_COLON,
 	LS_VAR_ROUND,
 	LS_VAR_SQUARE,
 	LS_VAR_CURLY,
@@ -47,11 +50,12 @@ 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)
 	
@@ -60,6 +64,8 @@ struct parse_control {
 	int sp; ///< =0
 	enum lexical_state stack[MAX_LEXICAL_STATES];
 	int brackets_nestages[MAX_LEXICAL_STATES]; ///< brackets nestage on each state
+
+	bool object_constructor_allowed;
 	//@}
 	
 	/// output: filled input 'methods' and 'error' if any
@@ -92,10 +98,12 @@ inline void P(Array/*<Operation>*/ *resu
 }
 /// 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);
 
 /**
 	Value Literal // returns array with