--- parser3/src/main/compile_tools.C	2001/02/21 06:21:19	1.3
+++ parser3/src/main/compile_tools.C	2001/06/28 07:41:59	1.35
@@ -1,42 +1,86 @@
-/*
-  $Id: compile_tools.C,v 1.3 2001/02/21 06:21:19 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.35 2001/06/28 07:41:59 parser Exp $
 */
+static char *RCSId="$Id: compile_tools.C,v 1.35 2001/06/28 07:41:59 parser Exp $"; 
 
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "pa_exception.h"
+#include "pa_vstring.h"
+#include "pa_vdouble.h"
 
-Array *L(String *string) {
-	// empty ops array
-	Array *result=N(&string->pool());
+void PV(Array/*<Operation>*/ *result, Value *value) {
+	// append OP_VALUE
+	Operation op; op.code=OP_VALUE;
+	*result+=op.cast;
+
+	// append 'value'
+	*result+=value;
+}
+
+void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append 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;
+
+	// append 'vstring'
+	*result+=code_array;
+}
 
-	// append OP_STRING
-	Operation op; op.code=OP_STRING;
-	*result+=reinterpret_cast<Array::Item *>(op.cast);
+Array *VL(Value *value) {
+	// empty ops array
+	Array *result=N(value->pool());
 
-	// append 'string'
-	*result+=string;
+	// append 'value' to 'result'
+	PV(result, value);
 
 	return result;
 }
 
-const String *LA2S(Array *literal_string_array) {
-	return static_cast<const String *>(literal_string_array->get(1));
+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<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));
+	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) {
-	if(pc->sp<MAX_LEXICAL_STATES) {
-		pc->stack[pc->sp++]=pc->ls;  pc->ls=LS_VAR_NAME_SIMPLE;
+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
-		(static_cast<Pool *>(pc->pool))->exception().raise(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
-		(static_cast<Pool *>(pc->pool))->exception().raise(0, 0, 0, 
-			"push_LS: stack underflow");
+		pc.pool->THROW(0, 0, 0, "pop_LS: stack underflow");
 }