--- parser3/src/main/compile.y	2001/02/22 15:39:23	1.24
+++ parser3/src/main/compile.y	2001/02/24 15:35:28	1.35
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.24 2001/02/22 15:39:23 paf Exp $
+  $Id: compile.y,v 1.35 2001/02/24 15:35:28 paf Exp $
 */
 
 %{
@@ -26,7 +26,9 @@ int yylex(YYSTYPE *lvalp, void *pc);
 
 // local convinient inplace typecast & var
 #define PC  ((parse_control *)pc)
-#define pool  *PC->pool
+#define POOL  *PC->pool
+#undef NEW
+#define NEW new(POOL)
 %}
 
 %pure_parser
@@ -39,34 +41,77 @@ int yylex(YYSTYPE *lvalp, void *pc);
 
 all:
 	one_big_piece {
-	String& name_main=*new(pool) String(pool);
+	String& name_main=*NEW String(POOL);
 	name_main.APPEND_CONST(MAIN_METHOD_NAME);
-	Array& param_names=*new(pool) Array(pool);
-	Array& local_names=*new(pool) Array(pool);
-	Method *method=new(pool) Method(pool, name_main, param_names, local_names, *$1);
-	*PC->methods+=method;
+	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);
 }
 |	methods;
 
 methods: method | methods method;
 one_big_piece: maybe_codes;
 
