--- parser3/src/main/compile_tools.C	2001/03/08 09:31:47	1.18
+++ parser3/src/main/compile_tools.C	2002/04/15 08:13:10	1.48
@@ -1,5 +1,10 @@
-/*
-  $Id: compile_tools.C,v 1.18 2001/03/08 09:31:47 paf Exp $
+/** @file
+	Parser: compiler support helper functions.
+
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+
+	$Id: compile_tools.C,v 1.48 2002/04/15 08:13:10 paf Exp $
 */
 
 #include "compile_tools.h"
@@ -9,7 +14,7 @@
 #include "pa_vstring.h"
 #include "pa_vdouble.h"
 
-void PV(Array/*<op>*/ *result, Value *value) {
+void PV(Array/*<Operation>*/ *result, Value *value) {
 	// append OP_VALUE
 	Operation op; op.code=OP_VALUE;
 	*result+=op.cast;
@@ -18,65 +23,116 @@ void PV(Array/*<op>*/ *result, Value *va
 	*result+=value;
 }
 
-void PCA(Array/*<op>*/ *result, Array/*<op>*/ *code_array) {
+void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
 	// append OP_CODE
-	Operation op; op.code=OP_CODE__STORE_PARAM;
+	Operation op; op.code=OP_CURLY_CODE__STORE_PARAM;
 	*result+=op.cast;
 
 	// append 'vstring'
 	*result+=code_array;
 }
 
+void PEA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_EXPR_CODE__STORE_PARAM;
+	*result+=op.cast;
 
-Array *VL(Value *value) {
-	// empty ops array
-	Array *result=N(value->pool());
+	// append 'vstring'
+	*result+=code_array;
+}
 
-	// append 'value' to 'result'
-	PV(result, value);
+void CCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_CURLY_CODE__CONSTRUCT;
+	*result+=op.cast;
 
-	return result;
+	// append 'vstring'
+	*result+=code_array;
 }
-Array *CL(VClass *vclass) {
-	// empty ops array
-	Array *result=N(vclass->pool());
 
-	// append OP_CLASS
-	Operation op; op.code=OP_CLASS;
+void PNC(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_NESTED_CODE;
 	*result+=op.cast;
 
-	// append 'vclass'
-	*result+=vclass;
+	// append 'vstring'
+	*result+=code_array;
+}
+
+void PJP(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_OBJECT_POOL;
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=code_array;
+}
+
+void PSP(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_STRING_POOL;
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=code_array;
+}
+
+
+
+Array *VL(Value *value) {
+	// empty ops array
+	Array *result=N(value->pool());
+
+	// append 'value' to 'result'
+	PV(result, value);
 
 	return result;
 }
 
-String *SLA2S(Array *literal_string_array, int offset) {
+Value *LA2V(Array *literal_string_array, int offset) {
 	Operation op;
 	op.cast=literal_string_array->get(offset+0);
-	if(op.code!=OP_VALUE)
-		return 0;
-
-	return static_cast<VString *>(literal_string_array->get(offset+1))->get_string();
+	return op.code==OP_VALUE?
+		static_cast<Value *>(literal_string_array->get(offset+1))
+		:0;
 }
 
 void change_string_literal_to_double_literal(Array *literal_string_array) {
 	VString *vstring=static_cast<VString *>(literal_string_array->get(1));
-	Pool& pool=vstring->pool();
-	VDouble *vdouble=new(pool) VDouble(pool, vstring->get_double());
-	literal_string_array->put(1, vdouble);
+	Value *value=vstring->as_expr_result();
+	literal_string_array->put(1, value);
+}
+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, OPCODE replace, OPCODE notfound) {
+	if(int tail=opcodes->size()) {
+		--tail;
+		Operation op;
+		op.cast=opcodes->get(tail);
+		if(op.code==find) {
+			op.code=replace;
+			opcodes->put(tail, op.cast);
+			return;
+		}
+	}
+
+	Operation op; op.code=notfound;
+	*opcodes+=op.cast;
 }
 
 
-void push_LS(struct parse_control *pc, lexical_state new_state) {
-	if(pc->sp<MAX_LEXICAL_STATES) {
-		pc->stack[pc->sp++]=pc->ls;  pc->ls=new_state;
+void push_LS(parse_control& pc, lexical_state new_state) { 
+	if(pc.ls_sp<MAX_LEXICAL_STATES) {
+		pc.ls_stack[pc.ls_sp++]=pc.ls;  
+		pc.ls=new_state;
 	} else
-		pc->pool->THROW(0, 0, 0, "push_LS: stack overflow");
+		throw Exception(0, 0, "push_LS: ls_stack overflow");
 }
-void pop_LS(struct parse_control *pc) {
-	if(--pc->sp>=0)
-		pc->ls=pc->stack[pc->sp];
+void pop_LS(parse_control& pc) {
+	if(--pc.ls_sp>=0)
+		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		pc->pool->THROW(0, 0, 0, "push_LS: stack underflow");
+		throw Exception(0, 0, "pop_LS: ls_stack underflow");
 }