--- parser3/src/main/compile.y	2001/03/06 13:07:03	1.51
+++ parser3/src/main/compile.y	2001/03/07 11:14:12	1.67
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.51 2001/03/06 13:07:03 paf Exp $
+  $Id: compile.y,v 1.67 2001/03/07 11:14:12 paf Exp $
 */
 
 %{
@@ -19,6 +19,7 @@
 #include "pa_value.h"
 #include "pa_request.h"
 #include "pa_vobject.h"
+#include "pa_vdouble.h"
 
 #define SELF_NAME "self"
 #define USES_NAME "USES"
@@ -40,7 +41,48 @@ int yylex(YYSTYPE *lvalp, void *pc);
 %token EON
 %token STRING
 %token BOGUS
-%token LOGICAL_AND LOGICAL_OR
+
+%token BAD_STRING_COMPARISON_OPERATOR
+
+%token LAND "&&"
+%token LOR "||"
+%token LXOR "##"
+
+%token NLE "<="
+%token NGE ">="
+%token NEQ "=="
+%token NNE "!="
+
+%token SLT "lt"
+%token SGT "gt"
+%token SLE "le"
+%token SGE "ge"
+%token SEQ "eq"
+%token SNE "ne"
+
+%token DEF "def"
+%token IN "in"
+%token FEXISTS "-f"
+
+/* logical */
+%left "lt" "gt" "le" "ge"
+%left "eq" "ne"
+%left '<' '>' "<=" ">=" "##"
+%left "==" "!="
+%left "||"
+%left "&&"
+%left "def" "in" "-f"
+%left NOT     /* not: unary ! */
+
+/* bitwise */
+%left '#'
+%left '&' '|'
+%left INV     /* invertion: unary ~ */
+
+/* numerical */
+%left '-' '+'
+%left '*' '/' '%'
+%left NEG     /* negation: unary - */
 
 %%
 
@@ -149,11 +191,12 @@ action: get | put | with | call;
 
 /* get */
 
-get: '$' get_name {
-	$$=$2; /* stack: resulting value */
-	OP($$, OP_WRITE); /* value=pop; write(value) */
+get: get_value {
+	$$=$1; /* stack: resulting value */
+	O($$, OP_WRITE); /* value=pop; wcontext.write(value) */
 };
-get_name: name_without_curly_rdive EON | name_in_curly_rdive;
+get_value: '$' get_name_value { $$=$2 }
+get_name_value: name_without_curly_rdive EON | name_in_curly_rdive;
 name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 };
 name_without_curly_rdive: 
 	name_without_curly_rdive_read 
@@ -164,19 +207,19 @@ name_without_curly_rdive_read: name_with
 	Array *diving_code=$1;
 	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
-		OP($$, OP_WITH_SELF); /* stack: starting context */
+		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
 			/* skip over... */
 			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
 	} else {
-		OP($$, OP_WITH_READ); /* stack: starting context */
+		O($$, OP_WITH_READ); /* stack: starting context */
 		P($$, diving_code);
 	}
 	/* diving code; stack: current context */
 };
 name_without_curly_rdive_root: ':' name_without_curly_rdive_code {
 	$$=N(POOL); 
-	OP($$, OP_WITH_ROOT); /* stack: starting context */
+	O($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: current context */
 };
 name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P($$, $2) };
@@ -184,10 +227,10 @@ name_without_curly_rdive_code: name_adva
 
 /* put */
 