-method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' 
+method: control_method | code_method;
+
+control_method: '@' STRING '\n' 
+				control_strings {
+	String *name=LA2S($2);
+	YYSTYPE strings_code=$4;
+	if(*name==CLASS_NAME) {
+		if(strings_code->size()==1*2) 
+			PC->vclass->set_name(*LA2S(strings_code));
+		else {
+			strcpy(PC->error, "@"CLASS_NAME" must contain sole name");
+			YYERROR;
+		}
+	} else {
+		if(*name==USES_NAME) {
+			for(int i=0; i<strings_code->size(); i+=2) {
+				String *file=LA2S(strings_code, i);
+				file->APPEND_CONST(".p");
+				PC->request->use(file->cstr(), 0);
+			}
+		} else if(*name==PARENTS_NAME) {
+			for(int i=0; i<strings_code->size(); i+=2) {
+				String *parent_name=LA2S(strings_code, i);
+				VClass *parent=static_cast<VClass *>(
+					PC->request->classes().get(*parent_name));
+				if(!parent) {
+					strcpy(PC->error, parent_name->cstr());
+					strcat(PC->error, ": undefined class");
+					YYERROR;
+				}
+				PC->vclass->add_parent(*parent);
+			}
+		} else {
+			strcpy(PC->error, name->cstr());
+			strcat(PC->error, ": invalid special name. valid names are "
+				CLASS_NAME", "USES_NAME" and "PARENTS_NAME);
+			YYERROR;
+		}
+	}
+};
+control_strings: control_string | control_strings '\n' control_string { $$=$1; P($$, $3) };
+control_string: STRING;
+
+code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' 
 			maybe_codes {
 	const String *name=LA2S($2);
 
 	YYSTYPE params_names_code=$3;
-	Array& params_names=*new(pool) Array(pool);
+	Array& params_names=*NEW Array(POOL);
 	for(int i=0; i<params_names_code->size(); i+=2)
 		params_names+=LA2S(params_names_code, i);
 
 	YYSTYPE locals_names_code=$4;
-	Array& locals_names=*new(pool) Array(pool);
+	Array& locals_names=*NEW Array(POOL);
 	for(int i=0; i<locals_names_code->size(); i+=2)
 		locals_names+=LA2S(locals_names_code, i);
 
-	Method *method=new(pool) Method(pool, *name, params_names, locals_names, *$7);
-	*PC->methods+=method;
+	Method& method=*NEW Method(POOL, *name, params_names, locals_names, *$7);
+	PC->vclass->add_method(*name, method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -99,7 +144,7 @@ any_name: name_without_curly_rdive EON |
 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_read: name_without_curly_rdive_code {
-	$$=N(pool); 
+	$$=N(POOL); 
 	Array *diving_code=$1;
 	String *first_name=LA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
@@ -114,7 +159,7 @@ name_without_curly_rdive_read: name_with
 	/* diving code; stack: current context */
 };
 name_without_curly_rdive_root: ':' name_without_curly_rdive_code {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: current context */
 };
@@ -122,20 +167,14 @@ name_without_curly_rdive_code: name_adva
 
 /* put */
 
-put: '$' name_expr_dive '(' constructor_value ')' {
-/*
-	TODO: подсмотреть в $3, и если там первым элементом self,
-		то выкинуть его и делать не WITH_WRITE, а WITH_SELF
-		если ничего не осталось - $self(xxx)
-			обругать
-*/
+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) */
 };
-name_expr_dive: name_expr_dive_write | name_expr_dive_root;
-name_expr_dive_write: name_expr_dive_code {
-	$$=N(pool); 
+name_expr_wdive: name_expr_wdive_write | name_expr_wdive_root;
+name_expr_wdive_write: name_expr_dive_code {
+	$$=N(POOL); 
 	Array *diving_code=$1;
 	String *first_name=LA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
@@ -149,8 +188,8 @@ name_expr_dive_write: name_expr_dive_cod
 	}
 	/* diving code; stack: current context */
 };
-name_expr_dive_root: ':' name_expr_dive_code {
-	$$=N(pool); 
+name_expr_wdive_root: ':' name_expr_dive_code {
+	$$=N(POOL); 
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,name */
 };
@@ -159,24 +198,24 @@ constructor_value:
 	constructor_one_param_value
 |	constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
 ;
+
 constructor_one_param_value: 
-	empty /* optimized $var() case */
+	empty_value /* optimized $var() case */
 |	STRING /* optimized $var(STRING) case */
 |	complex_constructor_param_value /* $var(something complex) */
 ;
 complex_constructor_param_value: complex_constructor_param_body {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */
 	P($$, $1); /* some codes to that context */
 	OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
 };
-complex_constructor_param_body:
-	codes__excluding_sole_str_literal
-|	codes__str__followed_by__excluding_sole_str_literal
-;
+complex_constructor_param_body: codes__excluding_sole_str_literal;
+codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) };
+
 constructor_two_params_value: STRING ';' constructor_one_param_value {
 	char *operator_or_fmt=LA2S($1)->cstr();
-	$$=N(pool);
+	$$=N(POOL);
 	P($$, $1); /* stack: ncontext name operator_or_fmt */
 	P($$, $3); /* stack: ncontext name operator_or_fmt expr */
 	switch(operator_or_fmt[0]) {
@@ -193,28 +232,10 @@ constructor_two_params_value: STRING ';'
 	/* stack: ncontext name value */
 };
 
-
 /* call */
 
-call: '^' name_expr_dive store_params EON { /* ^field.$method{vasya} */
-/*
-	TODO: подсмотреть в $3, и если там в первом элементе первая буква ":"
-		то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT
-	TODO: подсмотреть в $3, и если там первым элементом self,
-		то выкинуть его и делать не OP_WITH_READ, а WITH_SELF
-	TODO:
-		если первым в $3 идёт result
-		то
-			выкинуть его
-			если там ещё что-то осталось,
-			то
-				не OP_WITH_READ, а WITH_RESULT
-			иначе  // ^result(value)
-				обругать безобразие
-*/
-	$$=N(pool); 
-	OP($$, OP_WITH_READ); /* stack: starting context */
-	P($$, $2); /* diving code; stack: context,method_name */
+call: '^' name_without_curly_rdive store_params EON { /* ^field.$method{vasya} */
+	$$=$2; /* with_xxx,diving code; stack: context,method_name */
 	OP($$, 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) */
@@ -223,18 +244,26 @@ call: '^' name_expr_dive store_params EO
 store_params: store_param | store_params store_param { $$=$1; P($$, $2) };
 store_param: store_round_param | store_curly_param;
 store_round_param: '(' store_param_parts ')' {$$=$2};
-store_param_parts: store_param_part | store_param_parts ';' store_param_part { $$=$1; P($$, $3) };
-store_param_part: constructor_one_param_value {
+store_param_parts:
+	store_param_part
+|	store_param_parts ';' store_param_part { $$=$1; P($$, $3) }
+;
+store_curly_param: '{' maybe_codes '}' {
+	$$=N(POOL); 
+	PCA($$, $2);
+	OP($$, OP_STORE_PARAM);
+};
+store_param_part: 
+	empty /* optimized () case */
+|	STRING { /* optimized (STRING) case */
 	$$=$1;
 	OP($$, OP_STORE_PARAM);
 }
-store_curly_param: '{' maybe_codes '}' {
-	$$=N(pool); 
-	OP($$, OP_CODE_ARRAY);
-	AA($$, $2);
-	OP($$, OP_CREATE_JUNCTION);
+|	complex_constructor_param_value { /* (something complex) */
+	$$=$1;
 	OP($$, OP_STORE_PARAM);
-};
+}
+;
 
 /* name */
 
@@ -264,7 +293,7 @@ name_expr_subvar_value: '$' subvar_ref_n
 	OP($$, OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_CREATE_EWPOOL);
 	P($$, $1);
 	OP($$, OP_WRITE);
@@ -273,12 +302,12 @@ name_expr_with_subvar_value: STRING subv
 };
 subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root;
 subvar_ref_name_rdive_read: STRING {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_READ);
 	P($$, $1);
 };
 subvar_ref_name_rdive_root: ':' STRING {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_ROOT);
 	P($$, $2);
 };
@@ -299,29 +328,19 @@ with: '$' name_without_curly_rdive '{' c
 	OP($$, OP_WRITE);
 };
 
