--- parser3/src/main/compile_tools.h	2001/02/24 08:28:37	1.13
+++ parser3/src/main/compile_tools.h	2001/03/29 09:31:44	1.36
@@ -1,5 +1,11 @@
-/*
-  $Id: compile_tools.h,v 1.13 2001/02/24 08:28:37 paf Exp $
+/** @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.36 2001/03/29 09:31:44 paf Exp $
 */
 
 #ifndef COMPILE_TOOLS
@@ -7,33 +13,38 @@
 
 #include "code.h"
 #include "pa_types.h"
-#include "pa_pool.h"
-#include "pa_array.h"
-#include "pa_string.h"
 #include "pa_vstring.h"
+#include "pa_request.h"
 
 enum lexical_state {
 	LS_USER,
+	LS_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_VAR_NAME_CURLY,
 	LS_VAR_ROUND,
+	LS_VAR_SQUARE,
 	LS_VAR_CURLY,
 	LS_METHOD_NAME,
-	LS_METHOD_ROUND,
+	LS_METHOD_SQUARE,
 	LS_METHOD_CURLY,
+	LS_METHOD_ROUND,
 	LS_METHOD_AFTER
 };
 struct parse_control {
 	// input
 	Pool *pool;
-	Array *methods;
+	Request *request;
+	VStateless_class *cclass;
 #ifndef NO_CSTRING_ORIGIN
-	char *source;
-	char *file;
+	const char *source;
+	const char *file;
 	int line, col;
 #endif
 	// state
@@ -46,49 +57,57 @@ struct parse_control {
 	enum lexical_state stack[MAX_LEXICAL_STATES];
 	int brackets_nestages[MAX_LEXICAL_STATES];
 	
-	// output: filled input 'methods' and 'error' if any
+	/// output: filled input 'methods' and 'error' if any
 	char error[MAX_STRING];
 };
 
-// New array // return empty array
-inline Array/*<op>*/ *N(Pool& pool) {
-	return new(pool) Array/*<op>*/(pool);
+/// New array // return empty array
+inline Array/*<Operation>*/ *N(Pool& pool) {
+	return new(pool) Array/*<Operation>*/(pool);
 }
 
-// Assembler instruction // append ordinary instruction to ops
-inline void OP(Array/*<op>*/ *result, enum OPCODE code) {
+/// Assembler instruction // append ordinary instruction to ops
+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) {
+/// 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/*<op>*/ *result, Array *code_array) {
+/// aPpend 'code_array' to 'result'
+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) {
+/// aPpend part of 'code_array', starting from offset, to 'result'
+inline void P(Array/*<Operation>*/ *result, Array *code_array, int offset) {
 	result->append_array(*code_array, offset);
 }
-// aPpend 'vstring' to 'result'
-void PVS(Array/*<op>*/ *result, VString *vstring);
-// aPpend 'Code_Array' to result
-void PCA(Array/*<op>*/ *result, Array/*<op>*/ *code_array);
-
-
-// Literal // returns array with 
-// first: OP_STRING instruction
-// second op: string itself
-
-Array *L(VString *vstring);
-// Literal Array to(2) String // return string value from literal array OP+string array
-String *LA2S(Array *literal_string_array, int offset=0);
+/// 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);
+
+/**
+	Value Literal // returns array with 
+	- first: OP_VALUE instruction
+	- second op: string itself
+*/
+Array *VL(Value *value);
+/// 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
+inline const String *LA2S(Array *literal_string_array, int offset=0) {
+	return LA2V(literal_string_array, offset)->get_string();
+}
+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