-put: '$' name_expr_wdive '[' constructor_value ']' {
+put: '$' name_expr_wdive constructor_value {
 	$$=$2; /* stack: context,name */
-	P($$, $4); /* stack: context,name,constructor_value */
-	OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+	P($$, $3); /* stack: context,name,constructor_value */
+	O($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 };
 name_expr_wdive: 
 	name_expr_wdive_write
@@ -198,44 +241,52 @@ name_expr_wdive_write: name_expr_dive_co
 	Array *diving_code=$1;
 	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
-		OP($$, OP_WITH_SELF); /* stack: starting context */
+		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
 			/* skip over... */
 			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
 	} else {
-		OP($$, OP_WITH_WRITE); /* stack: starting context */
+		O($$, OP_WITH_WRITE); /* stack: starting context */
 		P($$, diving_code);
 	}
 	/* diving code; stack: current context */
 };
 name_expr_wdive_root: ':' name_expr_dive_code {
 	$$=N(POOL); 
-	OP($$, OP_WITH_ROOT); /* stack: starting context */
+	O($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,name */
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
 constructor_value: 
-	empty_value /* optimized $var() case */
-|	STRING /* optimized $var(STRING) case */
-|	complex_constructor_param_value /* $var(something complex) */
+	'[' any_constructor_code_value ']' { $$=$2 }
+|	'(' any_expr ')' { $$=$2 }
+;
+any_constructor_code_value: 
+	empty_string_value /* optimized $var[] case */
+|	STRING /* optimized $var[STRING] case */
+|	constructor_code_value /* $var[something complex] */
 ;
-complex_constructor_param_value: complex_constructor_param_body {
+constructor_code_value: constructor_code {
 	$$=N(POOL); 
-	OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */
+	O($$, OP_CREATE_EWPOOL); /* stack: empty write context */
 	P($$, $1); /* some codes to that context */
-	OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
+	O($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
 };
-complex_constructor_param_body: codes__excluding_sole_str_literal;
+constructor_code: codes__excluding_sole_str_literal;
 codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) };
 
 /* call */
 
-call: '^' call_name store_params EON { /* ^field.$method{vasya} */
+call: call_value {
+	$$=$1; /* stack: value */
+	O($$, OP_WRITE); /* value=pop; wcontext.write(value) */
+};
+call_value: '^' call_name store_params EON { /* ^field.$method{vasya} */
 	$$=$2; /* with_xxx,diving code; stack: context,method_junction */
-	OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
+	O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
 	P($$, $3); /* filling method_frame.store_params */
-	OP($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */
+	O($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value */
 };
 
 call_name: name_without_curly_rdive;
@@ -250,17 +301,17 @@ store_param_parts:
 store_curly_param: '{' maybe_codes '}' {
 	$$=N(POOL); 
 	PCA($$, $2);
-	OP($$, OP_STORE_PARAM);
+	O($$, OP_STORE_PARAM);
 };
 store_param_part: 
 	empty /* optimized () case */
 |	STRING { /* optimized (STRING) case */
 	$$=$1;
-	OP($$, OP_STORE_PARAM);
+	O($$, OP_STORE_PARAM);
 }
-|	complex_constructor_param_value { /* (something complex) */
+|	constructor_code_value { /* (something complex) */
 	$$=$1;
-	OP($$, OP_STORE_PARAM);
+	O($$, OP_STORE_PARAM);
 }
 ;
 
@@ -273,12 +324,12 @@ name_step: name_advance1 '.';
 name_advance1: name_expr_value {
 	/* stack: context */
 	$$=$1; /* stack: context,name */
-	OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 };
 name_advance2: name_expr_value {
 	/* stack: context */
 	$$=$1; /* stack: context,name */
-	OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 }
 |	STRING BOGUS
 ;
@@ -289,31 +340,31 @@ name_expr_value:
 ;
 name_expr_subvar_value: '$' subvar_ref_name_rdive {
 	$$=$2;
-	OP($$, OP_GET_ELEMENT);
+	O($$, OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
 	$$=N(POOL); 
-	OP($$, OP_CREATE_EWPOOL);
+	O($$, OP_CREATE_EWPOOL);
 	P($$, $1);
-	OP($$, OP_WRITE);
+	O($$, OP_WRITE);
 	P($$, $2);
-	OP($$, OP_REDUCE_EWPOOL);
+	O($$, OP_REDUCE_EWPOOL);
 };
 subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root;
 subvar_ref_name_rdive_read: STRING {
 	$$=N(POOL); 
-	OP($$, OP_WITH_READ);
+	O($$, OP_WITH_READ);
 	P($$, $1);
 };
 subvar_ref_name_rdive_root: ':' STRING {
 	$$=N(POOL); 
-	OP($$, OP_WITH_ROOT);
+	O($$, OP_WITH_ROOT);
 	P($$, $2);
 };
 subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) };
 subvar__get_write: '$' subvar_ref_name_rdive {
 	$$=$2;
-	OP($$, OP_GET_ELEMENT__WRITE);
+	O($$, OP_GET_ELEMENT__WRITE);
 };
 
 class_prefix: STRING ':' {
@@ -334,24 +385,78 @@ class_prefix: STRING ':' {
 
 with: '$' name_without_curly_rdive '{' codes '}' {
 	$$=$2;
-	OP($$, OP_CREATE_RWPOOL);
+	O($$, OP_CREATE_RWPOOL);
 	P($$, $4);
-	OP($$, OP_REDUCE_RWPOOL);
-	OP($$, OP_WRITE);
+	O($$, OP_REDUCE_RWPOOL);
+	O($$, OP_WRITE);
+};
+
+/* expr */
+
+any_expr:
+	empty_double_value /* optimized $var() case */
+|	optimized_expr /* $var(something) */
+;
+optimized_expr: expr {
+	if(($$=$1)->size()==2) { // only one string literal in there?
+		change_string_literal_to_double_literal($$); // make that string literal Double
+	}
+};
+expr: 
+	STRING
+|	get_value
+|	call_value
+|	'"' string_inside_quotes_value '"' { $$ = $2; }
+|	'(' expr ')' { $$ = $2; }
+/* stack: operand // stack: @operand */
+|	'-' expr %prec NEG { $$=$2;  O($$, OP_NEG) }
+|	'~' expr %prec INV { $$=$2;	 O($$, OP_INV) }
+|	'!' expr %prec NOT { $$=$2;  O($$, OP_NOT) }
+|	"def" expr %prec DEF { $$=$2;  O($$, OP_DEF) }
+|	"in" expr %prec IN { $$=$2;  O($$, OP_IN) }
+|	"-f" expr %prec FEXISTS { $$=$2;  O($$, OP_FEXISTS) }
+/* stack: a,b // stack: a@b */
+|	expr '-' expr {	$$=$1;  P($$, $3);  O($$, OP_SUB) }
+|	expr '+' expr { $$=$1;  P($$, $3);  O($$, OP_ADD) }
+|	expr '*' expr { $$=$1;  P($$, $3);  O($$, OP_MUL) }
+|	expr '/' expr { $$=$1;  P($$, $3);  O($$, OP_DIV) }
+|	expr '%' expr { $$=$1;  P($$, $3);  O($$, OP_MOD) }
+|	expr '&' expr { $$=$1; 	P($$, $3);  O($$, OP_BIN_AND) }
+|	expr '|' expr { $$=$1;  P($$, $3);  O($$, OP_BIN_OR) }
+|	expr '#' expr { $$=$1;  P($$, $3);  O($$, OP_BIN_XOR) }
+|	expr "&&" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_AND) }
+|	expr "||" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_OR) }
+|	expr "##" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_XOR) }
+|	expr '<' expr { $$=$1;  P($$, $3);  O($$, OP_NUM_LT) }
+|	expr '>' expr { $$=$1;  P($$, $3);  O($$, OP_NUM_GT) }
+|	expr "<=" expr { $$=$1;  P($$, $3);  O($$, OP_NUM_LE) }
+|	expr ">=" expr { $$=$1;  P($$, $3);  O($$, OP_NUM_GE) }
+|	expr "==" expr { $$=$1;  P($$, $3);  O($$, OP_NUM_EQ) }
+|	expr "!=" expr { $$=$1;  P($$, $3);  O($$, OP_NUM_NE) }
+|	expr "lt" expr { $$=$1;  P($$, $3);  O($$, OP_STR_LT) }
+|	expr "gt" expr { $$=$1;  P($$, $3);  O($$, OP_STR_GT) }
+|	expr "le" expr { $$=$1;  P($$, $3);  O($$, OP_STR_LE) }
+|	expr "ge" expr { $$=$1;  P($$, $3);  O($$, OP_STR_GE) }
+|	expr "eq" expr { $$=$1;  P($$, $3);  O($$, OP_STR_EQ) }
+|	expr "ne" expr { $$=$1;  P($$, $3);  O($$, OP_STR_NE) }
+;
+
+string_inside_quotes_value: maybe_codes {
+	$$=N(POOL);
+	O($$, OP_CREATE_SWPOOL); /* stack: empty write context */
+	P($$, $1); /* some code that write to that context */
+	O($$, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */
 };
 
 /* basics */
 
 write_str_literal: STRING {
-	if(SLA2S($1)->size()) {
-		$$=$1;
-		OP($$, OP_WRITE);
-	} else {
-		// optimized case of special end of macro. see yylex
-		$$=N(POOL);
-	}
+	$$=$1;
+	O($$, OP_WRITE);
 };
-empty_value: /* empty */ { $$=SL(NEW VString(POOL)) };
+
+empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL)) };
+empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -388,6 +493,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 	char *begin=PC->source;
 	char *end;
 	int begin_line=PC->line;
