--- parser3/src/main/compile.y 2002/02/18 15:21:01 1.182 +++ parser3/src/main/compile.y 2002/09/13 13:41:48 1.193 @@ -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.182 2002/02/18 15:21:01 paf Exp $ + $Id: compile.y,v 1.193 2002/09/13 13:41:48 paf Exp $ */ /** @@ -60,10 +60,13 @@ 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 ">=" @@ -84,7 +87,7 @@ static int yylex(YYSTYPE *lvalp, void *p %token IS "is" /* logical */ -%left "##" +%left "!||" %left "||" %left "&&" %left '<' '>' "<=" ">=" "lt" "gt" "le" "ge" @@ -93,7 +96,7 @@ static int yylex(YYSTYPE *lvalp, void *p %left '!' /* bitwise */ -%left '#' +%left "!|" %left '|' %left '&' %left '~' @@ -107,12 +110,12 @@ static int yylex(YYSTYPE *lvalp, void *p 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 +135,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, "'"); @@ -154,27 +157,28 @@ control_method: '@' STRING '\n' for(int i=0; isize(); i+=2) PC.request->use_file(*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 +243,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; @@ -329,7 +336,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: @@ -339,9 +346,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) }; @@ -350,7 +357,9 @@ codes__excluding_sole_str_literal: actio call: call_value { $$=$1; /* stack: value */ - O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + 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; @@ -360,16 +369,15 @@ call_value: '^' { } 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; @@ -401,11 +409,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 */ @@ -451,18 +459,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); @@ -481,6 +490,14 @@ 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 ':' { @@ -525,10 +542,10 @@ expr: | 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; 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) } @@ -546,9 +563,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 */ @@ -782,6 +799,9 @@ default: case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': @@ -849,7 +869,7 @@ default: skip_analized=1; result=DEXISTS; goto break2; - default: + default: // minus result=c; goto break2; } @@ -858,21 +878,37 @@ default: case '~': case ';': RC; - case '&': case '|': case '#': + //case '#': // comment start + 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; + if(PC.source[1]=='|') { + skip_analized++; + result=LXOR; + } else + result=NXOR; + goto break2; + case '=': // != + skip_analized=1; + result=NNE; + goto break2; + } + RC; + 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; @@ -983,7 +1019,7 @@ default: case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': pop_LS(PC);