--- parser3/src/main/compile.y	2001/02/24 16:19:06	1.37
+++ parser3/src/main/compile.y	2001/02/25 10:48:59	1.44
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.37 2001/02/24 16:19:06 paf Exp $
+  $Id: compile.y,v 1.44 2001/02/25 10:48:59 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);
@@ -57,7 +61,7 @@ method: control_method | code_method;
 
 control_method: '@' STRING '\n' 
 				control_strings {
-	String& name=*LA2S($2);
+	String& name=*SLA2S($2);
 	YYSTYPE strings_code=$4;
 	if(strings_code->size()<1*2) {
 		strcpy(PC->error, "@");
@@ -67,7 +71,7 @@ control_method: '@' STRING '\n'
 	}
 	if(name==CLASS_NAME) {
 		if(strings_code->size()==1*2) 
-			PC->vclass->set_name(*LA2S(strings_code));
+			PC->vclass->set_name(*SLA2S(strings_code));
 		else {
 			strcpy(PC->error, "@"CLASS_NAME" must contain sole name");
 			YYERROR;
@@ -75,18 +79,18 @@ control_method: '@' STRING '\n'
 	} else {
 		if(name==USES_NAME) {
 			for(int i=0; i<strings_code->size(); i+=2) {
-				String *file=LA2S(strings_code, i);
+				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=*LA2S(strings_code, i);
+				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");
+					strcat(PC->error, ": undefined class in @"PARENTS_NAME);
 					YYERROR;
 				}
 				PC->vclass->add_parent(*parent);
@@ -105,17 +109,17 @@ 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->vclass->add_method(*name, method);
@@ -141,19 +145,20 @@ action: get | put | with | call;
 
 /* get */
 
-get: '$' any_name {
+get: '$' get_name {
 	$$=$2; /* stack: resulting value */
 	OP($$, OP_WRITE); /* value=pop; write(value) */
 };
-
-any_name: name_without_curly_rdive EON | name_in_curly_rdive;
-
+get_name: 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: 
+	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); 
 	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, 
@@ -170,6 +175,7 @@ name_without_curly_rdive_root: ':' name_
 	OP($$, 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) };
 
 /* put */
@@ -179,11 +185,14 @@ put: '$' name_expr_wdive '(' constructor
 	P($$, $4); /* stack: context,name,constructor_value */
 	OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 };
-name_expr_wdive: name_expr_wdive_write | name_expr_wdive_root;
+name_expr_wdive: 
+	name_expr_wdive_write
+|	name_expr_wdive_root
+|	name_expr_wdive_class;
 name_expr_wdive_write: name_expr_dive_code {
-	$$=N(POOL); 
+	$$=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, 
@@ -200,6 +209,7 @@ name_expr_wdive_root: ':' name_expr_dive
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,name */
 };
+name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
 constructor_value: 
 	constructor_one_param_value
@@ -221,7 +231,7 @@ complex_constructor_param_body: codes__e
 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();
+	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 */
@@ -241,13 +251,15 @@ constructor_two_params_value: STRING ';'
 
 /* call */
 
-call: '^' name_without_curly_rdive store_params EON { /* ^field.$method{vasya} */
-	$$=$2; /* with_xxx,diving code; stack: context,method_name */
+call: '^' call_name store_params EON { /* ^field.$method{vasya} */
+	$$=$2; /* with_xxx,diving code; stack: context,method_junction */
 	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;
+
 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};
@@ -324,6 +336,18 @@ subvar__get_write: '$' subvar_ref_name_r
 	OP($$, OP_GET_ELEMENT__WRITE);
 };
 
+class_prefix: STRING ':' {
+	String& name=*SLA2S($1);
+	VClass *vclass=static_cast<VClass *>(PC->request->classes().get(name));
+	if(!vclass) {
+		strcpy(PC->error, "'");
+		strcat(PC->error, name.cstr());
+		strcat(PC->error, "' class is undefined in call");
+		YYERROR;
+	}
+	$$=CL(vclass); // vclass
+};
+
 
 /* with */
 
@@ -338,7 +362,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 {
@@ -346,7 +370,7 @@ write_str_literal: STRING {
 		$$=N(POOL);
 	}
 };
-empty_value: /* empty */ { $$=L(NEW VString(POOL)) };
+empty_value: /* empty */ { $$=SL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -391,21 +415,23 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 		} else
 			PC->col++;
 
-		/* escaping: ^^ ^$ ^; ^) ^} ^( ^{ */
+		// escaping: ^^ ^$ ^; ^) ^} ^( ^{
 		if(c=='^') {
-			char pending_c=*PC->source;
+			char next_c=*PC->source;
 
-			if(pending_c=='^' || pending_c=='$' || pending_c==';' ||
-				pending_c=='(' || pending_c==')' ||
-				pending_c=='{' || pending_c=='}') {
-				/* append piece till ^ */
-				PC->string->APPEND(begin, end-begin, PC->file, begin_line);
-				/* reset piece 'start' position & line */
-				begin=PC->source/*^*/;
+			if(next_c=='^' || next_c=='$' || next_c==';' ||
+				next_c=='(' || next_c==')' ||
+				next_c=='{' || next_c=='}') {
+				if(end!=begin) {
+					// append piece till ^
+					PC->string->APPEND(begin, end-begin, PC->file, begin_line);
+				}
+				// reset piece 'start' position & line
+				begin=PC->source; // ^
 				begin_line=PC->line;
-				/* skip over ^ and _ */
-				PC->source+=2;
-				/* skip analysis = forced literal */
+				// skip over ^ and _
+				PC->source++;
+				// skip analysis = forced literal
 				continue;
 			}
 		}
@@ -508,10 +534,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;
@@ -524,22 +546,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;
 			}
@@ -604,7 +626,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;
 			}
@@ -690,7 +714,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!
@@ -713,6 +737,6 @@ static void
           YYSTYPE value)
      {
        if(type==STRING)
-         fprintf(file, " \"%s\"", LA2S(value)->cstr());
+         fprintf(file, " \"%s\"", SLA2S(value)->cstr());
      }