--- parser3/src/main/compile_tools.C	2001/02/20 19:21:13	1.2
+++ parser3/src/main/compile_tools.C	2002/03/27 15:30:35	1.46
@@ -1,89 +1,103 @@
-/*
-  $Id: compile_tools.C,v 1.2 2001/02/20 19:21:13 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.46 2002/03/27 15:30:35 paf 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"
 
-void *N(void *apool) {
-	Pool& pool=*static_cast<Pool *>(apool);
-	return new(pool) Array(pool);
-}
+void PV(Array/*<Operation>*/ *result, Value *value) {
+	// append OP_VALUE
+	Operation op; op.code=OP_VALUE;
+	*result+=op.cast;
 
-void A(void **result, enum OPCODE acode) {
-	int code=acode;
-	(*static_cast<Array *>(*result))+=reinterpret_cast<Array::Item *>(code);
+	// append 'value'
+	*result+=value;
 }
 
-void G(void **result, void *param) {
-	(*static_cast<Array *>(*result))+=param;
-}
+void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_CURLY_CODE__STORE_PARAM;
+	*result+=op.cast;
 
-void *L(void *astring) {
-	String *string=static_cast<String *>(astring);
+	// append 'vstring'
+	*result+=code_array;
+}
 
-	// empty ops array
-	void *result=N(&string->pool());
+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 OP_STRING
-	int code=OP_STRING;
-	*(static_cast<Array *>(result))+=reinterpret_cast<Array::Item *>(code);
+	// append 'vstring'
+	*result+=code_array;
+}
 
-	// append 'string'
-	*(static_cast<Array *>(result))+=string;
+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;
 }
 
-void *LS(void *literal) {
-	return const_cast<void *>(static_cast<Array *>(literal)->get(1));
-}
+void PNC(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_NESTED_CODE;
+	*result+=op.cast;
 
-void P(void **result, void *code_array) {
-	(*(static_cast<Array *>(*result))).append_array(*static_cast<Array *>(code_array));
+	// append 'vstring'
+	*result+=code_array;
 }
 
 
+Array *VL(Value *value) {
+	// empty ops array
+	Array *result=N(value->pool());
 
-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;
-	} else
-		(static_cast<Pool *>(pc->pool))->exception().raise(0, 0, 0, 
-			"push_LS: stack overflow");
-}
-void pop_LS(struct 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");
-}
-
-void *string_create(void *apool) {
-	Pool& pool=*static_cast<Pool *>(apool);
-	return new(pool) String(pool);
-}
+	// append 'value' to 'result'
+	PV(result, value);
 
-void real_cstring_append(CSTRING_APPEND_PARAMS) {
-	static_cast<String *>(astring)->APPEND(piece, size, file, line);
+	return result;
 }
 
-char *string_cstr(void *astring) {
-	return static_cast<String *>(astring)->cstr();
+Value *LA2V(Array *literal_string_array, int offset) {
+	Operation op;
+	op.cast=literal_string_array->get(offset+0);
+	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));
+	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(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
+		throw Exception(0, 0, "push_LS: ls_stack overflow");
 }
-
-/* exception */
-
-void exception(void *pool, 
-		void *atype, void *acode,
-		void *aproblem_source, 
-		char *acomment) {
-	static_cast<Pool *>(pool)->exception().raise(
-		static_cast<class String *>(atype), 
-		static_cast<class String *>(acode), 
-		static_cast<class String *>(aproblem_source), 
-		acomment);
+void pop_LS(parse_control& pc) {
+	if(--pc.ls_sp>=0)
+		pc.ls=pc.ls_stack[pc.ls_sp];
+	else
+		throw Exception(0, 0, "pop_LS: ls_stack underflow");
 }