--- parser3/src/main/compile.y 2001/05/07 07:46:43 1.130 +++ parser3/src/main/compile.y 2001/08/10 12:36:56 1.160 @@ -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.130 2001/05/07 07:46:43 paf Exp $ */ +%{ +static char *RCSId="$Id: compile.y,v 1.160 2001/08/10 12:36:56 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,19 +27,16 @@ #define yyerror(msg) real_yyerror((parse_control *)pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) -#include "pa_config_includes.h" - #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_vunknown.h" +#include "pa_vvoid.h" #define SELF_ELEMENT_NAME "self" #define USE_CONTROL_METHOD_NAME "USE" -#define END_CONTROL_METHOD_NAME "end" static int real_yyerror(parse_control *pc, char *s); static void yyprint(FILE *file, int type, YYSTYPE value); @@ -87,19 +83,18 @@ static int yylex(YYSTYPE *lvalp, void *p %token IS "is" /* logical */ -%left "is" -%left "lt" "gt" "le" "ge" -%left "eq" "ne" -%left '<' '>' "<=" ">=" "##" -%left "==" "!=" +%left "##" %left "||" %left "&&" -%left "def" "in" "-f" "-d" +%left '<' '>' "<=" ">=" "lt" "gt" "le" "ge" +%left "==" "!=" "eq" "ne" +%left "is" "def" "in" "-f" "-d" %left '!' /* bitwise */ %left '#' -%left '&' '|' +%left '|' +%left '&' %left '~' /* numerical */ @@ -108,7 +103,7 @@ static int yylex(YYSTYPE *lvalp, void *p %left NEG /* negation: unary - */ %% -all: +all: one_big_piece { Method& method=*NEW Method(POOL, *main_method_name, @@ -126,11 +121,9 @@ one_big_piece: maybe_codes; method: control_method | code_method; control_method: '@' STRING '\n' - control_strings { + maybe_control_strings { const String& command=*LA2S($2); YYSTYPE strings_code=$4; - if(command==END_CONTROL_METHOD_NAME && strings_code->size()==0) - break; if(strings_code->size()<1*2) { strcpy(PC.error, "@"); strcat(PC.error, command.cstr()); @@ -138,7 +131,7 @@ control_method: '@' STRING '\n' YYERROR; } if(command==CLASS_NAME) { - if(PC.cclass!=&PC.request->OP) { // 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, "'"); @@ -158,8 +151,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 '"); @@ -194,6 +186,7 @@ control_method: '@' STRING '\n' 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; @@ -240,7 +233,7 @@ maybe_codes: empty | codes; codes: code | codes code { $$=$1; P($$, $2) }; code: write_string | action; -action: get | put | with | call; +action: get | put | call; /* get */ @@ -253,7 +246,6 @@ get_name_value: name_without_curly_rdive name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 }; name_without_curly_rdive: name_without_curly_rdive_read -| name_without_curly_rdive_root | name_without_curly_rdive_class; name_without_curly_rdive_read: name_without_curly_rdive_code { $$=N(POOL); @@ -270,11 +262,6 @@ name_without_curly_rdive_read: name_with } /* diving code; stack: current context */ }; -name_without_curly_rdive_root: ':' name_without_curly_rdive_code { - $$=N(POOL); - O($$, OP_WITH_ROOT); /* stack: starting context */ - P($$, $2); /* 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) }; @@ -285,10 +272,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); @@ -298,31 +285,43 @@ 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_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: - unknown_value /* optimized $var[] case */ + void_value /* optimized $var[] case */ | STRING /* optimized $var[STRING] case */ | constructor_code_value /* $var[something complex] */ ; @@ -341,14 +340,16 @@ 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 */ - YYSTYPE params_code=$3; - if(params_code->size()==3) // probably [] case. [OP_VALUE + Unknown + STORE_PARAM] + 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 VUnknown? + 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 @@ -391,7 +392,7 @@ store_curly_param_part: maybe_codes { PCA($$, $1); }; code_param_value: - unknown_value /* optimized [;...] case */ + void_value /* optimized [;...] case */ | STRING /* optimized [STRING] case */ | constructor_code_value /* [something complex] */ ; @@ -421,7 +422,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_curly_code_value /* (codes) */ ; name_expr_subvar_value: '$' subvar_ref_name_rdive { $$=$2; @@ -435,16 +437,16 @@ 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 { +name_curly_code_value: '(' codes ')' { $$=N(POOL); - O($$, OP_WITH_READ); - P($$, $1); + O($$, OP_CREATE_EWPOOL); + P($$, $2); + O($$, OP_REDUCE_EWPOOL); }; -subvar_ref_name_rdive_root: ':' STRING { +subvar_ref_name_rdive: STRING { $$=N(POOL); - O($$, OP_WITH_ROOT); - P($$, $2); + O($$, OP_WITH_READ); + P($$, $1); }; subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) }; subvar__get_write: '$' subvar_ref_name_rdive { @@ -452,22 +454,24 @@ subvar__get_write: '$' subvar_ref_name_r 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 { @@ -479,6 +483,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) } @@ -529,7 +534,7 @@ write_string: STRING { change_string_literal_to_write_string_literal($$=$1) }; -unknown_value: /* empty */ { $$=VL(NEW VUnknown(POOL)) }; +void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; empty: /* empty */ { $$=N(POOL) }; %% @@ -638,6 +643,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); @@ -651,6 +665,12 @@ static int yylex(YYSTYPE *lvalp, void *p RC; } break; + case ')': // $name.(code<)> + if(--lexical_brackets_nestage==0) { + pop_LS(PC); + RC; + } + break; } break; @@ -667,11 +687,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; @@ -728,6 +755,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 @@ -797,7 +829,10 @@ 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 @@ -859,6 +894,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) { @@ -869,18 +905,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 '<': case '>': // these stand for HTML brackets and expression binary ops + case '<': case '>': // these stand for HTML brackets AND expression binary ops case '+': case '*': case '/': case '%': case '&': case '|': case '=': case '!': // common delimiters - case ',': + case ',': case '?': + // before call + case '^': pop_LS(PC); PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; @@ -899,18 +947,30 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case '(': + // $name.<(>code) + if(PC.col>1/*not first column*/ && end[-1]=='.'/*was dot */) { + push_LS(PC, LS_USER); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim case '$': // name part subvar - case ':': // ':name' or 'class:name' + case ':': // class<:>name + PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' RC; } break; case LS_VAR_NAME_CURLY: switch(c) { + case '(': + // ${name.<(>code)} + push_LS(PC, LS_USER); + lexical_brackets_nestage=1; + RC; case '}': // ${name} finished, restoring LS pop_LS(PC); RC; @@ -975,6 +1035,12 @@ static int yylex(YYSTYPE *lvalp, void *p lexical_brackets_nestage=1; RC; case '(': + // $name.<(>code) + if(PC.col>1/*not first column*/ && end[-1]=='.'/*was dot */) { + push_LS(PC, LS_USER); + lexical_brackets_nestage=1; + RC; + } PC.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; @@ -1061,8 +1127,10 @@ 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_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); }