--- parser3/src/main/compile.y 2001/09/18 16:05:42 1.166 +++ parser3/src/main/compile.y 2003/02/04 09:44:27 1.204.2.6 @@ -1,12 +1,12 @@ +%{ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.y,v 1.204.2.6 2003/02/04 09:44:27 paf Exp $ */ -%{ -static char *RCSId="$Id: compile.y,v 1.166 2001/09/18 16:05:42 parser Exp $"; /** @todo parser4: @@ -19,7 +19,7 @@ static char *RCSId="$Id: compile.y,v 1.1 -#: in iis make up specialized Pool object for that */ -#define YYSTYPE Array/**/ * +#define YYSTYPE ArrayOperationPtr #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 @@ -34,8 +34,8 @@ static char *RCSId="$Id: compile.y,v 1.1 #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); @@ -59,15 +59,21 @@ 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" @@ -83,35 +89,36 @@ 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, - Method::CT_ANY, + MethodPtr method(new Method(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); + ArrayStringPtr(0)/*param_names*/, ArrayStringPtr(0)/*local_names*/, + $1/*parser_code*/, 0/*native_code*/)); + PC.cclass->add_method(main_method_name, method); } | methods; @@ -122,108 +129,114 @@ method: control_method | code_method; control_method: '@' STRING '\n' maybe_control_strings { - const String& command=*LA2S($2); + StringPtr command=LA2S(*$2); YYSTYPE strings_code=$4; - if(strings_code->size()<1*2) { + if(strings_code->count()<1*2) { strcpy(PC.error, "@"); - strcat(PC.error, command.cstr()); + strcat(PC.error, command->cstr()); strcat(PC.error, " is empty"); YYERROR; } - if(command==CLASS_NAME) { - if(PC.cclass->base()) { // already changed from default? + if(*command==CLASS_NAME) { + 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); + strncat(PC.error, PC.cclass->name()->cstr(), 100); strcat(PC.error, "'"); YYERROR; } - if(strings_code->size()==1*2) { + if(strings_code->count()==1*2) { // new class' name - const String *name=LA2S(strings_code); + StringPtr name=LA2S(*strings_code); // creating the class - PC.cclass=NEW VClass(POOL); - PC.cclass->set_name(*name); + VStateless_classPtr cclass(new VClass); + PC.cclass=cclass.get(); + PC.cclass->set_name(name); // append to request's classes - PC.request->classes().put(*name, PC.cclass); + PC.request->classes().put(name, cclass); } else { strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); YYERROR; } - } else if(command==USE_CONTROL_METHOD_NAME) { - 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? + } else if(*command==USE_CONTROL_METHOD_NAME) { + for(int i=0; icount(); i+=2) + PC.request->use_file(*PC.request->main_class, LA2S(*strings_code, i)); + } else if(*command==BASE_NAME) { + 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( - PC.request->classes().get(base_name)); - if(!base) { - strcpy(PC.error, base_name.cstr()); + if(strings_code->count()==1*2) { + StringPtr base_name=LA2S(*strings_code); + if(ValuePtr base_class_value=PC.request->classes().get(base_name)) { + // @CLASS == @BASE sanity check + if(VStateless_class *base_class=base_class_value->get_class()) { + if(PC.cclass==base_class) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + YYERROR; + } + PC.cclass->get_class()->set_base(base_class); + } else { // they asked to derive from a class without methods ['env' & co] + strcpy(PC.error, base_name->cstr()); + strcat(PC.error, ": you can not derive from this class in @"BASE_NAME); + YYERROR; + } + } else { + strcpy(PC.error, base_name->cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } - // @CLASS == @BASE sanity check - if(PC.cclass==base) { - strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); - YYERROR; - } - PC.cclass->set_base(*base); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; } } else { strcpy(PC.error, "'"); - strncat(PC.error, command.cstr(), MAX_STRING/2); + strncat(PC.error, command->cstr(), MAX_STRING/2); strcat(PC.error, "' invalid special name. valid names are " "'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'"); YYERROR; } }; maybe_control_strings: empty | control_strings; -control_strings: control_string | control_strings control_string { $$=$1; P($$, $2) }; +control_strings: control_string | control_strings control_string { $$=$1; P(*$$, *$2) }; control_string: maybe_string '\n'; maybe_string: empty | STRING; code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' maybe_codes { - const String *name=LA2S($2); + StringPtr name=LA2S(*$2); YYSTYPE params_names_code=$3; - Array *params_names=0; - if(int size=params_names_code->size()) { - params_names=NEW Array(POOL); + ArrayStringPtr params_names; + if(int size=params_names_code->count()) { + params_names=ArrayStringPtr(new ArrayString); for(int i=0; isize()) { - locals_names=NEW Array(POOL); + ArrayStringPtr locals_names; + if(int size=locals_names_code->count()) { + locals_names=ArrayStringPtr(new ArrayString); for(int i=0; iadd_method(*name, method); + $7, 0)); + PC.cclass->add_method(name, method); }; maybe_bracketed_strings: empty | bracketed_maybe_strings; bracketed_maybe_strings: '[' maybe_strings ']' {$$=$2}; maybe_strings: empty | strings; -strings: STRING | strings ';' STRING { $$=$1; P($$, $3) }; +strings: STRING | strings ';' STRING { $$=$1; P(*$$, *$3) }; maybe_comment: empty | STRING; @@ -231,15 +244,18 @@ maybe_comment: empty | STRING; maybe_codes: empty | codes; -codes: code | codes code { $$=$1; P($$, $2) }; +codes: code | codes code { $$=$1; P(*$$, *$2) }; code: write_string | action; 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; @@ -248,54 +264,63 @@ name_without_curly_rdive: name_without_curly_rdive_read | name_without_curly_rdive_class; name_without_curly_rdive_read: name_without_curly_rdive_code { - $$=N(POOL); - Array *diving_code=$1; - const String *first_name=LA2S(diving_code); + $$=N(); + ArrayOperationPtr diving_code=$1; + StringPtr 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, + 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->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O($$, OP_WITH_READ); /* stack: starting context */ - P($$, diving_code); + 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->count()==3) + (*diving_code)[2].code=OP_GET_ELEMENT_OR_OPERATOR; + P(*$$, *diving_code); } /* diving code; stack: current context */ }; -name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P($$, $2) }; -name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) }; +name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P(*$$, *$2) }; +name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P(*$$, *$2) }; /* put */ put: '$' name_expr_wdive construct { $$=$2; /* stack: context,name */ - P($$, $3); /* stack: context,name,constructor_value */ + P(*$$, *$3); /* stack: context,name,constructor_value */ }; name_expr_wdive: name_expr_wdive_root | name_expr_wdive_write | name_expr_wdive_class; name_expr_wdive_root: name_expr_dive_code { - $$=N(POOL); - Array *diving_code=$1; - const String *first_name=LA2S(diving_code); + $$=N(); + ArrayOperationPtr diving_code=$1; + StringPtr 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, + 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->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O($$, OP_WITH_ROOT); /* stack: starting context */ - P($$, diving_code); + O(*$$, OP_WITH_ROOT); /* stack: starting context */ + P(*$$, *diving_code); } /* diving code; stack: current context */ }; name_expr_wdive_write: '.' name_expr_dive_code { - $$=N(POOL); - O($$, OP_WITH_WRITE); /* stack: starting context */ - P($$, $2); /* diving code; stack: context,name */ + $$=N(); + 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) }; +name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P(*$$, *$2) }; construct: construct_square @@ -305,19 +330,21 @@ construct: construct_square: '[' any_constructor_code_value ']' { // stack: context, name $$=$2; // stack: context, name, value - O($$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(*$$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ } ; construct_round: '(' expr_value ')' { + $$=N(); + O(*$$, OP_PREPARE_TO_EXPRESSION); // stack: context, name - $$=$2; // stack: context, name, value - O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ + P(*$$, *$2); // stack: context, name, value + O(*$$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ } ; construct_curly: '{' maybe_codes '}' { // stack: context, name - $$=N(POOL); - CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + $$=N(); + OA(*$$, OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ }; any_constructor_code_value: @@ -326,39 +353,44 @@ any_constructor_code_value: | constructor_code_value /* $var[something complex] */ ; 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() */ + $$=N(); + 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) }; +codes__excluding_sole_str_literal: action | code codes { $$=$1; P(*$$, *$2) }; /* call */ 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(Value *value=LA2V(params_code)) // it is OP_VALUE + value? + if(params_code->count()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] + if(ValuePtr 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 + params_code=YYSTYPE(0); // ^zzz[] case. don't append lone empty param. + } + /* 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; -store_params: store_param | store_params store_param { $$=$1; P($$, $2) }; +store_params: store_param | store_params store_param { $$=$1; P(*$$, *$2) }; store_param: store_square_param | store_round_param @@ -369,27 +401,27 @@ store_round_param: '(' store_expr_param_ store_curly_param: '{' store_curly_param_parts '}' {$$=$2}; store_code_param_parts: store_code_param_part -| store_code_param_parts ';' store_code_param_part { $$=$1; P($$, $3) } +| store_code_param_parts ';' store_code_param_part { $$=$1; P(*$$, *$3) } ; store_expr_param_parts: store_expr_param_part -| store_expr_param_parts ';' store_expr_param_part { $$=$1; P($$, $3) } +| store_expr_param_parts ';' store_expr_param_part { $$=$1; P(*$$, *$3) } ; store_curly_param_parts: store_curly_param_part -| store_curly_param_parts ';' store_curly_param_part { $$=$1; P($$, $3) } +| store_curly_param_parts ';' store_curly_param_part { $$=$1; P(*$$, *$3) } ; store_code_param_part: code_param_value { $$=$1; - O($$, OP_STORE_PARAM); + O(*$$, OP_STORE_PARAM); }; store_expr_param_part: write_expr_value { - $$=N(POOL); - PEA($$, $1); + $$=N(); + OA(*$$, OP_EXPR_CODE__STORE_PARAM, $1); }; store_curly_param_part: maybe_codes { - $$=N(POOL); - PCA($$, $1); + $$=N(); + OA(*$$, OP_CURLY_CODE__STORE_PARAM, $1); }; code_param_value: void_value /* optimized [;...] case */ @@ -397,25 +429,30 @@ code_param_value: | constructor_code_value /* [something complex] */ ; write_expr_value: expr_value { - $$=$1; - O($$, OP_WRITE_EXPR_RESULT); + $$=N(); + O(*$$, OP_PREPARE_TO_EXPRESSION); + P(*$$, *$1); + O(*$$, OP_WRITE_EXPR_RESULT); }; /* name */ -name_expr_dive_code: name_expr_value | name_path name_expr_value { $$=$1; P($$, $2) }; +name_expr_dive_code: name_expr_value | name_path name_expr_value { $$=$1; P(*$$, *$2) }; -name_path: name_step | name_path name_step { $$=$1; P($$, $2) }; +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) */ + O(*$$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ }; 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(*$$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ } | STRING BOGUS ; @@ -427,31 +464,32 @@ name_expr_value: ; name_expr_subvar_value: '$' subvar_ref_name_rdive { $$=$2; - O($$, OP_GET_ELEMENT); + O(*$$, OP_GET_ELEMENT); }; name_expr_with_subvar_value: STRING subvar_get_writes { - $$=N(POOL); - O($$, OP_CREATE_EWPOOL); - P($$, $1); - O($$, OP_WRITE_VALUE); - P($$, $2); - O($$, OP_REDUCE_EWPOOL); + ArrayOperationPtr code; + { + change_string_literal_to_write_string_literal(*(code=$1)); + P(*code, *$2); + } + $$=N(); + OA(*$$, OP_STRING_POOL, code); }; name_square_code_value: '[' codes ']' { - $$=N(POOL); - O($$, OP_CREATE_EWPOOL); - P($$, $2); - O($$, OP_REDUCE_EWPOOL); + $$=N(); + 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); - O($$, OP_WITH_READ); - P($$, $1); + $$=N(); + O(*$$, OP_WITH_READ); + P(*$$, *$1); }; -subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) }; +subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P(*$$, *$2) }; subvar__get_write: '$' subvar_ref_name_rdive { $$=$2; - O($$, OP_GET_ELEMENT__WRITE); + O(*$$, OP_GET_ELEMENT__WRITE); }; class_prefix: @@ -460,23 +498,32 @@ class_prefix: ; class_static_prefix: STRING ':' { $$=$1; // stack: class name string - O($$, OP_GET_CLASS); + 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; } - O($$, OP_PREPARE_TO_CONSTRUCT_OBJECT); + O(*$$, OP_PREPARE_TO_CONSTRUCT_OBJECT); }; /* expr */ expr_value: expr { - if(($$=$1)->size()==2) // only one string literal in there? - change_string_literal_to_double_literal($$); // make that string literal Double + // see OP_PREPARE_TO_EXPRESSION!! + if(($$=$1)->count()==2) // only one string literal in there? + change_string_literal_to_double_literal(*$$); // make that string literal Double }; expr: STRING @@ -486,57 +533,60 @@ expr: | '\'' string_inside_quotes_value '\'' { $$ = $2; } | '(' 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) } -| "in" expr { $$=$2; O($$, OP_IN) } -| "-f" expr { $$=$2; O($$, OP_FEXISTS) } -| "-d" expr { $$=$2; O($$, OP_DEXISTS) } +| '-' 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) } +| "in" expr { $$=$2; O(*$$, OP_IN) } +| "-f" expr { $$=$2; O(*$$, OP_FEXISTS) } +| "-d" expr { $$=$2; O(*$$, OP_DEXISTS) } /* 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) } -| expr "is" expr { $$=$1; P($$, $3); O($$, OP_IS) } +| 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_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; 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) } +| 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) } +| expr "is" expr { $$=$1; P(*$$, *$3); O(*$$, OP_IS) } ; 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() */ + $$=N(); + OA(*$$, OP_STRING_POOL, $1); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.get_string() */ }; /* basics */ write_string: STRING { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE - change_string_literal_to_write_string_literal($$=$1) + change_string_literal_to_write_string_literal(*($$=$1)) }; -void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; -empty: /* empty */ { $$=N(POOL) }; +void_value: /* empty */ { $$=VL(ValuePtr(new VVoid())) }; +empty: /* empty */ { $$=N() }; %% #endif @@ -558,7 +608,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; @@ -584,32 +634,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 - end=begin=PC.source; // ^ + begin=PC.source; // ->punctuation begin_line=PC.line; - 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; - } + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; // converting ^#HH into char(hex(HH)) case '#': @@ -633,12 +708,16 @@ static int yylex(YYSTYPE *lvalp, void *p PC.source+=3; PC.col+=3; // reset piece 'begin' position & line - begin=PC.source; // ^ + begin=PC.source; // ->after ^#HH begin_line=PC.line; + // skip analysis = forced literal continue; } break; } + break; + } + } // #comment start skipping if(c=='#' && PC.col==1) { if(end!=begin) { @@ -646,7 +725,8 @@ static int yylex(YYSTYPE *lvalp, void *p 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) { @@ -669,12 +749,6 @@ static int yylex(YYSTYPE *lvalp, void *p case '^': push_LS(PC, LS_METHOD_NAME); RC; - case '@': - if(PC.col==0+1) { - push_LS(PC, LS_DEF_NAME); - RC; - } - break; case ']': if(PC.ls==LS_NAME_SQUARE_PART) if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> @@ -690,7 +764,7 @@ static int yylex(YYSTYPE *lvalp, void *p break; // #COMMENT - case LS_COMMENT: + case LS_USER_COMMENT: if(c=='\n') { // skip comment begin=PC.source; @@ -737,6 +811,9 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_DEF_PARAMS: switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; case ';': RC; case ']': @@ -770,19 +847,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) @@ -796,6 +862,15 @@ static int yylex(YYSTYPE *lvalp, void *p 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; @@ -815,34 +890,68 @@ static int yylex(YYSTYPE *lvalp, void *p skip_analized=1; result=DEXISTS; goto break2; - default: + default: // minus result=c; goto break2; } goto break2; - case '+': case '*': case '/': case '%': + case '+': case '*': case '/': case '%': case '\\': 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; @@ -905,6 +1014,24 @@ static int yylex(YYSTYPE *lvalp, void *p 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: @@ -914,9 +1041,12 @@ static int yylex(YYSTYPE *lvalp, void *p 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; @@ -946,7 +1076,7 @@ static int yylex(YYSTYPE *lvalp, void *p case '&': case '|': case '=': case '!': // common delimiters - case ',': case '?': + case ',': case '?': case '#': // before call case '^': pop_LS(PC); @@ -1080,6 +1210,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; @@ -1163,16 +1295,16 @@ 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*/); } } if(PC.string->size()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(NEW VString(*PC.string)); + *lvalp=VL(ValuePtr(new VString(PC.string))); // new pieces storage - PC.string=NEW String(POOL); + PC.string=StringPtr(new String); // make current result be pending for next call, return STRING for now PC.pending_state=result; result=STRING; } @@ -1189,5 +1321,5 @@ static int real_yyerror(parse_control *p static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", LA2S(value)->cstr()); + fprintf(file, " \"%s\"", LA2S(*value)->cstr().get()); }