--- parser3/src/main/compile.y 2002/01/31 15:04:38 1.176 +++ parser3/src/main/compile.y 2002/10/17 10:57:06 1.202 @@ -5,7 +5,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.y,v 1.176 2002/01/31 15:04:38 paf Exp $ + $Id: compile.y,v 1.202 2002/10/17 10:57:06 paf Exp $ */ /** @@ -34,8 +34,8 @@ #include "pa_vdouble.h" #include "pa_globals.h" #include "pa_vvoid.h" +#include "pa_vmethod_frame.h" -#define SELF_ELEMENT_NAME "self" #define USE_CONTROL_METHOD_NAME "USE" static int real_yyerror(parse_control *pc, char *s); @@ -60,15 +60,20 @@ static int yylex(YYSTYPE *lvalp, void *p %token BAD_STRING_COMPARISON_OPERATOR %token BAD_HEX_LITERAL %token BAD_METHOD_DECL_START +%token BAD_METHOD_PARAMETER_NAME_CHARACTER +%token BAD_MATH_OPERATOR_CHARACTER %token LAND "&&" %token LOR "||" -%token LXOR "##" +%token LXOR "!||" +%token NXOR "!|" %token NLE "<=" %token NGE ">=" %token NEQ "==" %token NNE "!=" +%token NSL "<<" +%token NSR ">>" %token SLT "lt" %token SGT "gt" @@ -84,35 +89,38 @@ static int yylex(YYSTYPE *lvalp, void *p %token IS "is" /* logical */ -%left "##" +%left "!||" %left "||" %left "&&" %left '<' '>' "<=" ">=" "lt" "gt" "le" "ge" %left "==" "!=" "eq" "ne" %left "is" "def" "in" "-f" "-d" -%left '!' /* bitwise */ -%left '#' +%left "!|" %left '|' %left '&' -%left '~' +%left "<<" ">>" /* numerical */ -%left '-' '+' -%left '*' '/' '%' '\\' -%left NEG /* negation: unary - */ +%left '+' '-' +%left '*' '/' '\\' '%' +%left NUNARY /* unary - + */ + +/* out-of-group */ +%left '~' /* bitwise */ +%left '!' /* logical */ %% -all: +all: one_big_piece { Method& method=*NEW Method(POOL, - *main_method_name, + PC.request->main_method_name, Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ 0/*param_names*/, 0/*local_names*/, $1/*parser_code*/, 0/*native_code*/); - PC.cclass->add_method(*main_method_name, method); + PC.cclass->add_method(PC.request->main_method_name, method); } | methods; @@ -132,7 +140,7 @@ control_method: '@' STRING '\n' YYERROR; } if(command==CLASS_NAME) { - if(PC.cclass->base()) { // already changed from default? + if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a name '"); strncat(PC.error, PC.cclass->name().cstr(), 100); strcat(PC.error, "'"); @@ -152,29 +160,30 @@ control_method: '@' STRING '\n' } } else if(command==USE_CONTROL_METHOD_NAME) { for(int i=0; isize(); i+=2) - PC.request->use_file(*LA2S(strings_code, i)); + PC.request->use_file(PC.request->main_class, *LA2S(strings_code, i)); } else if(command==BASE_NAME) { - if(PC.cclass->base()) { // already changed from default? + if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a base '"); - strncat(PC.error, PC.cclass->base()->name().cstr(), 100); + strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100); strcat(PC.error, "'"); YYERROR; } if(strings_code->size()==1*2) { const String& base_name=*LA2S(strings_code); - VClass *base=static_cast( + Value *vbase_class=static_cast( PC.request->classes().get(base_name)); - if(!base) { + VStateless_class *base_class=vbase_class?vbase_class->get_class():0; + if(!base_class) { strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } // @CLASS == @BASE sanity check - if(PC.cclass==base) { + if(PC.cclass==base_class) { strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); YYERROR; } - PC.cclass->set_base(*base); + PC.cclass->set_base(base_class); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; @@ -239,8 +248,11 @@ action: get | put | call; /* get */ get: get_value { - $$=$1; /* stack: resulting value */ - O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + $$=$1; /* stack: resulting value */ + changetail_or_append($$, + OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, + /*or */OP_WRITE_VALUE + ); /* value=pop; wcontext.write(value) */ }; get_value: '$' get_name_value { $$=$2 }; get_name_value: name_without_curly_rdive EON | name_in_curly_rdive; @@ -252,13 +264,20 @@ name_without_curly_rdive_read: name_with $$=N(POOL); Array *diving_code=$1; const String *first_name=LA2S(diving_code); + // self.xxx... -> xxx... + // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { O($$, OP_WITH_SELF); /* stack: starting context */ P($$, diving_code, /* skip over... */ - diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { O($$, OP_WITH_READ); /* stack: starting context */ + + // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR + // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR. + if(PC.in_call_value && diving_code->size()==3) + diving_code->put_int(2, OP_GET_ELEMENT_OR_OPERATOR); P($$, diving_code); } /* diving code; stack: current context */ @@ -280,11 +299,13 @@ name_expr_wdive_root: name_expr_dive_cod $$=N(POOL); Array *diving_code=$1; const String *first_name=LA2S(diving_code); + // $self.xxx... -> $xxx... + // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { O($$, OP_WITH_SELF); /* stack: starting context */ P($$, diving_code, /* skip over... */ - diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { O($$, OP_WITH_ROOT); /* stack: starting context */ P($$, diving_code); @@ -310,9 +331,9 @@ construct_square: '[' any_constructor_co } ; construct_round: '(' expr_value ')' { + $$=N(POOL); + O($$, OP_PREPARE_TO_EXPRESSION); // stack: context, name - $$=N(POOL); - O($$, OP_PREPARE_TO_CONSTRUCT_EXPR); /* drop change execution state */ P($$, $2); // stack: context, name, value O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ } @@ -320,7 +341,7 @@ construct_round: '(' expr_value ')' { construct_curly: '{' maybe_codes '}' { // stack: context, name $$=N(POOL); - CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + OA($$, OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ }; any_constructor_code_value: @@ -330,9 +351,9 @@ any_constructor_code_value: ; constructor_code_value: constructor_code { $$=N(POOL); - O($$, OP_CREATE_EWPOOL); /* stack: empty write context */ - P($$, $1); /* some code that writes to that context */ - O($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ + OA($$, OP_OBJECT_POOL, $1); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ }; constructor_code: codes__excluding_sole_str_literal; codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) }; @@ -341,22 +362,27 @@ codes__excluding_sole_str_literal: actio 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 } + changetail_or_append($$, + OP_CALL, true, /*->*/ OP_CALL__WRITE, + /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ +}; +call_value: '^' { + PC.in_call_value=true; + } + call_name { + PC.in_call_value=false; + } store_params EON { /* ^field.$method{vasya} */ $$=$3; /* with_xxx,diving code; stack: context,method_junction */ - O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ YYSTYPE params_code=$5; - if(params_code->size()==3) // probably [] case. [OP_VALUE + Void + STORE_PARAM] + if(params_code->size()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? params_code=0; // ^zzz[] case. don't append lone empty param. - if(params_code) - P($$, params_code); // filling method_frame.store_params - O($$, OP_CALL); // method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value + } + /* stack: context, method_junction */ + OA($$, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value }; call_name: name_without_curly_rdive; @@ -388,11 +414,11 @@ store_code_param_part: code_param_value }; store_expr_param_part: write_expr_value { $$=N(POOL); - PEA($$, $1); + OA($$, OP_EXPR_CODE__STORE_PARAM, $1); }; store_curly_param_part: maybe_codes { $$=N(POOL); - PCA($$, $1); + OA($$, OP_CURLY_CODE__STORE_PARAM, $1); }; code_param_value: void_value /* optimized [;...] case */ @@ -400,7 +426,9 @@ code_param_value: | constructor_code_value /* [something complex] */ ; write_expr_value: expr_value { - $$=$1; + $$=N(POOL); + O($$, OP_PREPARE_TO_EXPRESSION); + P($$, $1); O($$, OP_WRITE_EXPR_RESULT); }; @@ -411,6 +439,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) */ @@ -433,18 +464,19 @@ name_expr_subvar_value: '$' subvar_ref_n O($$, OP_GET_ELEMENT); }; name_expr_with_subvar_value: STRING subvar_get_writes { + Array *code; + { + change_string_literal_to_write_string_literal(code=$1); + P(code, $2); + } $$=N(POOL); - O($$, OP_CREATE_EWPOOL); - P($$, $1); - O($$, OP_WRITE_VALUE); - P($$, $2); - O($$, OP_REDUCE_EWPOOL); + OA($$, OP_STRING_POOL, code); }; name_square_code_value: '[' codes ']' { $$=N(POOL); - O($$, OP_CREATE_EWPOOL); - P($$, $2); - O($$, OP_REDUCE_EWPOOL); + OA($$, OP_OBJECT_POOL, $2); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ }; subvar_ref_name_rdive: STRING { $$=N(POOL); @@ -463,11 +495,19 @@ class_prefix: ; class_static_prefix: STRING ':' { $$=$1; // stack: class name string + if(*LA2S($$) == BASE_NAME) { // pseude BASE class + if(VStateless_class *base=PC.cclass->base_class()) { + change_string_literal_value($$, base->name()); + } else { + strcpy(PC.error, "no base class declared"); + YYERROR; + } + } O($$, OP_GET_CLASS); }; class_constructor_prefix: class_static_prefix ':' { $$=$1; - if(!PC.object_constructor_allowed) { + if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } @@ -478,6 +518,7 @@ class_constructor_prefix: class_static_p /* expr */ expr_value: expr { + // see OP_PREPARE_TO_EXPRESSION!! if(($$=$1)->size()==2) // only one string literal in there? change_string_literal_to_double_literal($$); // make that string literal Double }; @@ -489,8 +530,8 @@ expr: | '\'' string_inside_quotes_value '\'' { $$ = $2; } | '(' expr ')' { $$ = $2; } /* stack: operand // stack: @operand */ -| '-' expr %prec NEG { $$=$2; O($$, OP_NEG) } -| '+' expr %prec NEG { $$=$2 } +| '-' expr %prec NUNARY { $$=$2; O($$, OP_NEG) } +| '+' expr %prec NUNARY { $$=$2 } | '~' expr { $$=$2; O($$, OP_INV) } | '!' expr { $$=$2; O($$, OP_NOT) } | "def" expr { $$=$2; O($$, OP_DEF) } @@ -504,12 +545,14 @@ expr: | 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_SL) } +| expr ">>" expr { $$=$1; P($$, $3); O($$, OP_BIN_SR) } | 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; 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_BIN_XOR) } +| expr "&&" expr { $$=$1; OA($$, OP_NESTED_CODE, $3); O($$, OP_LOG_AND) } +| expr "||" expr { $$=$1; OA($$, OP_NESTED_CODE, $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) } @@ -527,9 +570,9 @@ expr: 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() */ + OA($$, OP_STRING_POOL, $1); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.get_string() */ }; /* basics */ @@ -562,7 +605,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; @@ -609,7 +652,7 @@ 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_USER_COMMENT: case LS_DEF_COMMENT: // no literals in names, please break; @@ -677,7 +720,7 @@ default: PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // fall into COMMENT lexical state [wait for \n] - push_LS(PC, LS_COMMENT); + push_LS(PC, LS_USER_COMMENT); continue; } switch(PC.ls) { @@ -716,7 +759,7 @@ default: break; // #COMMENT - case LS_COMMENT: + case LS_USER_COMMENT: if(c=='\n') { // skip comment begin=PC.source; @@ -763,6 +806,9 @@ default: case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': @@ -811,6 +857,15 @@ default: else // PC.ls==LS_VAR_ROUND // variable constructor ended pop_LS(PC); // return to normal life RC; + case '#': // comment start skipping + if(end!=begin) { + // append piece till # + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + } + // fall into COMMENT lexical state [wait for \n] + push_LS(PC, LS_EXPRESSION_COMMENT); + lexical_brackets_nestage=1; + continue; case '$': push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON); RC; @@ -830,7 +885,7 @@ default: skip_analized=1; result=DEXISTS; goto break2; - default: + default: // minus result=c; goto break2; } @@ -839,25 +894,59 @@ default: case '~': case ';': RC; - case '&': case '|': case '#': + case '&': case '|': if(*PC.source==c) { // && || - result=c=='#'?LXOR:c=='&'?LAND:LOR; + result=c=='&'?LAND:LOR; skip_analized=1; } else result=c; goto break2; - case '<': case '>': case '=': case '!': - if(*PC.source=='=') { // <= >= == != + case '!': + switch(PC.source[0]) { + case '|': // !| !|| skip_analized=1; - switch(c) { - case '<': result=NLE; break; - case '>': result=NGE; break; - case '=': result=NEQ; break; - case '!': result=NNE; break; - } - } else - result=c; + if(PC.source[1]=='|') { + skip_analized++; + result=LXOR; + } else + result=NXOR; + goto break2; + case '=': // != + skip_analized=1; + result=NNE; + goto break2; + } + RC; + + case '<': // <<, <=, < + switch(*PC.source) { + case '<': // <[<] + skip_analized=1; result=NSL; break; + case '=': // <[=] + skip_analized=1; result=NLE; break; + default: // <[] + result=c; break; + } + goto break2; + case '>': // >>, >=, > + switch(*PC.source) { + case '>': // >[>] + skip_analized=1; result=NSR; break; + case '=': // >[=] + skip_analized=1; result=NGE; break; + default: // >[] + result=c; break; + } + goto break2; + case '=': // == + switch(*PC.source) { + case '=': // =[=] + skip_analized=1; result=NEQ; break; + default: // =[] + result=c; break; // not used now + } goto break2; + case '"': push_LS(PC, LS_EXPRESSION_STRING_QUOTED); RC; @@ -920,6 +1009,24 @@ default: continue; } break; + case LS_EXPRESSION_COMMENT: + if(c=='(') + lexical_brackets_nestage++; + + switch(*PC.source) { + case '\n': case ')': + if(*PC.source==')') + if(--lexical_brackets_nestage!=0) + continue; + + // skip comment + begin=PC.source; + begin_line=PC.line; + + pop_LS(PC); + continue; + } + break; // VARIABLE GET/PUT/WITH case LS_VAR_NAME_SIMPLE_WITH_COLON: @@ -929,9 +1036,12 @@ default: 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 + // name in expr ends also before switch(c) { + // expression minus case '-': + // expression integer division + case '\\': pop_LS(PC); PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; @@ -961,7 +1071,7 @@ default: case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': pop_LS(PC); @@ -1180,7 +1290,7 @@ break2: if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME end--; } - if(end!=begin && PC.ls!=LS_COMMENT) { // last piece still alive and not comment? + if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? // append it PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); }