+	int skip_analized=0;
 	while(true) {
 		c=*(end=(PC->source++));
 
@@ -408,7 +514,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 					// append piece till ^
 					PC->string->APPEND(begin, end-begin, PC->file, begin_line);
 				}
-				// reset piece 'start' position & line
+				// reset piece 'begin' position & line
 				begin=PC->source; // ^
 				begin_line=PC->line;
 				// skip over ^ and _
@@ -524,33 +630,82 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			case '(':
 				lexical_brackets_nestage++;
 				RC;
-			case '+': case '-': case '*': case '/': case '%': 
-			case '&': case '|': 
-			case '<': case '>': case '=': case '!':
+			case '-':
+				if(*PC->source=='f') { // -f
+					skip_analized=1;
+					result=FEXISTS;
+				} else
+					result=c;
+				goto break2;
+			case '+': case '*': case '/': case '%': 
+			case '~':
 			case ';':
 				RC;
+			case '&': case '|':  case '#':
+				if(*PC->source==c) { // && ||
+					result=c=='#'?LXOR:c=='&'?LAND:LOR;
+					skip_analized=1;
+				} else
+					result=c;
+				goto break2;
+			case '<': case '>': case '=': case '!': 
+				if(*PC->source=='=') { // <= >= == !=
+					skip_analized=1;
+					switch(c) {
+					case '<': result=NLE; break;
+					case '>': result=NGE; break;
+					case '=': result=NEQ; break;
+					case '!': result=NNE; break;
+					}
+				} else
+					result=c;
+				goto break2;
 			case '"':
 				push_LS(PC, LS_EXPRESSION_STRING);
 				RC;
 			case 'l': case 'g': case 'e': case 'n':
 				if(end==begin) // right after whitespace
