--- parser3/src/main/compile.y	2003/04/03 12:40:53	1.204.2.8.2.13
+++ parser3/src/main/compile.y	2003/04/04 06:33:27	1.204.2.8.2.15
@@ -5,7 +5,7 @@
 	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.204.2.8.2.13 2003/04/03 12:40:53 paf Exp $
+	$Id: compile.y,v 1.204.2.8.2.15 2003/04/04 06:33:27 paf Exp $
 */
 
 /**
@@ -138,7 +138,7 @@ control_method: '@' STRING '\n'
 				maybe_control_strings {
 	const String& command=*LA2S(*$2);
 	YYSTYPE strings_code=$4;
-	if(strings_code->count()<1*2) {
+	if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) {
 		strcpy(PC.error, "@");
 		strcat(PC.error, command.cstr());
 		strcat(PC.error, " is empty");
@@ -151,7 +151,7 @@ control_method: '@' STRING '\n'
 			strcat(PC.error, "'");
 			YYERROR;
 		}
-		if(strings_code->count()==1*2) {
+		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			// new class' name
 			const String& name=*LA2S(*strings_code);
 			// creating the class
@@ -161,11 +161,11 @@ control_method: '@' STRING '\n'
 			// append to request's classes
 			PC.request.classes().put(name, cclass);
 		} else {
-			strcpy(PC.error, "@"CLASS_NAME" must contain sole name");
+			strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)");
 			YYERROR;
 		}
 	} else if(command==USE_CONTROL_METHOD_NAME) {
-		for(size_t i=0; i<strings_code->count(); i+=2) 
+		for(size_t i=0; i<strings_code->count(); i+=OPERATIONS_PER_OPVALUE) 
 			PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i));
 	} else if(command==BASE_NAME) {
 		if(PC.cclass->base_class()) { // already changed from default?
@@ -174,7 +174,7 @@ control_method: '@' STRING '\n'
 			strcat(PC.error, "'");
 			YYERROR;
 		}
-		if(strings_code->count()==1*2) {
+		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			const String& base_name=*LA2S(*strings_code);
 			if(Value* base_class_value=PC.request.classes().get(base_name)) {
 				// @CLASS == @BASE sanity check
@@ -219,7 +219,7 @@ code_method: '@' STRING bracketed_maybe_
 	ArrayString* params_names=0;
 	if(int size=params_names_code->count()) {
 		params_names=new ArrayString;
-		for(int i=0; i<size; i+=2)
+		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE)
 			*params_names+=LA2S(*params_names_code, i);
 	}
 
@@ -227,7 +227,7 @@ code_method: '@' STRING bracketed_maybe_
 	ArrayString* locals_names=0;
 	if(int size=locals_names_code->count()) {
 		locals_names=new ArrayString;
-		for(int i=0; i<size; i+=2)
+		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE)
 			*locals_names+=LA2S(*locals_names_code, i);
 	}
 
@@ -275,19 +275,19 @@ name_without_curly_rdive_read: name_with
 	ArrayOperation* diving_code=$1;
 	const String* first_name=LA2S(*diving_code);
 	// self.xxx... -> xxx...
-	// OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
+	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
-		O(*$$, OP_WITH_SELF); /* stack: starting context */
-		P(*$$, *diving_code, 
+		O(*yyval, OP_WITH_SELF); /* stack: starting context */
+		P(*yyval, *diving_code, 
 			/* skip over... */
-			diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/);
+			diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/);
 	} else {
-		O(*$$, OP_WITH_READ); /* stack: starting context */
+		O(*yyval, OP_WITH_READ); /* stack: starting context */
 
 		// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
-		// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR.
-		if(PC.in_call_value && diving_code->count()==3)
-			diving_code->put(2, OP_GET_ELEMENT_OR_OPERATOR);
+		// OP_VALUE+origin+string+OP_GET_ELEMENT. -> OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR.
+		if(PC.in_call_value && diving_code->count()==4)
+			diving_code->put(4-1, OP_GET_ELEMENT_OR_OPERATOR);
 		P(*$$, *diving_code);
 	}
 	/* diving code; stack: current context */
@@ -310,12 +310,12 @@ name_expr_wdive_root: name_expr_dive_cod
 	ArrayOperation* diving_code=$1;
 	const String* first_name=LA2S(*diving_code);
 	// $self.xxx... -> $xxx...
-	// OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
+	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
 		O(*$$, OP_WITH_SELF); /* stack: starting context */
 		P(*$$, *diving_code, 
 			/* skip over... */
-			diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/);
+			diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/);
 	} else {
 		O(*$$, OP_WITH_ROOT); /* stack: starting context */
 		P(*$$, *diving_code);
@@ -386,8 +386,8 @@ call_value: '^' {
 	$$=$3; /* with_xxx,diving code; stack: context,method_junction */
 
 	YYSTYPE params_code=$5;
-	if(params_code->count()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM]
-		if(Value* value=LA2V(*params_code)) // it is OP_VALUE + value?
+	if(params_code->count()==4) { // probably [] case. [OP_VALUE+origin+Void+STORE_PARAM]
+		if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value?
 			if(!value->is_defined()) // value is VVoid?
 				params_code=0; // ^zzz[] case. don't append lone empty param.
 	}
@@ -1326,7 +1326,7 @@ break2:
 		}
 	}
 	if(!pc.string.is_empty()) { // something accumulated?
-		// create STRING value: array of OP_VALUE+vstring
+		// create STRING value: array of OP_VALUE+origin+vstring
  		*lvalp=VL(
 			new VString(*new String(pc.string, String::L_CLEAN)),
 			pc.file_no, pc.string_start.line, pc.string_start.col);