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.204.2.8.2.1 and 1.204.2.8.2.9

version 1.204.2.8.2.1, 2003/03/21 13:42:30	version 1.204.2.8.2.9, 2003/04/02 16:05:20
Line 24	Line 24
#define YYLEX_PARAM pc	#define YYLEX_PARAM pc
#define YYDEBUG 1	#define YYDEBUG 1
#define YYERROR_VERBOSE 1	#define YYERROR_VERBOSE 1
#define yyerror(msg) real_yyerror((parse_control *)pc, msg)	#define yyerror(msg) real_yyerror((Parse_control *)pc, msg)
#define YYPRINT(file, type, value) yyprint(file, type, value)	#define YYPRINT(file, type, value) yyprint(file, type, value)

#include "compile_tools.h"	#include "compile_tools.h"
Line 38	Line 38

#define USE_CONTROL_METHOD_NAME "USE"	#define USE_CONTROL_METHOD_NAME "USE"

static int real_yyerror(parse_control pc, char s);	static int real_yyerror(Parse_control pc, char s);
static void yyprint(FILE *file, int type, YYSTYPE value);	static void yyprint(FILE *file, int type, YYSTYPE value);
static int yylex(YYSTYPE lvalp, void pc);	static int yylex(YYSTYPE lvalp, void pc);


