--- parser3/src/main/compile.y	2016/07/19 16:35:35	1.282
+++ parser3/src/main/compile.y	2021/11/08 11:44:19	1.291
@@ -2,13 +2,13 @@
 /** @file
 	Parser: compiler(lexical parser and grammar).
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
 	
 */
 
-volatile const char * IDENT_COMPILE_Y = "$Id: compile.y,v 1.282 2016/07/19 16:35:35 moko Exp $";
+volatile const char * IDENT_COMPILE_Y = "$Id: compile.y,v 1.291 2021/11/08 11:44:19 moko Exp $";
 
 /**
 	@todo parser4: 
@@ -143,7 +143,7 @@ static const VString vempty;
 %%
 all:
 	one_big_piece {
-	Method* method=new Method(Method::CT_ANY, 0, 0 /*min, max numbered_params_count*/, 0 /*param_names*/, 0 /*local_names*/, $1 /*parser_code*/, 0 /*native_code*/);
+	Method* method=new Method(Method::CT_ANY, 0, 0 /*min, max numbered_params_count*/, 0 /*param_names*/, 0 /*local_names*/, $1 /*parser_code*/, 0 /*native_code*/, PC.cclass->is_vars_local());
 	PC.cclass->set_method(PC.alias_method(main_method_name), method);
 }
 |	methods;
@@ -167,9 +167,8 @@ control_method: '@' STRING '\n'
 			// new class' name
 			const String& name=LA2S(*strings_code)->trim(String::TRIM_END);
 			// creating the class
-			VStateless_class* cclass=new VClass;
+			VStateless_class* cclass=new VClass(name.cstr(), PC.request.get_used_filespec(PC.file_no));
 			PC.cclass_new=cclass;
-			PC.cclass_new->set_type(name.cstr());
 			PC.append=false;
 		} else {
 			strcpy(PC.error, "@" CLASS_NAME " must contain only one line with class name (contains more then one)");
@@ -178,8 +177,7 @@ control_method: '@' STRING '\n'
 	} else if(command==USE_CONTROL_METHOD_NAME) {
 		CLASS_ADD;
 		for(size_t i=0; i<strings_code->count(); i+=OPERATIONS_PER_OPVALUE){
-			PC.request.use_file(PC.request.main_class, LA2S(*strings_code, i)->trim(String::TRIM_END),
-				PC.request.get_used_filename(PC.file_no), strings_code->get(i+1).origin);
+			PC.request.use_file(LA2S(*strings_code, i)->trim(String::TRIM_END), PC.request.get_used_filespec(PC.file_no), strings_code->get(i+1).origin);
 		}
 	} else if(command==BASE_NAME) {
 		if(PC.append){
@@ -193,18 +191,13 @@ control_method: '@' STRING '\n'
 		}
 		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			const String& base_name=LA2S(*strings_code)->trim(String::TRIM_END);
-			if(Value* base_class_value=PC.request.get_class(base_name)) {
+			if(VStateless_class *base_class=PC.request.get_class(base_name)) {
 				// @CLASS == @BASE sanity check
-				if(VStateless_class *base_class=base_class_value->get_class()) {
-					if(PC.cclass==base_class) {
-						strcpy(PC.error, "@" CLASS_NAME " equals @" BASE_NAME);
-						YYERROR;
-					}
-					PC.cclass->get_class()->set_base(base_class);
-				} else { // they asked to derive from a class without methods ['env' & co]
-					PC_ERROR("'", base_name.cstr(), "': you can not derive from this class in @" BASE_NAME);
+				if(PC.cclass==base_class) {
+					strcpy(PC.error, "@" CLASS_NAME " equals @" BASE_NAME);
 					YYERROR;
 				}
+				PC.cclass->get_class()->set_base(base_class);
 			} else {
 				PC_ERROR("'", base_name.cstr(), "': undefined class in @" BASE_NAME);
 				YYERROR;
@@ -266,7 +259,8 @@ code_method: '@' STRING bracketed_maybe_
 
 	YYSTYPE locals_names_code=$4;
 	ArrayString* locals_names=0;
-	bool all_vars_local=false;
+	bool all_vars_local=PC.cclass->is_vars_local();
+
 	if(int size=locals_names_code->count()) {
 		locals_names=new ArrayString;
 		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE) {
@@ -279,8 +273,6 @@ code_method: '@' STRING bracketed_maybe_
 				*locals_names+=local_name;
 		}
 	}
-	if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local())
-		all_vars_local=true;
 
 	Method* method=new Method(
 		//name, 
@@ -471,7 +463,6 @@ construct_square: '[' {
 ;
 construct_round: '(' expr_value ')' { 
 	$$=N(); 
-	O(*$$, OP::OP_PREPARE_TO_EXPRESSION);
 	// stack: context, name
 	P(*$$, *$2); // stack: context, name, value
 	O(*$$, OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
@@ -614,7 +605,6 @@ store_expr_param_part: expr_value {
 		$$=expr_code; 
 	} else {
 		YYSTYPE code=N();
-		O(*code, OP::OP_PREPARE_TO_EXPRESSION);
 		P(*code, *expr_code);
 		O(*code, OP::OP_WRITE_EXPR_RESULT);
 		$$=N(); 
@@ -722,8 +712,9 @@ class_static_prefix: STRING ':' {
 		}
 		code = OP::OP_VALUE__GET_BASE_CLASS;
 	} else {
-		Value *base=PC.request.get_class(*LA2S(*$$));
-		if(base && PC.cclass->derived_from(*base->get_class()))
+		// can't use get_class because it will call @autouse[] if the class wasn't loaded
+		VStateless_class* base=PC.request.classes().get(*LA2S(*$$));
+		if(base && PC.cclass->derived_from(*base))
 			code = OP::OP_VALUE__GET_BASE_CLASS;
 	}
 	// optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string
@@ -1626,7 +1617,7 @@ break2:
 }
 
 static int real_yyerror(Parse_control *pc, const char *s) {  // Called by yyparse on error
-	strncpy(PC.error, s, MAX_STRING);
+	pa_strncpy(PC.error, s, MAX_STRING);
 	return 1;
 }