--- parser3/src/main/compile_tools.C	2001/03/06 14:28:35	1.15
+++ parser3/src/main/compile_tools.C	2001/04/03 07:54:25	1.34
@@ -1,5 +1,11 @@
-/*
-  $Id: compile_tools.C,v 1.15 2001/03/06 14:28:35 paf Exp $
+/** @file
+	Parser: compiler support helper functions.
+
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: compile_tools.C,v 1.34 2001/04/03 07:54:25 paf Exp $
 */
 
 #include "compile_tools.h"
@@ -9,74 +15,71 @@
 #include "pa_vstring.h"
 #include "pa_vdouble.h"
 
-void PVS(Array/*<op>*/ *result, VString *vstring) {
-	// append OP_STRING
-	Operation op; op.code=OP_STRING;
+void PV(Array/*<Operation>*/ *result, Value *value) {
+	// append OP_VALUE
+	Operation op; op.code=OP_VALUE;
 	*result+=op.cast;
 
-	// append 'vstring'
-	*result+=vstring;
+	// append 'value'
+	*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;
+	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 *SL(VString *vstring) {
-	// empty ops array
-	Array *result=N(vstring->pool());
-
-	// append 'vstring' to 'result'
-	PVS(result, vstring);
-
-	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;
-	*result+=op.cast;
+Array *VL(Value *value) {
+	// empty ops array
+	Array *result=N(value->pool());
 
-	// append 'vclass'
-	*result+=vclass;
+	// 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_STRING)
+	if(op.code!=OP_VALUE)
 		return 0;
 
-	return static_cast<VString *>(literal_string_array->get(offset+1))->get_string();
+	return static_cast<Value *>(literal_string_array->get(offset+1));
 }
 
 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 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.sp<MAX_LEXICAL_STATES) {
+		pc.stack[pc.sp++]=pc.ls;  pc.ls=new_state;
 	} else
-		pc->pool->THROW(0, 0, 0, "push_LS: stack overflow");
+		pc.pool->THROW(0, 0, 0, "push_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.sp>=0)
+		pc.ls=pc.stack[pc.sp];
 	else
-		pc->pool->THROW(0, 0, 0, "push_LS: stack underflow");
+		pc.pool->THROW(0, 0, 0, "pop_LS: stack underflow");
 }