--- parser3/src/main/compile_tools.C	2001/02/21 11:13:16	1.4
+++ parser3/src/main/compile_tools.C	2002/04/18 11:41:29	1.49
@@ -1,42 +1,69 @@
-/*
-  $Id: compile_tools.C,v 1.4 2001/02/21 11:13:16 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.49 2002/04/18 11:41:29 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"
 
-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 OP_STRING
-	Operation op; op.code=OP_STRING;
-	*result+=reinterpret_cast<Array::Item *>(op.cast);
+	// append 'value'
+	*result+=value;
+}
 
-	// append 'string'
-	*result+=string;
+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;
+}
 
-	return result;
+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 changetail_or_append(Array *opcodes, 
+						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound) {
+	int tail=opcodes->size()-(with_argument?2:1);
+	if(tail>=0) {
+		Operation op;
+		op.cast=opcodes->get(tail);
+		if(op.code==find) {
+			op.code=replace;
+			opcodes->put(tail, op.cast);
+			return;
+		}
+	}
 
-const String *LA2S(Array *literal_string_array) {
-	return static_cast<const String *>(literal_string_array->get(1));
+	Operation op; op.code=notfound;
+	*opcodes+=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.ls_sp<MAX_LEXICAL_STATES) {
+		pc.ls_stack[pc.ls_sp++]=pc.ls;  
+		pc.ls=new_state;
 	} else
-		(static_cast<Pool *>(pc->pool))->exception().raise(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
-		(static_cast<Pool *>(pc->pool))->exception().raise(0, 0, 0, 
-			"push_LS: stack underflow");
+		throw Exception(0, 0, "pop_LS: ls_stack underflow");
 }