--- parser3/src/main/compile_tools.C	2001/02/21 06:21:19	1.3
+++ parser3/src/main/compile_tools.C	2001/02/21 15:00:02	1.5
@@ -1,5 +1,5 @@
 /*
-  $Id: compile_tools.C,v 1.3 2001/02/21 06:21:19 paf Exp $
+  $Id: compile_tools.C,v 1.5 2001/02/21 15:00:02 paf Exp $
 */
 
 #include "compile_tools.h"
@@ -9,7 +9,7 @@
 
 Array *L(String *string) {
 	// empty ops array
-	Array *result=N(&string->pool());
+	Array *result=N(string->pool());
 
 	// append OP_STRING
 	Operation op; op.code=OP_STRING;
@@ -21,14 +21,14 @@ Array *L(String *string) {
 	return result;
 }
 
-const String *LA2S(Array *literal_string_array) {
-	return static_cast<const String *>(literal_string_array->get(1));
+String *LA2S(Array *literal_string_array, int offset) {
+	return static_cast<String *>(literal_string_array->get(offset+1));
 }
 
 
-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");