--- parser3/src/main/compile.y	2001/03/08 11:34:22	1.74
+++ parser3/src/main/compile.y	2001/03/10 15:17:46	1.84
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.74 2001/03/08 11:34:22 paf Exp $
+  $Id: compile.y,v 1.84 2001/03/10 15:17:46 paf Exp $
 */
 
 %{
@@ -88,12 +88,14 @@ int yylex(YYSTYPE *lvalp, void *pc);
 
 all: /* TODO: у ^execute непременно задать какой-то name, см. 'RUN' */
 	one_big_piece {
-	String& name_main=*NEW String(POOL);
-	name_main.APPEND_CONST(MAIN_METHOD_NAME);
-	Array& param_names=*NEW Array(POOL);
-	Array& local_names=*NEW Array(POOL);
-	Method& method=*NEW Method(POOL, name_main, param_names, local_names, *$1);
-	PC->vclass->add_method(name_main, method);
+	String& MAIN=*NEW String(POOL);
+	MAIN.APPEND_CONST(MAIN_METHOD_NAME);
+	Method& method=*NEW Method(POOL, 
+		MAIN, 
+		0, 0, /*min, max numbered_params_count*/
+		0/*param_names*/, 0/*local_names*/, 
+		$1/*parser_code*/, 0/*native_code*/);
+	PC->vclass->add_method(MAIN, method);
 }
 |	methods;
 
@@ -104,7 +106,7 @@ method: control_method | code_method;
 
 control_method: '@' STRING '\n' 
 				control_strings {
-	String& command=*SLA2S($2);
+	const String& command=*SLA2S($2);
 	YYSTYPE strings_code=$4;
 	if(strings_code->size()<1*2) {
 		strcpy(PC->error, "@");
@@ -113,7 +115,7 @@ control_method: '@' STRING '\n'
 		YYERROR;
 	}
 	if(command==CLASS_NAME) {
-		if(PC->vclass!=&PC->request->ROOT_CLASS) { // already changed from default?
+		if(PC->vclass!=&PC->request->root_class) { // already changed from default?
 			strcpy(PC->error, "class already have a name '");
 			strncat(PC->error, PC->vclass->name().cstr(), 100);
 			strcat(PC->error, "'");
@@ -121,12 +123,12 @@ control_method: '@' STRING '\n'
 		}
 		if(strings_code->size()==1*2) {
 			// new class' name
-			String *name=SLA2S(strings_code);
+			const String *name=SLA2S(strings_code);
 			// creating the class
 			PC->vclass=NEW VClass(POOL);
 			PC->vclass->set_name(*name);
 			// defaulting base. may change with @BASE
-			PC->vclass->set_base(PC->request->ROOT_CLASS);
+			PC->vclass->set_base(PC->request->root_class);
 			// append to request's classes
 			PC->request->classes_array()+=PC->vclass;
 			PC->request->classes().put(*name, PC->vclass);
@@ -137,18 +139,18 @@ control_method: '@' STRING '\n'
 	} else {
 		if(command==USE_NAME) {
 			for(int i=0; i<strings_code->size(); i+=2) {
-				String *file=SLA2S(strings_code, i);
-				file->APPEND_CONST(".p");
-				PC->request->use(file->cstr(), 0);
+				String file(*SLA2S(strings_code, i));
+				file.APPEND_CONST(".p");
+				PC->request->use(file.cstr(), 0);
 			}
 		} else if(command==BASE_NAME) {
-			if(PC->vclass->base()!=&PC->request->ROOT_CLASS) { // already changed from default?
+			if(PC->vclass->base()!=&PC->request->root_class) { // already changed from default?
 				strcpy(PC->error, "there must be only one @"BASE_NAME);
 				YYERROR;
 			}
 			if(strings_code->size()==1*2) {
 				// TODO: преодолеть self и циклические base
-				String& base_name=*SLA2S(strings_code);
+				const String& base_name=*SLA2S(strings_code);
 				VClass *base=static_cast<VClass *>(
 					PC->request->classes().get(base_name));
 				if(!base) {
@@ -178,16 +180,26 @@ code_method: '@' STRING bracketed_maybe_
 	const String *name=SLA2S($2);
 
 	YYSTYPE params_names_code=$3;
-	Array& params_names=*NEW Array(POOL);
-	for(int i=0; i<params_names_code->size(); i+=2)
-		params_names+=SLA2S(params_names_code, i);
+	Array *params_names=0;
+	if(int size=params_names_code->size()) {
+		params_names=NEW Array(POOL);
+		for(int i=0; i<size; i+=2)
+			*params_names+=SLA2S(params_names_code, i);
+	}
 
 	YYSTYPE locals_names_code=$4;
-	Array& locals_names=*NEW Array(POOL);
-	for(int i=0; i<locals_names_code->size(); i+=2)
-		locals_names+=SLA2S(locals_names_code, i);
+	Array *locals_names=0;
+	if(int size=locals_names_code->size()) {
+		locals_names=NEW Array(POOL);
+		for(int i=0; i<size; i+=2)
+			*locals_names+=SLA2S(locals_names_code, i);
+	}
 
-	Method& method=*NEW Method(POOL, *name, params_names, locals_names, *$7);
+	Method& method=*NEW Method(POOL, 
+		*name, 
+		0, 0/*min,max numbered_params_count*/, 
+		params_names, locals_names, 
+		$7, 0);
 	PC->vclass->add_method(*name, method);
 };
 
@@ -206,7 +218,7 @@ codes: code | codes code {
 	$$=$1; 
 	P($$, $2);
 };
-code: write_str_literal | action;
+code: write_string | action;
 action: get | put | with | call;
 
 /* get */
@@ -225,7 +237,7 @@ name_without_curly_rdive:
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=N(POOL); 
 	Array *diving_code=$1;
-	String *first_name=SLA2S(diving_code);
+	const String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
 		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
@@ -247,10 +259,9 @@ name_without_curly_rdive_code: name_adva
 
 /* put */
 
-put: '$' name_expr_wdive constructor_value {
+put: '$' name_expr_wdive construct {
 	$$=$2; /* stack: context,name */
 	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
@@ -259,7 +270,7 @@ name_expr_wdive:
 name_expr_wdive_write: name_expr_dive_code {
 	$$=N(POOL);
 	Array *diving_code=$1;
-	String *first_name=SLA2S(diving_code);
+	const String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
 		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
@@ -278,9 +289,16 @@ name_expr_wdive_root: ':' name_expr_dive
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
-constructor_value: 
-	'[' any_constructor_code_value ']' { $$=$2 }
-|	'(' any_expr ')' { $$=$2 }
+construct: construct_by_code | construct_by_expr;
+construct_by_code: '[' any_constructor_code_value ']' {
+	$$=$2; /* stack: context, name, value */
+	O($$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+}
+;
+construct_by_expr: '(' any_expr ')' { 
+	$$=$2; /* stack: context, name, value */
+	O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+}
 ;
 any_constructor_code_value: 
 	empty_string_value /* optimized $var[] case */
@@ -332,13 +350,14 @@ store_expr_param_parts:
 |	store_expr_param_parts ';' store_expr_param_part { $$=$1; P($$, $3) }
 ;
 store_code_param_part: 
-	empty /* optimized () case */
-|	STRING { /* optimized (STRING) case */
+	empty /* optimized [] case */
+|	STRING { /* optimized [STRING] case */
 	$$=$1;
 	O($$, OP_STORE_PARAM);
 }
-|	constructor_code_value { /* (something complex) */
+|	constructor_code_value { /* [something complex] */
 	$$=$1;
+	O($$, OP_STORE_PARAM);
 }
 ;
 store_expr_param_part: write_expr_value {
@@ -422,12 +441,11 @@ with: '$' name_without_curly_rdive '{' c
 
 any_expr:
 	empty_double_value /* optimized $var() case */
-|	optimized_expr /* $var(something) */
+|	expr_value /* $var(something) */
 ;
-optimized_expr: expr {
-	if(($$=$1)->size()==2) { // only one string literal in there?
+expr_value: expr {
+	if(($$=$1)->size()==2) // only one string literal in there?
 		change_string_literal_to_double_literal($$); // make that string literal Double
-	}
 };
 expr: 
 	STRING
@@ -477,12 +495,12 @@ string_inside_quotes_value: maybe_codes
 
 /* basics */
 
-write_str_literal: STRING {
-	$$=$1;
-	O($$, OP_WRITE);
+write_string: STRING {
+	// optimized from OP_STRING+OP_WRITE to OP_STRING__WRITE
+	change_string_literal_to_write_string_literal($$=$1)
 };
 
-empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL)) };
+empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL, 0)) };
 empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
@@ -752,7 +770,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				switch(c) {
 				case '+': case '-': case '*': case '/': case '%': 
 				case '&': case '|': 
-				case '<': case '>': case '=': case '!':
+				case '=': case '!':
 					pop_LS(PC);
 					PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 					result=EON;
@@ -764,6 +782,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			case ' ': case '\t': case '\n':
 			case ';':
 			case ']': case '}': case ')': case '"':
+			case '<': case '>':  // these stand for HTML brackets and expression binary ops
 				pop_LS(PC);
 				PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 				result=EON;