--- parser3/src/main/compile.y 2001/03/06 17:03:18 1.58 +++ parser3/src/main/compile.y 2001/03/07 11:19:42 1.68 @@ -1,5 +1,5 @@ /* - $Id: compile.y,v 1.58 2001/03/06 17:03:18 paf Exp $ + $Id: compile.y,v 1.68 2001/03/07 11:19:42 paf Exp $ */ %{ @@ -44,8 +44,9 @@ int yylex(YYSTYPE *lvalp, void *pc); %token BAD_STRING_COMPARISON_OPERATOR -%token LOR "||" %token LAND "&&" +%token LOR "||" +%token LXOR "##" %token NLE "<=" %token NGE ">=" @@ -59,16 +60,24 @@ int yylex(YYSTYPE *lvalp, void *pc); %token SEQ "eq" %token SNE "ne" +%token DEF "def" +%token IN "in" +%token FEXISTS "-f" + /* logical */ -%left '<' '>' "<=" ">=" +%left "lt" "gt" "le" "ge" +%left "eq" "ne" +%left '<' '>' "<=" ">=" "##" %left "==" "!=" %left "||" %left "&&" -%left NOT /* not: unary ! */ +%left "def" "in" "-f" +%left '!' /* bitwise */ +%left '#' %left '&' '|' -%left INV /* invertion: unary ~ */ +%left '~' /* numerical */ %left '-' '+' @@ -182,11 +191,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 @@ -268,11 +278,15 @@ 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; @@ -381,126 +395,64 @@ with: '$' name_without_curly_rdive '{' c any_expr: empty_double_value /* optimized $var() case */ -| expr /* $var(something) */ +| optimized_expr /* $var(something) */ ; +optimized_expr: expr { + if(($$=$1)->size()==2) { // only one string literal in there? + change_string_literal_to_double_literal($$); // make that string literal Double + } +}; expr: - number -| '-' expr %prec NEG { - $$=$2; // stack: operand - O($$, OP_NEG); // value=-operand; stack: value -} -| '~' expr %prec INV { - $$=$2; // stack: operand - O($$, OP_INV); // value=~operand; stack: value -} -| '!' expr %prec NOT { - $$=$2; // stack: operand - O($$, OP_NOT); // value=!operand; stack: value -} -/*todo: def in fexists*/ -| expr '-' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_SUB); // value=first-second; stack: value -} -| expr '+' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_ADD); // value=first+second; stack: value -} -| expr '*' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_MUL); // value=first*second; stack: value -} -| expr '/' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_DIV); // value=first/second; stack: value -} -| expr '%' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_MOD); // value=first%second; stack: value -} -| expr '&' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_BIN_AND); // value=first&second; stack: value -} -| expr '|' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_BIN_OR); // value=first|second; stack: value -} -| expr "&&" expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_LOG_AND); // value=first&&second; stack: value -} -| expr "||" expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_LOG_OR); // value=first||second; stack: value -} -| expr '<' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_NUM_LT); // value=first' expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_NUM_GT); // value=first>second; stack: value -} -| expr "<=" expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_NUM_LE); // value=first<=second; stack: value -} -| expr ">=" expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_NUM_GE); // value=first>=second; stack: value -} -| expr "==" expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_NUM_EQ); // value=first==second; stack: value -} -| expr "!=" expr { - $$=$1; // stack: first operand - P($$, $3); // stack: first,second operands - O($$, OP_NUM_NE); // value=first!=second; stack: value -} -/* - OP_STR_LT, OP_STR_GT, OP_STR_LE, OP_STR_GE, OP_STR_EQ, OP_STR_NE -*/ + 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_expr_value: complex_expr { - $$=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 write 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_double_value: /* empty */ { $$=VL(NEW VDouble(POOL)) }; @@ -541,7 +493,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++)); @@ -562,7 +514,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 _ @@ -678,20 +630,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 '&': case '|': case '#': if(*PC->source==c) { // && || - result='&'?LAND:LOR; - skip_analized_char=true; + result=c=='#'?LXOR:c=='&'?LAND:LOR; + 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; @@ -709,22 +668,43 @@ int yylex(YYSTYPE *lvalp, void *pc) { 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; + 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] 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 char - 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 + // 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; @@ -750,7 +730,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; @@ -916,14 +896,17 @@ int yylex(YYSTYPE *lvalp, void *pc) { } break2: - if(end!=begin) { - // 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=VL(NEW VString(*PC->string)); // new pieces storage @@ -931,8 +914,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; }