--- parser3/src/main/compile.y	2001/03/08 11:34:22	1.74
+++ parser3/src/main/compile.y	2001/03/09 04:47:29	1.80
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.74 2001/03/08 11:34:22 paf Exp $
+  $Id: compile.y,v 1.80 2001/03/09 04:47:29 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, /*numbered_params_count*/
+		0/*param_names*/, 0/*local_names*/, 
+		$1/*parser_code*/, 0/*native_code*/);
+	PC->vclass->add_method(MAIN, method);
 }
 |	methods;
 
@@ -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, "'");
@@ -126,7 +128,7 @@ control_method: '@' STRING '\n'
 			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);
@@ -142,7 +144,7 @@ control_method: '@' STRING '\n'
 				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;
 			}
@@ -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/*numbered_params_count*/, 
+		params_names, locals_names, 
+		$7, 0);
 	PC->vclass->add_method(*name, method);
 };
 
@@ -332,13 +344,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 {
@@ -482,8 +495,8 @@ write_str_literal: STRING {
 	O($$, OP_WRITE);
 };
 
-empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL)) };
-empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) };
+empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL, 0)) };
+empty_string_value: /* empty */ { $$=VL(NEW VString()) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%