--- parser3/src/main/compile.y	2001/07/25 10:12:13	1.150
+++ parser3/src/main/compile.y	2001/08/20 13:22:05	1.163
@@ -6,7 +6,7 @@
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
 %{
-static char *RCSId="$Id: compile.y,v 1.150 2001/07/25 10:12:13 parser Exp $"; 
+static char *RCSId="$Id: compile.y,v 1.163 2001/08/20 13:22:05 parser Exp $"; 
 
 /**
 	@todo parser4: 
@@ -103,7 +103,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 %left NEG     /* negation: unary - */
 
 %%
-all:
+all: 
 	one_big_piece {
 	Method& method=*NEW Method(POOL, 
 		*main_method_name, 
@@ -151,8 +151,7 @@ control_method: '@' STRING '\n'
 		}
 	} 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)));
+			PC.request->use_file(*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 '");
@@ -242,12 +241,11 @@ get: get_value {
 	$$=$1; /* stack: resulting value */
 	O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 };
-get_value: '$' get_name_value { $$=$2 }
+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 
-|	name_without_curly_rdive_root
 |	name_without_curly_rdive_class;
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=N(POOL); 
@@ -264,11 +262,6 @@ name_without_curly_rdive_read: name_with
 	}
 	/* diving code; stack: current context */
 };
-name_without_curly_rdive_root: ':' name_without_curly_rdive_code {
-	$$=N(POOL); 
-	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) };
 name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) };
 
@@ -279,10 +272,10 @@ put: '$' name_expr_wdive construct {
 	P($$, $3); /* stack: context,name,constructor_value */
 };
 name_expr_wdive: 
-	name_expr_wdive_write
-|	name_expr_wdive_root
+	name_expr_wdive_root
+|	name_expr_wdive_write
 |	name_expr_wdive_class;
-name_expr_wdive_write: name_expr_dive_code {
+name_expr_wdive_root: name_expr_dive_code {
 	$$=N(POOL);
 	Array *diving_code=$1;
 	const String *first_name=LA2S(diving_code);
@@ -292,22 +285,22 @@ name_expr_wdive_write: name_expr_dive_co
 			/* skip over... */
 			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
 	} else {
-		O($$, OP_WITH_WRITE); /* stack: starting context */
+		O($$, OP_WITH_ROOT); /* stack: starting context */
 		P($$, diving_code);
 	}
 	/* diving code; stack: current context */
 };
