--- parser3/src/main/compile_tools.C	2001/02/20 19:21:13	1.2
+++ parser3/src/main/compile_tools.C	2001/02/22 10:43:45	1.7
@@ -1,89 +1,51 @@
 /*
-  $Id: compile_tools.C,v 1.2 2001/02/20 19:21:13 paf Exp $
+  $Id: compile_tools.C,v 1.7 2001/02/22 10:43:45 paf Exp $
 */
 
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "pa_exception.h"
+#include "pa_vstring.h"
 
-void *N(void *apool) {
-	Pool& pool=*static_cast<Pool *>(apool);
-	return new(pool) Array(pool);
-}
-
-void A(void **result, enum OPCODE acode) {
-	int code=acode;
-	(*static_cast<Array *>(*result))+=reinterpret_cast<Array::Item *>(code);
-}
-
-void G(void **result, void *param) {
-	(*static_cast<Array *>(*result))+=param;
-}
-
-void *L(void *astring) {
-	String *string=static_cast<String *>(astring);
-
+Array *L(String *string) {
 	// empty ops array
-	void *result=N(&string->pool());
+	Array *result=N(string->pool());
 
 	// append OP_STRING
-	int code=OP_STRING;
-	*(static_cast<Array *>(result))+=reinterpret_cast<Array::Item *>(code);
+	Operation op; op.code=OP_STRING;
+	*result+=op.cast;
 
 	// append 'string'
-	*(static_cast<Array *>(result))+=string;
+	*result+=string;
 
 	return result;
 }
 
-void *LS(void *literal) {
-	return const_cast<void *>(static_cast<Array *>(literal)->get(1));
+String *LA2S(Array *literal_string_array, int offset) {
+	return static_cast<String *>(literal_string_array->get(offset+1));
 }
+Array *LAS2LAVS(Array *literal_array) {
+	Operation op; op.code=OP_VSTRING;
+	literal_array->put(0, op.cast);
 
-void P(void **result, void *code_array) {
-	(*(static_cast<Array *>(*result))).append_array(*static_cast<Array *>(code_array));
-}
+	Value *value=new(literal_array->pool()) 
+		VString(static_cast<String *>(literal_array->get(1)));
+	literal_array->put(1, value);
 
+	return literal_array;
+}
 
 
-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");
-}
-
-void *string_create(void *apool) {
-	Pool& pool=*static_cast<Pool *>(apool);
-	return new(pool) String(pool);
-}
-
-void real_cstring_append(CSTRING_APPEND_PARAMS) {
-	static_cast<String *>(astring)->APPEND(piece, size, file, line);
-}
-
-char *string_cstr(void *astring) {
-	return static_cast<String *>(astring)->cstr();
-}
-
-/* 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);
+		pc->pool->THROW(0, 0, 0, "push_LS: stack underflow");
 }