--- parser3/src/main/compile.y 2001/08/20 13:22:05 1.163 +++ parser3/src/main/compile.y 2002/01/31 16:39:01 1.177 @@ -1,12 +1,12 @@ +%{ /** @file Parser: compiler(lexical parser and grammar). Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.y,v 1.177 2002/01/31 16:39:01 paf Exp $ */ -%{ -static char *RCSId="$Id: compile.y,v 1.163 2001/08/20 13:22:05 parser Exp $"; /** @todo parser4: @@ -59,6 +59,7 @@ static int yylex(YYSTYPE *lvalp, void *p %token BAD_STRING_COMPARISON_OPERATOR %token BAD_HEX_LITERAL +%token BAD_METHOD_DECL_START %token LAND "&&" %token LOR "||" @@ -99,7 +100,7 @@ static int yylex(YYSTYPE *lvalp, void *p /* numerical */ %left '-' '+' -%left '*' '/' '%' +%left '*' '/' '%' '\\' %left NEG /* negation: unary - */ %% @@ -340,8 +341,14 @@ call: call_value { $$=$1; /* stack: value */ O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ }; -call_value: '^' { PC.object_constructor_allowed=true } - call_name { PC.object_constructor_allowed=false } +call_value: '^' { + PC.object_constructor_allowed=true; + push_OCA(PC, true); + } + call_name { + PC.object_constructor_allowed=false; + pop_OCA(PC); + } store_params EON { /* ^field.$method{vasya} */ $$=$3; /* with_xxx,diving code; stack: context,method_junction */ O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ @@ -408,6 +415,9 @@ name_expr_dive_code: name_expr_value | n name_path: name_step | name_path name_step { $$=$1; P($$, $2) }; name_step: name_advance1 '.'; name_advance1: name_expr_value { + // we know that name_advance1 not called from ^xxx context + // so we'll not check for operator call possibility as we do in name_advance2 + /* stack: context */ $$=$1; /* stack: context,name */ O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ @@ -415,7 +425,9 @@ name_advance1: name_expr_value { name_advance2: name_expr_value { /* stack: context */ $$=$1; /* stack: context,name */ - O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O($$, PC.operator_call_allowed?OP_GET_ELEMENT_OR_OPERATOR:OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + // only ^FIRST.part.allowed.to.be.an.operator + PC.operator_call_allowed=false; } | STRING BOGUS ; @@ -423,7 +435,7 @@ name_expr_value: STRING /* subname_is_const */ | name_expr_subvar_value /* $subname_is_var_value */ | name_expr_with_subvar_value /* xxx$part_of_subname_is_var_value */ -| name_curly_code_value /* (codes) */ +| name_square_code_value /* [codes] */ ; name_expr_subvar_value: '$' subvar_ref_name_rdive { $$=$2; @@ -437,7 +449,7 @@ name_expr_with_subvar_value: STRING subv P($$, $2); O($$, OP_REDUCE_EWPOOL); }; -name_curly_code_value: '[' codes ']' { +name_square_code_value: '[' codes ']' { $$=N(POOL); O($$, OP_CREATE_EWPOOL); P($$, $2); @@ -487,6 +499,7 @@ expr: | '(' expr ')' { $$ = $2; } /* stack: operand // stack: @operand */ | '-' expr %prec NEG { $$=$2; O($$, OP_NEG) } +| '+' expr %prec NEG { $$=$2 } | '~' expr { $$=$2; O($$, OP_INV) } | '!' expr { $$=$2; O($$, OP_NOT) } | "def" expr { $$=$2; O($$, OP_DEF) } @@ -499,11 +512,12 @@ expr: | 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_INTDIV) } | 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; PNC($$, $3); O($$, OP_LOG_AND) } +| expr "||" expr { $$=$1; PNC($$, $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) } @@ -557,7 +571,7 @@ empty: /* empty */ { $$=N(POOL) }; */ static int yylex(YYSTYPE *lvalp, void *pc) { - #define lexical_brackets_nestage PC.brackets_nestages[PC.sp] + #define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp] #define RC {result=c; goto break2; } register int c; @@ -575,6 +589,7 @@ static int yylex(YYSTYPE *lvalp, void *p int skip_analized=0; while(true) { c=*(end=(PC.source++)); +// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp); if(c=='\n') { PC.line++; @@ -582,25 +597,57 @@ static int yylex(YYSTYPE *lvalp, void *p } else PC.col++; - if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) + if(c=='@' && PC.col==0+1) { + if(PC.ls==LS_DEF_SPECIAL_BODY) { + // @SPECIAL + // ... + // @APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - begin=PC.source; // ^ + end=begin=PC.source; // ^ begin_line=PC.line; - // skip over ^ and _ - PC.source++; PC.col++; - // skip analysis = forced literal - continue; + if(PC.ls==LS_METHOD_AFTER) { + pop_LS(PC); + result=EON; + skip_analized=-1; // return to ^ afterwards to assure it's literality + goto break2; + } else { + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; + } // converting ^#HH into char(hex(HH)) case '#': @@ -630,6 +677,8 @@ static int yylex(YYSTYPE *lvalp, void *p } break; } + break; + } // #comment start skipping if(c=='#' && PC.col==1) { if(end!=begin) { @@ -638,11 +687,13 @@ static int yylex(YYSTYPE *lvalp, void *p } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_COMMENT); + continue; } switch(PC.ls) { // USER'S = NOT OURS case LS_USER: + case LS_NAME_SQUARE_PART: // name.[here].xxx if(PC.trim_bof) switch(c) { case '\n': case ' ': case '\t': @@ -654,25 +705,21 @@ static int yylex(YYSTYPE *lvalp, void *p } switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); RC; - case '@': - if(PC.col==0+1) { - push_LS(PC, LS_DEF_NAME); - RC; - } - break; - case ']': // $name.(code<)> - if(--lexical_brackets_nestage==0) { - pop_LS(PC); - RC; - } + case ']': + if(PC.ls==LS_NAME_SQUARE_PART) + if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> + pop_LS(PC); // $name.[co<]>de<]!> + RC; + } break; - case '[': - lexical_brackets_nestage++; + case '[': // $name.[co<[>de] + if(PC.ls==LS_NAME_SQUARE_PART) + lexical_brackets_nestage++; break; } break; @@ -703,7 +750,7 @@ static int yylex(YYSTYPE *lvalp, void *p } break; case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -758,19 +805,8 @@ static int yylex(YYSTYPE *lvalp, void *p break; case LS_DEF_SPECIAL_BODY: - // @todo in case - // ################ - // @next-method - // we are here with c=='@' - // which is wrong, and need action - if(c=='\n') { - switch(*PC.source) { - case '@': case 0: // end of special_code - pop_LS(PC); - break; - } + if(c=='\n') RC; - } break; // (EXPRESSION) @@ -785,7 +821,7 @@ static int yylex(YYSTYPE *lvalp, void *p pop_LS(PC); // return to normal life RC; case '$': - push_LS(PC, LS_EXPRESSION_VAR_NAME); + push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -808,7 +844,7 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } goto break2; - case '+': case '*': case '/': case '%': + case '+': case '*': case '/': case '%': case '\\': case '~': case ';': RC; @@ -895,10 +931,13 @@ static int yylex(YYSTYPE *lvalp, void *p break; // VARIABLE GET/PUT/WITH - case LS_VAR_NAME_SIMPLE: - case LS_EXPRESSION_VAR_NAME: - case LS_VAR_NAME_NO_COLON: - if(PC.ls==LS_EXPRESSION_VAR_NAME) { + case LS_VAR_NAME_SIMPLE_WITH_COLON: + case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: + case LS_EXPRESSION_VAR_NAME_WITH_COLON: + case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: + if( + PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name in expr ends also before binary operators switch(c) { case '-': @@ -908,7 +947,9 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } } - if(PC.ls==LS_VAR_NAME_NO_COLON) { + if( + PC.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name already has ':', stop before next switch(c) { case ':': @@ -943,7 +984,7 @@ static int yylex(YYSTYPE *lvalp, void *p end[-1]==':'/*was class name delim */ || end[-1]=='.'/*was name delim */ )) { - push_LS(PC, LS_USER); + push_LS(PC, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; } @@ -966,7 +1007,12 @@ static int yylex(YYSTYPE *lvalp, void *p case '.': // name part delim case '$': // name part subvar case ':': // class<:>name - PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' + // go to _WITHOUT_COLON state variant... + if(PC.ls==LS_VAR_NAME_SIMPLE_WITH_COLON) + PC.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON; + else if(PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON) + PC.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON; + // ...stop before next ':' RC; } break; @@ -974,8 +1020,8 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_NAME_CURLY: switch(c) { case '[': - // ${name.<[>code)} - push_LS(PC, LS_USER); + // ${name.<[>code]} + push_LS(PC, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; case '}': // ${name} finished, restoring LS @@ -991,7 +1037,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -1013,7 +1059,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_VAR_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -1034,13 +1080,13 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': - // $name.<[>code) + // ^name.<[>code].xxx if(PC.col>1/*not first column*/ && ( end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... end[-1]==':'/*was class name delim */ || end[-1]=='.'/*was name delim */ )) { - push_LS(PC, LS_USER); + push_LS(PC, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; } @@ -1058,6 +1104,8 @@ static int yylex(YYSTYPE *lvalp, void *p case '.': // name part delim case '$': // name part subvar case ':': // ':name' or 'class:name' + case '^': // ^abc^xxx wrong. bailing out + case ']': case '}': case ')': // ^abc]}) wrong. bailing out RC; } break; @@ -1065,7 +1113,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_SQUARE: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME); @@ -1087,7 +1135,7 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_CURLY: switch(c) { case '$': - push_LS(PC, LS_VAR_NAME_SIMPLE); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': push_LS(PC, LS_METHOD_NAME);