-name_expr_wdive_root: ':' name_expr_dive_code {
+name_expr_wdive_write: '.' name_expr_dive_code {
 	$$=N(POOL); 
-	O($$, OP_WITH_ROOT); /* stack: starting context */
+	O($$, OP_WITH_WRITE); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,name */
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
 construct: 
-	construct_square | 
-	construct_round |
-	construct_curly
+	construct_square
+|	construct_round
+|	construct_curly
 ;
 construct_square: '[' any_constructor_code_value ']' {
 	// stack: context, name
@@ -318,7 +311,7 @@ construct_square: '[' any_constructor_co
 construct_round: '(' expr_value ')' { 
 	// stack: context, name
 	$$=$2; // stack: context, name, value
-	O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+	O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
 }
 ;
 construct_curly: '{' maybe_codes '}' {
@@ -328,7 +321,7 @@ construct_curly: '{' maybe_codes '}' {
 };
 
 any_constructor_code_value: 
-	unknown_value /* optimized $var[] case */
+	void_value /* optimized $var[] case */
 |	STRING /* optimized $var[STRING] case */
 |	constructor_code_value /* $var[something complex] */
 ;
@@ -347,11 +340,13 @@ call: call_value {
 	$$=$1; /* stack: value */
 	O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 };
-call_value: '^' call_name store_params EON { /* ^field.$method{vasya} */
-	$$=$2; /* with_xxx,diving code; stack: context,method_junction */
+call_value: '^' { PC.object_constructor_allowed=true } 
+			call_name { PC.object_constructor_allowed=false } 
+			store_params EON { /* ^field.$method{vasya} */
+	$$=$3; /* with_xxx,diving code; stack: context,method_junction */
 	O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
 
-	YYSTYPE params_code=$3;
+	YYSTYPE params_code=$5;
 	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 VVoid?
@@ -397,7 +392,7 @@ store_curly_param_part: maybe_codes {
 	PCA($$, $1);
 };
 code_param_value:
-	unknown_value /* optimized [;...] case */
+	void_value /* optimized [;...] case */
 |	STRING /* optimized [STRING] case */
 |	constructor_code_value /* [something complex] */
 ;
@@ -427,7 +422,8 @@ name_advance2: name_expr_value {
 name_expr_value: 
 	STRING /* subname_is_const */
 |	name_expr_subvar_value /* $subname_is_var_value */
-|	name_expr_with_subvar_value /* xxx$part_of_subname_is_var_value[$...] */
+|	name_expr_with_subvar_value /* xxx$part_of_subname_is_var_value */
+|	name_curly_code_value /* (codes) */
 ;
 name_expr_subvar_value: '$' subvar_ref_name_rdive {
 	$$=$2;
@@ -441,16 +437,16 @@ name_expr_with_subvar_value: STRING subv
 	P($$, $2);
 	O($$, OP_REDUCE_EWPOOL);
 };
-subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root;
-subvar_ref_name_rdive_read: STRING {
+name_curly_code_value: '[' codes ']' {
 	$$=N(POOL); 
-	O($$, OP_WITH_READ);
-	P($$, $1);
+	O($$, OP_CREATE_EWPOOL);
+	P($$, $2);
+	O($$, OP_REDUCE_EWPOOL);
 };
-subvar_ref_name_rdive_root: ':' STRING {
+subvar_ref_name_rdive: STRING {
 	$$=N(POOL); 
-	O($$, OP_WITH_ROOT);
-	P($$, $2);
+	O($$, OP_WITH_READ);
+	P($$, $1);
 };
 subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) };
 subvar__get_write: '$' subvar_ref_name_rdive {
@@ -458,10 +454,22 @@ subvar__get_write: '$' subvar_ref_name_r
 	O($$, OP_GET_ELEMENT__WRITE);
 };
 
-class_prefix: STRING ':' {
+class_prefix:
+	class_static_prefix
+|	class_constructor_prefix
+;
+class_static_prefix: STRING ':' {
 	$$=$1; // stack: class name string
 	O($$, OP_GET_CLASS);
 };
+class_constructor_prefix: class_static_prefix ':' {
+	$$=$1;
+	if(!PC.object_constructor_allowed) {
+		strcpy(PC.error, ":: not allowed here");
+		YYERROR;
+	}
+	O($$, OP_PREPARE_TO_CONSTRUCT_OBJECT);
+};
 
 
 /* expr */
@@ -526,7 +534,7 @@ write_string: STRING {
 	change_string_literal_to_write_string_literal($$=$1)
 };
 
-unknown_value: /* empty */ { $$=VL(NEW VString(POOL)) };
+void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -635,6 +643,15 @@ static int yylex(YYSTYPE *lvalp, void *p
 
 		// USER'S = NOT OURS
 		case LS_USER:
+			if(PC.trim_bof)
+				switch(c) {
+				case '\n': case ' ': case '\t':
+					begin=PC.source;
+					begin_line=PC.line;
+					continue; // skip it
+				default:
+					PC.trim_bof=false;
+				}
 			switch(c) {
 			case '$':
 				push_LS(PC, LS_VAR_NAME_SIMPLE);
@@ -648,6 +665,15 @@ static int yylex(YYSTYPE *lvalp, void *p
 					RC;
 				}
 				break;
+			case ']': // $name.(code<)>
+				if(--lexical_brackets_nestage==0) {
+					pop_LS(PC);
+					RC;
+				}
+				break;
+			case '[':
+				lexical_brackets_nestage++;
+				break;
 			}
 			break;
 			
@@ -903,7 +929,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 			case '&': case '|': 
 			case '=': case '!':
 			// common delimiters
-			case ',':
+			case ',': case '?':
 			// before call
 			case '^': 
 				pop_LS(PC);
@@ -911,6 +937,16 @@ static int yylex(YYSTYPE *lvalp, void *p
 				result=EON;
 				goto break2;
 			case '[':
+				// $name.<[>code]
+				if(PC.col>1/*not first column*/ && (
+					end[-1]=='$'/*was start of get*/ ||
+					end[-1]==':'/*was class name delim */ ||
+					end[-1]=='.'/*was name delim */
+					)) {
+					push_LS(PC, LS_USER);
+					lexical_brackets_nestage=1;
+					RC;
+				}
 				PC.ls=LS_VAR_SQUARE;
 				lexical_brackets_nestage=1;
 				RC;
@@ -929,7 +965,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 				RC;
 			case '.': // name part delim
 			case '$': // name part subvar
-			case ':': // ':name' or 'class:name'
+			case ':': // class<:>name
 				PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':'
 				RC;
 			}
@@ -937,6 +973,11 @@ static int yylex(YYSTYPE *lvalp, void *p
 
 		case LS_VAR_NAME_CURLY:
 			switch(c) {
+			case '[':
+				// ${name.<[>code)}
+				push_LS(PC, LS_USER);
+				lexical_brackets_nestage=1;
+				RC;
 			case '}': // ${name} finished, restoring LS
 				pop_LS(PC);
 				RC;
@@ -993,6 +1034,16 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_METHOD_NAME:
 			switch(c) {
 			case '[':
+				// $name.<[>code)
+				if(PC.col>1/*not first column*/ && (
+					end[-1]=='^'/*was start of call*/ || // never, ^[ is literal...
+					end[-1]==':'/*was class name delim */ ||
+					end[-1]=='.'/*was name delim */
+					)) {
+					push_LS(PC, LS_USER);
+					lexical_brackets_nestage=1;
+					RC;
+				}
 				PC.ls=LS_METHOD_SQUARE;
 				lexical_brackets_nestage=1;
 				RC;