--- parser3/src/main/compile_tools.h	2001/03/06 15:02:48	1.21
+++ parser3/src/main/compile_tools.h	2001/03/19 16:44:01	1.32
@@ -1,5 +1,9 @@
-/*
-  $Id: compile_tools.h,v 1.21 2001/03/06 15:02:48 paf Exp $
+/** @file
+	Parser
+	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.32 2001/03/19 16:44:01 paf Exp $
 */
 
 #ifndef COMPILE_TOOLS
@@ -17,26 +21,27 @@ enum lexical_state {
 	LS_DEF_LOCALS,
 	LS_DEF_COMMENT,
 	LS_DEF_SPECIAL_BODY,
-	LS_EXPRESSION_BODY,
 	LS_EXPRESSION_STRING,
+	LS_EXPRESSION_VAR_NAME,
 	LS_VAR_NAME_SIMPLE,
 	LS_VAR_NAME_CURLY,
-	LS_VAR_NAME_IN_EXPRESSION,
+	LS_VAR_ROUND,
 	LS_VAR_SQUARE,
 	LS_VAR_CURLY,
 	LS_METHOD_NAME,
 	LS_METHOD_SQUARE,
 	LS_METHOD_CURLY,
+	LS_METHOD_ROUND,
 	LS_METHOD_AFTER
 };
 struct parse_control {
 	// input
 	Pool *pool;
 	Request *request;
-	VClass *vclass;
+	VStateless_class *cclass;
 #ifndef NO_CSTRING_ORIGIN
-	char *source;
-	char *file;
+	const char *source;
+	const char *file;
 	int line, col;
 #endif
 	// state
@@ -54,49 +59,45 @@ struct parse_control {
 };
 
 // New array // return empty array
-inline Array/*<op>*/ *N(Pool& pool) {
-	return new(pool) Array/*<op>*/(pool);
+inline Array/*<Operation>*/ *N(Pool& pool) {
+	return new(pool) Array/*<Operation>*/(pool);
 }
 
 // Assembler instruction // append ordinary instruction to ops
-inline void O(Array/*<op>*/ *result, enum OPCODE code) {
+inline void O(Array/*<Operation>*/ *result, enum OPCODE code) {
 	Operation op; op.code=code;
 	*result+=op.cast;
 }
 
 // Argument Eval_expression // append eval_expression to ops
-inline void AE(Array/*<op>*/ *result, char *eval_expression) {
+inline void AE(Array/*<Operation>*/ *result, char *eval_expression) {
 	*result+=eval_expression;
 }
 
 // aPpend 'code_array' to 'result'
-inline void P(Array/*<op>*/ *result, Array *code_array) {
+inline void P(Array/*<Operation>*/ *result, Array *code_array) {
 	result->append_array(*code_array);
 }
 // aPpend part of 'code_array', starting from offset, to 'result'
-inline void P(Array/*<op>*/ *result, Array *code_array, int offset) {
+inline void P(Array/*<Operation>*/ *result, Array *code_array, int offset) {
 	result->append_array(*code_array, offset);
 }
 // aPpend 'vstring' to 'result'
-void PV(Array/*<op>*/ *result, VString *vstring);
-// aPpend 'Code_Array' to result
-void PCA(Array/*<op>*/ *result, Array/*<op>*/ *code_array);
-
+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);
 
 // Value Literal // returns array with 
 // first: OP_VALUE instruction
 // second op: string itself
 Array *VL(Value *value);
 // Literal Array to(2) String // return string value from literal array OP+string array
-String *SLA2S(Array *literal_string_array, int offset=0);
+const String *SLA2S(Array *literal_string_array, int offset=0);
 
 void change_string_literal_to_double_literal(Array *literal_string_array);
-
-// Class Literal // returns array with 
-// first: OP_CLASS instruction
-// second op: vclass itself
-Array *CL(VClass *vclass);
-
+void change_string_literal_to_write_string_literal(Array *literal_string_array);
 
 void push_LS(struct parse_control *pc, lexical_state new_state);
 void pop_LS(struct parse_control *pc);