// local convinient inplace typecast & var	// local convinient inplace typecast & var
#undef PC	#undef PC
#define PC ((parse_control )pc)	#define PC ((Parse_control )pc)
#undef POOL	#undef POOL
#define POOL (*PC.pool)	#define POOL (*PC.pool)
#ifndef DOXYGEN	#ifndef DOXYGEN
Line 114 static int yylex(YYSTYPE lvalp, void p	Line 114 static int yylex(YYSTYPE lvalp, void p
%%	%%
all:	all:
one_big_piece {	one_big_piece {
Method& method=*new Method(main_method_name, Method::CT_ANY,	Method& method=new Method(/main_method_name, */Method::CT_ANY,
0, 0, /min, max numbered_params_count/	0, 0, /min, max numbered_params_count/
0/param_names/, 0/local_names/,	0/param_names/, 0/local_names/,
$1/parser_code/, 0/native_code/);	$1/parser_code/, 0/native_code/);
Line 158 control_method: '@' STRING '\n'	Line 158 control_method: '@' STRING '\n'
YYERROR;	YYERROR;
}	}
} else if(command==USE_CONTROL_METHOD_NAME) {	} else if(command==USE_CONTROL_METHOD_NAME) {
for(int i=0; i<strings_code->count(); i+=2)	for(size_t i=0; i<strings_code->count(); i+=2)
PC.request.use_file(PC.request.main_class, LA2S(strings_code, i));	PC.request.use_file(PC.request.main_class, LA2S(strings_code, i));
} else if(command==BASE_NAME) {	} else if(command==BASE_NAME) {
if(PC.cclass->base_class()) { // already changed from default?	if(PC.cclass->base_class()) { // already changed from default?
Line 209 code_method: '@' STRING bracketed_maybe_	Line 209 code_method: '@' STRING bracketed_maybe_
const String& name=LA2S($2);	const String& name=LA2S($2);

YYSTYPE params_names_code=$3;	YYSTYPE params_names_code=$3;
ArrayString* params_names;	ArrayString* params_names=0;
if(int size=params_names_code->count()) {	if(int size=params_names_code->count()) {
params_names=new ArrayString;	params_names=new ArrayString;
for(int i=0; i<size; i+=2)	for(int i=0; i<size; i+=2)
Line 217 code_method: '@' STRING bracketed_maybe_	Line 217 code_method: '@' STRING bracketed_maybe_
}	}

YYSTYPE locals_names_code=$4;	YYSTYPE locals_names_code=$4;
ArrayString* locals_names;	ArrayString* locals_names=0;
if(int size=locals_names_code->count()) {	if(int size=locals_names_code->count()) {
locals_names=new ArrayString;	locals_names=new ArrayString;
for(int i=0; i<size; i+=2)	for(int i=0; i<size; i+=2)
Line 225 code_method: '@' STRING bracketed_maybe_	Line 225 code_method: '@' STRING bracketed_maybe_
}	}

Method& method=*new Method(	Method& method=*new Method(
name,	//name,
Method::CT_ANY,	Method::CT_ANY,
0, 0/min,max numbered_params_count/,	0, 0/min,max numbered_params_count/,
params_names, locals_names,	params_names, locals_names,
Line 280 name_without_curly_rdive_read: name_with	Line 280 name_without_curly_rdive_read: name_with
// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR	// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR.	// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR.
if(PC.in_call_value && diving_code->count()==3)	if(PC.in_call_value && diving_code->count()==3)
(*diving_code)[2].code=OP_GET_ELEMENT_OR_OPERATOR;	diving_code->put(2, OP_GET_ELEMENT_OR_OPERATOR);
P($$, diving_code);	P($$, diving_code);
}	}
/* diving code; stack: current context */	/* diving code; stack: current context */
Line 498 class_prefix:	Line 498 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(LA2S($$) == BASE_NAME) { // pseudo BASE class
if(VStateless_class* base=PC.cclass->base_class()) {	if(VStateless_class* base=PC.cclass->base_class()) {
change_string_literal_value(*$$, base->name());	change_string_literal_value(*$$, base->name());
} else {	} else {
Line 585 write_string: STRING {	Line 585 write_string: STRING {
change_string_literal_to_write_string_literal(*($$=$1))	change_string_literal_to_write_string_literal(*($$=$1))
};	};

void_value: /* empty */ { $$=VL(new VVoid()) };	void_value: /* empty */ { $$=VL(new VVoid(), 0, 0, 0) };
empty: /* empty */ { $$=N() };	empty: /* empty */ { $$=N() };

%%	%%
Line 607 empty: /* empty */ { $$=N() };	Line 607 empty: /* empty */ { $$=N() };
4:[^({]=pop	4:[^({]=pop
*/	*/

static int yylex(YYSTYPE lvalp, void pc) {	static int yylex(YYSTYPE lvalp, void apc) {
#define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp]	register Parse_control& pc=static_cast<Parse_control>(apc);

	#define lexical_brackets_nestage pc.brackets_nestages[pc.ls_sp]
#define RC {result=c; goto break2; }	#define RC {result=c; goto break2; }

register int c;	register int c;
int result;	int result;

if(PC.pending_state) {	if(pc.pending_state) {
result=PC.pending_state;	result=pc.pending_state;
PC.pending_state=0;	pc.pending_state=0;
return result;	return result;
}	}

const char *begin=PC.source;	const char *begin=pc.source;
	Pos begin_pos=pc.pos;
const char *end;	const char *end;
int begin_line=PC.line;
int skip_analized=0;	int skip_analized=0;
while(true) {	while(true) {
c=*(end=(PC.source++));	c=*(end=(pc.source++));
// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp);	// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, pc.sp);

if(c=='\n') {	if(c=='\n') {
PC.line++;	pc.pos.line++;
PC.col=0;	pc.pos.col=0;
} else	} else
PC.col++;	pc.pos.col++;

if(c=='@' && PC.col==0+1) {	if(c=='@' && pc.pos.col==0+1) {
if(PC.ls==LS_DEF_SPECIAL_BODY) {	if(pc.ls==LS_DEF_SPECIAL_BODY) {
// @SPECIAL	// @SPECIAL
// ...	// ...
// @<here =	// @<here =
pop_LS(PC); // exiting from LS_DEF_SPECIAL_BODY state	pop_LS(pc); // exiting from LS_DEF_SPECIAL_BODY state
} // continuing checks	} // continuing checks
if(PC.ls==LS_USER) {	if(pc.ls==LS_USER) {
push_LS(PC, LS_DEF_NAME);	push_LS(pc, LS_DEF_NAME);
RC;	RC;
} else // @ in first column inside some code [when could that be?]	} else // @ in first column inside some code [when could that be?]
result=BAD_METHOD_DECL_START;	result=BAD_METHOD_DECL_START;
goto break2;	goto break2;
} else if(c=='^') {	} else if(c=='^') {
if(PC.ls==LS_METHOD_AFTER) {	if(pc.ls==LS_METHOD_AFTER) {
// handle after-method situation	// handle after-method situation
pop_LS(PC);	pop_LS(pc);
result=EON;	result=EON;
skip_analized=-1; // return to punctuation afterwards to assure it's literality	skip_analized=-1; // return to punctuation afterwards to assure it's literality
goto break2;	goto break2;
}	}
switch(PC.ls) {	switch(pc.ls) {
case LS_EXPRESSION_VAR_NAME_WITH_COLON:	case LS_EXPRESSION_VAR_NAME_WITH_COLON:
case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON:	case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON:
case LS_VAR_NAME_SIMPLE_WITH_COLON:	case LS_VAR_NAME_SIMPLE_WITH_COLON:
Line 667 case LS_DEF_COMMENT:	Line 669 case LS_DEF_COMMENT:
// no literals in names, please	// no literals in names, please
break;	break;
default:	default:
switch(*PC.source) {	switch(*pc.source) {
// ^escaping some punctuators	// ^escaping some punctuators
case '^': case '$': case ';':	case '^': case '$': case ';':
case '(': case ')':	case '(': case ')':
Line 675 default:	Line 677 default:
case '{': case '}':	case '{': case '}':
case '"': case ':':	case '"': case ':':
if(end!=begin) {	if(end!=begin) {
	if(!pc.string_start)
	pc.string_start=begin_pos;
// append piece till ^	// append piece till ^
PC.string.append(begin, end-begin);	pc.string.append_strdup(begin, end-begin);
}	}
// reset piece 'begin' position & line	// reset piece 'begin' position & line
begin=PC.source; // ->punctuation	begin=pc.source; // ->punctuation
begin_line=PC.line;	begin_pos=pc.pos;
// skip over _ after ^	// skip over _ after ^
PC.source++; PC.col++;	pc.source++; pc.pos.col++;
// skip analysis = forced literal	// skip analysis = forced literal
continue;	continue;

// converting ^#HH into char(hex(HH))	// converting ^#HH into char(hex(HH))
case '#':	case '#':
if(end!=begin) {	if(end!=begin) {
	if(!pc.string_start)
	pc.string_start=begin_pos;
// append piece till ^	// append piece till ^
PC.string.append(begin, end-begin);	pc.string.append_strdup(begin, end-begin);
}	}
// #HH ?	// #HH ?
if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) {	if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) {
char c=	char c=
hex_value[(unsigned char)PC.source[1]]*0x10+	hex_value[(unsigned char)pc.source[1]]*0x10+
hex_value[(unsigned char)PC.source[2]];	hex_value[(unsigned char)pc.source[2]];
if(c==0) {	if(c==0) {
result=BAD_HEX_LITERAL;	result=BAD_HEX_LITERAL;
goto break2; // wrong hex value[no ^#00 chars allowed]: bail out	goto break2; // wrong hex value[no ^#00 chars allowed]: bail out
}	}
// append char(hex(HH))	// append char(hex(HH))
PC.string.append(c);	pc.string.append(c);
// skip over ^#HH	// skip over ^#HH
PC.source+=3;	pc.source+=3;
PC.col+=3;	pc.pos.col+=3;
// reset piece 'begin' position & line	// reset piece 'begin' position & line
begin=PC.source; // ->after ^#HH	begin=pc.source; // ->after ^#HH
begin_line=PC.line;	begin_pos=pc.pos;
// skip analysis = forced literal	// skip analysis = forced literal
continue;	continue;
}	}
Line 718 default:	Line 724 default:
}	}
}	}
// #comment start skipping	// #comment start skipping
if(c=='#' && PC.col==1) {	if(c=='#' && pc.pos.col==1) {
if(end!=begin) {	if(end!=begin) {
	if(!pc.string_start)
	pc.string_start=begin_pos;
// append piece till #	// append piece till #
PC.string.append(begin, end-begin);	pc.string.append_strdup(begin, end-begin);
}	}
// fall into COMMENT lexical state [wait for \n]	// fall into COMMENT lexical state [wait for \n]
push_LS(PC, LS_USER_COMMENT);	push_LS(pc, LS_USER_COMMENT);
continue;	continue;
}	}
switch(PC.ls) {	switch(pc.ls) {

// USER'S = NOT OURS	// USER'S = NOT OURS
case LS_USER:	case LS_USER:
case LS_NAME_SQUARE_PART: // name.[here].xxx	case LS_NAME_SQUARE_PART: // name.[here].xxx
if(PC.trim_bof)	if(pc.trim_bof)
switch(c) {	switch(c) {
case '\n': case ' ': case '\t':	case '\n': case ' ': case '\t':
begin=PC.source;	begin=pc.source;
begin_line=PC.line;	begin_pos=pc.pos;
continue; // skip it	continue; // skip it
default:	default:
PC.trim_bof=false;	pc.trim_bof=false;
}	}
switch(c) {	switch(c) {
case '$':	case '$':
push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);	push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
case ']':	case ']':
if(PC.ls==LS_NAME_SQUARE_PART)	if(pc.ls==LS_NAME_SQUARE_PART)
if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?>	if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?>
pop_LS(PC); // $name.[co<]>de<]!>	pop_LS(pc); // $name.[co<]>de<]!>
RC;	RC;
}	}
break;	break;
case '[': // $name.[co<[>de]	case '[': // $name.[co<[>de]
if(PC.ls==LS_NAME_SQUARE_PART)	if(pc.ls==LS_NAME_SQUARE_PART)
lexical_brackets_nestage++;	lexical_brackets_nestage++;
break;	break;
}	}
Line 766 default:	Line 774 default:
case LS_USER_COMMENT:	case LS_USER_COMMENT:
if(c=='\n') {	if(c=='\n') {
// skip comment	// skip comment
begin=PC.source;	begin=pc.source;
begin_line=PC.line;	begin_pos=pc.pos;

pop_LS(PC);	pop_LS(pc);
continue;	continue;
}	}
break;	break;
Line 781 default:	Line 789 default:
case '"':	case '"':
case '\'':	case '\'':
if(	if(
PC.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' \|\|	pc.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' \|\|
PC.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') {	pc.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') {
pop_LS(PC); //"abc". \| 'abc'.	pop_LS(pc); //"abc". \| 'abc'.
RC;	RC;
}	}
break;	break;
case '$':	case '$':
push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);	push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
}	}
break;	break;
Line 800 default:	Line 808 default:
case LS_DEF_NAME:	case LS_DEF_NAME:
switch(c) {	switch(c) {
case '[':	case '[':
PC.ls=LS_DEF_PARAMS;	pc.ls=LS_DEF_PARAMS;
RC;	RC;
case '\n':	case '\n':
PC.ls=LS_DEF_SPECIAL_BODY;	pc.ls=LS_DEF_SPECIAL_BODY;
RC;	RC;
}	}
break;	break;
Line 816 default:	Line 824 default:
case ';':	case ';':
RC;	RC;
case ']':	case ']':
PC.ls=*PC.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT;	pc.ls=*pc.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT;
RC;	RC;
case '\n': // wrong. bailing out	case '\n': // wrong. bailing out
pop_LS(PC);	pop_LS(pc);
RC;	RC;
}	}
break;	break;
Line 830 default:	Line 838 default:
case ';':	case ';':
RC;	RC;
case ']':	case ']':
PC.ls=LS_DEF_COMMENT;	pc.ls=LS_DEF_COMMENT;
RC;	RC;
case '\n': // wrong. bailing out	case '\n': // wrong. bailing out
pop_LS(PC);	pop_LS(pc);
RC;	RC;
}	}
break;	break;

case LS_DEF_COMMENT:	case LS_DEF_COMMENT:
if(c=='\n') {	if(c=='\n') {
pop_LS(PC);	pop_LS(pc);
RC;	RC;
}	}
break;	break;
Line 856 default:	Line 864 default:
switch(c) {	switch(c) {
case ')':	case ')':
if(--lexical_brackets_nestage==0)	if(--lexical_brackets_nestage==0)
if(PC.ls==LS_METHOD_ROUND) // method round param ended	if(pc.ls==LS_METHOD_ROUND) // method round param ended
PC.ls=LS_METHOD_AFTER; // look for method end	pc.ls=LS_METHOD_AFTER; // look for method end
else // PC.ls==LS_VAR_ROUND // variable constructor ended	else // pc.ls==LS_VAR_ROUND // variable constructor ended
pop_LS(PC); // return to normal life	pop_LS(pc); // return to normal life
RC;	RC;
case '#': // comment start skipping	case '#': // comment start skipping
if(end!=begin) {	if(end!=begin) {
	if(!pc.string_start)
	pc.string_start=begin_pos;
// append piece till #	// append piece till #
PC.string.append(begin, end-begin);	pc.string.append_strdup(begin, end-begin);
}	}
// fall into COMMENT lexical state [wait for \n]	// fall into COMMENT lexical state [wait for \n]
push_LS(PC, LS_EXPRESSION_COMMENT);	push_LS(pc, LS_EXPRESSION_COMMENT);
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
continue;	continue;
case '$':	case '$':
push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON);	push_LS(pc, LS_EXPRESSION_VAR_NAME_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
case '(':	case '(':
lexical_brackets_nestage++;	lexical_brackets_nestage++;
RC;	RC;
case '-':	case '-':
switch(*PC.source) {	switch(*pc.source) {
case 'f': // -f	case 'f': // -f
skip_analized=1;	skip_analized=1;
result=FEXISTS;	result=FEXISTS;
Line 899 default:	Line 909 default:
case ';':	case ';':
RC;	RC;
case '&': case '\|':	case '&': case '\|':
if(*PC.source==c) { // && \|\|	if(*pc.source==c) { // && \|\|
result=c=='&'?LAND:LOR;	result=c=='&'?LAND:LOR;
skip_analized=1;	skip_analized=1;
} else	} else
result=c;	result=c;
goto break2;	goto break2;
case '!':	case '!':
switch(PC.source[0]) {	switch(pc.source[0]) {
case '\|': // !\| !\|\|	case '\|': // !\| !\|\|
skip_analized=1;	skip_analized=1;
if(PC.source[1]=='\|') {	if(pc.source[1]=='\|') {
skip_analized++;	skip_analized++;
result=LXOR;	result=LXOR;
} else	} else
Line 923 default:	Line 933 default:
RC;	RC;

case '<': // <<, <=, <	case '<': // <<, <=, <
switch(*PC.source) {	switch(*pc.source) {
case '<': // <[<]	case '<': // <[<]
skip_analized=1; result=NSL; break;	skip_analized=1; result=NSL; break;
case '=': // <[=]	case '=': // <[=]
Line 933 default:	Line 943 default:
}	}
goto break2;	goto break2;
case '>': // >>, >=, >	case '>': // >>, >=, >
switch(*PC.source) {	switch(*pc.source) {
case '>': // >[>]	case '>': // >[>]
skip_analized=1; result=NSR; break;	skip_analized=1; result=NSR; break;
case '=': // >[=]	case '=': // >[=]
Line 943 default:	Line 953 default:
}	}
goto break2;	goto break2;
case '=': // ==	case '=': // ==
switch(*PC.source) {	switch(*pc.source) {
case '=': // =[=]	case '=': // =[=]
skip_analized=1; result=NEQ; break;	skip_analized=1; result=NEQ; break;
default: // =[]	default: // =[]
Line 952 default:	Line 962 default:
goto break2;	goto break2;

case '"':	case '"':
push_LS(PC, LS_EXPRESSION_STRING_QUOTED);	push_LS(pc, LS_EXPRESSION_STRING_QUOTED);
RC;	RC;
case '\'':	case '\'':
push_LS(PC, LS_EXPRESSION_STRING_APOSTROFED);	push_LS(pc, LS_EXPRESSION_STRING_APOSTROFED);
RC;	RC;
case 'l': case 'g': case 'e': case 'n':	case 'l': case 'g': case 'e': case 'n':
if(end==begin) // right after whitespace	if(end==begin) // right after whitespace
if(isspace(PC.source[1])) {	if(isspace(pc.source[1])) {
switch(*PC.source) {	switch(*pc.source) {
// case '?': // ok [and bad cases, yacc would bark at them]	// case '?': // ok [and bad cases, yacc would bark at them]
case 't': // lt gt [et nt]	case 't': // lt gt [et nt]
result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR;	result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR;
Line 979 default:	Line 989 default:
break;	break;
case 'i':	case 'i':
if(end==begin) // right after whitespace	if(end==begin) // right after whitespace
if(isspace(PC.source[1])) {	if(isspace(pc.source[1])) {
switch(PC.source[0]) {	switch(pc.source[0]) {
case 'n': // in	case 'n': // in
skip_analized=1;	skip_analized=1;
result=IN;	result=IN;
Line 994 default:	Line 1004 default:
break;	break;
case 'd':	case 'd':
if(end==begin) // right after whitespace	if(end==begin) // right after whitespace
if(PC.source[0]=='e' && PC.source[1]=='f') { // def	if(pc.source[0]=='e' && pc.source[1]=='f') { // def
skip_analized=2;	skip_analized=2;
result=DEF;	result=DEF;
goto break2;	goto break2;
Line 1008 default:	Line 1018 default:
// that's a leading\|traling space or after-operator-space	// that's a leading\|traling space or after-operator-space
// ignoring it	// ignoring it
// reset piece 'begin' position & line	// reset piece 'begin' position & line
begin=PC.source; // after whitespace char	begin=pc.source; // after whitespace char
begin_line=PC.line;	begin_pos=pc.pos;
continue;	continue;
}	}
break;	break;
Line 1017 default:	Line 1027 default:
if(c=='(')	if(c=='(')
lexical_brackets_nestage++;	lexical_brackets_nestage++;

switch(*PC.source) {	switch(*pc.source) {
case '\n': case ')':	case '\n': case ')':
if(*PC.source==')')	if(*pc.source==')')
if(--lexical_brackets_nestage!=0)	if(--lexical_brackets_nestage!=0)
continue;	continue;

// skip comment	// skip comment
begin=PC.source;	begin=pc.source;
begin_line=PC.line;	begin_pos=pc.pos;

pop_LS(PC);	pop_LS(pc);
continue;	continue;
}	}
break;	break;
Line 1038 default:	Line 1048 default:
case LS_EXPRESSION_VAR_NAME_WITH_COLON:	case LS_EXPRESSION_VAR_NAME_WITH_COLON:
case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON:	case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON:
if(	if(
PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON \|\|	pc.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON \|\|
PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {	pc.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {
// name in expr ends also before	// name in expr ends also before
switch(c) {	switch(c) {
// expression minus	// expression minus
case '-':	case '-':
// expression integer division	// expression integer division
case '\\':	case '\\':
pop_LS(PC);	pop_LS(pc);
PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; }	pc.source--; if(--pc.pos.col<0) { pc.pos.line--; pc.pos.col=-1; }
result=EON;	result=EON;
goto break2;	goto break2;
}	}
}	}
if(	if(
PC.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON \|\|	pc.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON \|\|
PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {	pc.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {
// name already has ':', stop before next	// name already has ':', stop before next
switch(c) {	switch(c) {
case ':':	case ':':
pop_LS(PC);	pop_LS(pc);
PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; }	pc.source--; if(--pc.pos.col<0) { pc.pos.line--; pc.pos.col=-1; }
result=EON;	result=EON;
goto break2;	goto break2;
}	}
Line 1078 default:	Line 1088 default:
case ',': case '?': case '#':	case ',': case '?': case '#':
// before call	// before call
case '^':	case '^':
pop_LS(PC);	pop_LS(pc);
PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; }	pc.source--; if(--pc.pos.col<0) { pc.pos.line--; pc.pos.col=-1; }
result=EON;	result=EON;
goto break2;	goto break2;
case '[':	case '[':
// $name.<[>code]	// $name.<[>code]
if(PC.col>1/not first column/ && (	if(pc.pos.col>1/not first column/ && (
end[-1]=='$'/was start of get/ \|\|	end[-1]=='$'/was start of get/ \|\|
end[-1]==':'/was class name delim / \|\|	end[-1]==':'/was class name delim / \|\|
end[-1]=='.'/was name delim /	end[-1]=='.'/was name delim /
)) {	)) {
push_LS(PC, LS_NAME_SQUARE_PART);	push_LS(pc, LS_NAME_SQUARE_PART);
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
}	}
PC.ls=LS_VAR_SQUARE;	pc.ls=LS_VAR_SQUARE;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
case '{':	case '{':
if(begin==end) { // ${name}, no need of EON, switching LS	if(begin==end) { // ${name}, no need of EON, switching LS
PC.ls=LS_VAR_NAME_CURLY;	pc.ls=LS_VAR_NAME_CURLY;
} else {	} else {
PC.ls=LS_VAR_CURLY;	pc.ls=LS_VAR_CURLY;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
}	}

RC;	RC;
case '(':	case '(':
PC.ls=LS_VAR_ROUND;	pc.ls=LS_VAR_ROUND;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
case '.': // name part delim	case '.': // name part delim
case '$': // name part subvar	case '$': // name part subvar
case ':': // class<:>name	case ':': // class<:>name
// go to _WITHOUT_COLON state variant...	// go to _WITHOUT_COLON state variant...
if(PC.ls==LS_VAR_NAME_SIMPLE_WITH_COLON)	if(pc.ls==LS_VAR_NAME_SIMPLE_WITH_COLON)
PC.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON;	pc.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON;
else if(PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON)	else if(pc.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON)
PC.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON;	pc.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON;
// ...stop before next ':'	// ...stop before next ':'
RC;	RC;
}	}
Line 1126 default:	Line 1136 default:
switch(c) {	switch(c) {
case '[':	case '[':
// ${name.<[>code]}	// ${name.<[>code]}
push_LS(PC, LS_NAME_SQUARE_PART);	push_LS(pc, LS_NAME_SQUARE_PART);
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
case '}': // ${name} finished, restoring LS	case '}': // ${name} finished, restoring LS
pop_LS(PC);	pop_LS(pc);
RC;	RC;
case '.': // name part delim	case '.': // name part delim
case '$': // name part subvar	case '$': // name part subvar
Line 1142 default:	Line 1152 default:
case LS_VAR_SQUARE:	case LS_VAR_SQUARE:
switch(c) {	switch(c) {
case '$':	case '$':
push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);	push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
case ']':	case ']':
if(--lexical_brackets_nestage==0) {	if(--lexical_brackets_nestage==0) {
pop_LS(PC);	pop_LS(pc);
RC;	RC;
}	}
break;	break;
Line 1164 default:	Line 1174 default:
case LS_VAR_CURLY:	case LS_VAR_CURLY:
switch(c) {	switch(c) {
case '$':	case '$':
push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);	push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
case '}':	case '}':
if(--lexical_brackets_nestage==0) {	if(--lexical_brackets_nestage==0) {
pop_LS(PC);	pop_LS(pc);
RC;	RC;
}	}
break;	break;
Line 1186 default:	Line 1196 default:
switch(c) {	switch(c) {
case '[':	case '[':
// ^name.<[>code].xxx	// ^name.<[>code].xxx
if(PC.col>1/not first column/ && (	if(pc.pos.col>1/not first column/ && (
end[-1]=='^'/was start of call/ \|\| // never, ^[ is literal...	end[-1]=='^'/was start of call/ \|\| // never, ^[ is literal...
end[-1]==':'/was class name delim / \|\|	end[-1]==':'/was class name delim / \|\|
end[-1]=='.'/was name delim /	end[-1]=='.'/was name delim /
)) {	)) {
push_LS(PC, LS_NAME_SQUARE_PART);	push_LS(pc, LS_NAME_SQUARE_PART);
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
}	}
PC.ls=LS_METHOD_SQUARE;	pc.ls=LS_METHOD_SQUARE;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
case '{':	case '{':
PC.ls=LS_METHOD_CURLY;	pc.ls=LS_METHOD_CURLY;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
case '(':	case '(':
PC.ls=LS_METHOD_ROUND;	pc.ls=LS_METHOD_ROUND;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
case '.': // name part delim	case '.': // name part delim
Line 1218 default:	Line 1228 default:
case LS_METHOD_SQUARE:	case LS_METHOD_SQUARE:
switch(c) {	switch(c) {
case '$':	case '$':
push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);	push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
case ';': // param delim	case ';': // param delim
RC;	RC;
case ']':	case ']':
if(--lexical_brackets_nestage==0) {	if(--lexical_brackets_nestage==0) {
PC.ls=LS_METHOD_AFTER;	pc.ls=LS_METHOD_AFTER;
RC;	RC;
}	}
break;	break;
Line 1240 default:	Line 1250 default:
case LS_METHOD_CURLY:	case LS_METHOD_CURLY:
switch(c) {	switch(c) {
case '$':	case '$':
push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);	push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON);
RC;	RC;
case '^':	case '^':
push_LS(PC, LS_METHOD_NAME);	push_LS(pc, LS_METHOD_NAME);
RC;	RC;
case ';': // param delim	case ';': // param delim
RC;	RC;
case '}':	case '}':
if(--lexical_brackets_nestage==0) {	if(--lexical_brackets_nestage==0) {
PC.ls=LS_METHOD_AFTER;	pc.ls=LS_METHOD_AFTER;
RC;	RC;
}	}
break;	break;
Line 1261 default:	Line 1271 default:

case LS_METHOD_AFTER:	case LS_METHOD_AFTER:
if(c=='[') {/* ][ }[ )[ */	if(c=='[') {/* ][ }[ )[ */
PC.ls=LS_METHOD_SQUARE;	pc.ls=LS_METHOD_SQUARE;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
}	}
if(c=='{') {/* ]{ }{ ){ */	if(c=='{') {/* ]{ }{ ){ */
PC.ls=LS_METHOD_CURLY;	pc.ls=LS_METHOD_CURLY;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
}	}
if(c=='(') {/* ]( }( )( */	if(c=='(') {/* ]( }( )( */
PC.ls=LS_METHOD_ROUND;	pc.ls=LS_METHOD_ROUND;
lexical_brackets_nestage=1;	lexical_brackets_nestage=1;
RC;	RC;
}	}
pop_LS(PC);	pop_LS(pc);
PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; }	pc.source--; if(--pc.pos.col<0) { pc.pos.line--; pc.pos.col=-1; }
result=EON;	result=EON;
goto break2;	goto break2;
}	}
Line 1294 break2:	Line 1304 break2:
if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME	if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME
end--;	end--;
}	}
if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment?	if(end!=begin && pc.ls!=LS_USER_COMMENT) { // last piece still alive and not comment?
	if(!pc.string_start)
	pc.string_start=begin_pos;
// append it	// append it
PC.string.append(begin, end-begin);	pc.string.append_strdup(begin, end-begin);
}	}
}	}
if(PC.string!=CORD_EMPTY) { // something accumulated?	if(!pc.string.is_empty()) { // something accumulated?
// create STRING value: array of OP_VALUE+vstring	// create STRING value: array of OP_VALUE+vstring
lvalp=VL(new VString(new String(PC.string, String::L_CLEAN)));	*lvalp=VL(
	new VString(*new String(pc.string, String::L_CLEAN)),
	pc.file_no, pc.string_start.line, pc.string_start.col);
// new pieces storage	// new pieces storage
PC.string.clear();	pc.string.clear();
	pc.string_start.clear();
// make current result be pending for next call, return STRING for now	// make current result be pending for next call, return STRING for now
PC.pending_state=result; result=STRING;	pc.pending_state=result; result=STRING;
}	}
if(skip_analized) {	if(skip_analized) {
PC.source+=skip_analized; PC.col+=skip_analized;	pc.source+=skip_analized; pc.pos.col+=skip_analized;
}	}
return result;	return result;
}	}

static int real_yyerror(parse_control pc, char s) { // Called by yyparse on error	static int real_yyerror(Parse_control pc, char s) { // Called by yyparse on error
strncpy(PC.error, s, MAX_STRING);	strncpy(PC.error, s, MAX_STRING);
return 1;	return 1;
}	}

E-mail:

Removed from v.1.204.2.8.2.1
changed lines
	Added in v.1.204.2.8.2.9