--- parser3/src/main/compile.y	2001/05/07 07:46:43	1.130
+++ parser3/src/main/compile.y	2001/06/28 07:41:59	1.143
@@ -5,8 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.130 2001/05/07 07:46:43 paf Exp $
+	$Id: compile.y,v 1.143 2001/06/28 07:41:59 parser Exp $
 */
+static char *RCSId="$Id: compile.y,v 1.143 2001/06/28 07:41:59 parser Exp $"; 
 
 /**
 	@todo parser4: 
@@ -28,15 +29,13 @@
 #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"
 #include "pa_vobject.h"
 #include "pa_vdouble.h"
 #include "pa_globals.h"
-#include "pa_vunknown.h"
+#include "pa_vvoid.h"
 
 #define SELF_ELEMENT_NAME "self"
 #define USE_CONTROL_METHOD_NAME "USE"
@@ -87,19 +86,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 */
@@ -126,7 +124,7 @@ 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)
@@ -138,7 +136,7 @@ control_method: '@' STRING '\n'
 		YYERROR;
 	}
 	if(command==CLASS_NAME) {
-		if(PC.cclass!=&PC.request->OP) { // already changed from default?
+		if(PC.cclass) { // already changed from default?
 			strcpy(PC.error, "class already have a name '");
 			strncat(PC.error, PC.cclass->name().cstr(), 100);
 			strcat(PC.error, "'");
@@ -161,7 +159,7 @@ control_method: '@' STRING '\n'
 			PC.request->use_file(
 			PC.request->absolute(*LA2S(strings_code, i)));
 	} else if(command==BASE_NAME) {
-		if(PC.cclass->base()) { // already changed from default?
+		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, "'");
@@ -194,6 +192,7 @@ control_method: '@' STRING '\n'
 		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;
@@ -346,9 +345,9 @@ call_value: '^' call_name store_params E
 	O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
 
 	YYSTYPE params_code=$3;
-	if(params_code->size()==3) // probably [] case. [OP_VALUE + Unknown + STORE_PARAM]
+	if(params_code->size()==3) // probably [] case. [OP_VALUE + Void + STORE_PARAM]
 		if(Value *value=LA2V(params_code)) // it is OP_VALUE + value?
-			if(!value->is_defined()) // value is VUnknown?
+			if(!value->is_defined()) // value is VVoid?
 				params_code=0; // ^zzz[] case. don't append lone empty param.
 	if(params_code)
 		P($$, params_code); // filling method_frame.store_params
@@ -460,7 +459,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);
@@ -529,7 +528,7 @@ write_string: STRING {
 	change_string_literal_to_write_string_literal($$=$1)
 };
 
-unknown_value: /* empty */ { $$=VL(NEW VUnknown(POOL)) };
+unknown_value: /* empty */ { $$=VL(NEW VVoid(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -859,6 +858,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 		// VARIABLE GET/PUT/WITH
 		case LS_VAR_NAME_SIMPLE:
 		case LS_EXPRESSION_VAR_NAME:
+		case LS_VAR_NAME_NO_COLON:
 			if(PC.ls==LS_EXPRESSION_VAR_NAME) {
 				// name in expr ends also before binary operators 
 				switch(c) {
@@ -869,18 +869,30 @@ static int yylex(YYSTYPE *lvalp, void *p
 					goto break2;
 				}
 			}
+			if(PC.ls==LS_VAR_NAME_NO_COLON) {
+				// name already has ':', stop before next 
+				switch(c) {
+				case ':': 
+					pop_LS(PC);
+					PC.source--;  if(--PC.col<0) { PC.line--;  PC.col=-1; }
+					result=EON;
+					goto break2;
+				}
+			}
 			switch(c) {
 			case 0:
 			case ' ': case '\t': case '\n':
 			case ';':
 			case ']': case '}': case ')': 
 			case '"': case '\'':
-			case '<': case '>':  // these stand for HTML brackets and expression binary ops
+			case '<': case '>':  // these stand for HTML brackets AND expression binary ops
 			case '+': case '*': case '/': case '%': 
 			case '&': case '|': 
 			case '=': case '!':
 			// common delimiters
 			case ',':
+			// before call
+			case '^': 
 				pop_LS(PC);
 				PC.source--;  if(--PC.col<0) { PC.line--;  PC.col=-1; }
 				result=EON;
@@ -905,6 +917,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 			case '.': // name part delim
 			case '$': // name part subvar
 			case ':': // ':name' or 'class:name'
+				PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':'
 				RC;
 			}
 			break;
@@ -1061,8 +1074,10 @@ break2:
 		if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF?
 			// strip last \n
 			end--;
+			if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME
+				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*/);
 		}