--- parser3/src/main/compile.y 2001/03/07 10:35:41 1.65 +++ parser3/src/main/compile.y 2001/03/08 11:27:49 1.73 @@ -1,5 +1,5 @@ /* - $Id: compile.y,v 1.65 2001/03/07 10:35:41 paf Exp $ + $Id: compile.y,v 1.73 2001/03/08 11:27:49 paf Exp $ */ %{ @@ -22,7 +22,7 @@ #include "pa_vdouble.h" #define SELF_NAME "self" -#define USES_NAME "USES" +#define USE_NAME "USE" int real_yyerror(parse_control *pc, char *s); static void yyprint(FILE *file, int type, YYSTYPE value); @@ -60,6 +60,10 @@ int yylex(YYSTYPE *lvalp, void *pc); %token SEQ "eq" %token SNE "ne" +%token DEF "def" +%token IN "in" +%token FEXISTS "-f" + /* logical */ %left "lt" "gt" "le" "ge" %left "eq" "ne" @@ -67,12 +71,13 @@ int yylex(YYSTYPE *lvalp, void *pc); %left "==" "!=" %left "||" %left "&&" -%left NOT /* not: unary ! */ +%left "def" "in" "-f" +%left '!' /* bitwise */ %left '#' %left '&' '|' -%left INV /* invertion: unary ~ */ +%left '~' /* numerical */ %left '-' '+' @@ -108,21 +113,41 @@ control_method: '@' STRING '\n' YYERROR; } if(name==CLASS_NAME) { - if(strings_code->size()==1*2) - PC->vclass->set_name(*SLA2S(strings_code)); - else { + if(PC->vclass!=&PC->request->ROOT_CLASS) { // already changed from default? + strcpy(PC->error, "class already have a name '"); + strncat(PC->error, PC->vclass->name().cstr(), 100); + strcat(PC->error, "'"); + YYERROR; + } + if(strings_code->size()==1*2) { + // new class' name + String *name=SLA2S(strings_code); + // creating the class + PC->vclass=NEW VClass(POOL); + PC->vclass->set_name(*name); + // defaulting base. may change with @BASE + PC->vclass->set_base(PC->request->ROOT_CLASS); + // append to request's classes + PC->request->classes_array()+=PC->vclass; + PC->request->classes().put(*name, PC->vclass); + } else { strcpy(PC->error, "@"CLASS_NAME" must contain sole name"); YYERROR; } } else { - if(name==USES_NAME) { + if(name==USE_NAME) { for(int i=0; isize(); i+=2) { String *file=SLA2S(strings_code, i); file->APPEND_CONST(".p"); PC->request->use(file->cstr(), 0); } } else if(name==BASE_NAME) { + if(PC->vclass->base()!=&PC->request->ROOT_CLASS) { // already changed from default? + strcpy(PC->error, "there must be only one @"BASE_NAME); + YYERROR; + } if(strings_code->size()==1*2) { + // TODO: преодолеть self и циклические base String& base_name=*SLA2S(strings_code); VClass *base=static_cast( PC->request->classes().get(base_name)); @@ -139,7 +164,7 @@ control_method: '@' STRING '\n' } else { strcpy(PC->error, name.cstr()); strcat(PC->error, ": invalid special name. valid names are " - CLASS_NAME", "USES_NAME" and "BASE_NAME); + CLASS_NAME", "USE_NAME" and "BASE_NAME); YYERROR; } } @@ -188,7 +213,7 @@ action: get | put | with | call; get: get_value { $$=$1; /* stack: resulting value */ - O($$, OP_WRITE); /* value=pop; write(value) */ + O($$, OP_WRITE); /* value=pop; wcontext.write(value) */ }; get_value: '$' get_name_value { $$=$2 } get_name_value: name_without_curly_rdive EON | name_in_curly_rdive; @@ -265,7 +290,7 @@ any_constructor_code_value: constructor_code_value: constructor_code { $$=N(POOL); O($$, OP_CREATE_EWPOOL); /* stack: empty write context */ - P($$, $1); /* some codes to that context */ + P($$, $1); /* some code that writes to that context */ O($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ }; constructor_code: codes__excluding_sole_str_literal; @@ -273,28 +298,40 @@ codes__excluding_sole_str_literal: actio /* call */ -call: '^' call_name store_params EON { /* ^field.$method{vasya} */ +call: call_value { + $$=$1; /* stack: value */ + O($$, OP_WRITE); /* value=pop; wcontext.write(value) */ +}; +call_value: '^' call_name store_params EON { /* ^field.$method{vasya} */ $$=$2; /* with_xxx,diving code; stack: context,method_junction */ O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ P($$, $3); /* filling method_frame.store_params */ - O($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */ + O($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value */ }; 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}; -store_param_parts: - store_param_part -| store_param_parts ';' store_param_part { $$=$1; P($$, $3) } +store_param: + store_square_param +| store_round_param +| store_curly_param ; +store_square_param: '[' store_code_param_parts ']' {$$=$2}; +store_round_param: '(' store_expr_param_parts ')' {$$=$2}; store_curly_param: '{' maybe_codes '}' { $$=N(POOL); PCA($$, $2); - O($$, OP_STORE_PARAM); }; -store_param_part: +store_code_param_parts: + store_code_param_part +| store_code_param_parts ';' store_code_param_part { $$=$1; P($$, $3) } +; +store_expr_param_parts: + store_expr_param_part +| store_expr_param_parts ';' store_expr_param_part { $$=$1; P($$, $3) } +; +store_code_param_part: empty /* optimized () case */ | STRING { /* optimized (STRING) case */ $$=$1; @@ -302,9 +339,16 @@ store_param_part: } | constructor_code_value { /* (something complex) */ $$=$1; - O($$, OP_STORE_PARAM); } ; +store_expr_param_part: write_expr_value { + $$=N(POOL); + PCA($$, $1); +}; +write_expr_value: any_expr { + $$=$1; + O($$, OP_WRITE); +}; /* name */ @@ -359,16 +403,8 @@ subvar__get_write: '$' subvar_ref_name_r }; class_prefix: STRING ':' { - String& name=*SLA2S($1); - VClass *vclass=static_cast(PC->request->classes().get(name)); - if(!vclass) { - strcpy(PC->error, "'"); - strcat(PC->error, name.cstr()); - strcat(PC->error, "' class is undefined in call"); - YYERROR; - } - //TODO: убрать зависимость от статических @USE, сделать имя, а не ссылку - $$=CL(vclass); // vclass + $$=$1; // stack: class name string + O($$, OP_GET_CLASS); }; @@ -396,13 +432,16 @@ optimized_expr: expr { expr: STRING | get_value +| call_value | '"' string_inside_quotes_value '"' { $$ = $2; } | '(' expr ')' { $$ = $2; } /* stack: operand // stack: @operand */ | '-' expr %prec NEG { $$=$2; O($$, OP_NEG) } -| '~' expr %prec INV { $$=$2; O($$, OP_INV) } -| '!' expr %prec NOT { $$=$2; O($$, OP_NOT) } -/*todo: def in fexists*/ +| '~' expr { $$=$2; O($$, OP_INV) } +| '!' expr { $$=$2; O($$, OP_NOT) } +| "def" expr { $$=$2; O($$, OP_DEF) } +| "in" expr { $$=$2; O($$, OP_IN) } +| "-f" expr { $$=$2; O($$, OP_FEXISTS) } /* stack: a,b // stack: a@b */ | expr '-' expr { $$=$1; P($$, $3); O($$, OP_SUB) } | expr '+' expr { $$=$1; P($$, $3); O($$, OP_ADD) } @@ -432,7 +471,7 @@ expr: string_inside_quotes_value: maybe_codes { $$=N(POOL); O($$, OP_CREATE_SWPOOL); /* stack: empty write context */ - P($$, $1); /* some code that write to that context */ + P($$, $1); /* some code that writes to that context */ O($$, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */ }; @@ -481,7 +520,7 @@ int yylex(YYSTYPE *lvalp, void *pc) { char *begin=PC->source; char *end; int begin_line=PC->line; - bool skip_analized_char=false; + int skip_analized=0; while(true) { c=*(end=(PC->source++)); @@ -491,6 +530,8 @@ int yylex(YYSTYPE *lvalp, void *pc) { } else PC->col++; + // todo: # in 0+1 column comment + // escaping: ^^ ^$ ^; ^) ^} ^( ^{ ^" if(c=='^') switch(*PC->source) { @@ -603,14 +644,18 @@ int yylex(YYSTYPE *lvalp, void *pc) { break; // (EXPRESSION) - case LS_EXPRESSION_BODY: + case LS_VAR_ROUND: + case LS_METHOD_ROUND: switch(c) { case ')': if(--lexical_brackets_nestage==0) - pop_LS(PC); //(EXPRESSION). + if(PC->ls==LS_METHOD_ROUND) // method round param ended + PC->ls=LS_METHOD_AFTER; // look for method end + else // PC->ls==LS_VAR_ROUND // variable constructor ended + pop_LS(PC); // return to normal life RC; case '$': - push_LS(PC, LS_VAR_NAME_IN_EXPRESSION); + push_LS(PC, LS_EXPRESSION_VAR_NAME); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -618,20 +663,27 @@ int yylex(YYSTYPE *lvalp, void *pc) { case '(': lexical_brackets_nestage++; RC; - case '+': case '-': case '*': case '/': case '%': + case '-': + if(*PC->source=='f') { // -f + skip_analized=1; + result=FEXISTS; + } else + result=c; + goto break2; + case '+': case '*': case '/': case '%': case '~': case ';': RC; case '&': case '|': case '#': if(*PC->source==c) { // && || result=c=='#'?LXOR:c=='&'?LAND:LOR; - skip_analized_char=true; + skip_analized=1; } else result=c; goto break2; case '<': case '>': case '=': case '!': if(*PC->source=='=') { // <= >= == != - skip_analized_char=true; + skip_analized=1; switch(c) { case '<': result=NLE; break; case '>': result=NGE; break; @@ -650,15 +702,31 @@ int yylex(YYSTYPE *lvalp, void *pc) { // case '?': // ok [and bad cases, yacc would bark at them] case 't': // lt gt [et nt] result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR; - skip_analized_char=true; + skip_analized=1; goto break2; case 'e': // le ge ne [ee] result=c=='l'?SLE:c=='g'?SGE:c=='n'?SNE:BAD_STRING_COMPARISON_OPERATOR; - skip_analized_char=true; + skip_analized=1; goto break2; case 'q': // eq [lq gq nq] result=c=='e'?SEQ:BAD_STRING_COMPARISON_OPERATOR; - skip_analized_char=true; + skip_analized=1; + goto break2; + } + break; + case 'i': + if(end==begin) // right after whitespace + if(PC->source[0]=='n') { // in + skip_analized=1; + result=IN; + goto break2; + } + break; + case 'd': + if(end==begin) // right after whitespace + if(PC->source[0]=='e' && PC->source[1]=='f') { // def + skip_analized=2; + result=DEF; goto break2; } break; @@ -678,8 +746,8 @@ int yylex(YYSTYPE *lvalp, void *pc) { // VARIABLE GET/PUT/WITH case LS_VAR_NAME_SIMPLE: - case LS_VAR_NAME_IN_EXPRESSION: - if(PC->ls==LS_VAR_NAME_IN_EXPRESSION) { + case LS_EXPRESSION_VAR_NAME: + if(PC->ls==LS_EXPRESSION_VAR_NAME) { // name in expr ends also before binary operators switch(c) { case '+': case '-': case '*': case '/': case '%': @@ -711,10 +779,10 @@ int yylex(YYSTYPE *lvalp, void *pc) { PC->ls=LS_VAR_CURLY; lexical_brackets_nestage=1; } - + RC; case '(': - PC->ls=LS_EXPRESSION_BODY; + PC->ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim @@ -789,6 +857,10 @@ int yylex(YYSTYPE *lvalp, void *pc) { PC->ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; + case '(': + PC->ls=LS_METHOD_ROUND; + lexical_brackets_nestage=1; + RC; case '.': // name part delim case '$': // name part subvar case ':': // ':name' or 'class:name' @@ -839,16 +911,21 @@ int yylex(YYSTYPE *lvalp, void *pc) { break; case LS_METHOD_AFTER: - if(c=='[') {/* )( }( */ + if(c=='[') {/* ][ }[ )[ */ PC->ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; } - if(c=='{') {/* ){ }{ */ + if(c=='{') {/* ]{ }{ ){ */ PC->ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; } + if(c=='(') {/* ]( }( )( */ + PC->ls=LS_METHOD_ROUND; + lexical_brackets_nestage=1; + RC; + } pop_LS(PC); PC->source--; if(--PC->col<0) { PC->line--; PC->col=-1; } result=EON; @@ -879,8 +956,8 @@ break2: // make current result be pending for next call, return STRING for now PC->pending_state=result; result=STRING; } - if(skip_analized_char) { - PC->source++; PC->col++; + if(skip_analized) { + PC->source+=skip_analized; PC->col+=skip_analized; } return result; }