--- parser3/src/main/compile.y 2001/05/15 10:01:25 1.133 +++ parser3/src/main/compile.y 2001/05/21 12:29:51 1.134.2.1 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.y,v 1.133 2001/05/15 10:01:25 parser Exp $ + $Id: compile.y,v 1.134.2.1 2001/05/21 12:29:51 parser Exp $ */ /** @@ -28,8 +28,6 @@ #define yyerror(msg) real_yyerror((parse_control *)pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) -#include "pa_config_includes.h" - #include "compile_tools.h" #include "pa_value.h" #include "pa_request.h" @@ -160,7 +158,7 @@ control_method: '@' STRING '\n' PC.request->use_file( PC.request->absolute(*LA2S(strings_code, i))); } else if(command==BASE_NAME) { - if(PC.cclass->base()) { // already changed from default? + if(PC.cclass->base()!=&PC.request->OP) { // already changed from default? strcpy(PC.error, "class already have a base '"); strncat(PC.error, PC.cclass->base()->name().cstr(), 100); strcat(PC.error, "'");