--- parser3/src/main/compile.y 2001/03/06 14:28:35 1.54 +++ parser3/src/main/compile.y 2001/03/08 16:54:26 1.77 @@ -1,5 +1,5 @@ /* - $Id: compile.y,v 1.54 2001/03/06 14:28:35 paf Exp $ + $Id: compile.y,v 1.77 2001/03/08 16:54:26 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); @@ -41,18 +41,61 @@ int yylex(YYSTYPE *lvalp, void *pc); %token EON %token STRING %token BOGUS -%token LOGICAL_AND LOGICAL_OR + +%token BAD_STRING_COMPARISON_OPERATOR + +%token LAND "&&" +%token LOR "||" +%token LXOR "##" + +%token NLE "<=" +%token NGE ">=" +%token NEQ "==" +%token NNE "!=" + +%token SLT "lt" +%token SGT "gt" +%token SLE "le" +%token SGE "ge" +%token SEQ "eq" +%token SNE "ne" + +%token DEF "def" +%token IN "in" +%token FEXISTS "-f" + +/* logical */ +%left "lt" "gt" "le" "ge" +%left "eq" "ne" +%left '<' '>' "<=" ">=" "##" +%left "==" "!=" +%left "||" +%left "&&" +%left "def" "in" "-f" +%left '!' + +/* bitwise */ +%left '#' +%left '&' '|' +%left '~' + +/* numerical */ +%left '-' '+' +%left '*' '/' '%' +%left NEG /* negation: unary - */ %% -all: +all: /* TODO: у ^execute непременно задать какой-то name, см. 'RUN' */ one_big_piece { - String& name_main=*NEW String(POOL); - name_main.APPEND_CONST(MAIN_METHOD_NAME); - Array& param_names=*NEW Array(POOL); - Array& local_names=*NEW Array(POOL); - Method& method=*NEW Method(POOL, name_main, param_names, local_names, *$1); - PC->vclass->add_method(name_main, method); + String& MAIN=*NEW String(POOL); + MAIN.APPEND_CONST(MAIN_METHOD_NAME); + Method& method=*NEW Method(POOL, + MAIN, + 0, /*numbered_params_count*/ + 0/*param_names*/, 0/*local_names*/, + $1/*parser_code*/, 0/*native_code*/); + PC->vclass->add_method(MAIN, method); } | methods; @@ -63,30 +106,50 @@ method: control_method | code_method; control_method: '@' STRING '\n' control_strings { - String& name=*SLA2S($2); + String& command=*SLA2S($2); YYSTYPE strings_code=$4; if(strings_code->size()<1*2) { strcpy(PC->error, "@"); - strcat(PC->error, name.cstr()); + strcat(PC->error, command.cstr()); strcat(PC->error, " is empty"); YYERROR; } - if(name==CLASS_NAME) { - if(strings_code->size()==1*2) - PC->vclass->set_name(*SLA2S(strings_code)); - else { + if(command==CLASS_NAME) { + 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(command==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) { + } else if(command==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)); @@ -101,9 +164,9 @@ control_method: '@' STRING '\n' YYERROR; } } else { - strcpy(PC->error, name.cstr()); + strcpy(PC->error, command.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; } } @@ -117,16 +180,26 @@ code_method: '@' STRING bracketed_maybe_ const String *name=SLA2S($2); YYSTYPE params_names_code=$3; - Array& params_names=*NEW Array(POOL); - for(int i=0; isize(); i+=2) - params_names+=SLA2S(params_names_code, i); + Array *params_names=0; + if(int size=params_names_code->size()) { + params_names=NEW Array(POOL); + for(int i=0; isize(); i+=2) - locals_names+=SLA2S(locals_names_code, i); + Array *locals_names=0; + if(int size=locals_names_code->size()) { + locals_names=NEW Array(POOL); + for(int i=0; ivclass->add_method(*name, method); }; @@ -150,11 +223,12 @@ action: get | put | with | call; /* get */ -get: '$' get_name { - $$=$2; /* stack: resulting value */ - O($$, OP_WRITE); /* value=pop; write(value) */ +get: get_value { + $$=$1; /* stack: resulting value */ + O($$, OP_WRITE); /* value=pop; wcontext.write(value) */ }; -get_name: name_without_curly_rdive EON | name_in_curly_rdive; +get_value: '$' get_name_value { $$=$2 } +get_name_value: name_without_curly_rdive EON | name_in_curly_rdive; name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 }; name_without_curly_rdive: name_without_curly_rdive_read @@ -217,57 +291,77 @@ name_expr_wdive_root: ':' name_expr_dive name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) }; constructor_value: - '[' constructor_code_value ']' { $$=$2 } -| '(' expression_value ')' { $$=$2 } + '[' any_constructor_code_value ']' { $$=$2 } +| '(' any_expr ')' { $$=$2 } ; -constructor_code_value: - empty_value /* optimized $var[] case */ +any_constructor_code_value: + empty_string_value /* optimized $var[] case */ | STRING /* optimized $var[STRING] case */ -| complex_constructor_code_value /* $var[something complex] */ +| constructor_code_value /* $var[something complex] */ ; -complex_constructor_code_value: complex_constructor_code { +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() */ }; -complex_constructor_code: codes__excluding_sole_str_literal; +constructor_code: codes__excluding_sole_str_literal; codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) }; /* 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; O($$, OP_STORE_PARAM); } -| complex_constructor_code_value { /* (something complex) */ +| 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 */ @@ -322,16 +416,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); }; @@ -345,45 +431,72 @@ with: '$' name_without_curly_rdive '{' c O($$, OP_WRITE); }; -/* expression */ +/* expr */ -expression_value: - empty_value /* optimized $var() case */ -| number /* optimized $var(STRING) case */ -| complex_expression /* $var(something complex) */ +any_expr: + empty_double_value /* optimized $var() case */ +| optimized_expr /* $var(something) */ ; -complex_expression: expression_operand '*' expression_operand { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_MUL); // value=first*second; stack: value +optimized_expr: expr { + if(($$=$1)->size()==2) { // only one string literal in there? + change_string_literal_to_double_literal($$); // make that string literal Double + } }; -expression_operand: number; +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 { $$=$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) } +| expr '*' expr { $$=$1; P($$, $3); O($$, OP_MUL) } +| expr '/' expr { $$=$1; P($$, $3); O($$, OP_DIV) } +| expr '%' expr { $$=$1; P($$, $3); O($$, OP_MOD) } +| expr '&' expr { $$=$1; P($$, $3); O($$, OP_BIN_AND) } +| expr '|' expr { $$=$1; P($$, $3); O($$, OP_BIN_OR) } +| expr '#' expr { $$=$1; P($$, $3); O($$, OP_BIN_XOR) } +| expr "&&" expr { $$=$1; P($$, $3); O($$, OP_LOG_AND) } +| expr "||" expr { $$=$1; P($$, $3); O($$, OP_LOG_OR) } +| expr "##" expr { $$=$1; P($$, $3); O($$, OP_LOG_XOR) } +| expr '<' expr { $$=$1; P($$, $3); O($$, OP_NUM_LT) } +| expr '>' expr { $$=$1; P($$, $3); O($$, OP_NUM_GT) } +| expr "<=" expr { $$=$1; P($$, $3); O($$, OP_NUM_LE) } +| expr ">=" expr { $$=$1; P($$, $3); O($$, OP_NUM_GE) } +| expr "==" expr { $$=$1; P($$, $3); O($$, OP_NUM_EQ) } +| expr "!=" expr { $$=$1; P($$, $3); O($$, OP_NUM_NE) } +| expr "lt" expr { $$=$1; P($$, $3); O($$, OP_STR_LT) } +| expr "gt" expr { $$=$1; P($$, $3); O($$, OP_STR_GT) } +| expr "le" expr { $$=$1; P($$, $3); O($$, OP_STR_LE) } +| expr "ge" expr { $$=$1; P($$, $3); O($$, OP_STR_GE) } +| expr "eq" expr { $$=$1; P($$, $3); O($$, OP_STR_EQ) } +| expr "ne" expr { $$=$1; P($$, $3); O($$, OP_STR_NE) } +; -/* -complex_expression_value: complex_expression { - $$=N(POOL); - O($$, OP_CREATE_SWPOOL); /* stack: empty write context * / - P($$, $1); /* some codes to that context * / - O($$, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() * / +string_inside_quotes_value: maybe_codes { + $$=N(POOL); + O($$, OP_CREATE_SWPOOL); /* stack: empty write context */ + P($$, $1); /* some code that writes to that context */ + O($$, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */ }; -*/ /* basics */ write_str_literal: STRING { - if(SLA2S($1)->size()) { - $$=$1; - O($$, OP_WRITE); - } else { - // optimized case of special end of macro. see yylex - $$=N(POOL); - } -}; -number: STRING { - change_string_literal_to_double_literal($$=$1); + $$=$1; + O($$, OP_WRITE); }; -empty_value: /* empty */ { $$=SL(NEW VString(POOL)) }; +empty_double_value: /* empty */ { $$=VL(NEW VDouble(*NEW Double(POOL, 0))) }; +empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) }; empty: /* empty */ { $$=N(POOL) }; %% @@ -420,6 +533,7 @@ int yylex(YYSTYPE *lvalp, void *pc) { char *begin=PC->source; char *end; int begin_line=PC->line; + int skip_analized=0; while(true) { c=*(end=(PC->source++)); @@ -429,6 +543,8 @@ int yylex(YYSTYPE *lvalp, void *pc) { } else PC->col++; + // todo: # in 0+1 column comment + // escaping: ^^ ^$ ^; ^) ^} ^( ^{ ^" if(c=='^') switch(*PC->source) { @@ -440,7 +556,7 @@ int yylex(YYSTYPE *lvalp, void *pc) { // append piece till ^ PC->string->APPEND(begin, end-begin, PC->file, begin_line); } - // reset piece 'start' position & line + // reset piece 'begin' position & line begin=PC->source; // ^ begin_line=PC->line; // skip over ^ and _ @@ -541,14 +657,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); @@ -556,33 +676,82 @@ int yylex(YYSTYPE *lvalp, void *pc) { case '(': lexical_brackets_nestage++; RC; - case '+': case '-': case '*': case '/': case '%': - case '&': 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=1; + } else + result=c; + goto break2; + case '<': case '>': case '=': case '!': + if(*PC->source=='=') { // <= >= == != + skip_analized=1; + switch(c) { + case '<': result=NLE; break; + case '>': result=NGE; break; + case '=': result=NEQ; break; + case '!': result=NNE; break; + } + } else + result=c; + goto break2; case '"': push_LS(PC, LS_EXPRESSION_STRING); RC; case 'l': case 'g': case 'e': case 'n': if(end==begin) // right after whitespace - switch(char next_c=*PC->source) { + switch(*PC->source) { // 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=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=1; + goto break2; case 'q': // eq [lq gq nq] - PC->source++; PC->col++; - PC->pending_state=next_c; - return c; + result=c=='e'?SEQ:BAD_STRING_COMPARISON_OPERATOR; + 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; case ' ': case '\t': case '\n': - if(end!=begin) { - // append piece till whitespace - PC->string->APPEND(begin, end-begin, PC->file, begin_line); + if(end!=begin) { // there were a string after previous operator? + result=0; // return that string + goto break2; } - // reset piece 'start' position & line - begin=PC->source; // after whitespace + // that's a leading|traling space or after-operator-space + // ignoring it + // reset piece 'begin' position & line + begin=PC->source; // after whitespace char begin_line=PC->line; continue; } @@ -590,9 +759,9 @@ 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) { - // name in expression ends also before binary operators + 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 '%': case '&': case '|': @@ -607,7 +776,7 @@ int yylex(YYSTYPE *lvalp, void *pc) { case 0: case ' ': case '\t': case '\n': case ';': - case ']': case '}': + case ']': case '}': case ')': case '"': pop_LS(PC); PC->source--; if(--PC->col<0) { PC->line--; PC->col=-1; } result=EON; @@ -623,10 +792,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 @@ -701,6 +870,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' @@ -751,16 +924,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; @@ -773,24 +951,28 @@ int yylex(YYSTYPE *lvalp, void *pc) { } break2: - if(begin==end) - return result; - else { - PC->pending_state=result; - // strip last \n before LS_DEF_NAME or EOF - if((c=='@' || c==0) && end[-1]=='\n') + if(end!=begin) { // there is last piece? + if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF? + // strip last \n end--; - if(end!=begin) { - // append last piece + } + if(end!=begin) { // last piece still alive? + // append it PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/); } + } + if(PC->string->size()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=SL(NEW VString(*PC->string)); + *lvalp=VL(NEW VString(*PC->string)); // new pieces storage PC->string=NEW String(POOL); - // go! - return STRING; + // make current result be pending for next call, return STRING for now + PC->pending_state=result; result=STRING; + } + if(skip_analized) { + PC->source+=skip_analized; PC->col+=skip_analized; } + return result; } int real_yyerror(parse_control *pc, char *s) /* Called by yyparse on error */