--- parser3/src/main/compile_tools.h	2004/02/11 15:33:15	1.72
+++ parser3/src/main/compile_tools.h	2009/04/17 12:00:08	1.83
@@ -1,14 +1,14 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 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 * const IDENT_COMPILE_TOOLS_H="$Date: 2004/02/11 15:33:15 $";
+static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2009/04/17 12:00:08 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -43,9 +43,9 @@ enum lexical_state {
 };
 
 struct Pos {
-	uint line;
-	uint col;
-	//Pos(uint aline, uint acol): line(aline), col(acol) {}
+	int line;
+	int col;
+	Pos(int aline, int acol): line(aline), col(acol) {}
 	Pos(): line(0), col(0) {}
 
 	void clear() { line=col=0; }
@@ -62,6 +62,8 @@ public:
 	/// @name input
 	Request& request;
 	VStateless_class* cclass;
+	VStateless_class* cclass_new;
+	ArrayClass* cclasses;
 	const char* source;
 	uint file_no;
 	Pos pos;
@@ -80,6 +82,8 @@ public:
 	int brackets_nestages[MAX_LEXICAL_STATES]; ///< brackets nestage on each state
 
 	bool in_call_value;
+	bool explicit_result;
+	bool append;
 	//@}
 	
 	/// output: filled input 'methods' and 'error' if any
@@ -88,7 +92,8 @@ public:
 	Parse_control(Request& arequest, 
 		VStateless_class* aclass,
 		const char* asource, const String* amain_alias, 
-		uint afile_no):
+		uint afile_no,
+		int line_no_offset):
 		main_alias(amain_alias),
 		last_line_end_col(0),
 
@@ -96,22 +101,69 @@ public:
 
 		// we were told the class to compile to?
 		cclass(aclass), // until changed with @CLASS would consider operators loading
+		cclass_new(0), 
+		cclasses(new ArrayClass(1)),
 		source(asource), 
 		file_no(afile_no),
+		pos(line_no_offset, 0),
 
 		// initialize state
 		trim_bof(true),
 		pending_state(0),
 		ls(LS_USER),
 		ls_sp(0),
-		in_call_value(false) {}
+		in_call_value(false),
+		explicit_result(false),
+		append(false) {
+
+		*cclasses+=aclass;
+	}
+
+	void class_add(){
+		if(cclass_new){
+			cclass=cclass_new;
+			// append to request's classes
+			request.classes().put(cclass->name(), cclass);
+			*cclasses+=cclass;
+			cclass_new=0;
+			append=false;
+		}
+	}
+
+	VStateless_class* get_existed_class(VStateless_class* aclass){
+		if(aclass){
+			if(Value* class_value=request.classes().get(aclass->name())){
+				return class_value->get_class();
+			}
+		}
+		return 0;
+	}
+
+	bool reuse_existed_class(VStateless_class* aclass){
+		if(aclass->is_partial()){
+			cclass=aclass;
+			cclass_new=0;
+			append=true;
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	void set_all_vars_local(){
+		if(cclass_new){
+			cclass_new->set_all_vars_local();
+		} else {
+			cclass->set_all_vars_local();
+		}
+	}
 
 	void pos_next_line() {
 		pos.line++;
 		last_line_end_col=pos.col;
 		pos.col=0;
 	}
-	void pos_next_c(char c) {
+	void pos_next_c(int c) {
 		if(c=='\t')
 			pos.col=(pos.col+TAB_SIZE)&~(TAB_SIZE-1);
 		else
@@ -136,7 +188,7 @@ inline ArrayOperation* N() {
 }
 
 /// Assembler instruction // append ordinary instruction to ops
-inline void O(ArrayOperation& result, OPCODE code) {
+inline void O(ArrayOperation& result, OP::OPCODE code) {
 	result+=Operation(code);
 }
 
@@ -150,7 +202,7 @@ inline void P(ArrayOperation& result, Ar
 }
 
 /// append cOde Array
-inline void OA(ArrayOperation& result, OPCODE code, ArrayOperation* code_array) {
+inline void OA(ArrayOperation& result, OP::OPCODE code, ArrayOperation* code_array) {
 	result+=Operation(code); // append OP_CODE
 	result+=Operation(code_array); // append 'code_array'
 }
@@ -166,7 +218,7 @@ inline ArrayOperation* VL(Value* value,
 	ArrayOperation& result=*N();
 
 	// append 'value' to 'result'
-	result+=Operation(OP_VALUE);
+	result+=Operation(OP::OP_VALUE);
 	result+=Operation(file_no, line, col); // append origin
 	result+=Operation(value); // append 'value'
 
@@ -183,16 +235,16 @@ inline const String* LA2S(ArrayOperation
 }
 
 inline void change_string_literal_to_write_string_literal(ArrayOperation& literal_string_array) {
-	literal_string_array.put(0, OP_STRING__WRITE);
+	literal_string_array.put(0, OP::OP_STRING__WRITE);
 }
 
 
-void change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
+void maybe_change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
 
 void change_string_literal_value(ArrayOperation& literal_string_array, const String& new_value);
 
 void changetail_or_append(ArrayOperation& opcodes, 
-						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound);
+						  OP::OPCODE find, bool with_argument, OP::OPCODE replace, OP::OPCODE notfound);
 
 
 void push_LS(Parse_control& pc, lexical_state new_state);