-/* codes_in_brackets */
+/* basics */
 
-codes__str__followed_by__excluding_sole_str_literal:
-	write_str_literal codes__excluding_sole_str_literal {
-		$$=$1;
-		P($$, $2);
-}
-;
-codes__excluding_sole_str_literal:
-	action
-|	codes__excluding_sole_str_literal write_str_literal {
-		$$=$1;
-		P($$, $2);
-}
-;
 write_str_literal: STRING {
-	$$=$1;
-	OP($$, OP_WRITE);
+	if(LA2S($1)->size()) {
+		$$=$1;
+		OP($$, OP_WRITE);
+	} else {
+		// optimized case of special end of macro. see yylex
+		$$=N(POOL);
+	}
 };
-
-/* */
-
-empty: /* empty */ { $$=N(pool) };
+empty_value: /* empty */ { $$=L(NEW VString(POOL)) };
+empty: /* empty */ { $$=N(POOL) };
 
 %%
 
@@ -412,7 +431,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				PC->ls=LS_DEF_PARAMS;
 				goto break2;
 			}
-			if(c=='\n') { // wrong. bailing out
+			if(c=='\n') { // special @NAME or wrong
 				result=c;
 				pop_LS(PC);
 				goto break2;
@@ -464,7 +483,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				c==' '|| c=='\t' || c=='\n' || 
 				c==')' || c=='}') {
 				pop_LS(PC);
-				PC->source--;	PC->col--;
+				PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 				result=EON;
 				goto break2;
 			}
@@ -632,13 +651,12 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				goto break2;
 			}					   
 			pop_LS(PC);
-			PC->source--;  PC->col--;
+			PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 			result=EON;
 			goto break2;
 		}
 		if(c==0) {
 			result=-1;
-//			PC->source--;  PC->col--;
 			break;
 		}
 	}
@@ -651,12 +669,14 @@ break2:
 		// strip last \n before LS_DEF_NAME or EOF
 		if((c=='@' || c==0) && end[-1]=='\n')
 			end--;
-		// append last piece
-		PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
+		if(end!=begin) {
+			// append last piece
+			PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
+		}
 		// create STRING value: array of OP_VALUE+vstring
-		*lvalp=L(new(pool) VString(PC->string));
+		*lvalp=L(NEW VString(PC->string));
 		// new pieces storage
-		PC->string=new(pool) String(pool);
+		PC->string=NEW String(POOL);
 		// go!
 		return STRING;
 	}