--- parser3/src/main/compile.y 2001/03/25 08:52:35 1.114 +++ parser3/src/main/compile.y 2001/08/06 16:18:26 1.159 @@ -4,9 +4,9 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: compile.y,v 1.114 2001/03/25 08:52:35 paf Exp $ */ +%{ +static char *RCSId="$Id: compile.y,v 1.159 2001/08/06 16:18:26 parser Exp $"; /** @todo parser4: @@ -19,7 +19,6 @@ -#: in iis make up specialized Pool object for that */ -%{ #define YYSTYPE Array/**/ * #define YYPARSE_PARAM pc #define YYLEX_PARAM pc @@ -28,23 +27,20 @@ #define yyerror(msg) real_yyerror((parse_control *)pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) -#include "pa_config_includes.h" -#include -#include - #include "compile_tools.h" #include "pa_value.h" #include "pa_request.h" #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_globals.h" +#include "pa_vvoid.h" #define SELF_ELEMENT_NAME "self" #define USE_CONTROL_METHOD_NAME "USE" -int real_yyerror(parse_control *pc, char *s); +static int real_yyerror(parse_control *pc, char *s); static void yyprint(FILE *file, int type, YYSTYPE value); -int yylex(YYSTYPE *lvalp, void *pc); +static int yylex(YYSTYPE *lvalp, void *pc); // local convinient inplace typecast & var @@ -83,22 +79,22 @@ int yylex(YYSTYPE *lvalp, void *pc); %token DEF "def" %token IN "in" %token FEXISTS "-f" +%token DEXISTS "-d" %token IS "is" /* logical */ -%left "is" -%left "lt" "gt" "le" "ge" -%left "eq" "ne" -%left '<' '>' "<=" ">=" "##" -%left "==" "!=" +%left "##" %left "||" %left "&&" -%left "def" "in" "-f" +%left '<' '>' "<=" ">=" "lt" "gt" "le" "ge" +%left "==" "!=" "eq" "ne" +%left "is" "def" "in" "-f" "-d" %left '!' /* bitwise */ %left '#' -%left '&' '|' +%left '|' +%left '&' %left '~' /* numerical */ @@ -107,10 +103,11 @@ int yylex(YYSTYPE *lvalp, void *pc); %left NEG /* negation: unary - */ %% -all: +all: one_big_piece { Method& method=*NEW Method(POOL, *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*/); @@ -124,8 +121,8 @@ one_big_piece: maybe_codes; method: control_method | code_method; control_method: '@' STRING '\n' - control_strings { - const String& command=*SLA2S($2); + maybe_control_strings { + const String& command=*LA2S($2); YYSTYPE strings_code=$4; if(strings_code->size()<1*2) { strcpy(PC.error, "@"); @@ -134,7 +131,7 @@ control_method: '@' STRING '\n' YYERROR; } if(command==CLASS_NAME) { - if(PC.cclass!=&PC.request->ROOT) { // already changed from default? + if(PC.cclass->base()) { // already changed from default? strcpy(PC.error, "class already have a name '"); strncat(PC.error, PC.cclass->name().cstr(), 100); strcat(PC.error, "'"); @@ -142,72 +139,68 @@ control_method: '@' STRING '\n' } if(strings_code->size()==1*2) { // new class' name - const String *name=SLA2S(strings_code); + const String *name=LA2S(strings_code); // creating the class PC.cclass=NEW VClass(POOL); PC.cclass->set_name(*name); - // defaulting base. may change with @BASE - PC.cclass->set_base(PC.request->ROOT); // append to request's classes PC.request->classes().put(*name, PC.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( - PC.request->absolute(*SLA2S(strings_code, i))); - } else if(command==BASE_NAME) { - if(PC.cclass->base()!=&PC.request->ROOT) { // already changed from default? - strcpy(PC.error, "class already have a base '"); - strncat(PC.error, PC.cclass->base()->name().cstr(), 100); - strcat(PC.error, "'"); + } 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? + strcpy(PC.error, "class already have a base '"); + strncat(PC.error, PC.cclass->base()->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()); + strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } - if(strings_code->size()==1*2) { - const String& base_name=*SLA2S(strings_code); - VClass *base=static_cast( - PC.request->classes().get(base_name)); - if(!base) { - 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"); + // @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, "'"); - 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"'"); + strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; } + } else { + strcpy(PC.error, "'"); + 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_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=SLA2S($2); + const String *name=LA2S($2); YYSTYPE params_names_code=$3; Array *params_names=0; if(int size=params_names_code->size()) { params_names=NEW Array(POOL); for(int i=0; isize()) { locals_names=NEW Array(POOL); for(int i=0; isize()>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_by_code | construct_by_expr; -construct_by_code: '[' any_constructor_code_value ']' { - $$=$2; /* stack: context, name, value */ +construct: + construct_square | + construct_round | + construct_curly +; +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) */ } ; -construct_by_expr: '(' expr_value ')' { - $$=$2; /* stack: context, name, value */ +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) */ } ; +construct_curly: '{' maybe_codes '}' { + // stack: context, name + $$=N(POOL); + CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ +}; + 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] */ ; @@ -340,11 +340,20 @@ call: call_value { $$=$1; /* stack: value */ O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ }; -call_value: '^' call_name store_params EON { /* ^field.$method{vasya} */ - $$=$2; /* with_xxx,diving code; stack: context,method_junction */ +call_value: '^' { PC.object_constructor_allowed=true } + call_name { PC.object_constructor_allowed=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 */ - P($$, $3); /* filling method_frame.store_params */ - O($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value */ + + 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(!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 }; call_name: name_without_curly_rdive; @@ -370,17 +379,10 @@ store_curly_param_parts: store_curly_param_part | store_curly_param_parts ';' store_curly_param_part { $$=$1; P($$, $3) } ; -store_code_param_part: - empty /* optimized [] case */ -| STRING { /* optimized [STRING] case */ +store_code_param_part: code_param_value { $$=$1; O($$, OP_STORE_PARAM); -} -| constructor_code_value { /* [something complex] */ - $$=$1; - O($$, OP_STORE_PARAM); -} -; +}; store_expr_param_part: write_expr_value { $$=N(POOL); PEA($$, $1); @@ -389,6 +391,11 @@ store_curly_param_part: maybe_codes { $$=N(POOL); PCA($$, $1); }; +code_param_value: + void_value /* optimized [;...] case */ +| STRING /* optimized [STRING] case */ +| constructor_code_value /* [something complex] */ +; write_expr_value: expr_value { $$=$1; O($$, OP_WRITE_EXPR_RESULT); @@ -429,39 +436,35 @@ name_expr_with_subvar_value: STRING subv P($$, $2); O($$, OP_REDUCE_EWPOOL); }; -subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root; -subvar_ref_name_rdive_read: STRING { +subvar_ref_name_rdive: STRING { $$=N(POOL); O($$, OP_WITH_READ); P($$, $1); }; -subvar_ref_name_rdive_root: ':' STRING { - $$=N(POOL); - O($$, OP_WITH_ROOT); - 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); }; -class_prefix: STRING ':' { +class_prefix: + class_static_prefix +| class_constructor_prefix +; +class_static_prefix: STRING ':' { $$=$1; // stack: class name string O($$, OP_GET_CLASS); }; - - -/* with */ - -with: '$' name_without_curly_rdive '{' codes '}' { - $$=$2; - O($$, OP_CREATE_RWPOOL); - P($$, $4); - O($$, OP_REDUCE_RWPOOL); - O($$, OP_WRITE_VALUE); +class_constructor_prefix: class_static_prefix ':' { + $$=$1; + if(!PC.object_constructor_allowed) { + strcpy(PC.error, ":: not allowed here"); + YYERROR; + } + O($$, OP_PREPARE_TO_CONSTRUCT_OBJECT); }; + /* expr */ expr_value: expr { @@ -473,6 +476,7 @@ expr: | get_value | call_value | '"' string_inside_quotes_value '"' { $$ = $2; } +| '\'' string_inside_quotes_value '\'' { $$ = $2; } | '(' expr ')' { $$ = $2; } /* stack: operand // stack: @operand */ | '-' expr %prec NEG { $$=$2; O($$, OP_NEG) } @@ -481,6 +485,7 @@ expr: | "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) } @@ -522,7 +527,7 @@ write_string: STRING { change_string_literal_to_write_string_literal($$=$1) }; -empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) }; +void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; empty: /* empty */ { $$=N(POOL) }; %% @@ -570,16 +575,17 @@ static int yylex(YYSTYPE *lvalp, void *p } else PC.col++; - if(c=='^') + if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) switch(*PC.source) { - // escaping: ^^ ^$ ^; ^) ^} ^( ^{ ^" + // escaping: ^^ & co case '^': case '$': case ';': + case '(': case ')': case '[': case ']': case '{': case '}': case '"': if(end!=begin) { // append piece till ^ - PC.string->APPEND(begin, end-begin, PC.file, begin_line); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line begin=PC.source; // ^ @@ -593,7 +599,7 @@ static int yylex(YYSTYPE *lvalp, void *p case '#': if(end!=begin) { // append piece till ^ - PC.string->APPEND(begin, end-begin, PC.file, begin_line); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // #HH ? if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) { @@ -606,7 +612,7 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; // wrong hex value[no ^#00 chars allowed]: bail out } // append char(hex(HH)) - PC.string->APPEND(hex, 1, PC.file, begin_line); + PC.string->APPEND_CLEAN(hex, 1, PC.file, begin_line); // skip over ^#HH PC.source+=3; PC.col+=3; @@ -621,8 +627,7 @@ static int yylex(YYSTYPE *lvalp, void *p if(c=='#' && PC.col==1) { if(end!=begin) { // append piece till # - PC.string->APPEND_SPECIFIC_TAINTED(begin, end-begin, - String::UL_TABLE, PC.file, begin_line); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_COMMENT); @@ -631,6 +636,15 @@ static int yylex(YYSTYPE *lvalp, void *p // USER'S = NOT OURS case LS_USER: + if(PC.trim_bof) + switch(c) { + case '\n': case ' ': case '\t': + begin=PC.source; + begin_line=PC.line; + continue; // skip it + default: + PC.trim_bof=false; + } switch(c) { case '$': push_LS(PC, LS_VAR_NAME_SIMPLE); @@ -660,11 +674,18 @@ static int yylex(YYSTYPE *lvalp, void *p break; // STRING IN EXPRESSION - case LS_EXPRESSION_STRING: + case LS_EXPRESSION_STRING_QUOTED: + case LS_EXPRESSION_STRING_APOSTROFED: switch(c) { case '"': - pop_LS(PC); //"abc". - RC; + case '\'': + if( + PC.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || + PC.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { + pop_LS(PC); //"abc". | 'abc'. + RC; + } + break; case '$': push_LS(PC, LS_VAR_NAME_SIMPLE); RC; @@ -721,6 +742,11 @@ 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 @@ -752,11 +778,19 @@ static int yylex(YYSTYPE *lvalp, void *p lexical_brackets_nestage++; RC; case '-': - if(*PC.source=='f') { // -f + switch(*PC.source) { + case 'f': // -f skip_analized=1; result=FEXISTS; - } else + goto break2; + case 'd': // -d + skip_analized=1; + result=DEXISTS; + goto break2; + default: result=c; + goto break2; + } goto break2; case '+': case '*': case '/': case '%': case '~': @@ -782,37 +816,40 @@ static int yylex(YYSTYPE *lvalp, void *p result=c; goto break2; case '"': - push_LS(PC, LS_EXPRESSION_STRING); + push_LS(PC, LS_EXPRESSION_STRING_QUOTED); + RC; + case '\'': + push_LS(PC, LS_EXPRESSION_STRING_APOSTROFED); RC; case 'l': case 'g': case 'e': case 'n': if(end==begin) // right after whitespace - switch(*PC.source) { -// case '?': // ok [and bad cases, yacc would bark at them] - case 't': // lt gt [et nt] - result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR; - skip_analized=1; - goto break2; - case 'e': // le ge ne [ee] - result=c=='l'?SLE:c=='g'?SGE:c=='n'?SNE:BAD_STRING_COMPARISON_OPERATOR; - skip_analized=1; - goto break2; - case 'q': // eq [lq gq nq] - result=c=='e'?SEQ:BAD_STRING_COMPARISON_OPERATOR; - skip_analized=1; - goto break2; + if(isspace(PC.source[1])) { + switch(*PC.source) { + // case '?': // ok [and bad cases, yacc would bark at them] + case 't': // lt gt [et nt] + result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR; + skip_analized=1; + goto break2; + case 'e': // le ge ne [ee] + result=c=='l'?SLE:c=='g'?SGE:c=='n'?SNE:BAD_STRING_COMPARISON_OPERATOR; + skip_analized=1; + goto break2; + case 'q': // eq [lq gq nq] + result=c=='e'?SEQ:BAD_STRING_COMPARISON_OPERATOR; + skip_analized=1; + goto break2; + } } break; case 'i': if(end==begin) // right after whitespace - switch(PC.source[0]) { - case 'n': - { // in + if(isspace(PC.source[1])) { + switch(PC.source[0]) { + case 'n': // in skip_analized=1; result=IN; goto break2; - } - case 's': - { // is + case 's': // is skip_analized=1; result=IS; goto break2; @@ -844,6 +881,7 @@ static int yylex(YYSTYPE *lvalp, void *p // 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) { // name in expr ends also before binary operators switch(c) { @@ -854,17 +892,30 @@ static int yylex(YYSTYPE *lvalp, void *p goto break2; } } + if(PC.ls==LS_VAR_NAME_NO_COLON) { + // name already has ':', stop before next + switch(c) { + case ':': + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + result=EON; + goto break2; + } + } switch(c) { case 0: case ' ': case '\t': case '\n': case ';': - case ']': case '}': case ')': case '"': - case '<': case '>': // these stand for HTML brackets and expression binary ops + case ']': case '}': case ')': + case '"': case '\'': + case '<': case '>': // these stand for HTML brackets AND expression binary ops case '+': case '*': case '/': case '%': case '&': case '|': case '=': case '!': // common delimiters - case '\'': case ',': + case ',': case '?': + // before call + case '^': pop_LS(PC); PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; @@ -889,6 +940,7 @@ static int yylex(YYSTYPE *lvalp, void *p case '.': // name part delim case '$': // name part subvar case ':': // ':name' or 'class:name' + PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' RC; } break; @@ -1045,10 +1097,12 @@ break2: if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF? // strip last \n end--; + if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME + end--; } - if(end!=begin) { // last piece still alive? + if(end!=begin && PC.ls!=LS_COMMENT) { // last piece still alive and not comment? // append it - PC.string->APPEND(begin, end-begin, PC.file, begin_line/*, start_col*/); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); } } if(PC.string->size()) { // something accumulated? @@ -1072,5 +1126,5 @@ static int real_yyerror(parse_control *p static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", SLA2S(value)->cstr()); + fprintf(file, " \"%s\"", LA2S(value)->cstr()); }