--- parser3/src/main/compile_tools.C	2001/02/22 09:14:46	1.6
+++ parser3/src/main/compile_tools.C	2001/03/08 09:31:47	1.18
@@ -1,5 +1,5 @@
 /*
-  $Id: compile_tools.C,v 1.6 2001/02/22 09:14:46 paf Exp $
+  $Id: compile_tools.C,v 1.18 2001/03/08 09:31:47 paf Exp $
 */
 
 #include "compile_tools.h"
@@ -7,33 +7,64 @@
 #include "pa_array.h"
 #include "pa_exception.h"
 #include "pa_vstring.h"
+#include "pa_vdouble.h"
 
-Array *L(String *string) {
+void PV(Array/*<op>*/ *result, Value *value) {
+	// append OP_VALUE
+	Operation op; op.code=OP_VALUE;
+	*result+=op.cast;
+
+	// append 'value'
+	*result+=value;
+}
+
+void PCA(Array/*<op>*/ *result, Array/*<op>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_CODE__STORE_PARAM;
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=code_array;
+}
+
+
+Array *VL(Value *value) {
 	// empty ops array
-	Array *result=N(string->pool());
+	Array *result=N(value->pool());
+
+	// append 'value' to 'result'
+	PV(result, value);
 
-	// append OP_STRING
-	Operation op; op.code=OP_STRING;
+	return result;
+}
+Array *CL(VClass *vclass) {
+	// empty ops array
+	Array *result=N(vclass->pool());
+
+	// append OP_CLASS
+	Operation op; op.code=OP_CLASS;
 	*result+=op.cast;
 
-	// append 'string'
-	*result+=string;
+	// append 'vclass'
+	*result+=vclass;
 
 	return result;
 }
 
-String *LA2S(Array *literal_string_array, int offset) {
-	return static_cast<String *>(literal_string_array->get(offset+1));
+String *SLA2S(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<VString *>(literal_string_array->get(offset+1))->get_string();
 }
-Array *LAS2LAVS(Array *literal_array) {
-	Operation op; op.code=OP_VSTRING;
-	literal_array->put(0, op.cast);
-
-	Value *value=new(literal_array->pool()) 
-		VString(static_cast<String *>(literal_array->get(1)));
-	literal_array->put(1, value);
 
-	return literal_array;
+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);
 }
 
 
@@ -41,13 +72,11 @@ void push_LS(struct parse_control *pc, l
 	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];
 	else
-		(static_cast<Pool *>(pc->pool))->exception().raise(0, 0, 0, 
-			"push_LS: stack underflow");
+		pc->pool->THROW(0, 0, 0, "push_LS: stack underflow");
 }