--- parser3/src/main/compile_tools.h	2001/05/07 14:00:49	1.39
+++ parser3/src/main/compile_tools.h	2003/01/30 09:14:01	1.67.2.1
@@ -1,32 +1,33 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: compile_tools.h,v 1.39 2001/05/07 14:00:49 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
+static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/01/30 09:14:01 $";
+
 #include "pa_opcode.h"
 #include "pa_types.h"
 #include "pa_vstring.h"
 #include "pa_request.h"
 
 enum lexical_state {
-	LS_USER,
-	LS_COMMENT,
+	LS_USER, LS_NAME_SQUARE_PART,
+	LS_USER_COMMENT,
 	LS_DEF_NAME,
 	LS_DEF_PARAMS,
 	LS_DEF_LOCALS,
 	LS_DEF_COMMENT,
 	LS_DEF_SPECIAL_BODY,
-	LS_EXPRESSION_STRING,
-	LS_EXPRESSION_VAR_NAME,
-	LS_VAR_NAME_SIMPLE,
+	LS_EXPRESSION_STRING_QUOTED,
+	LS_EXPRESSION_STRING_APOSTROFED,
+	LS_EXPRESSION_VAR_NAME_WITH_COLON, LS_EXPRESSION_VAR_NAME_WITHOUT_COLON,
+	LS_EXPRESSION_COMMENT,
+	LS_VAR_NAME_SIMPLE_WITH_COLON, LS_VAR_NAME_SIMPLE_WITHOUT_COLON,
 	LS_VAR_NAME_CURLY,
 	LS_VAR_ROUND,
 	LS_VAR_SQUARE,
@@ -44,22 +45,25 @@ struct parse_control {
 	Pool *pool;
 	Request *request;
 	VStateless_class *cclass;
-#ifndef NO_CSTRING_ORIGIN
+#ifndef NO_STRING_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)
+	StringPtr string; ///< lexical string accumulator
 	
 #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
@@ -67,8 +71,8 @@ struct parse_control {
 };
 
 /// New array // return empty array
-inline Array/*<Operation>*/ *N(Pool& pool) {
-	return new(pool) Array/*<Operation>*/(pool);
+inline ArrayCodePtr N() {
+	return new ArrayCode;
 }
 
 /// Assembler instruction // append ordinary instruction to ops
@@ -77,11 +81,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);
@@ -90,19 +89,34 @@ 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
-void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);
-/// aPpend 'expression Code_Array' to result
-void PEA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array);
+void PV(Array/*<Operation>*/ *result, Value *value);
+
+inline void OA(Array/*<Operation>*/ *result, OPCODE opcode, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=opcode;
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=code_array;
+}
 
 /**
 	Value Literal // returns array with 
 	- first: OP_VALUE instruction
 	- second op: string itself
 */
-Array *VL(Value *value);
+inline Array *VL(Value *value) {
+	// empty ops array
+	Array *result=N(value->pool());
+
+	// append 'value' to 'result'
+	PV(result, value);
+
+	return result;
+}
+
 /// Literal Array to(2) Value @return Value from literal Array OP+Value
 Value *LA2V(Array *literal_string_array, int offset=0);
 /// Literal Array to(2) String  @return String value from literal Array OP+String array
@@ -111,8 +125,18 @@ inline const String *LA2S(Array *literal
 		return value->get_string();
 	return 0;
 }
+
+inline void change_string_literal_to_write_string_literal(Array *literal_string_array) {
+	Operation op; op.code=OP_STRING__WRITE;
+	literal_string_array->put(0, op.cast);
+}
+
+void changetail_or_append(Array *opcodes, 
+						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound);
+
 void change_string_literal_to_double_literal(Array *literal_string_array);
-void change_string_literal_to_write_string_literal(Array *literal_string_array);
+
+void change_string_literal_value(Array *literal_string_array, const String& new_value);
 
 void push_LS(parse_control& pc, lexical_state new_state);
 void pop_LS(parse_control& pc);