--- parser3/src/main/compile.y 2001/02/20 19:21:13 1.2 +++ parser3/src/main/compile.y 2001/02/21 17:50:02 1.13 @@ -1,41 +1,84 @@ %{ -#define YYSTYPE void * -#define YYPARSE_PARAM pc -#define YYLEX_PARAM pc -#define YYDEBUG 1 +#define YYSTYPE Array/**/ * +#define YYPARSE_PARAM pc +#define YYLEX_PARAM pc +#define YYDEBUG 1 #define YYERROR_VERBOSE -#define YYPRINT(file, type, value) yyprint (file, type, value) +#define yyerror(msg) real_yyerror((parse_control *)pc, msg) +#define YYPRINT(file, type, value) yyprint(file, type, value) #include #include #include #include "compile_tools.h" +#include "pa_value.h" +#include "pa_request.h" -int yyerror (char *s); -static void yyprint (FILE *file, int type, YYSTYPE value); +int real_yyerror(parse_control *pc, char *s); +static void yyprint(FILE *file, int type, YYSTYPE value); int yylex(YYSTYPE *lvalp, void *pc); -#define PC ((struct parse_control *)pc) +// local convinient inplace typecast & var +#define PC ((parse_control *)pc) +#define pool *PC->pool %} %pure_parser -%token BREAK -%token STR_LITERAL +%token EON +%token STRING %token BOGUS %% -result: input { PC->result=$1 }; -input: empty | codes; +all: + one_big_piece { + String& name_main=*new(pool) String(pool); + name_main.APPEND_CONST(MAIN_METHOD_NAME); + Array& param_names=*new(pool) Array(pool); + Array& local_names=*new(pool) Array(pool); + Method *method=new(pool) Method(pool, name_main, param_names, local_names, *$1); + *PC->methods+=method; +} +| methods; + +methods: method | methods method; +one_big_piece: maybe_codes; + +method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' + maybe_codes { + const String *name=LA2S($2); + + YYSTYPE params_names_code=$3; + Array& params_names=*new(pool) Array(pool); + for(int i=0; isize(); i+=2) + params_names+=LA2S(params_names_code, i); + + YYSTYPE locals_names_code=$4; + Array& locals_names=*new(pool) Array(pool); + for(int i=0; isize(); i+=2) + locals_names+=LA2S(locals_names_code, i); + + Method *method=new(pool) Method(pool, *name, params_names, locals_names, *$7); + *PC->methods+=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) }; + +maybe_comment: empty | STRING; /* codes */ +maybe_codes: empty | codes; + codes: code | codes code { $$=$1; - P(&$$,$2); + P($$, $2); }; code: write_str_literal | action; action: get | put | with | call; @@ -44,10 +87,10 @@ action: get | put | with | call; get: '$' any_name { $$=$2; /* stack: resulting value */ - A(&$$,OP_WRITE); /* value=pop; write(value) */ + OP($$, OP_WRITE); /* value=pop; write(value) */ }; -any_name: name_without_curly_rdive BREAK | name_in_curly_rdive; +any_name: name_without_curly_rdive EON | name_in_curly_rdive; name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 }; name_without_curly_rdive: name_rdive { @@ -57,10 +100,10 @@ name_without_curly_rdive: name_rdive { TODO: подсмотреть в $1, и если там первым элементом self, то выкинуть его и делать не OP_WITH_READ, а WITH_SELF */ - $$=N(PC->pool); A(&$$, OP_WITH_READ); /* stack: starting context */ - P(&$$,$1); /* diving code; stack: current context */ + $$=N(pool); OP($$, OP_WITH_READ); /* stack: starting context */ + P($$, $1); /* diving code; stack: current context */ }; -name_rdive: name_advance2 | name_path name_advance2 { $$=$1; P(&$$,$2) } +name_rdive: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) }; /* put */ @@ -73,11 +116,11 @@ put: '$' name_expr_dive '(' constructor_ если ничего не осталось - $self(xxx) обругать */ - $$=N(PC->pool); - A(&$$, OP_WITH_WRITE); /* stack: starting context */ - P(&$$,$2); /* diving code; stack: context,name */ - P(&$$,$4); /* stack: context,name,constructor_value */ - A(&$$,OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + $$=N(pool); + OP($$, OP_WITH_WRITE); /* stack: starting context */ + P($$, $2); /* diving code; stack: context,name */ + P($$, $4); /* stack: context,name,constructor_value */ + OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */ }; constructor_value: constructor_one_param_value @@ -85,34 +128,35 @@ constructor_value: ; constructor_one_param_value: empty_value /* optimized $var() case */ -| STR_LITERAL /* optimized $var(STR_LITERAL) case */ +| STRING /* optimized $var(STRING) case */ | complex_constructor_param_value /* $var(something complex) */ ; empty_value: empty; complex_constructor_param_value: complex_constructor_param_body { - $$=N(PC->pool); - A(&$$, OP_CREATE_EWPOOL); /* stack: empty write context */ - P(&$$,$1); /* some codes to that context */ - A(&$$,OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ + $$=N(pool); + OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */ + P($$, $1); /* some codes to that context */ + OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ }; complex_constructor_param_body: codes__excluding_sole_str_literal | codes__str__followed_by__excluding_sole_str_literal ; -constructor_two_params_value: STR_LITERAL ';' constructor_one_param_value { - char *operator_or_fmt=string_cstr(LS($1)); - $$=N(PC->pool); - G(&$$, operator_or_fmt);/* stack: ncontext name char*operator_or_fmt */ - P(&$$, $3); /* stack: ncontext name char*operator_or_fmt expr */ +constructor_two_params_value: STRING ';' constructor_one_param_value { + char *operator_or_fmt=LA2S($1)->cstr(); + $$=N(pool); + P($$, $1); /* stack: ncontext name operator_or_fmt */ + P($$, $3); /* stack: ncontext name operator_or_fmt expr */ switch(operator_or_fmt[0]) { case '=': case '%': - A(&$$, OP_EXPRESSION_EVAL); + OP($$, OP_EXPRESSION_EVAL); break; case '+': case '-': case '*': case '/': - A(&$$, OP_MODIFY_EVAL); + OP($$, OP_MODIFY_EVAL); break; default: - exception(PC->pool, 0,0, LS($1), "invalid modification operator"); + strcpy(PC->error, "invalid modification operator"); + YYERROR; } /* stack: ncontext name value */ }; @@ -120,7 +164,7 @@ constructor_two_params_value: STR_LITERA /* call */ -call: '^' name_expr_dive store_params BREAK { /* ^field.$method{vasya} */ +call: '^' name_expr_dive store_params EON { /* ^field.$method{vasya} */ /* TODO: подсмотреть в $3, и если там в первом элементе первая буква ":" то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT @@ -136,77 +180,77 @@ call: '^' name_expr_dive store_params BR иначе // ^result(value) обругать безобразие */ - $$=N(PC->pool); - A(&$$, OP_WITH_READ); /* stack: starting context */ - P(&$$,$2); /* diving code; stack: context,method_name */ - A(&$$,OP_GET_METHOD_FRAME); /* stack: context,method_frame */ - P(&$$,$3); /* filling method_frame.store_params */ - A(&$$,OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */ + $$=N(pool); + OP($$, OP_WITH_READ); /* stack: starting context */ + P($$, $2); /* diving code; stack: context,method_name */ + OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ + P($$, $3); /* filling method_frame.store_params */ + OP($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */ }; -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_round_param | store_curly_param; store_round_param: '(' store_param_parts ')' {$$=$2}; -store_param_parts: store_param_part | store_param_parts ';' store_param_part { $$=$1; P(&$$,$3) }; +store_param_parts: store_param_part | store_param_parts ';' store_param_part { $$=$1; P($$, $3) }; store_param_part: constructor_one_param_value { $$=$1; - A(&$$,OP_STORE_PARAM); + OP($$, OP_STORE_PARAM); } -store_curly_param: '{' input '}' { - $$=N(PC->pool); - A(&$$, OP_CODE_ARRAY); - G(&$$,$2); - A(&$$,OP_CREATE_JUNCTION); - A(&$$,OP_STORE_PARAM); +store_curly_param: '{' maybe_codes '}' { + $$=N(pool); + OP($$, OP_CODE_ARRAY); + AA($$, $2); + OP($$, OP_CREATE_JUNCTION); + OP($$, OP_STORE_PARAM); }; /* name */ -name_expr_dive: name_expr_value | name_path name_expr_value { $$=$1; P(&$$,$2) }; +name_expr_dive: 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 { /* stack: context */ $$=$1; /* stack: context,name */ - A(&$$,OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ }; name_advance2: name_expr_value { /* stack: context */ $$=$1; /* stack: context,name */ - A(&$$,OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ } -| STR_LITERAL BOGUS +| STRING BOGUS ; name_expr_value: - STR_LITERAL /* subname_is_const */ + 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_subvar_value: '$' subvar_ref_name_rdive { $$=$2; - A(&$$,OP_GET_ELEMENT); + OP($$, OP_GET_ELEMENT); }; -name_expr_with_subvar_value: STR_LITERAL subvar_get_writes { - $$=N(PC->pool); - A(&$$, OP_CREATE_EWPOOL); - P(&$$,$1); - A(&$$,OP_WRITE); - P(&$$,$2); - A(&$$,OP_REDUCE_EWPOOL); +name_expr_with_subvar_value: STRING subvar_get_writes { + $$=N(pool); + OP($$, OP_CREATE_EWPOOL); + P($$, $1); + OP($$, OP_WRITE); + P($$, $2); + OP($$, OP_REDUCE_EWPOOL); }; -subvar_ref_name_rdive: STR_LITERAL { +subvar_ref_name_rdive: STRING { /* TODO: подсмотреть в $1, и если там в первом элементе первая буква ":" то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT */ - $$=N(PC->pool); A(&$$, OP_WITH_READ); - P(&$$,$1); + $$=N(pool); OP($$, 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; - A(&$$,OP_GET_ELEMENT__WRITE); + OP($$, OP_GET_ELEMENT__WRITE); }; @@ -214,10 +258,10 @@ subvar__get_write: '$' subvar_ref_name_r with: '$' name_without_curly_rdive '{' codes '}' { $$=$2; - A(&$$,OP_CREATE_RWPOOL); - P(&$$,$4); - A(&$$,OP_REDUCE_RWPOOL); - A(&$$,OP_WRITE); + OP($$, OP_CREATE_RWPOOL); + P($$, $4); + OP($$, OP_REDUCE_RWPOOL); + OP($$, OP_WRITE); }; /* codes_in_brackets */ @@ -225,37 +269,37 @@ with: '$' name_without_curly_rdive '{' c codes__str__followed_by__excluding_sole_str_literal: write_str_literal codes__excluding_sole_str_literal { $$=$1; - P(&$$,$2); + P($$, $2); } ; codes__excluding_sole_str_literal: action | codes__excluding_sole_str_literal write_str_literal { $$=$1; - P(&$$,$2); + P($$, $2); } ; -write_str_literal: STR_LITERAL { +write_str_literal: STRING { $$=$1; - A(&$$,OP_WRITE); + OP($$, OP_WRITE); }; /* */ -empty: /* empty */ { $$=N(PC->pool) }; +empty: /* empty */ { $$=N(pool) }; %% /* 000$111(2222)00 000$111{3333}00 - $,^: push, =0 + $,^: push,=0 1:( { break=pop 2:( ) pop 3:{ } pop 000^111(2222)4444{33333}4000 - $,^: push, =0 + $,^: push,=0 1:( { break=pop 2:( )=4 3:{ }=4 @@ -267,8 +311,6 @@ int yylex(YYSTYPE *lvalp, void *pc) { register int c; int result; - char *start; - int start_line; if(PC->pending_state) { result=PC->pending_state; @@ -276,26 +318,30 @@ int yylex(YYSTYPE *lvalp, void *pc) { return result; } - start=PC->source; - start_line=PC->line; + char *begin=PC->source; + char *end; + int begin_line=PC->line; while(1) { - c=*PC->source++; + c=*(end=(PC->source++)); - if(c=='\n') + if(c=='\n') { PC->line++; + PC->col=0; + } else + PC->col++; /* escaping: ^^ ^$ ^; ^) ^} ^( ^{ */ if(c=='^') { char pending_c=*PC->source; - if(pending_c == '^' || pending_c == '$' || pending_c == ';' || - pending_c == '(' || pending_c == ')' || - pending_c == '{' || pending_c == '}') { + if(pending_c=='^' || pending_c=='$' || pending_c==';' || + pending_c=='(' || pending_c==')' || + pending_c=='{' || pending_c=='}') { /* append piece till ^ */ - CSTRING_APPEND(PC->string, start, PC->source-start -1/*^*/, PC->file, start_line); + PC->string->APPEND(begin, end-begin, PC->file, begin_line); /* reset piece 'start' position & line */ - start=PC->source+1/*^*/; - start_line=PC->line; + begin=PC->source/*^*/; + begin_line=PC->line; /* skip over ^ and _ */ PC->source+=2; /* skip analysis = forced literal */ @@ -303,30 +349,91 @@ int yylex(YYSTYPE *lvalp, void *pc) { } } switch(PC->ls) { + + // USER'S = NOT OURS case LS_USER: if(c=='$') { - push_LS(PC); PC->ls=LS_VAR_NAME_SIMPLE; + push_LS(PC, LS_VAR_NAME_SIMPLE); result=c; goto break2; } if(c=='^') { - push_LS(PC); PC->ls=LS_METHOD_NAME; + push_LS(PC, LS_METHOD_NAME); + result=c; + goto break2; + } + if(c=='@' && PC->col==0+1) { result=c; + push_LS(PC, LS_DEF_NAME); goto break2; } + break; - /* VAR */ + // METHOD DEFINITION + case LS_DEF_NAME: + if(c=='[') { + result=c; + PC->ls=LS_DEF_PARAMS; + goto break2; + } + if(c=='\n') { // wrong. bailing out + result=c; + pop_LS(PC); + goto break2; + } + break; + case LS_DEF_PARAMS: + if(c==';') { + result=c; + goto break2; + } + if(c==']') { + result=c; + PC->ls=*PC->source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; + goto break2; + } + if(c=='\n') { // wrong. bailing out + result=c; + pop_LS(PC); + goto break2; + } + break; + case LS_DEF_LOCALS: + if(c=='[' || c==';') { + result=c; + goto break2; + } + if(c==']') { + result=c; + PC->ls=LS_DEF_COMMENT; + goto break2; + } + if(c=='\n') { // wrong. bailing out + result=c; + pop_LS(PC); + goto break2; + } + break; + case LS_DEF_COMMENT: + if(c=='\n') { + result=c; + pop_LS(PC); + goto break2; + } + break; + + // VARIABLE GET/PUT/WITH case LS_VAR_NAME_SIMPLE: if(c==0 || c==' '|| c=='\t' || c=='\n' || c==')' || c=='}') { pop_LS(PC); - PC->source--; - result=BREAK; + PC->source--; PC->col--; + result=EON; goto break2; } - if(PC->source==start && c=='{') { /* ${name}, no need of BREAK, switching LS */ + if(begin==end && c=='{') { /* ${name}, no need of EON, switching LS */ PC->ls=LS_VAR_NAME_CURLY; result=c; goto break2; @@ -361,12 +468,12 @@ int yylex(YYSTYPE *lvalp, void *pc) { break; case LS_VAR_ROUND: if(c=='$') { - push_LS(PC); PC->ls=LS_VAR_NAME_SIMPLE; + push_LS(PC, LS_VAR_NAME_SIMPLE); result=c; goto break2; } if(c=='^') { - push_LS(PC); PC->ls=LS_METHOD_NAME; + push_LS(PC, LS_METHOD_NAME); result=c; goto break2; } @@ -386,12 +493,12 @@ int yylex(YYSTYPE *lvalp, void *pc) { break; case LS_VAR_CURLY: if(c=='$') { - push_LS(PC); PC->ls=LS_VAR_NAME_SIMPLE; + push_LS(PC, LS_VAR_NAME_SIMPLE); result=c; goto break2; } if(c=='^') { - push_LS(PC); PC->ls=LS_METHOD_NAME; + push_LS(PC, LS_METHOD_NAME); result=c; goto break2; } @@ -405,7 +512,7 @@ int yylex(YYSTYPE *lvalp, void *pc) { lexical_brackets_nestage++; break; - /* METHOD */ + // METHOD CALL case LS_METHOD_NAME: if(c=='(') { PC->ls=LS_METHOD_ROUND; @@ -426,12 +533,12 @@ int yylex(YYSTYPE *lvalp, void *pc) { break; case LS_METHOD_ROUND: if(c=='$') { - push_LS(PC); PC->ls=LS_VAR_NAME_SIMPLE; + push_LS(PC, LS_VAR_NAME_SIMPLE); result=c; goto break2; } if(c=='^') { - push_LS(PC); PC->ls=LS_METHOD_NAME; + push_LS(PC, LS_METHOD_NAME); result=c; goto break2; } @@ -450,12 +557,12 @@ int yylex(YYSTYPE *lvalp, void *pc) { break; case LS_METHOD_CURLY: if(c=='$') { - push_LS(PC); PC->ls=LS_VAR_NAME_SIMPLE; + push_LS(PC, LS_VAR_NAME_SIMPLE); result=c; goto break2; } if(c=='^') { - push_LS(PC); PC->ls=LS_METHOD_NAME; + push_LS(PC, LS_METHOD_NAME); result=c; goto break2; } @@ -482,45 +589,51 @@ int yylex(YYSTYPE *lvalp, void *pc) { goto break2; } pop_LS(PC); - PC->source--; - result=BREAK; + PC->source--; PC->col--; + result=EON; goto break2; } - if (c == 0) { + if(c==0) { result=-1; + PC->source--; PC->col--; break; } } break2: - if(PC->source-1<=start) + if(begin==end) return result; else { PC->pending_state=result; - /* append last piece */ - CSTRING_APPEND(PC->string, start, PC->source-start-1, PC->file, start_line); - /* create STR_LITERAL value: array of OP_STRING+string */ + // strip last \n before LS_DEF_NAME or EOF + if((c=='@' || c==0) && end[-1]=='\n') + end--; + // append last piece + PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/); + // create STRING value: array of OP_STRING+string *lvalp=L(PC->string); - /* new pieces storage */ - PC->string=string_create(PC->pool); - /* go */ - return STR_LITERAL; + // new pieces storage + PC->string=new(pool) String(pool); + // go! + return STRING; } } -int yyerror (char *s) /* Called by yyparse on error */ +int real_yyerror(parse_control *pc, char *s) /* Called by yyparse on error */ { - printf ("[%s]\n", s); + fprintf(stderr, "[%s]\n", s); + + s[MAX_STRING-1]=0; strcpy(pc->error, s); return 1; } static void - yyprint ( + yyprint( FILE *file, int type, YYSTYPE value) { - if (type == STR_LITERAL) - fprintf (file, " \"%s\"", string_cstr(LS(value))); + if(type==STRING) + fprintf(file, " \"%s\"", LA2S(value)->cstr()); }