diff options
Diffstat (limited to 'mrbgems/mruby-compiler/core/parse.y')
| -rw-r--r-- | mrbgems/mruby-compiler/core/parse.y | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 911812706..cf5f5230f 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -74,6 +74,8 @@ typedef unsigned int stack_type; #define NUM_SUFFIX_R (1<<0) #define NUM_SUFFIX_I (1<<1) +#define NUMPARAM_MAX 9 + static inline mrb_sym intern_cstr_gen(parser_state *p, const char *s) { @@ -315,6 +317,24 @@ locals_node(parser_state *p) return p->locals ? p->locals->car : NULL; } +static void +nvars_nest(parser_state *p) +{ + p->nvars = cons(p->nvars, nint(0)); +} + +static void +nvars_block(parser_state *p) +{ + p->nvars = cons(p->nvars, nint(-2)); +} + +static void +nvars_unnest(parser_state *p) +{ + p->nvars = p->nvars->car; +} + /* (:scope (vars..) (prog...)) */ static node* new_scope(parser_state *p, node *body) @@ -649,6 +669,19 @@ new_cvar(parser_state *p, mrb_sym sym) return cons((node*)NODE_CVAR, nsym(sym)); } +/* (:nvar . a) */ +static node* +new_nvar(parser_state *p, int num) +{ + if (!p->nvars || intn(p->nvars->cdr) < -1) { + yyerror(p, "numbered parameter outside block"); + } else { + int nvars = intn(p->nvars->cdr); + p->nvars->cdr = nint(nvars > num ? nvars : num); + } + return cons((node*)NODE_NVAR, nint(num)); +} + /* (:const . a) */ static node* new_const(parser_state *p, mrb_sym sym) @@ -806,10 +839,39 @@ new_block_arg(parser_state *p, node *a) return cons((node*)NODE_BLOCK_ARG, a); } +static node* +setup_args(parser_state *p, node *a) +{ + int nvars = intn(p->nvars->cdr); + if (nvars > 0) { + int i; + mrb_sym sym; + // m || opt || rest || tail + if (a && (a->car || (a->cdr && a->cdr->car) || (a->cdr->cdr && a->cdr->cdr->car) || (a->cdr->cdr->cdr->cdr && a->cdr->cdr->cdr->cdr->car))) { + yyerror(p, "ordinary parameter is defined"); + } else { + node* args = 0; + for (i = nvars; i > 0; i--) { + char buf[3]; + + buf[0] = '_'; + buf[1] = i+'0'; + buf[2] = '\0'; + sym = intern_cstr(buf); + args = cons(new_arg(p, sym), args); + p->locals->car = cons(nsym(sym), p->locals->car); + } + a = new_args(p, args, 0, 0, 0, 0); + } + } + return a; +} + /* (:block arg body) */ static node* new_block(parser_state *p, node *a, node *b) { + a = setup_args(p, a); return list4((node*)NODE_BLOCK, locals_node(p), a, b); } @@ -817,6 +879,7 @@ new_block(parser_state *p, node *a, node *b) static node* new_lambda(parser_state *p, node *a, node *b) { + a = setup_args(p, a); return list4((node*)NODE_LAMBDA, locals_node(p), a, b); } @@ -1334,6 +1397,7 @@ heredoc_end(parser_state *p) %token <nd> tSTRING tSTRING_PART tSTRING_MID %token <nd> tNTH_REF tBACK_REF %token <num> tREGEXP_END +%token <num> tNUMPARAM %type <nd> singleton string string_fragment string_rep string_interp xstring regexp %type <nd> literal numeric cpath symbol @@ -1466,11 +1530,13 @@ top_stmt : stmt | keyword_BEGIN { $<nd>$ = local_switch(p); + nvars_block(p); } '{' top_compstmt '}' { yyerror(p, "BEGIN not supported"); local_resume(p, $<nd>2); + nvars_unnest(p); $$ = 0; } ; @@ -1668,6 +1734,7 @@ block_command : block_call cmd_brace_block : tLBRACE_ARG { local_nest(p); + nvars_nest(p); } opt_block_param compstmt @@ -1675,6 +1742,7 @@ cmd_brace_block : tLBRACE_ARG { $$ = new_block(p, $3, $4); local_unnest(p); + nvars_unnest(p); } ; @@ -2330,6 +2398,10 @@ primary : literal | heredoc | var_ref | backref + | tNUMPARAM + { + $$ = new_nvar(p, $1); + } | tFID { $$ = new_fcall(p, $1, 0); @@ -2410,6 +2482,7 @@ primary : literal | tLAMBDA { local_nest(p); + nvars_nest(p); $<num>$ = p->lpar_beg; p->lpar_beg = ++p->paren_nest; } @@ -2423,6 +2496,7 @@ primary : literal p->lpar_beg = $<num>2; $$ = new_lambda(p, $3, $5); local_unnest(p); + nvars_unnest(p); p->cmdarg_stack = $<stack>4; CMDARG_LEXPOP(); } @@ -2482,6 +2556,7 @@ primary : literal if (p->in_def || p->in_single) yyerror(p, "class definition in method body"); $<nd>$ = local_switch(p); + nvars_block(p); } bodystmt keyword_end @@ -2489,6 +2564,7 @@ primary : literal $$ = new_class(p, $2, $3, $5); SET_LINENO($$, $1); local_resume(p, $<nd>4); + nvars_unnest(p); } | keyword_class tLSHFT expr @@ -2499,6 +2575,7 @@ primary : literal term { $<nd>$ = cons(local_switch(p), nint(p->in_single)); + nvars_block(p); p->in_single = 0; } bodystmt @@ -2507,6 +2584,7 @@ primary : literal $$ = new_sclass(p, $3, $7); SET_LINENO($$, $1); local_resume(p, $<nd>6->car); + nvars_unnest(p); p->in_def = $<num>4; p->in_single = intn($<nd>6->cdr); } @@ -2516,6 +2594,7 @@ primary : literal if (p->in_def || p->in_single) yyerror(p, "module definition in method body"); $<nd>$ = local_switch(p); + nvars_block(p); } bodystmt keyword_end @@ -2523,6 +2602,7 @@ primary : literal $$ = new_module(p, $2, $4); SET_LINENO($$, $1); local_resume(p, $<nd>3); + nvars_unnest(p); } | keyword_def fname { @@ -2532,6 +2612,7 @@ primary : literal { p->in_def++; $<nd>$ = local_switch(p); + nvars_block(p); } f_arglist bodystmt @@ -2540,6 +2621,7 @@ primary : literal $$ = new_def(p, $2, $5, $6); SET_LINENO($$, $1); local_resume(p, $<nd>4); + nvars_unnest(p); p->in_def--; p->cmdarg_stack = $<stack>3; } @@ -2554,6 +2636,7 @@ primary : literal p->in_single++; p->lstate = EXPR_ENDFN; /* force for args */ $<nd>$ = local_switch(p); + nvars_block(p); } f_arglist bodystmt @@ -2562,6 +2645,7 @@ primary : literal $$ = new_sdef(p, $2, $5, $7, $8); SET_LINENO($$, $1); local_resume(p, $<nd>6); + nvars_unnest(p); p->in_single--; p->cmdarg_stack = $<stack>4; } @@ -2829,6 +2913,7 @@ lambda_body : tLAMBEG compstmt '}' do_block : keyword_do_block { local_nest(p); + nvars_nest(p); } opt_block_param bodystmt @@ -2836,6 +2921,7 @@ do_block : keyword_do_block { $$ = new_block(p,$3,$4); local_unnest(p); + nvars_unnest(p); } ; @@ -2906,6 +2992,7 @@ method_call : operation paren_args brace_block : '{' { local_nest(p); + nvars_nest(p); $<num>$ = p->lineno; } opt_block_param @@ -2914,10 +3001,12 @@ brace_block : '{' $$ = new_block(p,$3,$4); SET_LINENO($$, $<num>2); local_unnest(p); + nvars_unnest(p); } | keyword_do { local_nest(p); + nvars_nest(p); $<num>$ = p->lineno; } opt_block_param @@ -2926,6 +3015,7 @@ brace_block : '{' $$ = new_block(p,$3,$4); SET_LINENO($$, $<num>2); local_unnest(p); + nvars_unnest(p); } ; @@ -5861,6 +5951,35 @@ parser_yylex(parser_state *p) result = tIVAR; break; + case '_': + if (toklen(p) == 2 && ISDIGIT(tok(p)[1])) { + int n = tok(p)[1] - '0'; + node *nvars = p->nvars->car; + + while (nvars) { + if (intn(nvars->cdr) > 0) { + yywarning(p, "numbered parameter in nested block"); + break; + } + nvars->cdr = nint(-1); + nvars = nvars->car; + } + if (intn(p->nvars->cdr) < 0) { + yywarning(p, "numbered parameter in nested block"); + } + if (n == 0) { + yyerror(p, "_0 is not available"); + return 0; + } + if (n > NUMPARAM_MAX) { + yyerror(p, "too large numbered parameter"); + return 0; + } + pylval.num = n; + p->lstate = EXPR_END; + return tNUMPARAM; + } + /* fall through */ default: if (toklast(p) == '!' || toklast(p) == '?') { result = tFID; @@ -6843,6 +6962,10 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) printf("NODE_CVAR %s\n", mrb_sym_name(mrb, sym(tree))); break; + case NODE_NVAR: + printf("NODE_NVAR %d\n", intn(tree)); + break; + case NODE_CONST: printf("NODE_CONST %s\n", mrb_sym_name(mrb, sym(tree))); break; |