--- parser3/src/main/compile.y 2001/07/26 14:15:45 1.156 +++ parser3/src/main/compile.y 2002/01/24 17:18:48 1.174 @@ -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.174 2002/01/24 17:18:48 paf Exp $ */ -%{ -static char *RCSId="$Id: compile.y,v 1.156 2001/07/26 14:15:45 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 - */ %% @@ -151,8 +152,7 @@ control_method: '@' STRING '\n' } } else if(command==USE_CONTROL_METHOD_NAME) { for(int i=0; isize(); i+=2) - PC.request->use_file( - PC.request->absolute(*LA2S(strings_code, i))); + PC.request->use_file(*LA2S(strings_code, i)); } else if(command==BASE_NAME) { if(PC.cclass->base()) { // already changed from default? strcpy(PC.error, "class already have a base '"); @@ -242,7 +242,7 @@ get: get_value { $$=$1; /* stack: resulting value */ O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ }; -get_value: '$' get_name_value { $$=$2 } +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: @@ -273,10 +273,10 @@ put: '$' name_expr_wdive construct { P($$, $3); /* stack: context,name,constructor_value */ }; name_expr_wdive: - name_expr_wdive_write -| name_expr_wdive_root + name_expr_wdive_root +| name_expr_wdive_write | name_expr_wdive_class; -name_expr_wdive_write: name_expr_dive_code { +name_expr_wdive_root: name_expr_dive_code { $$=N(POOL); Array *diving_code=$1; const String *first_name=LA2S(diving_code); @@ -286,22 +286,22 @@ name_expr_wdive_write: name_expr_dive_co /* skip over... */ diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); } else { - O($$, OP_WITH_WRITE); /* stack: starting context */ + O($$, OP_WITH_ROOT); /* stack: starting context */ P($$, diving_code); } /* diving code; stack: current context */ }; -name_expr_wdive_root: ':' name_expr_dive_code { +name_expr_wdive_write: '.' name_expr_dive_code { $$=N(POOL); - O($$, OP_WITH_ROOT); /* stack: starting context */ + O($$, OP_WITH_WRITE); /* stack: starting context */ P($$, $2); /* diving code; stack: context,name */ }; name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) }; construct: - construct_square | - construct_round | - construct_curly + construct_square +| construct_round +| construct_curly ; construct_square: '[' any_constructor_code_value ']' { // stack: context, name @@ -312,7 +312,7 @@ construct_square: '[' any_constructor_co construct_round: '(' expr_value ')' { // stack: context, name $$=$2; // stack: context, name, value - O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ } ; construct_curly: '{' maybe_codes '}' { @@ -322,7 +322,7 @@ construct_curly: '{' maybe_codes '}' { }; any_constructor_code_value: - empty_string_value /* optimized $var[] case */ + void_value /* optimized $var[] case */ | STRING /* optimized $var[STRING] case */ | constructor_code_value /* $var[something complex] */ ; @@ -393,7 +393,7 @@ store_curly_param_part: maybe_codes { PCA($$, $1); }; code_param_value: - empty_void_value /* optimized [;...] case */ + void_value /* optimized [;...] case */ | STRING /* optimized [STRING] case */ | constructor_code_value /* [something complex] */ ; @@ -423,7 +423,8 @@ name_advance2: name_expr_value { 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_expr_with_subvar_value /* xxx$part_of_subname_is_var_value */ +| name_square_code_value /* [codes] */ ; name_expr_subvar_value: '$' subvar_ref_name_rdive { $$=$2; @@ -437,6 +438,12 @@ name_expr_with_subvar_value: STRING subv P($$, $2); O($$, OP_REDUCE_EWPOOL); }; +name_square_code_value: '[' codes ']' { + $$=N(POOL); + O($$, OP_CREATE_EWPOOL); + P($$, $2); + O($$, OP_REDUCE_EWPOOL); +}; subvar_ref_name_rdive: STRING { $$=N(POOL); O($$, OP_WITH_READ); @@ -481,6 +488,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) } @@ -493,11 +501,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) } @@ -528,8 +537,7 @@ write_string: STRING { change_string_literal_to_write_string_literal($$=$1) }; -empty_void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; -empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) }; +void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; empty: /* empty */ { $$=N(POOL) }; %% @@ -570,6 +578,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++; @@ -577,25 +586,51 @@ 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_USER) { + push_LS(PC, LS_DEF_NAME); + RC; + } else // @ in first column inside some code + result=BAD_METHOD_DECL_START; + goto break2; + } else if(c=='^') + switch(PC.ls) { +case LS_EXPRESSION_VAR_NAME_WITH_COLON: +case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: +case LS_VAR_NAME_SIMPLE_WITH_COLON: +case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: +case LS_VAR_NAME_CURLY: +case LS_METHOD_NAME: +case LS_COMMENT: +case LS_DEF_COMMENT: + // no literals in names, please + break; +default: switch(*PC.source) { - // escaping: ^^ & co + // ^escaping some punctuators case '^': case '$': case ';': case '(': case ')': case '[': case ']': case '{': case '}': - case '"': + case '"': case ':': if(end!=begin) { // append piece till ^ PC.string->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 '#': @@ -625,6 +660,8 @@ static int yylex(YYSTYPE *lvalp, void *p } break; } + break; + } // #comment start skipping if(c=='#' && PC.col==1) { if(end!=begin) { @@ -638,6 +675,7 @@ static int yylex(YYSTYPE *lvalp, void *p // 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': @@ -649,16 +687,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; - } + 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 '[': // $name.[co<[>de] + if(PC.ls==LS_NAME_SQUARE_PART) + lexical_brackets_nestage++; break; } break; @@ -689,7 +732,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); @@ -771,7 +814,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); @@ -794,7 +837,7 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } goto break2; - case '+': case '*': case '/': case '%': + case '+': case '*': case '/': case '%': case '\\': case '~': case ';': RC; @@ -881,10 +924,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 '-': @@ -894,7 +940,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 ':': @@ -915,7 +963,7 @@ static int yylex(YYSTYPE *lvalp, void *p case '&': case '|': case '=': case '!': // common delimiters - case ',': + case ',': case '?': // before call case '^': pop_LS(PC); @@ -923,6 +971,16 @@ static int yylex(YYSTYPE *lvalp, void *p result=EON; goto break2; case '[': + // $name.<[>code] + if(PC.col>1/*not first column*/ && ( + end[-1]=='$'/*was start of get*/ || + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; @@ -941,14 +999,24 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case '.': // name part delim case '$': // name part subvar - case ':': // ':name' or 'class:name' - PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' + case ':': // class<:>name + // 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; case LS_VAR_NAME_CURLY: switch(c) { + case '[': + // ${name.<[>code]} + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; case '}': // ${name} finished, restoring LS pop_LS(PC); RC; @@ -962,7 +1030,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); @@ -984,7 +1052,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); @@ -1005,6 +1073,16 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': + // ^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_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; @@ -1019,6 +1097,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; @@ -1026,7 +1106,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); @@ -1048,7 +1128,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);