--- parser3/src/main/compile.y	2001/02/24 09:00:11	1.31
+++ parser3/src/main/compile.y	2001/02/25 08:50:13	1.39
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.31 2001/02/24 09:00:11 paf Exp $
+  $Id: compile.y,v 1.39 2001/02/25 08:50:13 paf Exp $
 */
 
 %{
@@ -18,6 +18,10 @@
 #include "compile_tools.h"
 #include "pa_value.h"
 #include "pa_request.h"
+#include "pa_vobject.h"
+
+#define SELF_NAME "self"
+#define USES_NAME "USES"
 
 int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -45,30 +49,80 @@ all:
 	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->methods+=method;
+	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=*SLA2S($2);
+	YYSTYPE strings_code=$4;
+	if(strings_code->size()<1*2) {
+		strcpy(PC->error, "@");
+		strcat(PC->error, name.cstr());
+		strcat(PC->error, " is empty");
+		YYERROR;
+	}
+	if(name==CLASS_NAME) {
+		if(strings_code->size()==1*2) 
+			PC->vclass->set_name(*SLA2S(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=SLA2S(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=*SLA2S(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 in @"PARENTS_NAME);
+					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 control_string { $$=$1; P($$, $2) };
+control_string: maybe_string '\n';
+maybe_string: empty | STRING;
+
+code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' 
 			maybe_codes {
-	const String *name=LA2S($2);
+	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+=LA2S(params_names_code, i);
+		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+=LA2S(locals_names_code, i);
+		locals_names+=SLA2S(locals_names_code, i);
 
-	Method *method=NEW 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;
@@ -103,7 +157,7 @@ name_without_curly_rdive: name_without_c
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=N(POOL); 
 	Array *diving_code=$1;
-	String *first_name=LA2S(diving_code);
+	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
 		OP($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
@@ -133,7 +187,7 @@ name_expr_wdive: name_expr_wdive_write |
 name_expr_wdive_write: name_expr_dive_code {
 	$$=N(POOL); 
 	Array *diving_code=$1;
-	String *first_name=LA2S(diving_code);
+	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
 		OP($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
@@ -152,20 +206,14 @@ name_expr_wdive_root: ':' name_expr_dive
 };
 
 constructor_value: 
-	store_constructor_one_param_value
-|	store_constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
+	constructor_one_param_value
+|	constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
 ;
 
-store_constructor_one_param_value: 
-	empty /* optimized $var() case */
-|	STRING { /* optimized $var(STRING) case */
-	$$=$1;
-	OP($$, OP_STORE_PARAM);
-}
-|	complex_constructor_param_value { /* $var(something complex) */
-	$$=$1;
-	OP($$, OP_STORE_PARAM);
-}
+constructor_one_param_value: 
+	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); 
@@ -176,8 +224,8 @@ complex_constructor_param_value: complex
 complex_constructor_param_body: codes__excluding_sole_str_literal;
 codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) };
 
-store_constructor_two_params_value: STRING ';' store_constructor_one_param_value {
-	char *operator_or_fmt=LA2S($1)->cstr();
+constructor_two_params_value: STRING ';' constructor_one_param_value {
+	char *operator_or_fmt=SLA2S($1)->cstr();
 	$$=N(POOL);
 	P($$, $1); /* stack: ncontext name operator_or_fmt */
 	P($$, $3); /* stack: ncontext name operator_or_fmt expr */
@@ -197,25 +245,50 @@ store_constructor_two_params_value: STRI
 
 /* call */
 
-call: '^' name_without_curly_rdive store_params EON { /* ^field.$method{vasya} */
+call: '^' call_name 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) */
 };
 
+call_name: name_without_curly_rdive | class_method_name;
+
+class_method_name: STRING ':' name_advance1 {
+	String& name=*SLA2S($1);
+	VClass *vclass=static_cast<VClass *>(PC->request->classes().get(name));
+	if(!vclass) {
+		strcpy(PC->error, name.cstr());
+		strcat(PC->error, ": undefined class in call");
+		YYERROR;
+	}
+	$$=CL(vclass);
+	P($$, $3);
+};
+
 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_constructor_one_param_value
-|	store_param_parts ';' store_constructor_one_param_value { $$=$1; P($$, $3) }
+	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);
+}
+|	complex_constructor_param_value { /* (something complex) */
+	$$=$1;
+	OP($$, OP_STORE_PARAM);
+}
+;
 
 /* name */
 
@@ -283,7 +356,7 @@ with: '$' name_without_curly_rdive '{' c
 /* basics */
 
 write_str_literal: STRING {
-	if(LA2S($1)->size()) {
+	if(SLA2S($1)->size()) {
 		$$=$1;
 		OP($$, OP_WRITE);
 	} else {
@@ -291,6 +364,7 @@ write_str_literal: STRING {
 		$$=N(POOL);
 	}
 };
+empty_value: /* empty */ { $$=SL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -382,9 +456,9 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				PC->ls=LS_DEF_PARAMS;
 				goto break2;
 			}
-			if(c=='\n') { // wrong. bailing out
+			if(c=='\n') {
 				result=c;
-				pop_LS(PC);
+				PC->ls=LS_SPEC_CODE;
 				goto break2;
 			}
 			break;
@@ -428,13 +502,22 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			}
 			break;
 
+		case LS_SPEC_CODE:
+			if(c=='\n') {
+				result=c;
+				if(*PC->source=='@' || *PC->source==0) // end of special_code
+					pop_LS(PC);
+				goto break2;
+			}
+			break;
+
 		// VARIABLE GET/PUT/WITH
 		case LS_VAR_NAME_SIMPLE:
 			if(c==0 || 
 				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;
 			}
@@ -443,10 +526,6 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				result=c;
 				goto break2;
 			}
-			if(c==':') {
-				result=c;
-				goto break2;
-			}
 			if(c=='(') {
 				PC->ls=LS_VAR_ROUND;
 				lexical_brackets_nestage=1;
@@ -459,22 +538,22 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				result=c;
 				goto break2;
 			}
-			if(c=='.'/* name part delim */ || c=='$'/* name part subvar */) {
+			if(c=='.'/* name part delim */ || 
+				c=='$'/* name part subvar */ ||
+				c==':'/* ':name' or 'class:name' */) {
 				result=c;
 				goto break2;
 			}
 			break;
 		case LS_VAR_NAME_CURLY:
-			if(c==':') {
-				result=c;
-				goto break2;
-			}
 			if(c=='}') {  /* ${name} finished, restoring LS */
 				pop_LS(PC);
 				result=c;
 				goto break2;
 			}
-			if(c=='.'/* name part delim */ || c=='$'/*name part subvar*/) {
+			if(c=='.'/* name part delim */ || 
+				c=='$'/*name part subvar*/ ||
+				c==':'/* ':name' or 'class:name' */) {
 				result=c;
 				goto break2;
 			}
@@ -539,7 +618,9 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				result=c;
 				goto break2;
 			}
-			if(c=='.'/* name part delim */ || c=='$'/* name part subvar */) {
+			if(c=='.'/* name part delim */ || 
+				c=='$'/* name part subvar */ ||
+				c==':'/* ':name' or 'class:name' */) {
 				result=c;
 				goto break2;
 			}
@@ -602,13 +683,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;
 		}
 	}
@@ -626,7 +706,7 @@ break2:
 			PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
 		}
 		// create STRING value: array of OP_VALUE+vstring
-		*lvalp=L(NEW VString(PC->string));
+		*lvalp=SL(NEW VString(PC->string));
 		// new pieces storage
 		PC->string=NEW String(POOL);
 		// go!
@@ -649,6 +729,6 @@ static void
           YYSTYPE value)
      {
        if(type==STRING)
-         fprintf(file, " \"%s\"", LA2S(value)->cstr());
+         fprintf(file, " \"%s\"", SLA2S(value)->cstr());
      }