--- parser3/src/main/compile.y	2001/04/28 08:30:29	1.127.2.2
+++ parser3/src/main/compile.y	2001/05/21 12:29:51	1.134.2.1
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.127.2.2 2001/04/28 08:30:29 paf Exp $
+	$Id: compile.y,v 1.134.2.1 2001/05/21 12:29:51 parser Exp $
 */
 
 /**
@@ -28,8 +28,6 @@
 #define yyerror(msg)  real_yyerror((parse_control *)pc, msg)
 #define YYPRINT(file, type, value)  yyprint(file, type, value)
 
-#include "pa_config_includes.h"
-
 #include "compile_tools.h"
 #include "pa_value.h"
 #include "pa_request.h"
@@ -40,6 +38,7 @@
 
 #define SELF_ELEMENT_NAME "self"
 #define USE_CONTROL_METHOD_NAME "USE"
+#define END_CONTROL_METHOD_NAME "end"
 
 static int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -86,19 +85,18 @@ static int yylex(YYSTYPE *lvalp, void *p
 %token IS "is"
 
 /* logical */
-%left "is"
-%left "lt" "gt" "le" "ge"
-%left "eq" "ne"
-%left '<' '>' "<=" ">=" "##"
-%left "==" "!="
+%left "##"
 %left "||"
 %left "&&"
-%left "def" "in" "-f" "-d"
+%left '<' '>' "<=" ">="   "lt" "gt" "le" "ge"
+%left "==" "!="  "eq" "ne"
+%left "is" "def" "in" "-f" "-d"
 %left '!'
 
 /* bitwise */
 %left '#'
-%left '&' '|'
+%left '|'
+%left '&' 
 %left '~'
 
 /* numerical */
@@ -125,9 +123,11 @@ one_big_piece: maybe_codes;
 method: control_method | code_method;
 
 control_method: '@' STRING '\n' 
-				control_strings {
+				maybe_control_strings {
 	const String& command=*LA2S($2);
 	YYSTYPE strings_code=$4;
+	if(command==END_CONTROL_METHOD_NAME && strings_code->size()==0)
+		break;
 	if(strings_code->size()<1*2) {
 		strcpy(PC.error, "@");
 		strcat(PC.error, command.cstr());
@@ -153,46 +153,45 @@ control_method: '@' STRING '\n'
 			strcpy(PC.error, "@"CLASS_NAME" must contain sole name");
 			YYERROR;
 		}
-	} else {
-		if(command==USE_CONTROL_METHOD_NAME) {
-			for(int i=0; i<strings_code->size(); i+=2) 
-				PC.request->use_file(
-					PC.request->absolute(*LA2S(strings_code, i)));
-		} else if(command==BASE_NAME) {
-			if(PC.cclass->base()) { // already changed from default?
-				strcpy(PC.error, "class already have a base '");
-				strncat(PC.error, PC.cclass->base()->name().cstr(), 100);
-				strcat(PC.error, "'");
+	} else if(command==USE_CONTROL_METHOD_NAME) {
+		for(int i=0; i<strings_code->size(); i+=2) 
+			PC.request->use_file(
+			PC.request->absolute(*LA2S(strings_code, i)));
+	} else if(command==BASE_NAME) {
+		if(PC.cclass->base()!=&PC.request->OP) { // already changed from default?
+			strcpy(PC.error, "class already have a base '");
+			strncat(PC.error, PC.cclass->base()->name().cstr(), 100);
+			strcat(PC.error, "'");
+			YYERROR;
+		}
+		if(strings_code->size()==1*2) {
+			const String& base_name=*LA2S(strings_code);
+			VClass *base=static_cast<VClass *>(
+				PC.request->classes().get(base_name));
+			if(!base) {
+				strcpy(PC.error, base_name.cstr());
+				strcat(PC.error, ": undefined class in @"BASE_NAME);
 				YYERROR;
 			}
-			if(strings_code->size()==1*2) {
-				const String& base_name=*LA2S(strings_code);
-				VClass *base=static_cast<VClass *>(
-					PC.request->classes().get(base_name));
-				if(!base) {
-					strcpy(PC.error, base_name.cstr());
-					strcat(PC.error, ": undefined class in @"BASE_NAME);
-					YYERROR;
-				}
-				// @CLASS == @BASE sanity check
-				if(PC.cclass==base) {
-					strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME);
-					YYERROR;
-				}
-				PC.cclass->set_base(*base);
-			} else {
-				strcpy(PC.error, "@"BASE_NAME" must contain sole name");
+			// @CLASS == @BASE sanity check
+			if(PC.cclass==base) {
+				strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME);
 				YYERROR;
 			}
+			PC.cclass->set_base(*base);
 		} else {
-			strcpy(PC.error, "'");
-			strncat(PC.error, command.cstr(), MAX_STRING/2);
-			strcat(PC.error, "' invalid special name. valid names are "
-				"'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'");
+			strcpy(PC.error, "@"BASE_NAME" must contain sole name");
 			YYERROR;
 		}
+	} else {
+		strcpy(PC.error, "'");
+		strncat(PC.error, command.cstr(), MAX_STRING/2);
+		strcat(PC.error, "' invalid special name. valid names are "
+			"'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'");
+		YYERROR;
 	}
 };
+maybe_control_strings: empty | control_strings;
 control_strings: control_string | control_strings control_string { $$=$1; P($$, $2) };
 control_string: maybe_string '\n';
 maybe_string: empty | STRING;
@@ -459,7 +458,7 @@ class_prefix: STRING ':' {
 
 /* with */
 
-with: '$' name_without_curly_rdive '{' codes '}' {
+with: '$' name_without_curly_rdive '{' maybe_codes '}' {
 	$$=$2;
 	O($$, OP_CREATE_RWPOOL);
 	P($$, $4);
@@ -1061,7 +1060,7 @@ break2:
 			// strip last \n
 			end--;
 		}
-		if(end!=begin) { // last piece still alive?
+		if(end!=begin && PC.ls!=LS_COMMENT) { // last piece still alive and not comment?
 			// append it
 			PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/);
 		}