parser3/src/main/compile.y - diff

Return to compile.y CVS log

Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/compile.y between versions 1.187 and 1.191

version 1.187, 2002/05/07 07:39:18	version 1.191, 2002/09/13 10:43:26
Line 132 control_method: '@' STRING '\n'	Line 132 control_method: '@' STRING '\n'
YYERROR;	YYERROR;
}	}
if(command==CLASS_NAME) {	if(command==CLASS_NAME) {
if(PC.cclass->base()) { // already changed from default?	if(PC.cclass->base_class()) { // already changed from default?
strcpy(PC.error, "class already have a name '");	strcpy(PC.error, "class already have a name '");
strncat(PC.error, PC.cclass->name().cstr(), 100);	strncat(PC.error, PC.cclass->name().cstr(), 100);
strcat(PC.error, "'");	strcat(PC.error, "'");
Line 154 control_method: '@' STRING '\n'	Line 154 control_method: '@' STRING '\n'
for(int i=0; i<strings_code->size(); i+=2)	for(int i=0; i<strings_code->size(); i+=2)
PC.request->use_file(*LA2S(strings_code, i));	PC.request->use_file(*LA2S(strings_code, i));
} else if(command==BASE_NAME) {	} else if(command==BASE_NAME) {
if(PC.cclass->base()) { // already changed from default?	if(PC.cclass->base_class()) { // already changed from default?
strcpy(PC.error, "class already have a base '");	strcpy(PC.error, "class already have a base '");
strncat(PC.error, PC.cclass->base()->name().cstr(), 100);	strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100);
strcat(PC.error, "'");	strcat(PC.error, "'");
YYERROR;	YYERROR;
}	}
if(strings_code->size()==1*2) {	if(strings_code->size()==1*2) {
const String& base_name=*LA2S(strings_code);	const String& base_name=*LA2S(strings_code);
VClass base=static_cast<VClass >(	Value vbase_class=static_cast<VClass >(
PC.request->classes().get(base_name));	PC.request->classes().get(base_name));
if(!base) {	VStateless_class *base_class=vbase_class?vbase_class->get_class():0;
	if(!base_class) {
strcpy(PC.error, base_name.cstr());	strcpy(PC.error, base_name.cstr());
strcat(PC.error, ": undefined class in @"BASE_NAME);	strcat(PC.error, ": undefined class in @"BASE_NAME);
YYERROR;	YYERROR;
}	}
// @CLASS == @BASE sanity check	// @CLASS == @BASE sanity check
if(PC.cclass==base) {	if(PC.cclass==base_class) {
strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME);	strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME);
YYERROR;	YYERROR;
}	}
PC.cclass->set_base(*base);	PC.cclass->set_base(base_class);
} else {	} else {
strcpy(PC.error, "@"BASE_NAME" must contain sole name");	strcpy(PC.error, "@"BASE_NAME" must contain sole name");
YYERROR;	YYERROR;
Line 486 class_prefix:	Line 487 class_prefix:
;	;
class_static_prefix: STRING ':' {	class_static_prefix: STRING ':' {
$$=$1; // stack: class name string	$$=$1; // stack: class name string
	if(*LA2S($$) == BASE_NAME) { // pseude BASE class
	if(VStateless_class *base=PC.cclass->base_class()) {
	change_string_literal_value($$, base->name());
	} else {
	strcpy(PC.error, "no base class declared");
	YYERROR;
	}
	}
O($$, OP_GET_CLASS);	O($$, OP_GET_CLASS);
};	};
class_constructor_prefix: class_static_prefix ':' {	class_constructor_prefix: class_static_prefix ':' {
Line 854 default:	Line 863 default:
skip_analized=1;	skip_analized=1;
result=DEXISTS;	result=DEXISTS;
goto break2;	goto break2;
default:	default: // minus
result=c;	result=c;
goto break2;	goto break2;
}	}
Line 988 default:	Line 997 default:
case '&': case '\|':	case '&': case '\|':
case '=': case '!':	case '=': case '!':
// common delimiters	// common delimiters
case ',': case '?':	case ',': case '?': case '#':
// before call	// before call
case '^':	case '^':
pop_LS(PC);	pop_LS(PC);

E-mail:

Removed from v.1.187
changed lines
	Added in v.1.191