--- parser3/src/main/compile_tools.h	2001/03/11 08:16:34	1.27
+++ parser3/src/main/compile_tools.h	2001/03/25 08:52:36	1.35
@@ -1,9 +1,11 @@
-/*
-	Parser
+/** @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.27 2001/03/11 08:16:34 paf Exp $
+	$Id: compile_tools.h,v 1.35 2001/03/25 08:52:36 paf Exp $
 */
 
 #ifndef COMPILE_TOOLS
@@ -16,6 +18,7 @@
 
 enum lexical_state {
 	LS_USER,
+	LS_COMMENT,
 	LS_DEF_NAME,
 	LS_DEF_PARAMS,
 	LS_DEF_LOCALS,
@@ -38,10 +41,10 @@ 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
@@ -59,34 +62,35 @@ 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
@@ -98,7 +102,7 @@ const String *SLA2S(Array *literal_strin
 void change_string_literal_to_double_literal(Array *literal_string_array);
 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);
+void push_LS(parse_control& pc, lexical_state new_state);
+void pop_LS(parse_control& pc);
 
 #endif