--- parser3/src/main/compile_tools.C	2001/02/21 11:13:16	1.4
+++ parser3/src/main/compile_tools.C	2001/02/25 08:12:22	1.14
@@ -1,42 +1,74 @@
 /*
-  $Id: compile_tools.C,v 1.4 2001/02/21 11:13:16 paf Exp $
+  $Id: compile_tools.C,v 1.14 2001/02/25 08:12:22 paf Exp $
 */
 
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "pa_exception.h"
+#include "pa_vstring.h"
 
-Array *L(String *string) {
-	// empty ops array
-	Array *result=N(string->pool());
-
+void PVS(Array/*<op>*/ *result, VString *vstring) {
 	// append OP_STRING
 	Operation op; op.code=OP_STRING;
-	*result+=reinterpret_cast<Array::Item *>(op.cast);
+	*result+=op.cast;
+
+	// append 'vstring'
+	*result+=vstring;
+}
+
+void PCA(Array/*<op>*/ *result, Array/*<op>*/ *code_array) {
+	// append OP_CODE
+	Operation op; op.code=OP_CODE;
+	*result+=op.cast;
 
-	// append 'string'
-	*result+=string;
+	// append 'vstring'
+	*result+=code_array;
+}
+
+
+Array *SL(VString *vstring) {
+	// empty ops array
+	Array *result=N(vstring->pool());
+
+	// append 'vstring' to 'result'
+	PVS(result, vstring);
+
+	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 'vclass'
+	*result+=vclass;
 
 	return result;
 }
 
-const String *LA2S(Array *literal_string_array) {
-	return static_cast<const String *>(literal_string_array->get(1));
+String *SLA2S(Array *literal_string_array, int offset) {
+	Operation op;
+	op.cast=literal_string_array->get(offset+0);
+	if(op.code!=OP_STRING)
+		return 0;
+
+	return static_cast<VString *>(literal_string_array->get(offset+1))->get_string();
 }
 
 
-void push_LS(struct parse_control *pc) {
+void push_LS(struct parse_control *pc, lexical_state new_state) {
 	if(pc->sp<MAX_LEXICAL_STATES) {
-		pc->stack[pc->sp++]=pc->ls;  pc->ls=LS_VAR_NAME_SIMPLE;
+		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");
 }