--- parser3/src/main/compile_tools.C	2001/06/28 07:41:59	1.35
+++ parser3/src/main/compile_tools.C	2002/02/08 07:27:46	1.44
@@ -1,13 +1,11 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	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 $
+	$Id: compile_tools.C,v 1.44 2002/02/08 07:27:46 paf 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"
@@ -43,6 +41,25 @@ void PEA(Array/*<Operation>*/ *result, A
 	*result+=code_array;
 }
 
+void CCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_CURLY_CODE__CONSTRUCT;
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=code_array;
+}
+
+void PNC(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_NESTED_CODE;
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=code_array;
+}
+
+
 Array *VL(Value *value) {
 	// empty ops array
 	Array *result=N(value->pool());
@@ -56,10 +73,9 @@ Array *VL(Value *value) {
 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));
+	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) {
@@ -73,14 +89,15 @@ void change_string_literal_to_write_stri
 }
 
 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;
+	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, 0, "push_LS: ls_stack overflow");
 }
 void pop_LS(parse_control& pc) {
-	if(--pc.sp>=0)
-		pc.ls=pc.stack[pc.sp];
+	if(--pc.ls_sp>=0)
+		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		pc.pool->THROW(0, 0, 0, "pop_LS: stack underflow");
+		throw Exception(0, 0, 0, "pop_LS: ls_stack underflow");
 }