-					switch(char next_c=*PC->source) {
+					switch(*PC->source) {
 //					case '?': // ok [and bad cases, yacc would bark at them]
 					case 't': // lt gt [et nt]
+						result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR;
+						skip_analized=1;
+						goto break2;
 					case 'e': // le ge ne [ee]
+						result=c=='l'?SLE:c=='g'?SGE:c=='n'?SNE:BAD_STRING_COMPARISON_OPERATOR;
+						skip_analized=1;
+						goto break2;
 					case 'q': // eq [lq gq nq]
-						PC->source++;  PC->col++;
-						PC->pending_state=next_c;
-						return c;
+						result=c=='e'?SEQ:BAD_STRING_COMPARISON_OPERATOR;
+						skip_analized=1;
+						goto break2;
+					}
+				break;
+			case 'i':
+				if(end==begin) // right after whitespace
+					if(PC->source[0]=='n') { // in
+						skip_analized=1;
+						result=IN;
+						goto break2;
+					}
+				break;
+			case 'd':
+				if(end==begin) // right after whitespace
+					if(PC->source[0]=='e' && PC->source[1]=='f') { // def
+						skip_analized=2;
+						result=DEF;
+						goto break2;
 					}
 				break;
 			case ' ': case '\t': case '\n':
-				if(end!=begin) {
-					// append piece till whitespace
-					PC->string->APPEND(begin, end-begin, PC->file, begin_line);
+				if(end!=begin) { // there were a string after previous operator?
+					result=0; // return that string
+					goto break2;
 				}
-				// reset piece 'start' position & line
-				begin=PC->source; // after whitespace
+				// that's a leading|traling space or after-operator-space
+				// ignoring it
+				// reset piece 'begin' position & line
+				begin=PC->source; // after whitespace char
 				begin_line=PC->line;
 				continue;
 			}
@@ -560,7 +715,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 		case LS_VAR_NAME_SIMPLE:
 		case LS_VAR_NAME_IN_EXPRESSION:
 			if(PC->ls==LS_VAR_NAME_IN_EXPRESSION) {
-				// name in expression ends also before binary operators 
+				// name in expr ends also before binary operators 
 				switch(c) {
 				case '+': case '-': case '*': case '/': case '%': 
 				case '&': case '|': 
@@ -575,7 +730,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			case 0:
 			case ' ': case '\t': case '\n':
 			case ';':
-			case ']': case '}':
+			case ']': case '}': case ')': case '"':
 				pop_LS(PC);
 				PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 				result=EON;
@@ -741,24 +896,28 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 	}
 
 break2:
-	if(begin==end)
-		return result;
-	else {
-		PC->pending_state=result;
-		// strip last \n before LS_DEF_NAME or EOF
-		if((c=='@' || c==0) && end[-1]=='\n')
+	if(end!=begin) { // there is last piece?
+		if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF?
+			// strip last \n
 			end--;
-		if(end!=begin) {
-			// append last piece
+		}
+		if(end!=begin) { // last piece still alive?
+			// append it
 			PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
 		}
+	}
+	if(PC->string->size()) { // something accumulated?
 		// create STRING value: array of OP_VALUE+vstring
-		*lvalp=SL(NEW VString(*PC->string));
+		*lvalp=VL(NEW VString(*PC->string));
 		// new pieces storage
 		PC->string=NEW String(POOL);
-		// go!
-		return STRING;
+		// make current result be pending for next call, return STRING for now
+		PC->pending_state=result;  result=STRING;
+	}
+	if(skip_analized) {
+		PC->source+=skip_analized;  PC->col+=skip_analized;
 	}
+	return result;
 }
 
 int real_yyerror(parse_control *pc, char *s)  /* Called by yyparse on error */