From 6af555b394234ba8f7038c9b8352b4467d53a529 Mon Sep 17 00:00:00 2001 From: take-cheeze Date: Fri, 13 Dec 2019 04:41:43 +0900 Subject: Align RIStruct data for rational --- include/mruby/istruct.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/mruby/istruct.h b/include/mruby/istruct.h index 45b1fadae..d6b6116a7 100644 --- a/include/mruby/istruct.h +++ b/include/mruby/istruct.h @@ -21,7 +21,10 @@ MRB_BEGIN_DECL struct RIStruct { MRB_OBJECT_HEADER; - char inline_data[ISTRUCT_DATA_SIZE]; + union { + intptr_t inline_alignment[3]; + char inline_data[ISTRUCT_DATA_SIZE]; + }; }; #define RISTRUCT(obj) ((struct RIStruct*)(mrb_ptr(obj))) -- cgit v1.2.3 From d9832699085d60e21002e4ba76e3e3fd0480d9e8 Mon Sep 17 00:00:00 2001 From: dearblue Date: Sat, 11 Apr 2020 20:30:03 +0900 Subject: Add `mrb_float_to_cstr()` MRB_API function In order to share the same operation with `mrb_float_to_str()`, the internal structure is modified. --- include/mruby/numeric.h | 1 + src/fmt_fp.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 68 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h index a176d96cd..06a33cc6f 100644 --- a/include/mruby/numeric.h +++ b/include/mruby/numeric.h @@ -37,6 +37,7 @@ MRB_API mrb_value mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, mrb_int base); /* ArgumentError if format string doesn't match /%(\.[0-9]+)?[aAeEfFgG]/ */ #ifndef MRB_WITHOUT_FLOAT MRB_API mrb_value mrb_float_to_str(mrb_state *mrb, mrb_value x, const char *fmt); +MRB_API int mrb_float_to_cstr(mrb_state *mrb, char *buf, size_t len, const char *fmt, mrb_float f); MRB_API mrb_float mrb_to_flo(mrb_state *mrb, mrb_value x); MRB_API mrb_value mrb_int_value(mrb_state *mrb, mrb_float f); #endif diff --git a/src/fmt_fp.c b/src/fmt_fp.c index 99ba1e5ff..9ae5dd177 100644 --- a/src/fmt_fp.c +++ b/src/fmt_fp.c @@ -37,9 +37,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include +struct fmt_args; + +typedef void output_func(struct fmt_args *f, const char *s, size_t l); + struct fmt_args { mrb_state *mrb; - mrb_value str; + output_func *output; + void *opaque; +}; + +struct mrb_cstr { + char *buf; + size_t len; }; #define MAX(a,b) ((a)>(b) ? (a) : (b)) @@ -56,10 +66,37 @@ struct fmt_args { #define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS) +static output_func strcat_value; +static output_func strcat_cstr; + +static void +strcat_value(struct fmt_args *f, const char *s, size_t l) +{ + mrb_value str = *(mrb_value*)f->opaque; + mrb_str_cat(f->mrb, str, s, l); +} + +static void +strcat_cstr(struct fmt_args *f, const char *s, size_t l) +{ + struct mrb_cstr *cstr = (struct mrb_cstr*)f->opaque; + + if (l > cstr->len) { + mrb_state *mrb = f->mrb; + + mrb_raise(mrb, E_ARGUMENT_ERROR, "string buffer too small"); + } + + memcpy(cstr->buf, s, l); + + cstr->buf += l; + cstr->len -= l; +} + static void out(struct fmt_args *f, const char *s, size_t l) { - mrb_str_cat(f->mrb, f->str, s, l); + f->output(f, s, l); } #define PAD_SIZE 256 @@ -377,13 +414,33 @@ MRB_API mrb_value mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt) { struct fmt_args f; + mrb_value str = mrb_str_new_capa(mrb, 24); f.mrb = mrb; - f.str = mrb_str_new_capa(mrb, 24); + f.output = strcat_value; + f.opaque = (void*)&str; if (fmt_core(&f, fmt, mrb_float(flo)) < 0) { mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format string"); } - return f.str; + return str; +} + +MRB_API int +mrb_float_to_cstr(mrb_state *mrb, char *buf, size_t len, const char *fmt, mrb_float fval) +{ + struct fmt_args f; + struct mrb_cstr cstr; + + cstr.buf = buf; + cstr.len = len - 1; /* reserve NUL terminator */ + f.mrb = mrb; + f.output = strcat_cstr; + f.opaque = (void*)&cstr; + if (fmt_core(&f, fmt, fval) < 0) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format string"); + } + *cstr.buf = '\0'; + return cstr.buf - buf; } #else /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */ #include @@ -397,5 +454,11 @@ mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt) snprintf(buf, sizeof(buf), fmt, mrb_float(flo)); return mrb_str_new_cstr(mrb, buf); } + +MRB_API int +mrb_float_to_cstr(mrb_state *mrb, char *buf, size_t len, const char *fmt, mrb_float fval) +{ + return snprintf(buf, len, fmt, fval); +} #endif /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */ #endif -- cgit v1.2.3 From d0501c69b0892208309dcbb8aa7fc1b8d75f3c8e Mon Sep 17 00:00:00 2001 From: dearblue Date: Mon, 13 Apr 2020 22:32:16 +0900 Subject: Fix `MRB_TT_CPTR` object with `MRB_NAN_BOXING` Previously, if `MRB_NAN_BOXING` is defined, for example, `mrb_cptr_value()` could not keep an odd address. If it is `MRB_32BIT`, it can be embedded in `NaN` as it is. If it is `MRB_64BIT`, some operations are shared with `MRB_WORD_BOXING`. In this case, the MRB_API function `mrb_nan_boxing_cptr_value()` is defined. --- include/mruby/boxing_nan.h | 13 +++++++++++-- include/mruby/boxing_word.h | 5 ----- include/mruby/value.h | 7 +++++++ src/etc.c | 17 +++++++++++++---- 4 files changed, 31 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/mruby/boxing_nan.h b/include/mruby/boxing_nan.h index e7bc9331c..fae3b7630 100644 --- a/include/mruby/boxing_nan.h +++ b/include/mruby/boxing_nan.h @@ -44,6 +44,9 @@ typedef struct mrb_value { }; ) }; +#ifdef MRB_64BIT + struct RCptr *vp; +#endif } value; }; } mrb_value; @@ -54,13 +57,15 @@ typedef struct mrb_value { #define mrb_type(o) (enum mrb_vtype)((uint32_t)0xfff00000 < (o).value.ttt ? mrb_tt(o) : MRB_TT_FLOAT) #define mrb_ptr(o) ((void*)((((uintptr_t)0x3fffffffffff)&((uintptr_t)((o).value.p)))<<2)) #define mrb_float(o) (o).f -#define mrb_cptr(o) mrb_ptr(o) #define mrb_fixnum(o) (o).value.i #define mrb_symbol(o) (o).value.sym #ifdef MRB_64BIT +MRB_API mrb_value mrb_nan_boxing_cptr_value(struct mrb_state*, void*); +#define mrb_cptr(o) (((struct RCptr*)mrb_ptr(o))->p) #define BOXNAN_SHIFT_LONG_POINTER(v) (((uintptr_t)(v)>>34)&0x3fff) #else +#define mrb_cptr(o) ((o).value.p) #define BOXNAN_SHIFT_LONG_POINTER(v) 0 #endif @@ -90,7 +95,11 @@ typedef struct mrb_value { #define SET_INT_VALUE(r,n) BOXNAN_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n)) #define SET_SYM_VALUE(r,v) BOXNAN_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v)) #define SET_OBJ_VALUE(r,v) BOXNAN_SET_OBJ_VALUE(r, (((struct RObject*)(v))->tt), (v)) -#define SET_CPTR_VALUE(mrb,r,v) BOXNAN_SET_OBJ_VALUE(r, MRB_TT_CPTR, v) +#ifdef MRB_64BIT +#define SET_CPTR_VALUE(mrb,r,v) ((r) = mrb_nan_boxing_cptr_value(mrb, v)) +#else +#define SET_CPTR_VALUE(mrb,r,v) BOXNAN_SET_VALUE(r, MRB_TT_CPTR, value.p, v) +#endif #define SET_UNDEF_VALUE(r) BOXNAN_SET_VALUE(r, MRB_TT_UNDEF, value.i, 0) #endif /* MRUBY_BOXING_NAN_H */ diff --git a/include/mruby/boxing_word.h b/include/mruby/boxing_word.h index 1388bb9f6..c0d7087e0 100644 --- a/include/mruby/boxing_word.h +++ b/include/mruby/boxing_word.h @@ -18,11 +18,6 @@ struct RFloat { }; #endif -struct RCptr { - MRB_OBJECT_HEADER; - void *p; -}; - enum mrb_special_consts { MRB_Qnil = 0, MRB_Qfalse = 4, diff --git a/include/mruby/value.h b/include/mruby/value.h index 232beb1dc..33c70f15a 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -149,6 +149,13 @@ typedef void mrb_value; #endif +#if defined(MRB_WORD_BOXING) || (defined(MRB_NAN_BOXING) && defined(MRB_64BIT)) +struct RCptr { + MRB_OBJECT_HEADER; + void *p; +}; +#endif + #if defined(MRB_NAN_BOXING) #include "boxing_nan.h" #elif defined(MRB_WORD_BOXING) diff --git a/src/etc.c b/src/etc.c index 607e82ca1..6e1533e3d 100644 --- a/src/etc.c +++ b/src/etc.c @@ -140,7 +140,13 @@ mrb_obj_id(mrb_value obj) } } +#if defined(MRB_NAN_BOXING) && defined(MRB_64BIT) +#define mrb_xxx_boxing_cptr_value mrb_nan_boxing_cptr_value +#endif + #ifdef MRB_WORD_BOXING +#define mrb_xxx_boxing_cptr_value mrb_word_boxing_cptr_value + #ifndef MRB_WITHOUT_FLOAT MRB_API mrb_value mrb_word_boxing_float_value(mrb_state *mrb, mrb_float f) @@ -164,17 +170,20 @@ mrb_word_boxing_float_pool(mrb_state *mrb, mrb_float f) return mrb_obj_value(nf); } #endif /* MRB_WITHOUT_FLOAT */ +#endif /* MRB_WORD_BOXING */ +#if defined(MRB_WORD_BOXING) || (defined(MRB_NAN_BOXING) && defined(MRB_64BIT)) MRB_API mrb_value -mrb_word_boxing_cptr_value(mrb_state *mrb, void *p) +mrb_xxx_boxing_cptr_value(mrb_state *mrb, void *p) { mrb_value v; + struct RCptr *cptr = (struct RCptr*)mrb_obj_alloc(mrb, MRB_TT_CPTR, mrb->object_class); - v.value.p = mrb_obj_alloc(mrb, MRB_TT_CPTR, mrb->object_class); - v.value.vp->p = p; + SET_OBJ_VALUE(v, cptr); + cptr->p = p; return v; } -#endif /* MRB_WORD_BOXING */ +#endif #if defined _MSC_VER && _MSC_VER < 1900 -- cgit v1.2.3 From 87d1bbe94794304d92fc9a4af5cf17eab5d1534c Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 22 Apr 2020 16:44:39 +0900 Subject: Add new function `mrb_singleton_class_ptr()`; ref #4973 The difference between `mrb_singleton_class` and `mrb_singleton_class_ptr`: - `mrb_singleton_class_ptr` returns `struct RClass*`. - `mrb_singleton_class_ptr` returns `NULL` on immediate values where `mrb_singleton_class` raises exceptions. --- include/mruby.h | 2 ++ src/class.c | 30 +++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/mruby.h b/include/mruby.h index 7419618fd..4b7a673f3 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -317,7 +317,9 @@ MRB_API struct RClass *mrb_define_class(mrb_state *mrb, const char *name, struct * @return [struct RClass *] Reference to the newly defined module. */ MRB_API struct RClass *mrb_define_module(mrb_state *mrb, const char *name); + MRB_API mrb_value mrb_singleton_class(mrb_state *mrb, mrb_value val); +MRB_API struct RClass *mrb_singleton_class_ptr(mrb_state *mrb, mrb_value val); /** * Include a module in another class or module. diff --git a/src/class.c b/src/class.c index c49f0f474..b0af74e74 100644 --- a/src/class.c +++ b/src/class.c @@ -1242,33 +1242,45 @@ mrb_mod_dummy_visibility(mrb_state *mrb, mrb_value mod) return mod; } -MRB_API mrb_value -mrb_singleton_class(mrb_state *mrb, mrb_value v) +/* returns mrb_class_ptr(mrb_singleton_class()) */ +/* except that it return NULL for immediate values */ +MRB_API struct RClass* +mrb_singleton_class_ptr(mrb_state *mrb, mrb_value v) { struct RBasic *obj; switch (mrb_type(v)) { case MRB_TT_FALSE: if (mrb_nil_p(v)) - return mrb_obj_value(mrb->nil_class); - return mrb_obj_value(mrb->false_class); + return mrb->nil_class; + return mrb->false_class; case MRB_TT_TRUE: - return mrb_obj_value(mrb->true_class); + return mrb->true_class; case MRB_TT_CPTR: - return mrb_obj_value(mrb->object_class); + return mrb->object_class; case MRB_TT_SYMBOL: case MRB_TT_FIXNUM: #ifndef MRB_WITHOUT_FLOAT case MRB_TT_FLOAT: #endif - mrb_raise(mrb, E_TYPE_ERROR, "can't define singleton"); - return mrb_nil_value(); /* not reached */ + return NULL; default: break; } obj = mrb_basic_ptr(v); prepare_singleton_class(mrb, obj); - return mrb_obj_value(obj->c); + return obj->c; +} + +MRB_API mrb_value +mrb_singleton_class(mrb_state *mrb, mrb_value v) +{ + struct RClass *c = mrb_singleton_class_ptr(mrb, v); + + if (c == NULL) { + mrb_raise(mrb, E_TYPE_ERROR, "can't define singleton"); + } + return mrb_obj_value(c); } MRB_API void -- cgit v1.2.3 From 26eb29547b6e2c5b94ec1bf4b0e90a7821b04be1 Mon Sep 17 00:00:00 2001 From: dearblue Date: Fri, 24 Apr 2020 21:15:34 +0900 Subject: Support `undef` for `mrb_ary_splice()` instead of `[]` When removing elements from an array, it is possible to avoid creating an empty array. Before this patch: ```c mrb_ary_splice(mrb, ary, head, len, mrb_ary_new(mrb)); ``` After this patch: ```c mrb_ary_splice(mrb, ary, head, len, mrb_undef_value()); ``` --- include/mruby/array.h | 1 + src/array.c | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'include') diff --git a/include/mruby/array.h b/include/mruby/array.h index e2dd9bb1c..fd4094a02 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -239,6 +239,7 @@ MRB_API mrb_value mrb_ary_entry(mrb_value ary, mrb_int offset); * @param head Beginning position of a replacement subsequence. * @param len Length of a replacement subsequence. * @param rpl The array of replacement elements. + * It is possible to pass `mrb_undef_value()` instead of an empty array. * @return The receiver array. */ MRB_API mrb_value mrb_ary_splice(mrb_state *mrb, mrb_value self, mrb_int head, mrb_int len, mrb_value rpl); diff --git a/src/array.c b/src/array.c index 8547cfff4..6e73bcd8e 100644 --- a/src/array.c +++ b/src/array.c @@ -732,6 +732,10 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val argv = ARY_PTR(r); } } + else if (mrb_undef_p(rpl)) { + argc = 0; + argv = NULL; + } else { argc = 1; argv = &rpl; -- cgit v1.2.3 From 1b0cf6a91bcec88699150c6376c9eacf86af85ff Mon Sep 17 00:00:00 2001 From: dearblue Date: Sun, 26 Apr 2020 21:15:24 +0900 Subject: Reduce `struct mrb_context` --- include/mruby.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/mruby.h b/include/mruby.h index 4b7a673f3..eca7eb9cf 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -164,8 +164,8 @@ struct mrb_context { struct RProc **ensure; /* ensure handler stack */ uint16_t esize, eidx; - enum mrb_fiber_state status; - mrb_bool vmexec; + enum mrb_fiber_state status : 4; + mrb_bool vmexec : 1; struct RFiber *fib; }; -- cgit v1.2.3 From a395f8e2c829706eb7c9e0dccaab077f189ddb6e Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 28 Apr 2020 13:16:27 +0900 Subject: Rename (and expose) UTF-8 related functions; ref #4712 - mrb_utf8len() - returns the size of a UTF-8 char (in bytes) - mrb_utf8_strlen() - returns the length of a UTF-8 string (in char) --- include/mruby/string.h | 3 ++- mrbgems/mruby-symbol-ext/src/symbol.c | 2 +- src/string.c | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/mruby/string.h b/include/mruby/string.h index a518d9147..93c94ef5d 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -465,7 +465,8 @@ mrb_bool mrb_str_beg_len(mrb_int str_len, mrb_int *begp, mrb_int *lenp); mrb_value mrb_str_byte_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len); #ifdef MRB_UTF8_STRING -mrb_int mrb_utf8_len(const char *str, mrb_int byte_len); +mrb_int mrb_utf8len(const char *str, const char *end); +mrb_int mrb_utf8_strlen(const char *str, mrb_int byte_len); #endif MRB_END_DECL diff --git a/mrbgems/mruby-symbol-ext/src/symbol.c b/mrbgems/mruby-symbol-ext/src/symbol.c index 87f8381b1..ad922ad2f 100644 --- a/mrbgems/mruby-symbol-ext/src/symbol.c +++ b/mrbgems/mruby-symbol-ext/src/symbol.c @@ -47,7 +47,7 @@ mrb_sym_length(mrb_state *mrb, mrb_value self) #ifdef MRB_UTF8_STRING mrb_int byte_len; const char *name = mrb_sym_name_len(mrb, mrb_symbol(self), &byte_len); - len = mrb_utf8_len(name, byte_len); + len = mrb_utf8_strlen(name, byte_len); #else mrb_sym_name_len(mrb, mrb_symbol(self), &len); #endif diff --git a/src/string.c b/src/string.c index 2ef1ad95a..458c511dc 100644 --- a/src/string.c +++ b/src/string.c @@ -301,8 +301,8 @@ static const char utf8len_codepage[256] = 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,1,1,1,1,1,1,1,1,1,1,1, }; -static mrb_int -utf8len(const char* p, const char* e) +mrb_int +mrb_utf8len(const char* p, const char* e) { mrb_int len; mrb_int i; @@ -318,14 +318,14 @@ utf8len(const char* p, const char* e) } mrb_int -mrb_utf8_len(const char *str, mrb_int byte_len) +mrb_utf8_strlen(const char *str, mrb_int byte_len) { mrb_int total = 0; const char *p = str; const char *e = p + byte_len; while (p < e) { - p += utf8len(p, e); + p += mrb_utf8len(p, e); total++; } return total; @@ -341,7 +341,7 @@ utf8_strlen(mrb_value str) return byte_len; } else { - mrb_int utf8_len = mrb_utf8_len(RSTR_PTR(s), byte_len); + mrb_int utf8_len = mrb_utf8_strlen(RSTR_PTR(s), byte_len); if (byte_len == utf8_len) RSTR_SET_ASCII_FLAG(s); return utf8_len; } @@ -362,7 +362,7 @@ chars2bytes(mrb_value s, mrb_int off, mrb_int idx) const char *e = RSTRING_END(s); for (b=i=0; p beg) { p --; if ((*p & 0xc0) != 0x80) { - int clen = utf8len(p, end); + int clen = mrb_utf8len(p, end); if (clen > ptr - p) return p; break; } @@ -466,7 +466,7 @@ str_index_str_by_char_search(mrb_state *mrb, const char *p, const char *pend, co if (pivot >= pend || pivot < p /* overflowed */) { return -1; } do { - p += utf8len(p, pend); + p += mrb_utf8len(p, pend); off ++; } while (p < pivot); } @@ -485,7 +485,7 @@ str_index_str_by_char(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int pos) for (; pos > 0; pos --) { if (pend - p < 1) { return -1; } - p += utf8len(p, pend); + p += mrb_utf8len(p, pend); } if (slen < 1) { return off; } @@ -1362,7 +1362,7 @@ str_escape(mrb_state *mrb, mrb_value str, mrb_bool inspect) unsigned char c, cc; #ifdef MRB_UTF8_STRING if (inspect) { - mrb_int clen = utf8len(p, pend); + mrb_int clen = mrb_utf8len(p, pend); if (clen > 1) { mrb_int i; @@ -1665,7 +1665,7 @@ mrb_str_chop_bang(mrb_state *mrb, mrb_value str) const char* t = RSTR_PTR(s), *p = t; const char* e = p + RSTR_LEN(s); while (p=e) break; p += clen; } @@ -2037,7 +2037,7 @@ mrb_str_reverse_bang(mrb_state *mrb, mrb_value str) p = RSTR_PTR(s); e = p + RSTR_LEN(s); while (p Date: Thu, 30 Apr 2020 16:22:23 +0900 Subject: Enable MRB_METHOD_T_STRUCT by default on 32bit GUN/Linux Because we can't use the highest 2 bits of function pointers. --- include/mrbconf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/mrbconf.h b/include/mrbconf.h index 35762a8f0..2b1adb24e 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -39,8 +39,9 @@ /* add -DMRB_METHOD_T_STRUCT on machines that use higher bits of pointers */ /* no MRB_METHOD_T_STRUCT requires highest 2 bits of function pointers to be zero */ #ifndef MRB_METHOD_T_STRUCT - // can't use highest 2 bits of function pointers on 32bit Windows. -# if defined(_WIN32) && !defined(_WIN64) + // can't use highest 2 bits of function pointers at least on 32bit + // Windows and 32bit Linux. +# ifdef MRB_32BIT # define MRB_METHOD_T_STRUCT # endif #endif -- cgit v1.2.3 From c143d87e7ce55092aa7b3578be3d525d5b311384 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 6 May 2020 15:49:06 +0900 Subject: Remove `mrb_run` from `MRB_API`; #4488 `mrb_run` requires to push callinfo stack before calling, which is very hard from outside of `vm.c`. So there should be virtually no correct usage of the function, hence the cause of #4488. We removed it. You can use `mrb_top_run(mrb, proc, self, 0)` instead of `mrb_run(mrb, proc self)`. --- include/mruby.h | 1 - src/vm.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/mruby.h b/include/mruby.h index eca7eb9cf..af7503375 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -1150,7 +1150,6 @@ MRB_API void mrb_close(mrb_state *mrb); MRB_API void* mrb_default_allocf(mrb_state*, void*, size_t, void*); MRB_API mrb_value mrb_top_self(mrb_state *mrb); -MRB_API mrb_value mrb_run(mrb_state *mrb, struct RProc* proc, mrb_value self); MRB_API mrb_value mrb_top_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep); MRB_API mrb_value mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stack_keep); MRB_API mrb_value mrb_vm_exec(mrb_state *mrb, struct RProc *proc, const mrb_code *iseq); diff --git a/src/vm.c b/src/vm.c index 85f28584c..ea1bb5087 100644 --- a/src/vm.c +++ b/src/vm.c @@ -324,6 +324,7 @@ cipop(mrb_state *mrb) } void mrb_exc_set(mrb_state *mrb, mrb_value exc); +static mrb_value mrb_run(mrb_state *mrb, struct RProc* proc, mrb_value self); static void ecall(mrb_state *mrb) @@ -2808,7 +2809,7 @@ RETRY_TRY_BLOCK: MRB_END_EXC(&c_jmp); } -MRB_API mrb_value +static mrb_value mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) { if (mrb->c->ci->argc < 0) { -- cgit v1.2.3 From fa8668c77d181a5075dc56fb63d6fa087ab4b1d3 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 17 Jan 2020 09:28:21 +0900 Subject: Add a new instruction `OP_LOADI16`. Which loads 16bit integer to the register. The instruction number should be reorder on massive instruction refactoring. The instruction is added for `mruby/c` which had performance issue with `OP_EXT`. With this instruction, `mruby/c` VM can just raise errors on `OP_EXT` extension instructions. --- include/mruby/ops.h | 1 + mrbgems/mruby-compiler/core/codegen.c | 21 ++++++++++++++++----- src/codedump.c | 4 ++++ src/vm.c | 5 +++++ 4 files changed, 26 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/mruby/ops.h b/include/mruby/ops.h index 2327c33fd..c8990ae43 100644 --- a/include/mruby/ops.h +++ b/include/mruby/ops.h @@ -115,3 +115,4 @@ OPCODE(EXT1, Z) /* make 1st operand 16bit */ OPCODE(EXT2, Z) /* make 2nd operand 16bit */ OPCODE(EXT3, Z) /* make 1st and 2nd operands 16bit */ OPCODE(STOP, Z) /* stop VM */ +OPCODE(LOADI16, BS) /* R(a) = mrb_int(b) */ diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 717d9eb9a..162666eb9 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -2440,12 +2440,20 @@ codegen(codegen_scope *s, node *tree, int val) else #endif { - if (i == -1) genop_1(s, OP_LOADI__1, cursp()); - else if (i < 0) genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i); + if (i < 0) { + if (i == -1) genop_1(s, OP_LOADI__1, cursp()); + else if (i >= -0xff) genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i); + else if (i >= -0x8000) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i); + else goto lit_int; + } else if (i < 8) genop_1(s, OP_LOADI_0 + (uint8_t)i, cursp()); - else if (i <= 0xffff) genop_2(s, OP_LOADI, cursp(), (uint16_t)i); + else if (i <= 0xff) genop_2(s, OP_LOADI, cursp(), (uint16_t)i); + else if (i <= 0xffff) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i); else { - int off = new_lit(s, mrb_fixnum_value(i)); + int off; + + lit_int: + off = new_lit(s, mrb_fixnum_value(i)); genop_2(s, OP_LOADL, cursp(), off); } } @@ -2501,9 +2509,12 @@ codegen(codegen_scope *s, node *tree, int val) else { #endif if (i == -1) genop_1(s, OP_LOADI__1, cursp()); - else if (i >= -0xffff) { + else if (i >= -0xff) { genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i); } + else if (i >= -0x8000) { + genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i); + } else { int off = new_lit(s, mrb_fixnum_value(i)); genop_2(s, OP_LOADL, cursp(), off); diff --git a/src/codedump.c b/src/codedump.c index 7faa39360..649be176b 100644 --- a/src/codedump.c +++ b/src/codedump.c @@ -130,6 +130,10 @@ codedump(mrb_state *mrb, mrb_irep *irep) printf("OP_LOADI\tR%d\t-%d\t", a, b); print_lv_a(mrb, irep, a); break; + CASE(OP_LOADI16, BS): + printf("OP_LOADI16\tR%d\t%d\t", a, (int)(int16_t)b); + print_lv_a(mrb, irep, a); + break; CASE(OP_LOADI__1, B): printf("OP_LOADI__1\tR%d\t\t", a); print_lv_a(mrb, irep, a); diff --git a/src/vm.c b/src/vm.c index ea1bb5087..26da5831e 100644 --- a/src/vm.c +++ b/src/vm.c @@ -1047,6 +1047,11 @@ RETRY_TRY_BLOCK: NEXT; } + CASE(OP_LOADI16, BS) { + SET_INT_VALUE(regs[a], (mrb_int)(int16_t)b); + NEXT; + } + CASE(OP_LOADSYM, BB) { SET_SYM_VALUE(regs[a], syms[b]); NEXT; -- cgit v1.2.3 From 87d77c13f5cc69a2ac5a8449ae24b2334b2e6bd1 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 1 May 2020 08:56:44 +0900 Subject: Update compiled binary format version for `OP_LOADI16`. --- include/mruby/dump.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 46c3b63ce..2da5eb28d 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -53,7 +53,7 @@ MRB_API mrb_irep *mrb_read_irep_buf(mrb_state*, const void*, size_t); /* Rite Binary File header */ #define RITE_BINARY_IDENT "RITE" #define RITE_BINARY_IDENT_LIL "ETIR" -#define RITE_BINARY_FORMAT_VER "0006" +#define RITE_BINARY_FORMAT_VER "0007" #define RITE_COMPILER_NAME "MATZ" #define RITE_COMPILER_VERSION "0000" -- cgit v1.2.3 From 87576b819e704492f4690027ad41543637cabb16 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 1 May 2020 14:13:16 +0900 Subject: Remove endian information/flags from compiled binary format. Since `mruby 2.0`, compiled bytecode no longer depends on the endian of the machine. --- include/mruby/dump.h | 16 ------------- src/dump.c | 65 +++------------------------------------------------- src/load.c | 20 ++-------------- 3 files changed, 5 insertions(+), 96 deletions(-) (limited to 'include') diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 2da5eb28d..db3e287d3 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -17,10 +17,6 @@ MRB_BEGIN_DECL #define DUMP_DEBUG_INFO 1 -#define DUMP_ENDIAN_BIG 2 -#define DUMP_ENDIAN_LIL 4 -#define DUMP_ENDIAN_NAT 6 -#define DUMP_ENDIAN_MASK 6 int mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size); #ifndef MRB_DISABLE_STDIO @@ -52,7 +48,6 @@ MRB_API mrb_irep *mrb_read_irep_buf(mrb_state*, const void*, size_t); /* Rite Binary File header */ #define RITE_BINARY_IDENT "RITE" -#define RITE_BINARY_IDENT_LIL "ETIR" #define RITE_BINARY_FORMAT_VER "0007" #define RITE_COMPILER_NAME "MATZ" #define RITE_COMPILER_VERSION "0000" @@ -106,17 +101,6 @@ struct rite_binary_footer { RITE_SECTION_HEADER; }; -static inline int -bigendian_p() -{ - int i; - char *p; - - i = 1; - p = (char*)&i; - return p[0]?0:1; -} - static inline size_t uint8_to_bin(uint8_t s, uint8_t *bin) { diff --git a/src/dump.c b/src/dump.c index 183f3b67d..95fe1ac82 100644 --- a/src/dump.c +++ b/src/dump.c @@ -709,22 +709,7 @@ write_rite_binary_header(mrb_state *mrb, size_t binary_size, uint8_t *bin, uint8 uint16_t crc; uint32_t offset; - switch (flags & DUMP_ENDIAN_NAT) { - endian_big: - case DUMP_ENDIAN_BIG: - memcpy(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident)); - break; - endian_little: - case DUMP_ENDIAN_LIL: - memcpy(header->binary_ident, RITE_BINARY_IDENT_LIL, sizeof(header->binary_ident)); - break; - - case DUMP_ENDIAN_NAT: - if (bigendian_p()) goto endian_big; - goto endian_little; - break; - } - + memcpy(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident)); memcpy(header->binary_version, RITE_BINARY_FORMAT_VER, sizeof(header->binary_version)); memcpy(header->compiler_name, RITE_COMPILER_NAME, sizeof(header->compiler_name)); memcpy(header->compiler_version, RITE_COMPILER_VERSION, sizeof(header->compiler_version)); @@ -764,21 +749,6 @@ lv_defined_p(mrb_irep *irep) return FALSE; } -static uint8_t -dump_flags(uint8_t flags, uint8_t native) -{ - if (native == FLAG_BYTEORDER_NATIVE) { - if ((flags & DUMP_ENDIAN_NAT) == 0) { - return (flags & DUMP_DEBUG_INFO) | DUMP_ENDIAN_NAT; - } - return flags; - } - if ((flags & DUMP_ENDIAN_NAT) == 0) { - return (flags & DUMP_DEBUG_INFO) | DUMP_ENDIAN_BIG; - } - return flags; -} - static int dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size) { @@ -870,7 +840,7 @@ error_exit: int mrb_dump_irep(mrb_state *mrb, mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size) { - return dump_irep(mrb, irep, dump_flags(flags, FLAG_BYTEORDER_NONATIVE), bin, bin_size); + return dump_irep(mrb, irep, flags, bin, bin_size); } #ifndef MRB_DISABLE_STDIO @@ -886,7 +856,7 @@ mrb_dump_irep_binary(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE* fp) return MRB_DUMP_INVALID_ARGUMENT; } - result = dump_irep(mrb, irep, dump_flags(flags, FLAG_BYTEORDER_NONATIVE), &bin, &bin_size); + result = dump_irep(mrb, irep, flags, &bin, &bin_size); if (result == MRB_DUMP_OK) { if (fwrite(bin, sizeof(bin[0]), bin_size, fp) != bin_size) { result = MRB_DUMP_WRITE_FAULT; @@ -897,20 +867,6 @@ mrb_dump_irep_binary(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE* fp) return result; } -static mrb_bool -dump_bigendian_p(uint8_t flags) -{ - switch (flags & DUMP_ENDIAN_NAT) { - case DUMP_ENDIAN_BIG: - return TRUE; - case DUMP_ENDIAN_LIL: - return FALSE; - default: - case DUMP_ENDIAN_NAT: - return bigendian_p(); - } -} - int mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE *fp, const char *initname) { @@ -921,23 +877,8 @@ mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE *fp, con if (fp == NULL || initname == NULL || initname[0] == '\0') { return MRB_DUMP_INVALID_ARGUMENT; } - flags = dump_flags(flags, FLAG_BYTEORDER_NATIVE); result = dump_irep(mrb, irep, flags, &bin, &bin_size); if (result == MRB_DUMP_OK) { - if (!dump_bigendian_p(flags)) { - if (fprintf(fp, "/* dumped in little endian order.\n" - " use `mrbc -E` option for big endian CPU. */\n") < 0) { - mrb_free(mrb, bin); - return MRB_DUMP_WRITE_FAULT; - } - } - else { - if (fprintf(fp, "/* dumped in big endian order.\n" - " use `mrbc -e` option for better performance on little endian CPU. */\n") < 0) { - mrb_free(mrb, bin); - return MRB_DUMP_WRITE_FAULT; - } - } if (fprintf(fp, "#include \n") < 0) { /* for uint8_t under at least Darwin */ mrb_free(mrb, bin); return MRB_DUMP_WRITE_FAULT; diff --git a/src/load.c b/src/load.c index e624c52d5..2a118c922 100644 --- a/src/load.c +++ b/src/load.c @@ -19,9 +19,6 @@ # error size_t must be at least 32 bits wide #endif -#define FLAG_BYTEORDER_BIG 2 -#define FLAG_BYTEORDER_LIL 4 -#define FLAG_BYTEORDER_NATIVE 8 #define FLAG_SRC_MALLOC 1 #define FLAG_SRC_STATIC 0 @@ -94,8 +91,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag if (SIZE_ERROR_MUL(irep->ilen, sizeof(mrb_code))) { return NULL; } - if ((flags & FLAG_SRC_MALLOC) == 0 && - (flags & FLAG_BYTEORDER_NATIVE)) { + if ((flags & FLAG_SRC_MALLOC) == 0) { irep->iseq = (mrb_code*)src; src += sizeof(mrb_code) * irep->ilen; irep->flags |= MRB_ISEQ_NO_FREE; @@ -464,19 +460,7 @@ read_binary_header(const uint8_t *bin, size_t bufsize, size_t *bin_size, uint16_ return MRB_DUMP_READ_FAULT; } - if (memcmp(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident)) == 0) { - if (bigendian_p()) - *flags |= FLAG_BYTEORDER_NATIVE; - else - *flags |= FLAG_BYTEORDER_BIG; - } - else if (memcmp(header->binary_ident, RITE_BINARY_IDENT_LIL, sizeof(header->binary_ident)) == 0) { - if (bigendian_p()) - *flags |= FLAG_BYTEORDER_LIL; - else - *flags |= FLAG_BYTEORDER_NATIVE; - } - else { + if (memcmp(header->binary_ident, RITE_BINARY_IDENT, sizeof(header->binary_ident)) != 0) { return MRB_DUMP_INVALID_FILE_HEADER; } -- cgit v1.2.3 From 69bc477b434b6d1ac990178ca0e3cfbbf28b90d9 Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Tue, 19 May 2020 01:07:49 -0700 Subject: Adding warnings for mrb_load functions leaking RProc objects --- include/mruby/compile.h | 10 +++++++++- include/mruby/irep.h | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/mruby/compile.h b/include/mruby/compile.h index 69dfd1d50..5e73e66a6 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -180,7 +180,15 @@ MRB_API struct mrb_parser_state* mrb_parse_nstring(mrb_state*,const char*,size_t MRB_API struct RProc* mrb_generate_code(mrb_state*, struct mrb_parser_state*); MRB_API mrb_value mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c); -/* program load functions */ +/** program load functions +* Please note! Currently due to interactions with the GC calling these functions will +* leak one RProc object per function call. +* To prevent this save the current memory arena before calling and restore the arena +* right after, like so +* int ai = mrb_gc_arena_save(mrb); +* mrb_value status = mrb_load_string(mrb, buffer); +* mrb_gc_arena_restore(mrb, ai); +*/ #ifndef MRB_DISABLE_STDIO MRB_API mrb_value mrb_load_file(mrb_state*,FILE*); MRB_API mrb_value mrb_load_file_cxt(mrb_state*,FILE*, mrbc_context *cxt); diff --git a/include/mruby/irep.h b/include/mruby/irep.h index 4393129c7..661ef2b48 100644 --- a/include/mruby/irep.h +++ b/include/mruby/irep.h @@ -49,6 +49,16 @@ typedef struct mrb_irep { MRB_API mrb_irep *mrb_add_irep(mrb_state *mrb); +/** load mruby bytecode functions +* Please note! Currently due to interactions with the GC calling these functions will +* leak one RProc object per function call. +* To prevent this save the current memory arena before calling and restore the arena +* right after, like so +* int ai = mrb_gc_arena_save(mrb); +* mrb_value status = mrb_load_irep(mrb, buffer); +* mrb_gc_arena_restore(mrb, ai); +*/ + /* @param [const uint8_t*] irep code, expected as a literal */ MRB_API mrb_value mrb_load_irep(mrb_state*, const uint8_t*); -- cgit v1.2.3 From 6f4c585bd73fc43fb9e34a70d74b5a50852600ea Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Sun, 24 May 2020 01:25:03 +0900 Subject: Do not destruct rest arguments for __send__ Formerly, `__send__(*args)` modified `args` with `Array#shift`. This bug affects optcarrot. This changeset avoids the array destruction by using `args = args[1, len-1]`. --- include/mruby/array.h | 3 +++ src/array.c | 7 +++++++ src/vm.c | 2 +- test/t/kernel.rb | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/mruby/array.h b/include/mruby/array.h index fd4094a02..92c86a8c5 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -292,6 +292,9 @@ MRB_API mrb_value mrb_ary_join(mrb_state *mrb, mrb_value ary, mrb_value sep); */ MRB_API mrb_value mrb_ary_resize(mrb_state *mrb, mrb_value ary, mrb_int new_len); +/* helper functions */ +mrb_value mrb_ary_subseq(mrb_state *mrb, mrb_value ary, mrb_int beg, mrb_int len); + MRB_END_DECL #endif /* MRUBY_ARRAY_H */ diff --git a/src/array.c b/src/array.c index 6e73bcd8e..ad0d5b8db 100644 --- a/src/array.c +++ b/src/array.c @@ -808,6 +808,13 @@ ary_subseq(mrb_state *mrb, struct RArray *a, mrb_int beg, mrb_int len) return mrb_obj_value(b); } +mrb_value +mrb_ary_subseq(mrb_state *mrb, mrb_value ary, mrb_int beg, mrb_int len) +{ + struct RArray *a = mrb_ary_ptr(ary); + return ary_subseq(mrb, a, beg, len); +} + static mrb_int aget_index(mrb_state *mrb, mrb_value index) { diff --git a/src/vm.c b/src/vm.c index 7bb153910..bd54f3f00 100644 --- a/src/vm.c +++ b/src/vm.c @@ -625,7 +625,7 @@ mrb_f_send(mrb_state *mrb, mrb_value self) ci->argc--; } else { /* variable length arguments */ - mrb_ary_shift(mrb, regs[0]); + regs[0] = mrb_ary_subseq(mrb, regs[0], 1, RARRAY_LEN(regs[0]) - 1); } if (MRB_METHOD_CFUNC_P(m)) { diff --git a/test/t/kernel.rb b/test/t/kernel.rb index aac6373fa..e3b9fe8ab 100644 --- a/test/t/kernel.rb +++ b/test/t/kernel.rb @@ -100,6 +100,10 @@ assert('Kernel#__send__', '15.3.1.3.4') do assert_true __send__(:respond_to?, :nil?) # test without argument and without block assert_equal String, __send__(:to_s).class + + args = [:respond_to?, :nil?] + assert_true __send__(*args) + assert_equal [:respond_to?, :nil?], args end assert('Kernel#block_given?', '15.3.1.3.6') do -- cgit v1.2.3 From 89ceb3e7baf54cc3360a76c94b02249e7afc491e Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Sun, 31 May 2020 20:11:38 -0700 Subject: Fix float constant redefinition warnings --- include/mruby.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/mruby.h b/include/mruby.h index af7503375..2fd075112 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -76,6 +76,7 @@ #include #ifndef MRB_WITHOUT_FLOAT +#include #ifndef FLT_EPSILON #define FLT_EPSILON (1.19209290e-07f) #endif -- cgit v1.2.3 From f85906b67920c0e69599c6e59d843274aef152be Mon Sep 17 00:00:00 2001 From: dearblue Date: Thu, 21 May 2020 21:27:51 +0900 Subject: Remove `patch_irep()` in `mruby-eval` - It can now deal with operands in the range of `OP_EXT*`. - It can now call the same method as the variable name without arguments. ```ruby def a "Safe!" end a = "Auto!" eval "a()" # call method `a` ``` --- include/mruby/compile.h | 4 +- mrbgems/mruby-compiler/core/codegen.c | 101 +- mrbgems/mruby-compiler/core/parse.y | 15 +- mrbgems/mruby-compiler/core/y.tab.c | 2967 ++++++++++++++------------------- mrbgems/mruby-eval/src/eval.c | 215 +-- mrbgems/mruby-eval/test/eval.rb | 21 + 6 files changed, 1391 insertions(+), 1932 deletions(-) (limited to 'include') diff --git a/include/mruby/compile.h b/include/mruby/compile.h index 5e73e66a6..7b878d460 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -33,7 +33,7 @@ typedef struct mrbc_context { mrb_bool no_exec:1; mrb_bool keep_lv:1; mrb_bool no_optimize:1; - mrb_bool on_eval:1; + struct RProc *upper; size_t parser_nerr; } mrbc_context; @@ -151,8 +151,8 @@ struct mrb_parser_state { mrb_ast_node *tree; mrb_bool no_optimize:1; - mrb_bool on_eval:1; mrb_bool capture_errors:1; + struct RProc *upper; struct mrb_parser_message error_buffer[10]; struct mrb_parser_message warn_buffer[10]; diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 88aac477f..da598adaf 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -281,15 +281,6 @@ no_optimize(codegen_scope *s) return FALSE; } -static -mrb_bool -on_eval(codegen_scope *s) -{ - if (s && s->parser && s->parser->on_eval) - return TRUE; - return FALSE; -} - struct mrb_insn_data mrb_decode_insn(const mrb_code *pc) { @@ -407,9 +398,6 @@ gen_move(codegen_scope *s, uint16_t dst, uint16_t src, int nopeep) if (no_peephole(s)) { normal: genop_2(s, OP_MOVE, dst, src); - if (on_eval(s)) { - genop_0(s, OP_NOP); - } return; } else { @@ -674,6 +662,43 @@ lv_idx(codegen_scope *s, mrb_sym id) return 0; } +static int +search_upvar(codegen_scope *s, mrb_sym id, int *idx) +{ + struct RProc *u; + int lv = 0; + codegen_scope *up = s->prev; + + while (up) { + *idx = lv_idx(up, id); + if (*idx > 0) { + return lv; + } + lv ++; + up = up->prev; + } + + if (lv < 1) lv = 1; + u = s->parser->upper; + while (u && !MRB_PROC_CFUNC_P(u)) { + struct mrb_irep *ir = u->body.irep; + uint_fast16_t n = ir->nlocals; + const struct mrb_locals *v = ir->lv; + for (; n > 1; n --, v ++) { + if (v->name == id) { + *idx = v->r; + return lv - 1; + } + } + if (MRB_PROC_SCOPE_P(u)) break; + u = u->upper; + lv ++; + } + + codegen_error(s, "Can't found local variables"); + return -1; /* not reached */ +} + static void for_body(codegen_scope *s, node *tree) { @@ -786,12 +811,19 @@ lambda_body(codegen_scope *s, node *tree, int blk) i = 0; while (opt) { int idx; + mrb_sym id = nsym(opt->car->car); dispatch(s, pos+i*3+1); codegen(s, opt->car->cdr, VAL); pop(); - idx = lv_idx(s, nsym(opt->car->car)); - gen_move(s, idx, cursp(), 0); + idx = lv_idx(s, id); + if (idx > 0) { + gen_move(s, idx, cursp(), 0); + } + else { + int lv = search_upvar(s, id, &idx); + genop_3(s, OP_GETUPVAR, cursp(), idx, lv); + } i++; opt = opt->cdr; } @@ -818,11 +850,19 @@ lambda_body(codegen_scope *s, node *tree, int blk) mrb_assert(nint(kwd->car) == NODE_KW_ARG); if (def_arg) { + int idx; genop_2(s, OP_KEY_P, lv_idx(s, kwd_sym), new_sym(s, kwd_sym)); jmpif_key_p = genjmp2(s, OP_JMPIF, lv_idx(s, kwd_sym), 0, 0); codegen(s, def_arg, VAL); pop(); - gen_move(s, lv_idx(s, kwd_sym), cursp(), 0); + idx = lv_idx(s, kwd_sym); + if (idx > 0) { + gen_move(s, idx, cursp(), 0); + } + else { + int lv = search_upvar(s, kwd_sym, &idx); + genop_3(s, OP_GETUPVAR, cursp(), idx, lv); + } jmp_def_set = genjmp(s, OP_JMP, 0); dispatch(s, jmpif_key_p); } @@ -1103,23 +1143,12 @@ gen_assignment(codegen_scope *s, node *tree, int sp, int val) if (idx > 0) { if (idx != sp) { gen_move(s, idx, sp, val); - if (val && on_eval(s)) genop_0(s, OP_NOP); } break; } else { /* upvar */ - int lv = 0; - codegen_scope *up = s->prev; - - while (up) { - idx = lv_idx(up, nsym(tree)); - if (idx > 0) { - genop_3(s, OP_SETUPVAR, sp, idx, lv); - break; - } - lv++; - up = up->prev; - } + int lv = search_upvar(s, nsym(tree), &idx); + genop_3(s, OP_SETUPVAR, sp, idx, lv); } break; case NODE_NVAR: @@ -2324,21 +2353,10 @@ codegen(codegen_scope *s, node *tree, int val) if (idx > 0) { gen_move(s, cursp(), idx, val); - if (val && on_eval(s)) genop_0(s, OP_NOP); } else { - int lv = 0; - codegen_scope *up = s->prev; - - while (up) { - idx = lv_idx(up, nsym(tree)); - if (idx > 0) { - genop_3(s, OP_GETUPVAR, cursp(), idx, lv); - break; - } - lv++; - up = up->prev; - } + int lv = search_upvar(s, nsym(tree), &idx); + genop_3(s, OP_GETUPVAR, cursp(), idx, lv); } push(); } @@ -2349,7 +2367,6 @@ codegen(codegen_scope *s, node *tree, int val) int idx = nint(tree); gen_move(s, cursp(), idx, val); - if (val && on_eval(s)) genop_0(s, OP_NOP); push(); } diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 7280390a7..123c6c0c2 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -265,6 +265,7 @@ local_unnest(parser_state *p) static mrb_bool local_var_p(parser_state *p, mrb_sym sym) { + struct RProc *u; node *l = p->locals; while (l) { @@ -275,6 +276,18 @@ local_var_p(parser_state *p, mrb_sym sym) } l = l->cdr; } + + u = p->upper; + while (u && !MRB_PROC_CFUNC_P(u)) { + struct mrb_irep *ir = u->body.irep; + uint_fast16_t n = ir->nlocals; + const struct mrb_locals *v = ir->lv; + for (; n > 1; n --, v ++) { + if (v->name == sym) return TRUE; + } + if (MRB_PROC_SCOPE_P(u)) break; + u = u->upper; + } return FALSE; } @@ -6192,7 +6205,7 @@ parser_init_cxt(parser_state *p, mrbc_context *cxt) } p->capture_errors = cxt->capture_errors; p->no_optimize = cxt->no_optimize; - p->on_eval = cxt->on_eval; + p->upper = cxt->upper; if (cxt->partial_hook) { p->cxt = cxt; } diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index 0a7a62e69..827f1123f 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.6.2. */ +/* A Bison parser, made by GNU Bison 3.5.1. */ /* Bison implementation for Yacc-like parsers in C @@ -34,10 +34,6 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ -/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, - especially those whose name start with YY_ or yy_. They are - private implementation details that can be changed or removed. */ - /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -45,11 +41,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.6.2" +#define YYBISON_VERSION "3.5.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -329,6 +328,7 @@ local_unnest(parser_state *p) static mrb_bool local_var_p(parser_state *p, mrb_sym sym) { + struct RProc *u; node *l = p->locals; while (l) { @@ -339,6 +339,18 @@ local_var_p(parser_state *p, mrb_sym sym) } l = l->cdr; } + + u = p->upper; + while (u && !MRB_PROC_CFUNC_P(u)) { + struct mrb_irep *ir = u->body.irep; + uint_fast16_t n = ir->nlocals; + const struct mrb_locals *v = ir->lv; + for (; n > 1; n --, v ++) { + if (v->name == sym) return TRUE; + } + if (MRB_PROC_SCOPE_P(u)) break; + u = u->upper; + } return FALSE; } @@ -1392,7 +1404,7 @@ heredoc_end(parser_state *p) /* xxx ----------------------------- */ -#line 1396 "mrbgems/mruby-compiler/core/y.tab.c" +#line 1408 "mrbgems/mruby-compiler/core/y.tab.c" # ifndef YY_CAST # ifdef __cplusplus @@ -1415,6 +1427,14 @@ heredoc_end(parser_state *p) # endif # endif +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 1 +#endif + /* Debug traces. */ #ifndef YYDEBUG @@ -1424,142 +1444,137 @@ heredoc_end(parser_state *p) extern int yydebug; #endif -/* Token kinds. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - YYEMPTY = -2, - YYEOF = 0, /* "end of file" */ - YYerror = 256, /* error */ - YYUNDEF = 257, /* "invalid token" */ - keyword_class = 258, /* keyword_class */ - keyword_module = 259, /* keyword_module */ - keyword_def = 260, /* keyword_def */ - keyword_begin = 261, /* keyword_begin */ - keyword_if = 262, /* keyword_if */ - keyword_unless = 263, /* keyword_unless */ - keyword_while = 264, /* keyword_while */ - keyword_until = 265, /* keyword_until */ - keyword_for = 266, /* keyword_for */ - keyword_undef = 267, /* keyword_undef */ - keyword_rescue = 268, /* keyword_rescue */ - keyword_ensure = 269, /* keyword_ensure */ - keyword_end = 270, /* keyword_end */ - keyword_then = 271, /* keyword_then */ - keyword_elsif = 272, /* keyword_elsif */ - keyword_else = 273, /* keyword_else */ - keyword_case = 274, /* keyword_case */ - keyword_when = 275, /* keyword_when */ - keyword_break = 276, /* keyword_break */ - keyword_next = 277, /* keyword_next */ - keyword_redo = 278, /* keyword_redo */ - keyword_retry = 279, /* keyword_retry */ - keyword_in = 280, /* keyword_in */ - keyword_do = 281, /* keyword_do */ - keyword_do_cond = 282, /* keyword_do_cond */ - keyword_do_block = 283, /* keyword_do_block */ - keyword_do_LAMBDA = 284, /* keyword_do_LAMBDA */ - keyword_return = 285, /* keyword_return */ - keyword_yield = 286, /* keyword_yield */ - keyword_super = 287, /* keyword_super */ - keyword_self = 288, /* keyword_self */ - keyword_nil = 289, /* keyword_nil */ - keyword_true = 290, /* keyword_true */ - keyword_false = 291, /* keyword_false */ - keyword_and = 292, /* keyword_and */ - keyword_or = 293, /* keyword_or */ - keyword_not = 294, /* keyword_not */ - modifier_if = 295, /* modifier_if */ - modifier_unless = 296, /* modifier_unless */ - modifier_while = 297, /* modifier_while */ - modifier_until = 298, /* modifier_until */ - modifier_rescue = 299, /* modifier_rescue */ - keyword_alias = 300, /* keyword_alias */ - keyword_BEGIN = 301, /* keyword_BEGIN */ - keyword_END = 302, /* keyword_END */ - keyword__LINE__ = 303, /* keyword__LINE__ */ - keyword__FILE__ = 304, /* keyword__FILE__ */ - keyword__ENCODING__ = 305, /* keyword__ENCODING__ */ - tIDENTIFIER = 306, /* tIDENTIFIER */ - tFID = 307, /* tFID */ - tGVAR = 308, /* tGVAR */ - tIVAR = 309, /* tIVAR */ - tCONSTANT = 310, /* tCONSTANT */ - tCVAR = 311, /* tCVAR */ - tLABEL_TAG = 312, /* tLABEL_TAG */ - tINTEGER = 313, /* tINTEGER */ - tFLOAT = 314, /* tFLOAT */ - tCHAR = 315, /* tCHAR */ - tXSTRING = 316, /* tXSTRING */ - tREGEXP = 317, /* tREGEXP */ - tSTRING = 318, /* tSTRING */ - tSTRING_PART = 319, /* tSTRING_PART */ - tSTRING_MID = 320, /* tSTRING_MID */ - tNTH_REF = 321, /* tNTH_REF */ - tBACK_REF = 322, /* tBACK_REF */ - tREGEXP_END = 323, /* tREGEXP_END */ - tNUMPARAM = 324, /* tNUMPARAM */ - tUPLUS = 325, /* tUPLUS */ - tUMINUS = 326, /* tUMINUS */ - tPOW = 327, /* tPOW */ - tCMP = 328, /* tCMP */ - tEQ = 329, /* tEQ */ - tEQQ = 330, /* tEQQ */ - tNEQ = 331, /* tNEQ */ - tGEQ = 332, /* tGEQ */ - tLEQ = 333, /* tLEQ */ - tANDOP = 334, /* tANDOP */ - tOROP = 335, /* tOROP */ - tMATCH = 336, /* tMATCH */ - tNMATCH = 337, /* tNMATCH */ - tDOT2 = 338, /* tDOT2 */ - tDOT3 = 339, /* tDOT3 */ - tAREF = 340, /* tAREF */ - tASET = 341, /* tASET */ - tLSHFT = 342, /* tLSHFT */ - tRSHFT = 343, /* tRSHFT */ - tCOLON2 = 344, /* tCOLON2 */ - tCOLON3 = 345, /* tCOLON3 */ - tOP_ASGN = 346, /* tOP_ASGN */ - tASSOC = 347, /* tASSOC */ - tLPAREN = 348, /* tLPAREN */ - tLPAREN_ARG = 349, /* tLPAREN_ARG */ - tRPAREN = 350, /* tRPAREN */ - tLBRACK = 351, /* tLBRACK */ - tLBRACE = 352, /* tLBRACE */ - tLBRACE_ARG = 353, /* tLBRACE_ARG */ - tSTAR = 354, /* tSTAR */ - tDSTAR = 355, /* tDSTAR */ - tAMPER = 356, /* tAMPER */ - tLAMBDA = 357, /* tLAMBDA */ - tANDDOT = 358, /* tANDDOT */ - tSYMBEG = 359, /* tSYMBEG */ - tREGEXP_BEG = 360, /* tREGEXP_BEG */ - tWORDS_BEG = 361, /* tWORDS_BEG */ - tSYMBOLS_BEG = 362, /* tSYMBOLS_BEG */ - tSTRING_BEG = 363, /* tSTRING_BEG */ - tXSTRING_BEG = 364, /* tXSTRING_BEG */ - tSTRING_DVAR = 365, /* tSTRING_DVAR */ - tLAMBEG = 366, /* tLAMBEG */ - tHEREDOC_BEG = 367, /* tHEREDOC_BEG */ - tHEREDOC_END = 368, /* tHEREDOC_END */ - tLITERAL_DELIM = 369, /* tLITERAL_DELIM */ - tHD_LITERAL_DELIM = 370, /* tHD_LITERAL_DELIM */ - tHD_STRING_PART = 371, /* tHD_STRING_PART */ - tHD_STRING_MID = 372, /* tHD_STRING_MID */ - tLOWEST = 373, /* tLOWEST */ - tUMINUS_NUM = 374, /* tUMINUS_NUM */ - tLAST_TOKEN = 375 /* tLAST_TOKEN */ + keyword_class = 258, + keyword_module = 259, + keyword_def = 260, + keyword_begin = 261, + keyword_if = 262, + keyword_unless = 263, + keyword_while = 264, + keyword_until = 265, + keyword_for = 266, + keyword_undef = 267, + keyword_rescue = 268, + keyword_ensure = 269, + keyword_end = 270, + keyword_then = 271, + keyword_elsif = 272, + keyword_else = 273, + keyword_case = 274, + keyword_when = 275, + keyword_break = 276, + keyword_next = 277, + keyword_redo = 278, + keyword_retry = 279, + keyword_in = 280, + keyword_do = 281, + keyword_do_cond = 282, + keyword_do_block = 283, + keyword_do_LAMBDA = 284, + keyword_return = 285, + keyword_yield = 286, + keyword_super = 287, + keyword_self = 288, + keyword_nil = 289, + keyword_true = 290, + keyword_false = 291, + keyword_and = 292, + keyword_or = 293, + keyword_not = 294, + modifier_if = 295, + modifier_unless = 296, + modifier_while = 297, + modifier_until = 298, + modifier_rescue = 299, + keyword_alias = 300, + keyword_BEGIN = 301, + keyword_END = 302, + keyword__LINE__ = 303, + keyword__FILE__ = 304, + keyword__ENCODING__ = 305, + tIDENTIFIER = 306, + tFID = 307, + tGVAR = 308, + tIVAR = 309, + tCONSTANT = 310, + tCVAR = 311, + tLABEL_TAG = 312, + tINTEGER = 313, + tFLOAT = 314, + tCHAR = 315, + tXSTRING = 316, + tREGEXP = 317, + tSTRING = 318, + tSTRING_PART = 319, + tSTRING_MID = 320, + tNTH_REF = 321, + tBACK_REF = 322, + tREGEXP_END = 323, + tNUMPARAM = 324, + tUPLUS = 325, + tUMINUS = 326, + tPOW = 327, + tCMP = 328, + tEQ = 329, + tEQQ = 330, + tNEQ = 331, + tGEQ = 332, + tLEQ = 333, + tANDOP = 334, + tOROP = 335, + tMATCH = 336, + tNMATCH = 337, + tDOT2 = 338, + tDOT3 = 339, + tAREF = 340, + tASET = 341, + tLSHFT = 342, + tRSHFT = 343, + tCOLON2 = 344, + tCOLON3 = 345, + tOP_ASGN = 346, + tASSOC = 347, + tLPAREN = 348, + tLPAREN_ARG = 349, + tRPAREN = 350, + tLBRACK = 351, + tLBRACE = 352, + tLBRACE_ARG = 353, + tSTAR = 354, + tDSTAR = 355, + tAMPER = 356, + tLAMBDA = 357, + tANDDOT = 358, + tSYMBEG = 359, + tREGEXP_BEG = 360, + tWORDS_BEG = 361, + tSYMBOLS_BEG = 362, + tSTRING_BEG = 363, + tXSTRING_BEG = 364, + tSTRING_DVAR = 365, + tLAMBEG = 366, + tHEREDOC_BEG = 367, + tHEREDOC_END = 368, + tLITERAL_DELIM = 369, + tHD_LITERAL_DELIM = 370, + tHD_STRING_PART = 371, + tHD_STRING_MID = 372, + tLOWEST = 373, + tUMINUS_NUM = 374, + tLAST_TOKEN = 375 }; - typedef enum yytokentype yytoken_kind_t; #endif /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 1337 "mrbgems/mruby-compiler/core/parse.y" +#line 1350 "mrbgems/mruby-compiler/core/parse.y" node *nd; mrb_sym id; @@ -1567,7 +1582,7 @@ union YYSTYPE stack_type stack; const struct vtable *vars; -#line 1571 "mrbgems/mruby-compiler/core/y.tab.c" +#line 1586 "mrbgems/mruby-compiler/core/y.tab.c" }; typedef union YYSTYPE YYSTYPE; @@ -1580,336 +1595,6 @@ typedef union YYSTYPE YYSTYPE; int yyparse (parser_state *p); -/* Symbol kind. */ -enum yysymbol_kind_t -{ - YYSYMBOL_YYEMPTY = -2, - YYSYMBOL_YYEOF = 0, /* "end of file" */ - YYSYMBOL_YYerror = 1, /* error */ - YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ - YYSYMBOL_keyword_class = 3, /* keyword_class */ - YYSYMBOL_keyword_module = 4, /* keyword_module */ - YYSYMBOL_keyword_def = 5, /* keyword_def */ - YYSYMBOL_keyword_begin = 6, /* keyword_begin */ - YYSYMBOL_keyword_if = 7, /* keyword_if */ - YYSYMBOL_keyword_unless = 8, /* keyword_unless */ - YYSYMBOL_keyword_while = 9, /* keyword_while */ - YYSYMBOL_keyword_until = 10, /* keyword_until */ - YYSYMBOL_keyword_for = 11, /* keyword_for */ - YYSYMBOL_keyword_undef = 12, /* keyword_undef */ - YYSYMBOL_keyword_rescue = 13, /* keyword_rescue */ - YYSYMBOL_keyword_ensure = 14, /* keyword_ensure */ - YYSYMBOL_keyword_end = 15, /* keyword_end */ - YYSYMBOL_keyword_then = 16, /* keyword_then */ - YYSYMBOL_keyword_elsif = 17, /* keyword_elsif */ - YYSYMBOL_keyword_else = 18, /* keyword_else */ - YYSYMBOL_keyword_case = 19, /* keyword_case */ - YYSYMBOL_keyword_when = 20, /* keyword_when */ - YYSYMBOL_keyword_break = 21, /* keyword_break */ - YYSYMBOL_keyword_next = 22, /* keyword_next */ - YYSYMBOL_keyword_redo = 23, /* keyword_redo */ - YYSYMBOL_keyword_retry = 24, /* keyword_retry */ - YYSYMBOL_keyword_in = 25, /* keyword_in */ - YYSYMBOL_keyword_do = 26, /* keyword_do */ - YYSYMBOL_keyword_do_cond = 27, /* keyword_do_cond */ - YYSYMBOL_keyword_do_block = 28, /* keyword_do_block */ - YYSYMBOL_keyword_do_LAMBDA = 29, /* keyword_do_LAMBDA */ - YYSYMBOL_keyword_return = 30, /* keyword_return */ - YYSYMBOL_keyword_yield = 31, /* keyword_yield */ - YYSYMBOL_keyword_super = 32, /* keyword_super */ - YYSYMBOL_keyword_self = 33, /* keyword_self */ - YYSYMBOL_keyword_nil = 34, /* keyword_nil */ - YYSYMBOL_keyword_true = 35, /* keyword_true */ - YYSYMBOL_keyword_false = 36, /* keyword_false */ - YYSYMBOL_keyword_and = 37, /* keyword_and */ - YYSYMBOL_keyword_or = 38, /* keyword_or */ - YYSYMBOL_keyword_not = 39, /* keyword_not */ - YYSYMBOL_modifier_if = 40, /* modifier_if */ - YYSYMBOL_modifier_unless = 41, /* modifier_unless */ - YYSYMBOL_modifier_while = 42, /* modifier_while */ - YYSYMBOL_modifier_until = 43, /* modifier_until */ - YYSYMBOL_modifier_rescue = 44, /* modifier_rescue */ - YYSYMBOL_keyword_alias = 45, /* keyword_alias */ - YYSYMBOL_keyword_BEGIN = 46, /* keyword_BEGIN */ - YYSYMBOL_keyword_END = 47, /* keyword_END */ - YYSYMBOL_keyword__LINE__ = 48, /* keyword__LINE__ */ - YYSYMBOL_keyword__FILE__ = 49, /* keyword__FILE__ */ - YYSYMBOL_keyword__ENCODING__ = 50, /* keyword__ENCODING__ */ - YYSYMBOL_tIDENTIFIER = 51, /* tIDENTIFIER */ - YYSYMBOL_tFID = 52, /* tFID */ - YYSYMBOL_tGVAR = 53, /* tGVAR */ - YYSYMBOL_tIVAR = 54, /* tIVAR */ - YYSYMBOL_tCONSTANT = 55, /* tCONSTANT */ - YYSYMBOL_tCVAR = 56, /* tCVAR */ - YYSYMBOL_tLABEL_TAG = 57, /* tLABEL_TAG */ - YYSYMBOL_tINTEGER = 58, /* tINTEGER */ - YYSYMBOL_tFLOAT = 59, /* tFLOAT */ - YYSYMBOL_tCHAR = 60, /* tCHAR */ - YYSYMBOL_tXSTRING = 61, /* tXSTRING */ - YYSYMBOL_tREGEXP = 62, /* tREGEXP */ - YYSYMBOL_tSTRING = 63, /* tSTRING */ - YYSYMBOL_tSTRING_PART = 64, /* tSTRING_PART */ - YYSYMBOL_tSTRING_MID = 65, /* tSTRING_MID */ - YYSYMBOL_tNTH_REF = 66, /* tNTH_REF */ - YYSYMBOL_tBACK_REF = 67, /* tBACK_REF */ - YYSYMBOL_tREGEXP_END = 68, /* tREGEXP_END */ - YYSYMBOL_tNUMPARAM = 69, /* tNUMPARAM */ - YYSYMBOL_tUPLUS = 70, /* tUPLUS */ - YYSYMBOL_tUMINUS = 71, /* tUMINUS */ - YYSYMBOL_tPOW = 72, /* tPOW */ - YYSYMBOL_tCMP = 73, /* tCMP */ - YYSYMBOL_tEQ = 74, /* tEQ */ - YYSYMBOL_tEQQ = 75, /* tEQQ */ - YYSYMBOL_tNEQ = 76, /* tNEQ */ - YYSYMBOL_tGEQ = 77, /* tGEQ */ - YYSYMBOL_tLEQ = 78, /* tLEQ */ - YYSYMBOL_tANDOP = 79, /* tANDOP */ - YYSYMBOL_tOROP = 80, /* tOROP */ - YYSYMBOL_tMATCH = 81, /* tMATCH */ - YYSYMBOL_tNMATCH = 82, /* tNMATCH */ - YYSYMBOL_tDOT2 = 83, /* tDOT2 */ - YYSYMBOL_tDOT3 = 84, /* tDOT3 */ - YYSYMBOL_tAREF = 85, /* tAREF */ - YYSYMBOL_tASET = 86, /* tASET */ - YYSYMBOL_tLSHFT = 87, /* tLSHFT */ - YYSYMBOL_tRSHFT = 88, /* tRSHFT */ - YYSYMBOL_tCOLON2 = 89, /* tCOLON2 */ - YYSYMBOL_tCOLON3 = 90, /* tCOLON3 */ - YYSYMBOL_tOP_ASGN = 91, /* tOP_ASGN */ - YYSYMBOL_tASSOC = 92, /* tASSOC */ - YYSYMBOL_tLPAREN = 93, /* tLPAREN */ - YYSYMBOL_tLPAREN_ARG = 94, /* tLPAREN_ARG */ - YYSYMBOL_tRPAREN = 95, /* tRPAREN */ - YYSYMBOL_tLBRACK = 96, /* tLBRACK */ - YYSYMBOL_tLBRACE = 97, /* tLBRACE */ - YYSYMBOL_tLBRACE_ARG = 98, /* tLBRACE_ARG */ - YYSYMBOL_tSTAR = 99, /* tSTAR */ - YYSYMBOL_tDSTAR = 100, /* tDSTAR */ - YYSYMBOL_tAMPER = 101, /* tAMPER */ - YYSYMBOL_tLAMBDA = 102, /* tLAMBDA */ - YYSYMBOL_tANDDOT = 103, /* tANDDOT */ - YYSYMBOL_tSYMBEG = 104, /* tSYMBEG */ - YYSYMBOL_tREGEXP_BEG = 105, /* tREGEXP_BEG */ - YYSYMBOL_tWORDS_BEG = 106, /* tWORDS_BEG */ - YYSYMBOL_tSYMBOLS_BEG = 107, /* tSYMBOLS_BEG */ - YYSYMBOL_tSTRING_BEG = 108, /* tSTRING_BEG */ - YYSYMBOL_tXSTRING_BEG = 109, /* tXSTRING_BEG */ - YYSYMBOL_tSTRING_DVAR = 110, /* tSTRING_DVAR */ - YYSYMBOL_tLAMBEG = 111, /* tLAMBEG */ - YYSYMBOL_tHEREDOC_BEG = 112, /* tHEREDOC_BEG */ - YYSYMBOL_tHEREDOC_END = 113, /* tHEREDOC_END */ - YYSYMBOL_tLITERAL_DELIM = 114, /* tLITERAL_DELIM */ - YYSYMBOL_tHD_LITERAL_DELIM = 115, /* tHD_LITERAL_DELIM */ - YYSYMBOL_tHD_STRING_PART = 116, /* tHD_STRING_PART */ - YYSYMBOL_tHD_STRING_MID = 117, /* tHD_STRING_MID */ - YYSYMBOL_tLOWEST = 118, /* tLOWEST */ - YYSYMBOL_119_ = 119, /* '=' */ - YYSYMBOL_120_ = 120, /* '?' */ - YYSYMBOL_121_ = 121, /* ':' */ - YYSYMBOL_122_ = 122, /* '>' */ - YYSYMBOL_123_ = 123, /* '<' */ - YYSYMBOL_124_ = 124, /* '|' */ - YYSYMBOL_125_ = 125, /* '^' */ - YYSYMBOL_126_ = 126, /* '&' */ - YYSYMBOL_127_ = 127, /* '+' */ - YYSYMBOL_128_ = 128, /* '-' */ - YYSYMBOL_129_ = 129, /* '*' */ - YYSYMBOL_130_ = 130, /* '/' */ - YYSYMBOL_131_ = 131, /* '%' */ - YYSYMBOL_tUMINUS_NUM = 132, /* tUMINUS_NUM */ - YYSYMBOL_133_ = 133, /* '!' */ - YYSYMBOL_134_ = 134, /* '~' */ - YYSYMBOL_tLAST_TOKEN = 135, /* tLAST_TOKEN */ - YYSYMBOL_136_ = 136, /* '{' */ - YYSYMBOL_137_ = 137, /* '}' */ - YYSYMBOL_138_ = 138, /* '[' */ - YYSYMBOL_139_ = 139, /* ']' */ - YYSYMBOL_140_ = 140, /* ',' */ - YYSYMBOL_141_ = 141, /* '`' */ - YYSYMBOL_142_ = 142, /* '(' */ - YYSYMBOL_143_ = 143, /* ')' */ - YYSYMBOL_144_ = 144, /* ';' */ - YYSYMBOL_145_ = 145, /* '.' */ - YYSYMBOL_146_n_ = 146, /* '\n' */ - YYSYMBOL_YYACCEPT = 147, /* $accept */ - YYSYMBOL_program = 148, /* program */ - YYSYMBOL_149_1 = 149, /* $@1 */ - YYSYMBOL_top_compstmt = 150, /* top_compstmt */ - YYSYMBOL_top_stmts = 151, /* top_stmts */ - YYSYMBOL_top_stmt = 152, /* top_stmt */ - YYSYMBOL_153_2 = 153, /* @2 */ - YYSYMBOL_bodystmt = 154, /* bodystmt */ - YYSYMBOL_compstmt = 155, /* compstmt */ - YYSYMBOL_stmts = 156, /* stmts */ - YYSYMBOL_stmt = 157, /* stmt */ - YYSYMBOL_158_3 = 158, /* $@3 */ - YYSYMBOL_command_asgn = 159, /* command_asgn */ - YYSYMBOL_command_rhs = 160, /* command_rhs */ - YYSYMBOL_expr = 161, /* expr */ - YYSYMBOL_expr_value = 162, /* expr_value */ - YYSYMBOL_command_call = 163, /* command_call */ - YYSYMBOL_block_command = 164, /* block_command */ - YYSYMBOL_cmd_brace_block = 165, /* cmd_brace_block */ - YYSYMBOL_166_4 = 166, /* $@4 */ - YYSYMBOL_command = 167, /* command */ - YYSYMBOL_mlhs = 168, /* mlhs */ - YYSYMBOL_mlhs_inner = 169, /* mlhs_inner */ - YYSYMBOL_mlhs_basic = 170, /* mlhs_basic */ - YYSYMBOL_mlhs_item = 171, /* mlhs_item */ - YYSYMBOL_mlhs_list = 172, /* mlhs_list */ - YYSYMBOL_mlhs_post = 173, /* mlhs_post */ - YYSYMBOL_mlhs_node = 174, /* mlhs_node */ - YYSYMBOL_lhs = 175, /* lhs */ - YYSYMBOL_cname = 176, /* cname */ - YYSYMBOL_cpath = 177, /* cpath */ - YYSYMBOL_fname = 178, /* fname */ - YYSYMBOL_fsym = 179, /* fsym */ - YYSYMBOL_undef_list = 180, /* undef_list */ - YYSYMBOL_181_5 = 181, /* $@5 */ - YYSYMBOL_op = 182, /* op */ - YYSYMBOL_reswords = 183, /* reswords */ - YYSYMBOL_arg = 184, /* arg */ - YYSYMBOL_aref_args = 185, /* aref_args */ - YYSYMBOL_arg_rhs = 186, /* arg_rhs */ - YYSYMBOL_paren_args = 187, /* paren_args */ - YYSYMBOL_opt_paren_args = 188, /* opt_paren_args */ - YYSYMBOL_opt_call_args = 189, /* opt_call_args */ - YYSYMBOL_call_args = 190, /* call_args */ - YYSYMBOL_command_args = 191, /* command_args */ - YYSYMBOL_192_6 = 192, /* @6 */ - YYSYMBOL_block_arg = 193, /* block_arg */ - YYSYMBOL_opt_block_arg = 194, /* opt_block_arg */ - YYSYMBOL_comma = 195, /* comma */ - YYSYMBOL_args = 196, /* args */ - YYSYMBOL_mrhs = 197, /* mrhs */ - YYSYMBOL_primary = 198, /* primary */ - YYSYMBOL_199_7 = 199, /* @7 */ - YYSYMBOL_200_8 = 200, /* @8 */ - YYSYMBOL_201_9 = 201, /* $@9 */ - YYSYMBOL_202_10 = 202, /* $@10 */ - YYSYMBOL_203_11 = 203, /* @11 */ - YYSYMBOL_204_12 = 204, /* @12 */ - YYSYMBOL_205_13 = 205, /* $@13 */ - YYSYMBOL_206_14 = 206, /* $@14 */ - YYSYMBOL_207_15 = 207, /* $@15 */ - YYSYMBOL_208_16 = 208, /* $@16 */ - YYSYMBOL_209_17 = 209, /* $@17 */ - YYSYMBOL_210_18 = 210, /* $@18 */ - YYSYMBOL_211_19 = 211, /* @19 */ - YYSYMBOL_212_20 = 212, /* @20 */ - YYSYMBOL_213_21 = 213, /* @21 */ - YYSYMBOL_214_22 = 214, /* @22 */ - YYSYMBOL_215_23 = 215, /* @23 */ - YYSYMBOL_216_24 = 216, /* @24 */ - YYSYMBOL_217_25 = 217, /* @25 */ - YYSYMBOL_218_26 = 218, /* @26 */ - YYSYMBOL_primary_value = 219, /* primary_value */ - YYSYMBOL_then = 220, /* then */ - YYSYMBOL_do = 221, /* do */ - YYSYMBOL_if_tail = 222, /* if_tail */ - YYSYMBOL_opt_else = 223, /* opt_else */ - YYSYMBOL_for_var = 224, /* for_var */ - YYSYMBOL_f_margs = 225, /* f_margs */ - YYSYMBOL_226_27 = 226, /* $@27 */ - YYSYMBOL_block_args_tail = 227, /* block_args_tail */ - YYSYMBOL_opt_block_args_tail = 228, /* opt_block_args_tail */ - YYSYMBOL_block_param = 229, /* block_param */ - YYSYMBOL_opt_block_param = 230, /* opt_block_param */ - YYSYMBOL_block_param_def = 231, /* block_param_def */ - YYSYMBOL_232_28 = 232, /* $@28 */ - YYSYMBOL_opt_bv_decl = 233, /* opt_bv_decl */ - YYSYMBOL_bv_decls = 234, /* bv_decls */ - YYSYMBOL_bvar = 235, /* bvar */ - YYSYMBOL_f_larglist = 236, /* f_larglist */ - YYSYMBOL_lambda_body = 237, /* lambda_body */ - YYSYMBOL_do_block = 238, /* do_block */ - YYSYMBOL_239_29 = 239, /* $@29 */ - YYSYMBOL_block_call = 240, /* block_call */ - YYSYMBOL_method_call = 241, /* method_call */ - YYSYMBOL_brace_block = 242, /* brace_block */ - YYSYMBOL_243_30 = 243, /* @30 */ - YYSYMBOL_244_31 = 244, /* @31 */ - YYSYMBOL_case_body = 245, /* case_body */ - YYSYMBOL_cases = 246, /* cases */ - YYSYMBOL_opt_rescue = 247, /* opt_rescue */ - YYSYMBOL_exc_list = 248, /* exc_list */ - YYSYMBOL_exc_var = 249, /* exc_var */ - YYSYMBOL_opt_ensure = 250, /* opt_ensure */ - YYSYMBOL_literal = 251, /* literal */ - YYSYMBOL_string = 252, /* string */ - YYSYMBOL_string_fragment = 253, /* string_fragment */ - YYSYMBOL_string_rep = 254, /* string_rep */ - YYSYMBOL_string_interp = 255, /* string_interp */ - YYSYMBOL_256_32 = 256, /* @32 */ - YYSYMBOL_xstring = 257, /* xstring */ - YYSYMBOL_regexp = 258, /* regexp */ - YYSYMBOL_heredoc = 259, /* heredoc */ - YYSYMBOL_heredoc_bodies = 260, /* heredoc_bodies */ - YYSYMBOL_heredoc_body = 261, /* heredoc_body */ - YYSYMBOL_heredoc_string_rep = 262, /* heredoc_string_rep */ - YYSYMBOL_heredoc_string_interp = 263, /* heredoc_string_interp */ - YYSYMBOL_264_33 = 264, /* @33 */ - YYSYMBOL_words = 265, /* words */ - YYSYMBOL_symbol = 266, /* symbol */ - YYSYMBOL_basic_symbol = 267, /* basic_symbol */ - YYSYMBOL_sym = 268, /* sym */ - YYSYMBOL_symbols = 269, /* symbols */ - YYSYMBOL_numeric = 270, /* numeric */ - YYSYMBOL_variable = 271, /* variable */ - YYSYMBOL_var_lhs = 272, /* var_lhs */ - YYSYMBOL_var_ref = 273, /* var_ref */ - YYSYMBOL_backref = 274, /* backref */ - YYSYMBOL_superclass = 275, /* superclass */ - YYSYMBOL_276_34 = 276, /* $@34 */ - YYSYMBOL_f_arglist = 277, /* f_arglist */ - YYSYMBOL_f_label = 278, /* f_label */ - YYSYMBOL_f_kw = 279, /* f_kw */ - YYSYMBOL_f_block_kw = 280, /* f_block_kw */ - YYSYMBOL_f_block_kwarg = 281, /* f_block_kwarg */ - YYSYMBOL_f_kwarg = 282, /* f_kwarg */ - YYSYMBOL_kwrest_mark = 283, /* kwrest_mark */ - YYSYMBOL_f_kwrest = 284, /* f_kwrest */ - YYSYMBOL_args_tail = 285, /* args_tail */ - YYSYMBOL_opt_args_tail = 286, /* opt_args_tail */ - YYSYMBOL_f_args = 287, /* f_args */ - YYSYMBOL_f_bad_arg = 288, /* f_bad_arg */ - YYSYMBOL_f_norm_arg = 289, /* f_norm_arg */ - YYSYMBOL_f_arg_item = 290, /* f_arg_item */ - YYSYMBOL_291_35 = 291, /* @35 */ - YYSYMBOL_f_arg = 292, /* f_arg */ - YYSYMBOL_f_opt_asgn = 293, /* f_opt_asgn */ - YYSYMBOL_f_opt = 294, /* f_opt */ - YYSYMBOL_f_block_opt = 295, /* f_block_opt */ - YYSYMBOL_f_block_optarg = 296, /* f_block_optarg */ - YYSYMBOL_f_optarg = 297, /* f_optarg */ - YYSYMBOL_restarg_mark = 298, /* restarg_mark */ - YYSYMBOL_f_rest_arg = 299, /* f_rest_arg */ - YYSYMBOL_blkarg_mark = 300, /* blkarg_mark */ - YYSYMBOL_f_block_arg = 301, /* f_block_arg */ - YYSYMBOL_opt_f_block_arg = 302, /* opt_f_block_arg */ - YYSYMBOL_singleton = 303, /* singleton */ - YYSYMBOL_304_36 = 304, /* $@36 */ - YYSYMBOL_assoc_list = 305, /* assoc_list */ - YYSYMBOL_assocs = 306, /* assocs */ - YYSYMBOL_label_tag = 307, /* label_tag */ - YYSYMBOL_assoc = 308, /* assoc */ - YYSYMBOL_operation = 309, /* operation */ - YYSYMBOL_operation2 = 310, /* operation2 */ - YYSYMBOL_operation3 = 311, /* operation3 */ - YYSYMBOL_dot_or_colon = 312, /* dot_or_colon */ - YYSYMBOL_call_op = 313, /* call_op */ - YYSYMBOL_call_op2 = 314, /* call_op2 */ - YYSYMBOL_opt_terms = 315, /* opt_terms */ - YYSYMBOL_opt_nl = 316, /* opt_nl */ - YYSYMBOL_rparen = 317, /* rparen */ - YYSYMBOL_trailer = 318, /* trailer */ - YYSYMBOL_term = 319, /* term */ - YYSYMBOL_nl = 320, /* nl */ - YYSYMBOL_terms = 321, /* terms */ - YYSYMBOL_none = 322 /* none */ -}; -typedef enum yysymbol_kind_t yysymbol_kind_t; - @@ -2009,7 +1694,6 @@ typedef int yytype_uint16; #define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) - /* Stored state numbers (used for stacks). */ typedef yytype_int16 yy_state_t; @@ -2028,7 +1712,6 @@ typedef int yy_state_fast_t; # endif #endif - #ifndef YY_ATTRIBUTE_PURE # if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) # define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) @@ -2086,7 +1769,7 @@ typedef int yy_state_fast_t; #define YY_ASSERT(E) ((void) (0 && (E))) -#if 1 +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -2151,7 +1834,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* 1 */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + #if (! defined yyoverflow \ && (! defined __cplusplus \ @@ -2227,15 +1911,14 @@ union yyalloc /* YYNSTATES -- Number of states. */ #define YYNSTATES 1034 +#define YYUNDEFTOK 2 #define YYMAXUTOK 375 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ -#define YYTRANSLATE(YYX) \ - (0 <= (YYX) && (YYX) <= YYMAXUTOK \ - ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ - : YYSYMBOL_YYUNDEF) +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM as returned by yylex. */ @@ -2282,100 +1965,92 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG - /* YYRLINEYYN -- Source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 1495, 1495, 1495, 1506, 1512, 1516, 1521, 1525, 1531, - 1533, 1532, 1546, 1573, 1579, 1583, 1588, 1592, 1598, 1598, - 1602, 1606, 1610, 1614, 1618, 1622, 1626, 1631, 1632, 1636, - 1640, 1644, 1648, 1651, 1655, 1659, 1663, 1667, 1671, 1676, - 1680, 1687, 1688, 1692, 1696, 1697, 1701, 1705, 1709, 1713, - 1716, 1725, 1726, 1729, 1730, 1737, 1736, 1751, 1755, 1760, - 1764, 1769, 1773, 1778, 1782, 1786, 1790, 1794, 1800, 1804, - 1810, 1811, 1817, 1821, 1825, 1829, 1833, 1837, 1841, 1845, - 1849, 1853, 1859, 1860, 1866, 1870, 1876, 1880, 1886, 1890, - 1894, 1898, 1902, 1906, 1912, 1918, 1925, 1929, 1933, 1937, - 1941, 1945, 1951, 1957, 1962, 1968, 1972, 1975, 1979, 1983, - 1990, 1991, 1992, 1993, 1998, 2005, 2006, 2009, 2013, 2013, - 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2028, - 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036, 2037, 2038, - 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, 2047, 2048, - 2051, 2051, 2051, 2052, 2052, 2053, 2053, 2053, 2054, 2054, - 2054, 2054, 2055, 2055, 2055, 2056, 2056, 2056, 2057, 2057, - 2057, 2057, 2058, 2058, 2058, 2058, 2059, 2059, 2059, 2059, - 2060, 2060, 2060, 2060, 2061, 2061, 2061, 2061, 2062, 2062, - 2065, 2069, 2073, 2077, 2081, 2085, 2089, 2094, 2099, 2104, - 2108, 2112, 2116, 2120, 2124, 2128, 2132, 2136, 2140, 2144, - 2148, 2152, 2156, 2160, 2164, 2168, 2172, 2176, 2180, 2184, - 2188, 2192, 2196, 2200, 2204, 2208, 2212, 2216, 2220, 2224, - 2228, 2232, 2236, 2242, 2243, 2248, 2252, 2259, 2263, 2271, - 2275, 2301, 2302, 2305, 2306, 2307, 2312, 2317, 2324, 2330, - 2335, 2340, 2345, 2352, 2352, 2363, 2369, 2373, 2379, 2380, - 2383, 2389, 2395, 2400, 2407, 2412, 2417, 2424, 2425, 2426, - 2427, 2428, 2429, 2430, 2431, 2435, 2440, 2439, 2451, 2455, - 2450, 2460, 2460, 2464, 2468, 2472, 2476, 2481, 2486, 2490, - 2494, 2498, 2502, 2506, 2507, 2513, 2519, 2512, 2531, 2539, - 2547, 2547, 2547, 2554, 2554, 2554, 2561, 2567, 2572, 2574, - 2571, 2583, 2581, 2599, 2604, 2597, 2621, 2619, 2636, 2640, - 2635, 2657, 2663, 2656, 2680, 2684, 2688, 2692, 2698, 2705, - 2706, 2707, 2710, 2711, 2714, 2715, 2723, 2724, 2730, 2734, - 2737, 2741, 2745, 2749, 2754, 2758, 2762, 2766, 2772, 2771, - 2781, 2785, 2789, 2793, 2799, 2804, 2809, 2813, 2817, 2821, - 2825, 2829, 2833, 2837, 2841, 2845, 2849, 2853, 2857, 2861, - 2865, 2871, 2876, 2883, 2883, 2887, 2892, 2899, 2903, 2909, - 2910, 2913, 2918, 2921, 2925, 2931, 2935, 2942, 2941, 2956, - 2966, 2970, 2975, 2982, 2986, 2990, 2994, 2998, 3002, 3006, - 3010, 3014, 3021, 3020, 3035, 3034, 3050, 3058, 3067, 3070, - 3077, 3080, 3084, 3085, 3088, 3092, 3095, 3099, 3102, 3103, - 3104, 3105, 3108, 3109, 3115, 3116, 3117, 3121, 3127, 3128, - 3134, 3139, 3138, 3149, 3153, 3159, 3163, 3169, 3173, 3179, - 3182, 3183, 3186, 3192, 3198, 3199, 3202, 3209, 3208, 3222, - 3226, 3233, 3238, 3245, 3251, 3252, 3253, 3254, 3255, 3259, - 3265, 3269, 3275, 3276, 3277, 3281, 3287, 3291, 3295, 3299, - 3303, 3309, 3313, 3319, 3323, 3327, 3331, 3335, 3339, 3347, - 3354, 3365, 3366, 3370, 3374, 3373, 3389, 3395, 3413, 3419, - 3425, 3431, 3438, 3443, 3450, 3454, 3460, 3464, 3470, 3471, - 3474, 3478, 3484, 3488, 3492, 3496, 3502, 3507, 3512, 3516, - 3520, 3524, 3528, 3532, 3536, 3540, 3544, 3548, 3552, 3556, - 3560, 3564, 3569, 3575, 3580, 3585, 3590, 3595, 3602, 3606, - 3613, 3618, 3617, 3629, 3633, 3639, 3647, 3655, 3663, 3667, - 3673, 3677, 3683, 3684, 3687, 3692, 3699, 3700, 3703, 3709, - 3713, 3719, 3724, 3724, 3749, 3750, 3756, 3761, 3767, 3768, - 3771, 3777, 3782, 3792, 3799, 3800, 3801, 3804, 3805, 3806, - 3807, 3810, 3811, 3812, 3815, 3816, 3819, 3823, 3829, 3830, - 3836, 3837, 3840, 3841, 3844, 3847, 3848, 3849, 3852, 3853, - 3854, 3857, 3864, 3865, 3869 + 0, 1508, 1508, 1508, 1519, 1525, 1529, 1534, 1538, 1544, + 1546, 1545, 1559, 1586, 1592, 1596, 1601, 1605, 1611, 1611, + 1615, 1619, 1623, 1627, 1631, 1635, 1639, 1644, 1645, 1649, + 1653, 1657, 1661, 1664, 1668, 1672, 1676, 1680, 1684, 1689, + 1693, 1700, 1701, 1705, 1709, 1710, 1714, 1718, 1722, 1726, + 1729, 1738, 1739, 1742, 1743, 1750, 1749, 1764, 1768, 1773, + 1777, 1782, 1786, 1791, 1795, 1799, 1803, 1807, 1813, 1817, + 1823, 1824, 1830, 1834, 1838, 1842, 1846, 1850, 1854, 1858, + 1862, 1866, 1872, 1873, 1879, 1883, 1889, 1893, 1899, 1903, + 1907, 1911, 1915, 1919, 1925, 1931, 1938, 1942, 1946, 1950, + 1954, 1958, 1964, 1970, 1975, 1981, 1985, 1988, 1992, 1996, + 2003, 2004, 2005, 2006, 2011, 2018, 2019, 2022, 2026, 2026, + 2032, 2033, 2034, 2035, 2036, 2037, 2038, 2039, 2040, 2041, + 2042, 2043, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, + 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2061, + 2064, 2064, 2064, 2065, 2065, 2066, 2066, 2066, 2067, 2067, + 2067, 2067, 2068, 2068, 2068, 2069, 2069, 2069, 2070, 2070, + 2070, 2070, 2071, 2071, 2071, 2071, 2072, 2072, 2072, 2072, + 2073, 2073, 2073, 2073, 2074, 2074, 2074, 2074, 2075, 2075, + 2078, 2082, 2086, 2090, 2094, 2098, 2102, 2107, 2112, 2117, + 2121, 2125, 2129, 2133, 2137, 2141, 2145, 2149, 2153, 2157, + 2161, 2165, 2169, 2173, 2177, 2181, 2185, 2189, 2193, 2197, + 2201, 2205, 2209, 2213, 2217, 2221, 2225, 2229, 2233, 2237, + 2241, 2245, 2249, 2255, 2256, 2261, 2265, 2272, 2276, 2284, + 2288, 2314, 2315, 2318, 2319, 2320, 2325, 2330, 2337, 2343, + 2348, 2353, 2358, 2365, 2365, 2376, 2382, 2386, 2392, 2393, + 2396, 2402, 2408, 2413, 2420, 2425, 2430, 2437, 2438, 2439, + 2440, 2441, 2442, 2443, 2444, 2448, 2453, 2452, 2464, 2468, + 2463, 2473, 2473, 2477, 2481, 2485, 2489, 2494, 2499, 2503, + 2507, 2511, 2515, 2519, 2520, 2526, 2532, 2525, 2544, 2552, + 2560, 2560, 2560, 2567, 2567, 2567, 2574, 2580, 2585, 2587, + 2584, 2596, 2594, 2612, 2617, 2610, 2634, 2632, 2649, 2653, + 2648, 2670, 2676, 2669, 2693, 2697, 2701, 2705, 2711, 2718, + 2719, 2720, 2723, 2724, 2727, 2728, 2736, 2737, 2743, 2747, + 2750, 2754, 2758, 2762, 2767, 2771, 2775, 2779, 2785, 2784, + 2794, 2798, 2802, 2806, 2812, 2817, 2822, 2826, 2830, 2834, + 2838, 2842, 2846, 2850, 2854, 2858, 2862, 2866, 2870, 2874, + 2878, 2884, 2889, 2896, 2896, 2900, 2905, 2912, 2916, 2922, + 2923, 2926, 2931, 2934, 2938, 2944, 2948, 2955, 2954, 2969, + 2979, 2983, 2988, 2995, 2999, 3003, 3007, 3011, 3015, 3019, + 3023, 3027, 3034, 3033, 3048, 3047, 3063, 3071, 3080, 3083, + 3090, 3093, 3097, 3098, 3101, 3105, 3108, 3112, 3115, 3116, + 3117, 3118, 3121, 3122, 3128, 3129, 3130, 3134, 3140, 3141, + 3147, 3152, 3151, 3162, 3166, 3172, 3176, 3182, 3186, 3192, + 3195, 3196, 3199, 3205, 3211, 3212, 3215, 3222, 3221, 3235, + 3239, 3246, 3251, 3258, 3264, 3265, 3266, 3267, 3268, 3272, + 3278, 3282, 3288, 3289, 3290, 3294, 3300, 3304, 3308, 3312, + 3316, 3322, 3326, 3332, 3336, 3340, 3344, 3348, 3352, 3360, + 3367, 3378, 3379, 3383, 3387, 3386, 3402, 3408, 3426, 3432, + 3438, 3444, 3451, 3456, 3463, 3467, 3473, 3477, 3483, 3484, + 3487, 3491, 3497, 3501, 3505, 3509, 3515, 3520, 3525, 3529, + 3533, 3537, 3541, 3545, 3549, 3553, 3557, 3561, 3565, 3569, + 3573, 3577, 3582, 3588, 3593, 3598, 3603, 3608, 3615, 3619, + 3626, 3631, 3630, 3642, 3646, 3652, 3660, 3668, 3676, 3680, + 3686, 3690, 3696, 3697, 3700, 3705, 3712, 3713, 3716, 3722, + 3726, 3732, 3737, 3737, 3762, 3763, 3769, 3774, 3780, 3781, + 3784, 3790, 3795, 3805, 3812, 3813, 3814, 3817, 3818, 3819, + 3820, 3823, 3824, 3825, 3828, 3829, 3832, 3836, 3842, 3843, + 3849, 3850, 3853, 3854, 3857, 3860, 3861, 3862, 3865, 3866, + 3867, 3870, 3877, 3878, 3882 }; #endif -/** Accessing symbol of state STATE. */ -#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) - -#if 1 -/* The user-facing name of the symbol whose (internal) number is - YYSYMBOL. No bounds checking. */ -static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; - +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "\"end of file\"", "error", "\"invalid token\"", "keyword_class", - "keyword_module", "keyword_def", "keyword_begin", "keyword_if", - "keyword_unless", "keyword_while", "keyword_until", "keyword_for", - "keyword_undef", "keyword_rescue", "keyword_ensure", "keyword_end", - "keyword_then", "keyword_elsif", "keyword_else", "keyword_case", - "keyword_when", "keyword_break", "keyword_next", "keyword_redo", - "keyword_retry", "keyword_in", "keyword_do", "keyword_do_cond", - "keyword_do_block", "keyword_do_LAMBDA", "keyword_return", - "keyword_yield", "keyword_super", "keyword_self", "keyword_nil", - "keyword_true", "keyword_false", "keyword_and", "keyword_or", - "keyword_not", "modifier_if", "modifier_unless", "modifier_while", - "modifier_until", "modifier_rescue", "keyword_alias", "keyword_BEGIN", - "keyword_END", "keyword__LINE__", "keyword__FILE__", - "keyword__ENCODING__", "tIDENTIFIER", "tFID", "tGVAR", "tIVAR", - "tCONSTANT", "tCVAR", "tLABEL_TAG", "tINTEGER", "tFLOAT", "tCHAR", - "tXSTRING", "tREGEXP", "tSTRING", "tSTRING_PART", "tSTRING_MID", + "$end", "error", "$undefined", "keyword_class", "keyword_module", + "keyword_def", "keyword_begin", "keyword_if", "keyword_unless", + "keyword_while", "keyword_until", "keyword_for", "keyword_undef", + "keyword_rescue", "keyword_ensure", "keyword_end", "keyword_then", + "keyword_elsif", "keyword_else", "keyword_case", "keyword_when", + "keyword_break", "keyword_next", "keyword_redo", "keyword_retry", + "keyword_in", "keyword_do", "keyword_do_cond", "keyword_do_block", + "keyword_do_LAMBDA", "keyword_return", "keyword_yield", "keyword_super", + "keyword_self", "keyword_nil", "keyword_true", "keyword_false", + "keyword_and", "keyword_or", "keyword_not", "modifier_if", + "modifier_unless", "modifier_while", "modifier_until", "modifier_rescue", + "keyword_alias", "keyword_BEGIN", "keyword_END", "keyword__LINE__", + "keyword__FILE__", "keyword__ENCODING__", "tIDENTIFIER", "tFID", "tGVAR", + "tIVAR", "tCONSTANT", "tCVAR", "tLABEL_TAG", "tINTEGER", "tFLOAT", + "tCHAR", "tXSTRING", "tREGEXP", "tSTRING", "tSTRING_PART", "tSTRING_MID", "tNTH_REF", "tBACK_REF", "tREGEXP_END", "tNUMPARAM", "tUPLUS", "tUMINUS", "tPOW", "tCMP", "tEQ", "tEQQ", "tNEQ", "tGEQ", "tLEQ", "tANDOP", "tOROP", "tMATCH", "tNMATCH", "tDOT2", "tDOT3", "tAREF", "tASET", "tLSHFT", @@ -2421,15 +2096,9 @@ static const char *const yytname[] = "call_op2", "opt_terms", "opt_nl", "rparen", "trailer", "term", "nl", "terms", "none", YY_NULLPTR }; - -static const char * -yysymbol_name (yysymbol_kind_t yysymbol) -{ - return yytname[yysymbol]; -} #endif -#ifdef YYPRINT +# ifdef YYPRINT /* YYTOKNUM[NUM] -- (External) token number corresponding to the (internal) symbol number NUM (which must be that of a token). */ static const yytype_int16 yytoknum[] = @@ -2450,7 +2119,7 @@ static const yytype_int16 yytoknum[] = 47, 37, 374, 33, 126, 375, 123, 125, 91, 93, 44, 96, 40, 41, 59, 46, 10 }; -#endif +# endif #define YYPACT_NINF (-829) @@ -2462,7 +2131,7 @@ static const yytype_int16 yytoknum[] = #define yytable_value_is_error(Yyn) \ ((Yyn) == YYTABLE_NINF) - /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const yytype_int16 yypact[] = { @@ -2572,7 +2241,7 @@ static const yytype_int16 yypact[] = -829, -829, 793, -829 }; - /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM. + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. Performed when YYTABLE does not specify something else to do. Zero means the default is an error. */ static const yytype_int16 yydefact[] = @@ -2683,7 +2352,7 @@ static const yytype_int16 yydefact[] = 362, 365, 355, 357 }; - /* YYPGOTONTERM-NUM. */ + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -829, -829, -829, 510, -829, 32, -829, -214, 182, -829, @@ -2706,7 +2375,7 @@ static const yytype_int16 yypgoto[] = -152, -254, 788, -12, -33, -2 }; - /* YYDEFGOTONTERM-NUM. */ + /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 66, 67, 68, 278, 413, 414, 287, @@ -2729,7 +2398,7 @@ static const yytype_int16 yydefgoto[] = 464, 482, 248, 249, 250, 291 }; - /* YYTABLEYYPACT[STATE-NUM] -- What to do in state STATE-NUM. If + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule whose number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = @@ -5058,7 +4727,7 @@ static const yytype_int16 yycheck[] = 125, 126, 127, 128, 129, 130, 131 }; - /* YYSTOSSTATE-NUM -- The (internal number of the) accessing + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_int16 yystos[] = { @@ -5168,7 +4837,7 @@ static const yytype_int16 yystos[] = 228, 228, 292, 228 }; - /* YYR1YYN -- Symbol number of symbol that rule YYN derives. */ + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_int16 yyr1[] = { 0, 147, 149, 148, 150, 151, 151, 151, 151, 152, @@ -5233,7 +4902,7 @@ static const yytype_int16 yyr1[] = 319, 320, 321, 321, 322 }; - /* YYR2YYN -- Number of symbols on the right hand side of rule YYN. */ + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_int8 yyr2[] = { 0, 2, 0, 2, 2, 1, 1, 3, 2, 1, @@ -5299,10 +4968,10 @@ static const yytype_int8 yyr2[] = }; -enum { YYENOMEM = -2 }; - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab @@ -5328,9 +4997,10 @@ enum { YYENOMEM = -2 }; } \ while (0) -/* Backward compatibility with an undocumented macro. - Use YYerror or YYUNDEF. */ -#define YYERRCODE YYUNDEF +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 + /* Enable debugging if requested. */ @@ -5348,18 +5018,18 @@ do { \ } while (0) /* This macro is provided for backward compatibility. */ -# ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Kind, Value, p); \ + Type, Value, p); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -5370,8 +5040,7 @@ do { \ `-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyo, - yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, parser_state *p) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, parser_state *p) { FILE *yyoutput = yyo; YYUSE (yyoutput); @@ -5379,11 +5048,11 @@ yy_symbol_value_print (FILE *yyo, if (!yyvaluep) return; # ifdef YYPRINT - if (yykind < YYNTOKENS) - YYPRINT (yyo, yytoknum[yykind], *yyvaluep); + if (yytype < YYNTOKENS) + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yykind); + YYUSE (yytype); YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -5393,13 +5062,12 @@ yy_symbol_value_print (FILE *yyo, `---------------------------*/ static void -yy_symbol_print (FILE *yyo, - yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, parser_state *p) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, parser_state *p) { YYFPRINTF (yyo, "%s %s (", - yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyo, yykind, yyvaluep, p); + yy_symbol_value_print (yyo, yytype, yyvaluep, p); YYFPRINTF (yyo, ")"); } @@ -5432,8 +5100,7 @@ do { \ `------------------------------------------------*/ static void -yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, - int yyrule, parser_state *p) +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule, parser_state *p) { int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; @@ -5445,8 +5112,9 @@ yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, - YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), - &yyvsp[(yyi + 1) - (yynrhs)], p); + yystos[+yyssp[yyi + 1 - yynrhs]], + &yyvsp[(yyi + 1) - (yynrhs)] + , p); YYFPRINTF (stderr, "\n"); } } @@ -5461,8 +5129,8 @@ do { \ multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) ((void) 0) -# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -5485,60 +5153,12 @@ int yydebug; #endif -/* Context of a parse error. */ -typedef struct -{ - yy_state_t *yyssp; - yysymbol_kind_t yytoken; -} yypcontext_t; - -/* Put in YYARG at most YYARGN of the expected tokens given the - current YYCTX, and return the number of tokens stored in YYARG. If - YYARG is null, return the number of expected tokens (guaranteed to - be less than YYNTOKENS). Return YYENOMEM on memory exhaustion. - Return 0 if there are more than YYARGN expected tokens, yet fill - YYARG up to YYARGN. */ -static int -yypcontext_expected_tokens (const yypcontext_t *yyctx, - yysymbol_kind_t yyarg[], int yyargn) -{ - /* Actual size of YYARG. */ - int yycount = 0; - int yyn = yypact[+*yyctx->yyssp]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYSYMBOL_YYerror - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (!yyarg) - ++yycount; - else if (yycount == yyargn) - return 0; - else - yyarg[yycount++] = YY_CAST (yysymbol_kind_t, yyx); - } - } - if (yyarg && yycount == 0 && 0 < yyargn) - yyarg[0] = YYSYMBOL_YYEMPTY; - return yycount; -} - - - +#if YYERROR_VERBOSE -#ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) -# else +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) +# else /* Return the length of YYSTR. */ static YYPTRDIFF_T yystrlen (const char *yystr) @@ -5548,13 +5168,13 @@ yystrlen (const char *yystr) continue; return yylen; } +# endif # endif -#endif -#ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ static char * @@ -5568,10 +5188,10 @@ yystpcpy (char *yydest, const char *yysrc) return yyd - 1; } +# endif # endif -#endif -#ifndef yytnamerr +# ifndef yytnamerr /* Copy to YYRES the contents of YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string @@ -5586,6 +5206,7 @@ yytnamerr (char *yyres, const char *yystr) { YYPTRDIFF_T yyn = 0; char const *yyp = yystr; + for (;;) switch (*++yyp) { @@ -5619,15 +5240,31 @@ yytnamerr (char *yyres, const char *yystr) else return yystrlen (yystr); } -#endif +# endif +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ static int -yy_syntax_error_arguments (const yypcontext_t *yyctx, - yysymbol_kind_t yyarg[], int yyargn) +yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, + yy_state_t *yyssp, int yytoken) { + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat: reported tokens (one for the "unexpected", + one per "expected"). */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Actual size of YYARG. */ int yycount = 0; + /* Cumulated lengths of YYARG. */ + YYPTRDIFF_T yysize = 0; + /* There are many possibilities here to consider: - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action @@ -5651,54 +5288,52 @@ yy_syntax_error_arguments (const yypcontext_t *yyctx, one exception: it will still contain any token that will not be accepted due to an error action in a later state. */ - if (yyctx->yytoken != YYSYMBOL_YYEMPTY) + if (yytoken != YYEMPTY) { - int yyn; - if (yyarg) - yyarg[yycount] = yyctx->yytoken; - ++yycount; - yyn = yypcontext_expected_tokens (yyctx, - yyarg ? yyarg + 1 : yyarg, yyargn - 1); - if (yyn == YYENOMEM) - return YYENOMEM; - else - yycount += yyn; + int yyn = yypact[+*yyssp]; + YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + yysize = yysize0; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + { + YYPTRDIFF_T yysize1 + = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else + return 2; + } + } + } } - return yycount; -} - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return -1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return YYENOMEM if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, - const yypcontext_t *yyctx) -{ - enum { YYARGS_MAX = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat: reported tokens (one for the "unexpected", - one per "expected"). */ - yysymbol_kind_t yyarg[YYARGS_MAX]; - /* Cumulated lengths of YYARG. */ - YYPTRDIFF_T yysize = 0; - - /* Actual size of YYARG. */ - int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX); - if (yycount == YYENOMEM) - return YYENOMEM; switch (yycount) { -#define YYCASE_(N, S) \ +# define YYCASE_(N, S) \ case N: \ yyformat = S; \ - break + break default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); @@ -5706,23 +5341,17 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -#undef YYCASE_ +# undef YYCASE_ } - /* Compute error message size. Don't count the "%s"s, but reserve - room for the terminator. */ - yysize = yystrlen (yyformat) - 2 * yycount + 1; { - int yyi; - for (yyi = 0; yyi < yycount; ++yyi) - { - YYPTRDIFF_T yysize1 - = yysize + yytnamerr (YY_NULLPTR, yytname[yyarg[yyi]]); - if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) - yysize = yysize1; - else - return YYENOMEM; - } + /* Don't count the "%s"s in the final size, but reserve room for + the terminator. */ + YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1; + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else + return 2; } if (*yymsg_alloc < yysize) @@ -5731,7 +5360,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, if (! (yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return -1; + return 1; } /* Avoid sprintf, as that infringes on the user's name space. @@ -5743,7 +5372,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, while ((*yyp = *yyformat) != '\0') if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) { - yyp += yytnamerr (yyp, yytname[yyarg[yyi++]]); + yyp += yytnamerr (yyp, yyarg[yyi++]); yyformat += 2; } else @@ -5754,32 +5383,29 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, } return 0; } - +#endif /* YYERROR_VERBOSE */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void -yydestruct (const char *yymsg, - yysymbol_kind_t yykind, YYSTYPE *yyvaluep, parser_state *p) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_state *p) { YYUSE (yyvaluep); YYUSE (p); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yykind); + YYUSE (yytype); YY_IGNORE_MAYBE_UNINITIALIZED_END } - - /*----------. | yyparse. | `----------*/ @@ -5811,9 +5437,6 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* Their size. */ - YYPTRDIFF_T yystacksize; - /* The state stack. */ yy_state_t yyssa[YYINITDEPTH]; yy_state_t *yyss; @@ -5824,19 +5447,22 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); YYSTYPE *yyvs; YYSTYPE *yyvsp; + YYPTRDIFF_T yystacksize; + int yyn; - /* The return value of yyparse. */ int yyresult; /* Lookahead token as an internal (translated) token number. */ - yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; +#if YYERROR_VERBOSE /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; char *yymsg = yymsgbuf; YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf; +#endif #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) @@ -5844,17 +5470,15 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); Keep to zero when no symbol should be popped. */ int yylen = 0; - yynerrs = 0; - yystate = 0; - yyerrstatus = 0; - - yystacksize = YYINITDEPTH; yyssp = yyss = yyssa; yyvsp = yyvs = yyvsa; - + yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; @@ -5877,7 +5501,6 @@ yysetstate: YY_IGNORE_USELESS_CAST_BEGIN *yyssp = YY_CAST (yy_state_t, yystate); YY_IGNORE_USELESS_CAST_END - YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) #if !defined yyoverflow && !defined YYSTACK_RELOCATE @@ -5923,7 +5546,7 @@ yysetstate: goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -5962,29 +5585,18 @@ yybackup: /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token\n")); + YYDPRINTF ((stderr, "Reading a token: ")); yychar = yylex (&yylval, p); } if (yychar <= YYEOF) { - yychar = YYEOF; - yytoken = YYSYMBOL_YYEOF; + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } - else if (yychar == YYerror) - { - /* The scanner already issued an error message, process directly - to error recovery. But do not keep the error token as - lookahead, it is too special and may lead us to an endless - loop in error recovery. */ - yychar = YYUNDEF; - yytoken = YYSYMBOL_YYerror; - goto yyerrlab1; - } else { yytoken = YYTRANSLATE (yychar); @@ -6054,86 +5666,86 @@ yyreduce: switch (yyn) { case 2: -#line 1495 "mrbgems/mruby-compiler/core/parse.y" +#line 1508 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_BEG; if (!p->locals) p->locals = cons(0,0); } -#line 6063 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5675 "mrbgems/mruby-compiler/core/y.tab.c" break; case 3: -#line 1500 "mrbgems/mruby-compiler/core/parse.y" +#line 1513 "mrbgems/mruby-compiler/core/parse.y" { p->tree = new_scope(p, (yyvsp[0].nd)); NODE_LINENO(p->tree, (yyvsp[0].nd)); } -#line 6072 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5684 "mrbgems/mruby-compiler/core/y.tab.c" break; case 4: -#line 1507 "mrbgems/mruby-compiler/core/parse.y" +#line 1520 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 6080 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5692 "mrbgems/mruby-compiler/core/y.tab.c" break; case 5: -#line 1513 "mrbgems/mruby-compiler/core/parse.y" +#line 1526 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_begin(p, 0); } -#line 6088 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5700 "mrbgems/mruby-compiler/core/y.tab.c" break; case 6: -#line 1517 "mrbgems/mruby-compiler/core/parse.y" +#line 1530 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_begin(p, (yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 6097 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5709 "mrbgems/mruby-compiler/core/y.tab.c" break; case 7: -#line 1522 "mrbgems/mruby-compiler/core/parse.y" +#line 1535 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd))); } -#line 6105 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5717 "mrbgems/mruby-compiler/core/y.tab.c" break; case 8: -#line 1526 "mrbgems/mruby-compiler/core/parse.y" +#line 1539 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_begin(p, 0); } -#line 6113 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5725 "mrbgems/mruby-compiler/core/y.tab.c" break; case 10: -#line 1533 "mrbgems/mruby-compiler/core/parse.y" +#line 1546 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = local_switch(p); nvars_block(p); } -#line 6122 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5734 "mrbgems/mruby-compiler/core/y.tab.c" break; case 11: -#line 1538 "mrbgems/mruby-compiler/core/parse.y" +#line 1551 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "BEGIN not supported"); local_resume(p, (yyvsp[-3].nd)); nvars_unnest(p); (yyval.nd) = 0; } -#line 6133 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5745 "mrbgems/mruby-compiler/core/y.tab.c" break; case 12: -#line 1550 "mrbgems/mruby-compiler/core/parse.y" +#line 1563 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-2].nd)) { (yyval.nd) = new_rescue(p, (yyvsp[-3].nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); @@ -6155,1332 +5767,1332 @@ yyreduce: } } } -#line 6159 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5771 "mrbgems/mruby-compiler/core/y.tab.c" break; case 13: -#line 1574 "mrbgems/mruby-compiler/core/parse.y" +#line 1587 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 6167 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5779 "mrbgems/mruby-compiler/core/y.tab.c" break; case 14: -#line 1580 "mrbgems/mruby-compiler/core/parse.y" +#line 1593 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_begin(p, 0); } -#line 6175 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5787 "mrbgems/mruby-compiler/core/y.tab.c" break; case 15: -#line 1584 "mrbgems/mruby-compiler/core/parse.y" +#line 1597 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_begin(p, (yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 6184 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5796 "mrbgems/mruby-compiler/core/y.tab.c" break; case 16: -#line 1589 "mrbgems/mruby-compiler/core/parse.y" +#line 1602 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), newline_node((yyvsp[0].nd))); } -#line 6192 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5804 "mrbgems/mruby-compiler/core/y.tab.c" break; case 17: -#line 1593 "mrbgems/mruby-compiler/core/parse.y" +#line 1606 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_begin(p, (yyvsp[0].nd)); } -#line 6200 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5812 "mrbgems/mruby-compiler/core/y.tab.c" break; case 18: -#line 1598 "mrbgems/mruby-compiler/core/parse.y" +#line 1611 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_FNAME;} -#line 6206 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5818 "mrbgems/mruby-compiler/core/y.tab.c" break; case 19: -#line 1599 "mrbgems/mruby-compiler/core/parse.y" +#line 1612 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_alias(p, (yyvsp[-2].id), (yyvsp[0].id)); } -#line 6214 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5826 "mrbgems/mruby-compiler/core/y.tab.c" break; case 20: -#line 1603 "mrbgems/mruby-compiler/core/parse.y" +#line 1616 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 6222 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5834 "mrbgems/mruby-compiler/core/y.tab.c" break; case 21: -#line 1607 "mrbgems/mruby-compiler/core/parse.y" +#line 1620 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0); } -#line 6230 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5842 "mrbgems/mruby-compiler/core/y.tab.c" break; case 22: -#line 1611 "mrbgems/mruby-compiler/core/parse.y" +#line 1624 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_unless(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd), 0); } -#line 6238 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5850 "mrbgems/mruby-compiler/core/y.tab.c" break; case 23: -#line 1615 "mrbgems/mruby-compiler/core/parse.y" +#line 1628 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_while(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } -#line 6246 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5858 "mrbgems/mruby-compiler/core/y.tab.c" break; case 24: -#line 1619 "mrbgems/mruby-compiler/core/parse.y" +#line 1632 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_until(p, cond((yyvsp[0].nd)), (yyvsp[-2].nd)); } -#line 6254 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5866 "mrbgems/mruby-compiler/core/y.tab.c" break; case 25: -#line 1623 "mrbgems/mruby-compiler/core/parse.y" +#line 1636 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6262 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5874 "mrbgems/mruby-compiler/core/y.tab.c" break; case 26: -#line 1627 "mrbgems/mruby-compiler/core/parse.y" +#line 1640 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "END not supported"); (yyval.nd) = new_postexe(p, (yyvsp[-1].nd)); } -#line 6271 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5883 "mrbgems/mruby-compiler/core/y.tab.c" break; case 28: -#line 1633 "mrbgems/mruby-compiler/core/parse.y" +#line 1646 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6279 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5891 "mrbgems/mruby-compiler/core/y.tab.c" break; case 29: -#line 1637 "mrbgems/mruby-compiler/core/parse.y" +#line 1650 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd))); } -#line 6287 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5899 "mrbgems/mruby-compiler/core/y.tab.c" break; case 30: -#line 1641 "mrbgems/mruby-compiler/core/parse.y" +#line 1654 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6295 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5907 "mrbgems/mruby-compiler/core/y.tab.c" break; case 31: -#line 1645 "mrbgems/mruby-compiler/core/parse.y" +#line 1658 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-2].nd), new_array(p, (yyvsp[0].nd))); } -#line 6303 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5915 "mrbgems/mruby-compiler/core/y.tab.c" break; case 33: -#line 1652 "mrbgems/mruby-compiler/core/parse.y" +#line 1665 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6311 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5923 "mrbgems/mruby-compiler/core/y.tab.c" break; case 34: -#line 1656 "mrbgems/mruby-compiler/core/parse.y" +#line 1669 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 6319 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5931 "mrbgems/mruby-compiler/core/y.tab.c" break; case 35: -#line 1660 "mrbgems/mruby-compiler/core/parse.y" +#line 1673 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-5].nd), intern_lit("[]"), (yyvsp[-3].nd), '.'), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 6327 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5939 "mrbgems/mruby-compiler/core/y.tab.c" break; case 36: -#line 1664 "mrbgems/mruby-compiler/core/parse.y" +#line 1677 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 6335 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5947 "mrbgems/mruby-compiler/core/y.tab.c" break; case 37: -#line 1668 "mrbgems/mruby-compiler/core/parse.y" +#line 1681 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 6343 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5955 "mrbgems/mruby-compiler/core/y.tab.c" break; case 38: -#line 1672 "mrbgems/mruby-compiler/core/parse.y" +#line 1685 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "constant re-assignment"); (yyval.nd) = 0; } -#line 6352 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5964 "mrbgems/mruby-compiler/core/y.tab.c" break; case 39: -#line 1677 "mrbgems/mruby-compiler/core/parse.y" +#line 1690 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, tCOLON2), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 6360 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5972 "mrbgems/mruby-compiler/core/y.tab.c" break; case 40: -#line 1681 "mrbgems/mruby-compiler/core/parse.y" +#line 1694 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_begin(p, 0); } -#line 6369 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5981 "mrbgems/mruby-compiler/core/y.tab.c" break; case 42: -#line 1689 "mrbgems/mruby-compiler/core/parse.y" +#line 1702 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6377 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5989 "mrbgems/mruby-compiler/core/y.tab.c" break; case 45: -#line 1698 "mrbgems/mruby-compiler/core/parse.y" +#line 1711 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6385 "mrbgems/mruby-compiler/core/y.tab.c" +#line 5997 "mrbgems/mruby-compiler/core/y.tab.c" break; case 46: -#line 1702 "mrbgems/mruby-compiler/core/parse.y" +#line 1715 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6393 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6005 "mrbgems/mruby-compiler/core/y.tab.c" break; case 47: -#line 1706 "mrbgems/mruby-compiler/core/parse.y" +#line 1719 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } -#line 6401 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6013 "mrbgems/mruby-compiler/core/y.tab.c" break; case 48: -#line 1710 "mrbgems/mruby-compiler/core/parse.y" +#line 1723 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } -#line 6409 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6021 "mrbgems/mruby-compiler/core/y.tab.c" break; case 50: -#line 1717 "mrbgems/mruby-compiler/core/parse.y" +#line 1730 "mrbgems/mruby-compiler/core/parse.y" { if (!(yyvsp[0].nd)) (yyval.nd) = new_nil(p); else { (yyval.nd) = (yyvsp[0].nd); } } -#line 6420 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6032 "mrbgems/mruby-compiler/core/y.tab.c" break; case 54: -#line 1731 "mrbgems/mruby-compiler/core/parse.y" +#line 1744 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 6428 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6040 "mrbgems/mruby-compiler/core/y.tab.c" break; case 55: -#line 1737 "mrbgems/mruby-compiler/core/parse.y" +#line 1750 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); } -#line 6437 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6049 "mrbgems/mruby-compiler/core/y.tab.c" break; case 56: -#line 1744 "mrbgems/mruby-compiler/core/parse.y" +#line 1757 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p, (yyvsp[-2].nd), (yyvsp[-1].nd)); local_unnest(p); nvars_unnest(p); } -#line 6447 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6059 "mrbgems/mruby-compiler/core/y.tab.c" break; case 57: -#line 1752 "mrbgems/mruby-compiler/core/parse.y" +#line 1765 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 6455 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6067 "mrbgems/mruby-compiler/core/y.tab.c" break; case 58: -#line 1756 "mrbgems/mruby-compiler/core/parse.y" +#line 1769 "mrbgems/mruby-compiler/core/parse.y" { args_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = new_fcall(p, (yyvsp[-2].id), (yyvsp[-1].nd)); } -#line 6464 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6076 "mrbgems/mruby-compiler/core/y.tab.c" break; case 59: -#line 1761 "mrbgems/mruby-compiler/core/parse.y" +#line 1774 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 6472 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6084 "mrbgems/mruby-compiler/core/y.tab.c" break; case 60: -#line 1765 "mrbgems/mruby-compiler/core/parse.y" +#line 1778 "mrbgems/mruby-compiler/core/parse.y" { args_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num)); } -#line 6481 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6093 "mrbgems/mruby-compiler/core/y.tab.c" break; case 61: -#line 1770 "mrbgems/mruby-compiler/core/parse.y" +#line 1783 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); } -#line 6489 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6101 "mrbgems/mruby-compiler/core/y.tab.c" break; case 62: -#line 1774 "mrbgems/mruby-compiler/core/parse.y" +#line 1787 "mrbgems/mruby-compiler/core/parse.y" { args_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), tCOLON2); } -#line 6498 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6110 "mrbgems/mruby-compiler/core/y.tab.c" break; case 63: -#line 1779 "mrbgems/mruby-compiler/core/parse.y" +#line 1792 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_super(p, (yyvsp[0].nd)); } -#line 6506 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6118 "mrbgems/mruby-compiler/core/y.tab.c" break; case 64: -#line 1783 "mrbgems/mruby-compiler/core/parse.y" +#line 1796 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_yield(p, (yyvsp[0].nd)); } -#line 6514 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6126 "mrbgems/mruby-compiler/core/y.tab.c" break; case 65: -#line 1787 "mrbgems/mruby-compiler/core/parse.y" +#line 1800 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_return(p, ret_args(p, (yyvsp[0].nd))); } -#line 6522 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6134 "mrbgems/mruby-compiler/core/y.tab.c" break; case 66: -#line 1791 "mrbgems/mruby-compiler/core/parse.y" +#line 1804 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_break(p, ret_args(p, (yyvsp[0].nd))); } -#line 6530 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6142 "mrbgems/mruby-compiler/core/y.tab.c" break; case 67: -#line 1795 "mrbgems/mruby-compiler/core/parse.y" +#line 1808 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_next(p, ret_args(p, (yyvsp[0].nd))); } -#line 6538 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6150 "mrbgems/mruby-compiler/core/y.tab.c" break; case 68: -#line 1801 "mrbgems/mruby-compiler/core/parse.y" +#line 1814 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 6546 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6158 "mrbgems/mruby-compiler/core/y.tab.c" break; case 69: -#line 1805 "mrbgems/mruby-compiler/core/parse.y" +#line 1818 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 6554 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6166 "mrbgems/mruby-compiler/core/y.tab.c" break; case 71: -#line 1812 "mrbgems/mruby-compiler/core/parse.y" +#line 1825 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 6562 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6174 "mrbgems/mruby-compiler/core/y.tab.c" break; case 72: -#line 1818 "mrbgems/mruby-compiler/core/parse.y" +#line 1831 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 6570 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6182 "mrbgems/mruby-compiler/core/y.tab.c" break; case 73: -#line 1822 "mrbgems/mruby-compiler/core/parse.y" +#line 1835 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(push((yyvsp[-1].nd),(yyvsp[0].nd))); } -#line 6578 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6190 "mrbgems/mruby-compiler/core/y.tab.c" break; case 74: -#line 1826 "mrbgems/mruby-compiler/core/parse.y" +#line 1839 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list2((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6586 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6198 "mrbgems/mruby-compiler/core/y.tab.c" break; case 75: -#line 1830 "mrbgems/mruby-compiler/core/parse.y" +#line 1843 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-4].nd), (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6594 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6206 "mrbgems/mruby-compiler/core/y.tab.c" break; case 76: -#line 1834 "mrbgems/mruby-compiler/core/parse.y" +#line 1847 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list2((yyvsp[-1].nd), new_nil(p)); } -#line 6602 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6214 "mrbgems/mruby-compiler/core/y.tab.c" break; case 77: -#line 1838 "mrbgems/mruby-compiler/core/parse.y" +#line 1851 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-3].nd), new_nil(p), (yyvsp[0].nd)); } -#line 6610 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6222 "mrbgems/mruby-compiler/core/y.tab.c" break; case 78: -#line 1842 "mrbgems/mruby-compiler/core/parse.y" +#line 1855 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list2(0, (yyvsp[0].nd)); } -#line 6618 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6230 "mrbgems/mruby-compiler/core/y.tab.c" break; case 79: -#line 1846 "mrbgems/mruby-compiler/core/parse.y" +#line 1859 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 6626 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6238 "mrbgems/mruby-compiler/core/y.tab.c" break; case 80: -#line 1850 "mrbgems/mruby-compiler/core/parse.y" +#line 1863 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list2(0, new_nil(p)); } -#line 6634 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6246 "mrbgems/mruby-compiler/core/y.tab.c" break; case 81: -#line 1854 "mrbgems/mruby-compiler/core/parse.y" +#line 1867 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_nil(p), (yyvsp[0].nd)); } -#line 6642 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6254 "mrbgems/mruby-compiler/core/y.tab.c" break; case 83: -#line 1861 "mrbgems/mruby-compiler/core/parse.y" +#line 1874 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn(p, (yyvsp[-1].nd), NULL); } -#line 6650 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6262 "mrbgems/mruby-compiler/core/y.tab.c" break; case 84: -#line 1867 "mrbgems/mruby-compiler/core/parse.y" +#line 1880 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[-1].nd)); } -#line 6658 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6270 "mrbgems/mruby-compiler/core/y.tab.c" break; case 85: -#line 1871 "mrbgems/mruby-compiler/core/parse.y" +#line 1884 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[-1].nd)); } -#line 6666 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6278 "mrbgems/mruby-compiler/core/y.tab.c" break; case 86: -#line 1877 "mrbgems/mruby-compiler/core/parse.y" +#line 1890 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 6674 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6286 "mrbgems/mruby-compiler/core/y.tab.c" break; case 87: -#line 1881 "mrbgems/mruby-compiler/core/parse.y" +#line 1894 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 6682 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6294 "mrbgems/mruby-compiler/core/y.tab.c" break; case 88: -#line 1887 "mrbgems/mruby-compiler/core/parse.y" +#line 1900 "mrbgems/mruby-compiler/core/parse.y" { assignable(p, (yyvsp[0].nd)); } -#line 6690 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6302 "mrbgems/mruby-compiler/core/y.tab.c" break; case 89: -#line 1891 "mrbgems/mruby-compiler/core/parse.y" +#line 1904 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_lit("[]"), (yyvsp[-1].nd), '.'); } -#line 6698 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6310 "mrbgems/mruby-compiler/core/y.tab.c" break; case 90: -#line 1895 "mrbgems/mruby-compiler/core/parse.y" +#line 1908 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } -#line 6706 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6318 "mrbgems/mruby-compiler/core/y.tab.c" break; case 91: -#line 1899 "mrbgems/mruby-compiler/core/parse.y" +#line 1912 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } -#line 6714 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6326 "mrbgems/mruby-compiler/core/y.tab.c" break; case 92: -#line 1903 "mrbgems/mruby-compiler/core/parse.y" +#line 1916 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } -#line 6722 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6334 "mrbgems/mruby-compiler/core/y.tab.c" break; case 93: -#line 1907 "mrbgems/mruby-compiler/core/parse.y" +#line 1920 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "dynamic constant assignment"); (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); } -#line 6732 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6344 "mrbgems/mruby-compiler/core/y.tab.c" break; case 94: -#line 1913 "mrbgems/mruby-compiler/core/parse.y" +#line 1926 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "dynamic constant assignment"); (yyval.nd) = new_colon3(p, (yyvsp[0].id)); } -#line 6742 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6354 "mrbgems/mruby-compiler/core/y.tab.c" break; case 95: -#line 1919 "mrbgems/mruby-compiler/core/parse.y" +#line 1932 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[0].nd)); (yyval.nd) = 0; } -#line 6751 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6363 "mrbgems/mruby-compiler/core/y.tab.c" break; case 96: -#line 1926 "mrbgems/mruby-compiler/core/parse.y" +#line 1939 "mrbgems/mruby-compiler/core/parse.y" { assignable(p, (yyvsp[0].nd)); } -#line 6759 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6371 "mrbgems/mruby-compiler/core/y.tab.c" break; case 97: -#line 1930 "mrbgems/mruby-compiler/core/parse.y" +#line 1943 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_lit("[]"), (yyvsp[-1].nd), '.'); } -#line 6767 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6379 "mrbgems/mruby-compiler/core/y.tab.c" break; case 98: -#line 1934 "mrbgems/mruby-compiler/core/parse.y" +#line 1947 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } -#line 6775 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6387 "mrbgems/mruby-compiler/core/y.tab.c" break; case 99: -#line 1938 "mrbgems/mruby-compiler/core/parse.y" +#line 1951 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } -#line 6783 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6395 "mrbgems/mruby-compiler/core/y.tab.c" break; case 100: -#line 1942 "mrbgems/mruby-compiler/core/parse.y" +#line 1955 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, (yyvsp[-1].num)); } -#line 6791 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6403 "mrbgems/mruby-compiler/core/y.tab.c" break; case 101: -#line 1946 "mrbgems/mruby-compiler/core/parse.y" +#line 1959 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "dynamic constant assignment"); (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); } -#line 6801 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6413 "mrbgems/mruby-compiler/core/y.tab.c" break; case 102: -#line 1952 "mrbgems/mruby-compiler/core/parse.y" +#line 1965 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "dynamic constant assignment"); (yyval.nd) = new_colon3(p, (yyvsp[0].id)); } -#line 6811 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6423 "mrbgems/mruby-compiler/core/y.tab.c" break; case 103: -#line 1958 "mrbgems/mruby-compiler/core/parse.y" +#line 1971 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[0].nd)); (yyval.nd) = 0; } -#line 6820 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6432 "mrbgems/mruby-compiler/core/y.tab.c" break; case 104: -#line 1963 "mrbgems/mruby-compiler/core/parse.y" +#line 1976 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "can't assign to numbered parameter"); } -#line 6828 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6440 "mrbgems/mruby-compiler/core/y.tab.c" break; case 105: -#line 1969 "mrbgems/mruby-compiler/core/parse.y" +#line 1982 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "class/module name must be CONSTANT"); } -#line 6836 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6448 "mrbgems/mruby-compiler/core/y.tab.c" break; case 107: -#line 1976 "mrbgems/mruby-compiler/core/parse.y" +#line 1989 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons((node*)1, nsym((yyvsp[0].id))); } -#line 6844 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6456 "mrbgems/mruby-compiler/core/y.tab.c" break; case 108: -#line 1980 "mrbgems/mruby-compiler/core/parse.y" +#line 1993 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons((node*)0, nsym((yyvsp[0].id))); } -#line 6852 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6464 "mrbgems/mruby-compiler/core/y.tab.c" break; case 109: -#line 1984 "mrbgems/mruby-compiler/core/parse.y" +#line 1997 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[-2].nd)); (yyval.nd) = cons((yyvsp[-2].nd), nsym((yyvsp[0].id))); } -#line 6861 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6473 "mrbgems/mruby-compiler/core/y.tab.c" break; case 113: -#line 1994 "mrbgems/mruby-compiler/core/parse.y" +#line 2007 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDFN; (yyval.id) = (yyvsp[0].id); } -#line 6870 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6482 "mrbgems/mruby-compiler/core/y.tab.c" break; case 114: -#line 1999 "mrbgems/mruby-compiler/core/parse.y" +#line 2012 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDFN; (yyval.id) = (yyvsp[0].id); } -#line 6879 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6491 "mrbgems/mruby-compiler/core/y.tab.c" break; case 117: -#line 2010 "mrbgems/mruby-compiler/core/parse.y" +#line 2023 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_undef(p, (yyvsp[0].id)); } -#line 6887 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6499 "mrbgems/mruby-compiler/core/y.tab.c" break; case 118: -#line 2013 "mrbgems/mruby-compiler/core/parse.y" +#line 2026 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_FNAME;} -#line 6893 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6505 "mrbgems/mruby-compiler/core/y.tab.c" break; case 119: -#line 2014 "mrbgems/mruby-compiler/core/parse.y" +#line 2027 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), nsym((yyvsp[0].id))); } -#line 6901 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6513 "mrbgems/mruby-compiler/core/y.tab.c" break; case 120: -#line 2019 "mrbgems/mruby-compiler/core/parse.y" +#line 2032 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("|"); } -#line 6907 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6519 "mrbgems/mruby-compiler/core/y.tab.c" break; case 121: -#line 2020 "mrbgems/mruby-compiler/core/parse.y" +#line 2033 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("^"); } -#line 6913 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6525 "mrbgems/mruby-compiler/core/y.tab.c" break; case 122: -#line 2021 "mrbgems/mruby-compiler/core/parse.y" +#line 2034 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("&"); } -#line 6919 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6531 "mrbgems/mruby-compiler/core/y.tab.c" break; case 123: -#line 2022 "mrbgems/mruby-compiler/core/parse.y" +#line 2035 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("<=>"); } -#line 6925 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6537 "mrbgems/mruby-compiler/core/y.tab.c" break; case 124: -#line 2023 "mrbgems/mruby-compiler/core/parse.y" +#line 2036 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("=="); } -#line 6931 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6543 "mrbgems/mruby-compiler/core/y.tab.c" break; case 125: -#line 2024 "mrbgems/mruby-compiler/core/parse.y" +#line 2037 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("==="); } -#line 6937 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6549 "mrbgems/mruby-compiler/core/y.tab.c" break; case 126: -#line 2025 "mrbgems/mruby-compiler/core/parse.y" +#line 2038 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("=~"); } -#line 6943 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6555 "mrbgems/mruby-compiler/core/y.tab.c" break; case 127: -#line 2026 "mrbgems/mruby-compiler/core/parse.y" +#line 2039 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("!~"); } -#line 6949 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6561 "mrbgems/mruby-compiler/core/y.tab.c" break; case 128: -#line 2027 "mrbgems/mruby-compiler/core/parse.y" +#line 2040 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit(">"); } -#line 6955 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6567 "mrbgems/mruby-compiler/core/y.tab.c" break; case 129: -#line 2028 "mrbgems/mruby-compiler/core/parse.y" +#line 2041 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit(">="); } -#line 6961 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6573 "mrbgems/mruby-compiler/core/y.tab.c" break; case 130: -#line 2029 "mrbgems/mruby-compiler/core/parse.y" +#line 2042 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("<"); } -#line 6967 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6579 "mrbgems/mruby-compiler/core/y.tab.c" break; case 131: -#line 2030 "mrbgems/mruby-compiler/core/parse.y" +#line 2043 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("<="); } -#line 6973 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6585 "mrbgems/mruby-compiler/core/y.tab.c" break; case 132: -#line 2031 "mrbgems/mruby-compiler/core/parse.y" +#line 2044 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("!="); } -#line 6979 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6591 "mrbgems/mruby-compiler/core/y.tab.c" break; case 133: -#line 2032 "mrbgems/mruby-compiler/core/parse.y" +#line 2045 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("<<"); } -#line 6985 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6597 "mrbgems/mruby-compiler/core/y.tab.c" break; case 134: -#line 2033 "mrbgems/mruby-compiler/core/parse.y" +#line 2046 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit(">>"); } -#line 6991 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6603 "mrbgems/mruby-compiler/core/y.tab.c" break; case 135: -#line 2034 "mrbgems/mruby-compiler/core/parse.y" +#line 2047 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("+"); } -#line 6997 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6609 "mrbgems/mruby-compiler/core/y.tab.c" break; case 136: -#line 2035 "mrbgems/mruby-compiler/core/parse.y" +#line 2048 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("-"); } -#line 7003 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6615 "mrbgems/mruby-compiler/core/y.tab.c" break; case 137: -#line 2036 "mrbgems/mruby-compiler/core/parse.y" +#line 2049 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("*"); } -#line 7009 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6621 "mrbgems/mruby-compiler/core/y.tab.c" break; case 138: -#line 2037 "mrbgems/mruby-compiler/core/parse.y" +#line 2050 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("*"); } -#line 7015 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6627 "mrbgems/mruby-compiler/core/y.tab.c" break; case 139: -#line 2038 "mrbgems/mruby-compiler/core/parse.y" +#line 2051 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("/"); } -#line 7021 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6633 "mrbgems/mruby-compiler/core/y.tab.c" break; case 140: -#line 2039 "mrbgems/mruby-compiler/core/parse.y" +#line 2052 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("%"); } -#line 7027 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6639 "mrbgems/mruby-compiler/core/y.tab.c" break; case 141: -#line 2040 "mrbgems/mruby-compiler/core/parse.y" +#line 2053 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("**"); } -#line 7033 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6645 "mrbgems/mruby-compiler/core/y.tab.c" break; case 142: -#line 2041 "mrbgems/mruby-compiler/core/parse.y" +#line 2054 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("**"); } -#line 7039 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6651 "mrbgems/mruby-compiler/core/y.tab.c" break; case 143: -#line 2042 "mrbgems/mruby-compiler/core/parse.y" +#line 2055 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("!"); } -#line 7045 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6657 "mrbgems/mruby-compiler/core/y.tab.c" break; case 144: -#line 2043 "mrbgems/mruby-compiler/core/parse.y" +#line 2056 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("~"); } -#line 7051 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6663 "mrbgems/mruby-compiler/core/y.tab.c" break; case 145: -#line 2044 "mrbgems/mruby-compiler/core/parse.y" +#line 2057 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("+@"); } -#line 7057 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6669 "mrbgems/mruby-compiler/core/y.tab.c" break; case 146: -#line 2045 "mrbgems/mruby-compiler/core/parse.y" +#line 2058 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("-@"); } -#line 7063 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6675 "mrbgems/mruby-compiler/core/y.tab.c" break; case 147: -#line 2046 "mrbgems/mruby-compiler/core/parse.y" +#line 2059 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("[]"); } -#line 7069 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6681 "mrbgems/mruby-compiler/core/y.tab.c" break; case 148: -#line 2047 "mrbgems/mruby-compiler/core/parse.y" +#line 2060 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("[]="); } -#line 7075 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6687 "mrbgems/mruby-compiler/core/y.tab.c" break; case 149: -#line 2048 "mrbgems/mruby-compiler/core/parse.y" +#line 2061 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_lit("`"); } -#line 7081 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6693 "mrbgems/mruby-compiler/core/y.tab.c" break; case 190: -#line 2066 "mrbgems/mruby-compiler/core/parse.y" +#line 2079 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_asgn(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7089 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6701 "mrbgems/mruby-compiler/core/y.tab.c" break; case 191: -#line 2070 "mrbgems/mruby-compiler/core/parse.y" +#line 2083 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, (yyvsp[-2].nd), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7097 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6709 "mrbgems/mruby-compiler/core/y.tab.c" break; case 192: -#line 2074 "mrbgems/mruby-compiler/core/parse.y" +#line 2087 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-5].nd), intern_lit("[]"), (yyvsp[-3].nd), '.'), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7105 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6717 "mrbgems/mruby-compiler/core/y.tab.c" break; case 193: -#line 2078 "mrbgems/mruby-compiler/core/parse.y" +#line 2091 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7113 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6725 "mrbgems/mruby-compiler/core/y.tab.c" break; case 194: -#line 2082 "mrbgems/mruby-compiler/core/parse.y" +#line 2095 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, (yyvsp[-3].num)), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7121 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6733 "mrbgems/mruby-compiler/core/y.tab.c" break; case 195: -#line 2086 "mrbgems/mruby-compiler/core/parse.y" +#line 2099 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_op_asgn(p, new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), 0, tCOLON2), (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 7129 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6741 "mrbgems/mruby-compiler/core/y.tab.c" break; case 196: -#line 2090 "mrbgems/mruby-compiler/core/parse.y" +#line 2103 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "constant re-assignment"); (yyval.nd) = new_begin(p, 0); } -#line 7138 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6750 "mrbgems/mruby-compiler/core/y.tab.c" break; case 197: -#line 2095 "mrbgems/mruby-compiler/core/parse.y" +#line 2108 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "constant re-assignment"); (yyval.nd) = new_begin(p, 0); } -#line 7147 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6759 "mrbgems/mruby-compiler/core/y.tab.c" break; case 198: -#line 2100 "mrbgems/mruby-compiler/core/parse.y" +#line 2113 "mrbgems/mruby-compiler/core/parse.y" { backref_error(p, (yyvsp[-2].nd)); (yyval.nd) = new_begin(p, 0); } -#line 7156 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6768 "mrbgems/mruby-compiler/core/y.tab.c" break; case 199: -#line 2105 "mrbgems/mruby-compiler/core/parse.y" +#line 2118 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot2(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7164 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6776 "mrbgems/mruby-compiler/core/y.tab.c" break; case 200: -#line 2109 "mrbgems/mruby-compiler/core/parse.y" +#line 2122 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dot3(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7172 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6784 "mrbgems/mruby-compiler/core/y.tab.c" break; case 201: -#line 2113 "mrbgems/mruby-compiler/core/parse.y" +#line 2126 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "+", (yyvsp[0].nd)); } -#line 7180 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6792 "mrbgems/mruby-compiler/core/y.tab.c" break; case 202: -#line 2117 "mrbgems/mruby-compiler/core/parse.y" +#line 2130 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "-", (yyvsp[0].nd)); } -#line 7188 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6800 "mrbgems/mruby-compiler/core/y.tab.c" break; case 203: -#line 2121 "mrbgems/mruby-compiler/core/parse.y" +#line 2134 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "*", (yyvsp[0].nd)); } -#line 7196 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6808 "mrbgems/mruby-compiler/core/y.tab.c" break; case 204: -#line 2125 "mrbgems/mruby-compiler/core/parse.y" +#line 2138 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "/", (yyvsp[0].nd)); } -#line 7204 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6816 "mrbgems/mruby-compiler/core/y.tab.c" break; case 205: -#line 2129 "mrbgems/mruby-compiler/core/parse.y" +#line 2142 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "%", (yyvsp[0].nd)); } -#line 7212 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6824 "mrbgems/mruby-compiler/core/y.tab.c" break; case 206: -#line 2133 "mrbgems/mruby-compiler/core/parse.y" +#line 2146 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)); } -#line 7220 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6832 "mrbgems/mruby-compiler/core/y.tab.c" break; case 207: -#line 2137 "mrbgems/mruby-compiler/core/parse.y" +#line 2150 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)), "-@"); } -#line 7228 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6840 "mrbgems/mruby-compiler/core/y.tab.c" break; case 208: -#line 2141 "mrbgems/mruby-compiler/core/parse.y" +#line 2154 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, call_bin_op(p, (yyvsp[-2].nd), "**", (yyvsp[0].nd)), "-@"); } -#line 7236 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6848 "mrbgems/mruby-compiler/core/y.tab.c" break; case 209: -#line 2145 "mrbgems/mruby-compiler/core/parse.y" +#line 2158 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, (yyvsp[0].nd), "+@"); } -#line 7244 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6856 "mrbgems/mruby-compiler/core/y.tab.c" break; case 210: -#line 2149 "mrbgems/mruby-compiler/core/parse.y" +#line 2162 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, (yyvsp[0].nd), "-@"); } -#line 7252 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6864 "mrbgems/mruby-compiler/core/y.tab.c" break; case 211: -#line 2153 "mrbgems/mruby-compiler/core/parse.y" +#line 2166 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "|", (yyvsp[0].nd)); } -#line 7260 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6872 "mrbgems/mruby-compiler/core/y.tab.c" break; case 212: -#line 2157 "mrbgems/mruby-compiler/core/parse.y" +#line 2170 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "^", (yyvsp[0].nd)); } -#line 7268 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6880 "mrbgems/mruby-compiler/core/y.tab.c" break; case 213: -#line 2161 "mrbgems/mruby-compiler/core/parse.y" +#line 2174 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "&", (yyvsp[0].nd)); } -#line 7276 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6888 "mrbgems/mruby-compiler/core/y.tab.c" break; case 214: -#line 2165 "mrbgems/mruby-compiler/core/parse.y" +#line 2178 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=>", (yyvsp[0].nd)); } -#line 7284 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6896 "mrbgems/mruby-compiler/core/y.tab.c" break; case 215: -#line 2169 "mrbgems/mruby-compiler/core/parse.y" +#line 2182 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">", (yyvsp[0].nd)); } -#line 7292 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6904 "mrbgems/mruby-compiler/core/y.tab.c" break; case 216: -#line 2173 "mrbgems/mruby-compiler/core/parse.y" +#line 2186 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">=", (yyvsp[0].nd)); } -#line 7300 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6912 "mrbgems/mruby-compiler/core/y.tab.c" break; case 217: -#line 2177 "mrbgems/mruby-compiler/core/parse.y" +#line 2190 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<", (yyvsp[0].nd)); } -#line 7308 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6920 "mrbgems/mruby-compiler/core/y.tab.c" break; case 218: -#line 2181 "mrbgems/mruby-compiler/core/parse.y" +#line 2194 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<=", (yyvsp[0].nd)); } -#line 7316 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6928 "mrbgems/mruby-compiler/core/y.tab.c" break; case 219: -#line 2185 "mrbgems/mruby-compiler/core/parse.y" +#line 2198 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "==", (yyvsp[0].nd)); } -#line 7324 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6936 "mrbgems/mruby-compiler/core/y.tab.c" break; case 220: -#line 2189 "mrbgems/mruby-compiler/core/parse.y" +#line 2202 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "===", (yyvsp[0].nd)); } -#line 7332 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6944 "mrbgems/mruby-compiler/core/y.tab.c" break; case 221: -#line 2193 "mrbgems/mruby-compiler/core/parse.y" +#line 2206 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!=", (yyvsp[0].nd)); } -#line 7340 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6952 "mrbgems/mruby-compiler/core/y.tab.c" break; case 222: -#line 2197 "mrbgems/mruby-compiler/core/parse.y" +#line 2210 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "=~", (yyvsp[0].nd)); } -#line 7348 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6960 "mrbgems/mruby-compiler/core/y.tab.c" break; case 223: -#line 2201 "mrbgems/mruby-compiler/core/parse.y" +#line 2214 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "!~", (yyvsp[0].nd)); } -#line 7356 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6968 "mrbgems/mruby-compiler/core/y.tab.c" break; case 224: -#line 2205 "mrbgems/mruby-compiler/core/parse.y" +#line 2218 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "!"); } -#line 7364 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6976 "mrbgems/mruby-compiler/core/y.tab.c" break; case 225: -#line 2209 "mrbgems/mruby-compiler/core/parse.y" +#line 2222 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[0].nd)), "~"); } -#line 7372 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6984 "mrbgems/mruby-compiler/core/y.tab.c" break; case 226: -#line 2213 "mrbgems/mruby-compiler/core/parse.y" +#line 2226 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), "<<", (yyvsp[0].nd)); } -#line 7380 "mrbgems/mruby-compiler/core/y.tab.c" +#line 6992 "mrbgems/mruby-compiler/core/y.tab.c" break; case 227: -#line 2217 "mrbgems/mruby-compiler/core/parse.y" +#line 2230 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_bin_op(p, (yyvsp[-2].nd), ">>", (yyvsp[0].nd)); } -#line 7388 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7000 "mrbgems/mruby-compiler/core/y.tab.c" break; case 228: -#line 2221 "mrbgems/mruby-compiler/core/parse.y" +#line 2234 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_and(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7396 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7008 "mrbgems/mruby-compiler/core/y.tab.c" break; case 229: -#line 2225 "mrbgems/mruby-compiler/core/parse.y" +#line 2238 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_or(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7404 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7016 "mrbgems/mruby-compiler/core/y.tab.c" break; case 230: -#line 2229 "mrbgems/mruby-compiler/core/parse.y" +#line 2242 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); } -#line 7412 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7024 "mrbgems/mruby-compiler/core/y.tab.c" break; case 231: -#line 2233 "mrbgems/mruby-compiler/core/parse.y" +#line 2246 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-5].nd)), (yyvsp[-3].nd), (yyvsp[0].nd)); } -#line 7420 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7032 "mrbgems/mruby-compiler/core/y.tab.c" break; case 232: -#line 2237 "mrbgems/mruby-compiler/core/parse.y" +#line 2250 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 7428 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7040 "mrbgems/mruby-compiler/core/y.tab.c" break; case 234: -#line 2244 "mrbgems/mruby-compiler/core/parse.y" +#line 2257 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7437 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7049 "mrbgems/mruby-compiler/core/y.tab.c" break; case 235: -#line 2249 "mrbgems/mruby-compiler/core/parse.y" +#line 2262 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd))); } -#line 7445 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7057 "mrbgems/mruby-compiler/core/y.tab.c" break; case 236: -#line 2253 "mrbgems/mruby-compiler/core/parse.y" +#line 2266 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(new_kw_hash(p, (yyvsp[-1].nd)), 0); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7454 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7066 "mrbgems/mruby-compiler/core/y.tab.c" break; case 237: -#line 2260 "mrbgems/mruby-compiler/core/parse.y" +#line 2273 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 7462 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7074 "mrbgems/mruby-compiler/core/y.tab.c" break; case 238: -#line 2264 "mrbgems/mruby-compiler/core/parse.y" +#line 2277 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[-2].nd)); void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = new_mod_rescue(p, (yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7472 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7084 "mrbgems/mruby-compiler/core/y.tab.c" break; case 239: -#line 2272 "mrbgems/mruby-compiler/core/parse.y" +#line 2285 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 7480 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7092 "mrbgems/mruby-compiler/core/y.tab.c" break; case 240: -#line 2276 "mrbgems/mruby-compiler/core/parse.y" +#line 2289 "mrbgems/mruby-compiler/core/parse.y" { #if 1 mrb_sym r = mrb_intern_lit(p->mrb, "*"); @@ -7504,373 +7116,373 @@ yyreduce: (yyval.nd) = 0; } } -#line 7508 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7120 "mrbgems/mruby-compiler/core/y.tab.c" break; case 245: -#line 2308 "mrbgems/mruby-compiler/core/parse.y" +#line 2321 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons((yyvsp[-1].nd),0); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7517 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7129 "mrbgems/mruby-compiler/core/y.tab.c" break; case 246: -#line 2313 "mrbgems/mruby-compiler/core/parse.y" +#line 2326 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(push((yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd))), 0); NODE_LINENO((yyval.nd), (yyvsp[-3].nd)); } -#line 7526 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7138 "mrbgems/mruby-compiler/core/y.tab.c" break; case 247: -#line 2318 "mrbgems/mruby-compiler/core/parse.y" +#line 2331 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(list1(new_kw_hash(p, (yyvsp[-1].nd))), 0); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7535 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7147 "mrbgems/mruby-compiler/core/y.tab.c" break; case 248: -#line 2325 "mrbgems/mruby-compiler/core/parse.y" +#line 2338 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(list1((yyvsp[0].nd)), 0); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 7545 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7157 "mrbgems/mruby-compiler/core/y.tab.c" break; case 249: -#line 2331 "mrbgems/mruby-compiler/core/parse.y" +#line 2344 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons((yyvsp[-1].nd), (yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7554 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7166 "mrbgems/mruby-compiler/core/y.tab.c" break; case 250: -#line 2336 "mrbgems/mruby-compiler/core/parse.y" +#line 2349 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(list1(new_kw_hash(p, (yyvsp[-1].nd))), (yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7563 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7175 "mrbgems/mruby-compiler/core/y.tab.c" break; case 251: -#line 2341 "mrbgems/mruby-compiler/core/parse.y" +#line 2354 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(push((yyvsp[-3].nd), new_kw_hash(p, (yyvsp[-1].nd))), (yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[-3].nd)); } -#line 7572 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7184 "mrbgems/mruby-compiler/core/y.tab.c" break; case 252: -#line 2346 "mrbgems/mruby-compiler/core/parse.y" +#line 2359 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(0, (yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 7581 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7193 "mrbgems/mruby-compiler/core/y.tab.c" break; case 253: -#line 2352 "mrbgems/mruby-compiler/core/parse.y" +#line 2365 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; CMDARG_PUSH(1); } -#line 7590 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7202 "mrbgems/mruby-compiler/core/y.tab.c" break; case 254: -#line 2357 "mrbgems/mruby-compiler/core/parse.y" +#line 2370 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-1].stack); (yyval.nd) = (yyvsp[0].nd); } -#line 7599 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7211 "mrbgems/mruby-compiler/core/y.tab.c" break; case 255: -#line 2364 "mrbgems/mruby-compiler/core/parse.y" +#line 2377 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block_arg(p, (yyvsp[0].nd)); } -#line 7607 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7219 "mrbgems/mruby-compiler/core/y.tab.c" break; case 256: -#line 2370 "mrbgems/mruby-compiler/core/parse.y" +#line 2383 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 7615 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7227 "mrbgems/mruby-compiler/core/y.tab.c" break; case 257: -#line 2374 "mrbgems/mruby-compiler/core/parse.y" +#line 2387 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 7623 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7235 "mrbgems/mruby-compiler/core/y.tab.c" break; case 260: -#line 2384 "mrbgems/mruby-compiler/core/parse.y" +#line 2397 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons((yyvsp[0].nd), 0); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 7633 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7245 "mrbgems/mruby-compiler/core/y.tab.c" break; case 261: -#line 2390 "mrbgems/mruby-compiler/core/parse.y" +#line 2403 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(new_splat(p, (yyvsp[0].nd)), 0); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 7643 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7255 "mrbgems/mruby-compiler/core/y.tab.c" break; case 262: -#line 2396 "mrbgems/mruby-compiler/core/parse.y" +#line 2409 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7652 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7264 "mrbgems/mruby-compiler/core/y.tab.c" break; case 263: -#line 2401 "mrbgems/mruby-compiler/core/parse.y" +#line 2414 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } -#line 7661 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7273 "mrbgems/mruby-compiler/core/y.tab.c" break; case 264: -#line 2408 "mrbgems/mruby-compiler/core/parse.y" +#line 2421 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 7670 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7282 "mrbgems/mruby-compiler/core/y.tab.c" break; case 265: -#line 2413 "mrbgems/mruby-compiler/core/parse.y" +#line 2426 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } -#line 7679 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7291 "mrbgems/mruby-compiler/core/y.tab.c" break; case 266: -#line 2418 "mrbgems/mruby-compiler/core/parse.y" +#line 2431 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); } -#line 7688 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7300 "mrbgems/mruby-compiler/core/y.tab.c" break; case 274: -#line 2432 "mrbgems/mruby-compiler/core/parse.y" +#line 2445 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nvar(p, (yyvsp[0].num)); } -#line 7696 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7308 "mrbgems/mruby-compiler/core/y.tab.c" break; case 275: -#line 2436 "mrbgems/mruby-compiler/core/parse.y" +#line 2449 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[0].id), 0); } -#line 7704 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7316 "mrbgems/mruby-compiler/core/y.tab.c" break; case 276: -#line 2440 "mrbgems/mruby-compiler/core/parse.y" +#line 2453 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 7713 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7325 "mrbgems/mruby-compiler/core/y.tab.c" break; case 277: -#line 2446 "mrbgems/mruby-compiler/core/parse.y" +#line 2459 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-2].stack); (yyval.nd) = (yyvsp[-1].nd); } -#line 7722 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7334 "mrbgems/mruby-compiler/core/y.tab.c" break; case 278: -#line 2451 "mrbgems/mruby-compiler/core/parse.y" +#line 2464 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 7731 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7343 "mrbgems/mruby-compiler/core/y.tab.c" break; case 279: -#line 2455 "mrbgems/mruby-compiler/core/parse.y" +#line 2468 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_ENDARG;} -#line 7737 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7349 "mrbgems/mruby-compiler/core/y.tab.c" break; case 280: -#line 2456 "mrbgems/mruby-compiler/core/parse.y" +#line 2469 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-3].stack); (yyval.nd) = (yyvsp[-2].nd); } -#line 7746 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7358 "mrbgems/mruby-compiler/core/y.tab.c" break; case 281: -#line 2460 "mrbgems/mruby-compiler/core/parse.y" +#line 2473 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_ENDARG;} -#line 7752 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7364 "mrbgems/mruby-compiler/core/y.tab.c" break; case 282: -#line 2461 "mrbgems/mruby-compiler/core/parse.y" +#line 2474 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nil(p); } -#line 7760 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7372 "mrbgems/mruby-compiler/core/y.tab.c" break; case 283: -#line 2465 "mrbgems/mruby-compiler/core/parse.y" +#line 2478 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 7768 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7380 "mrbgems/mruby-compiler/core/y.tab.c" break; case 284: -#line 2469 "mrbgems/mruby-compiler/core/parse.y" +#line 2482 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); } -#line 7776 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7388 "mrbgems/mruby-compiler/core/y.tab.c" break; case 285: -#line 2473 "mrbgems/mruby-compiler/core/parse.y" +#line 2486 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_colon3(p, (yyvsp[0].id)); } -#line 7784 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7396 "mrbgems/mruby-compiler/core/y.tab.c" break; case 286: -#line 2477 "mrbgems/mruby-compiler/core/parse.y" +#line 2490 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_array(p, (yyvsp[-1].nd)); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7793 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7405 "mrbgems/mruby-compiler/core/y.tab.c" break; case 287: -#line 2482 "mrbgems/mruby-compiler/core/parse.y" +#line 2495 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_hash(p, (yyvsp[-1].nd)); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 7802 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7414 "mrbgems/mruby-compiler/core/y.tab.c" break; case 288: -#line 2487 "mrbgems/mruby-compiler/core/parse.y" +#line 2500 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_return(p, 0); } -#line 7810 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7422 "mrbgems/mruby-compiler/core/y.tab.c" break; case 289: -#line 2491 "mrbgems/mruby-compiler/core/parse.y" +#line 2504 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_yield(p, (yyvsp[0].nd)); } -#line 7818 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7430 "mrbgems/mruby-compiler/core/y.tab.c" break; case 290: -#line 2495 "mrbgems/mruby-compiler/core/parse.y" +#line 2508 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!"); } -#line 7826 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7438 "mrbgems/mruby-compiler/core/y.tab.c" break; case 291: -#line 2499 "mrbgems/mruby-compiler/core/parse.y" +#line 2512 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = call_uni_op(p, new_nil(p), "!"); } -#line 7834 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7446 "mrbgems/mruby-compiler/core/y.tab.c" break; case 292: -#line 2503 "mrbgems/mruby-compiler/core/parse.y" +#line 2516 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), cons(0, (yyvsp[0].nd))); } -#line 7842 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7454 "mrbgems/mruby-compiler/core/y.tab.c" break; case 294: -#line 2508 "mrbgems/mruby-compiler/core/parse.y" +#line 2521 "mrbgems/mruby-compiler/core/parse.y" { call_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 7851 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7463 "mrbgems/mruby-compiler/core/y.tab.c" break; case 295: -#line 2513 "mrbgems/mruby-compiler/core/parse.y" +#line 2526 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); (yyval.num) = p->lpar_beg; p->lpar_beg = ++p->paren_nest; } -#line 7861 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7473 "mrbgems/mruby-compiler/core/y.tab.c" break; case 296: -#line 2519 "mrbgems/mruby-compiler/core/parse.y" +#line 2532 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 7870 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7482 "mrbgems/mruby-compiler/core/y.tab.c" break; case 297: -#line 2524 "mrbgems/mruby-compiler/core/parse.y" +#line 2537 "mrbgems/mruby-compiler/core/parse.y" { p->lpar_beg = (yyvsp[-3].num); (yyval.nd) = new_lambda(p, (yyvsp[-2].nd), (yyvsp[0].nd)); @@ -7878,149 +7490,149 @@ yyreduce: p->cmdarg_stack = (yyvsp[-1].stack); CMDARG_LEXPOP(); } -#line 7882 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7494 "mrbgems/mruby-compiler/core/y.tab.c" break; case 298: -#line 2535 "mrbgems/mruby-compiler/core/parse.y" +#line 2548 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-5].num)); } -#line 7891 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7503 "mrbgems/mruby-compiler/core/y.tab.c" break; case 299: -#line 2543 "mrbgems/mruby-compiler/core/parse.y" +#line 2556 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_unless(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-5].num)); } -#line 7900 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7512 "mrbgems/mruby-compiler/core/y.tab.c" break; case 300: -#line 2547 "mrbgems/mruby-compiler/core/parse.y" +#line 2560 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 7906 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7518 "mrbgems/mruby-compiler/core/y.tab.c" break; case 301: -#line 2547 "mrbgems/mruby-compiler/core/parse.y" +#line 2560 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 7912 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7524 "mrbgems/mruby-compiler/core/y.tab.c" break; case 302: -#line 2550 "mrbgems/mruby-compiler/core/parse.y" +#line 2563 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_while(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-6].num)); } -#line 7921 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7533 "mrbgems/mruby-compiler/core/y.tab.c" break; case 303: -#line 2554 "mrbgems/mruby-compiler/core/parse.y" +#line 2567 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 7927 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7539 "mrbgems/mruby-compiler/core/y.tab.c" break; case 304: -#line 2554 "mrbgems/mruby-compiler/core/parse.y" +#line 2567 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 7933 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7545 "mrbgems/mruby-compiler/core/y.tab.c" break; case 305: -#line 2557 "mrbgems/mruby-compiler/core/parse.y" +#line 2570 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_until(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-6].num)); } -#line 7942 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7554 "mrbgems/mruby-compiler/core/y.tab.c" break; case 306: -#line 2564 "mrbgems/mruby-compiler/core/parse.y" +#line 2577 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_case(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); } -#line 7950 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7562 "mrbgems/mruby-compiler/core/y.tab.c" break; case 307: -#line 2568 "mrbgems/mruby-compiler/core/parse.y" +#line 2581 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_case(p, 0, (yyvsp[-1].nd)); } -#line 7958 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7570 "mrbgems/mruby-compiler/core/y.tab.c" break; case 308: -#line 2572 "mrbgems/mruby-compiler/core/parse.y" +#line 2585 "mrbgems/mruby-compiler/core/parse.y" {COND_PUSH(1);} -#line 7964 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7576 "mrbgems/mruby-compiler/core/y.tab.c" break; case 309: -#line 2574 "mrbgems/mruby-compiler/core/parse.y" +#line 2587 "mrbgems/mruby-compiler/core/parse.y" {COND_POP();} -#line 7970 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7582 "mrbgems/mruby-compiler/core/y.tab.c" break; case 310: -#line 2577 "mrbgems/mruby-compiler/core/parse.y" +#line 2590 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_for(p, (yyvsp[-7].nd), (yyvsp[-4].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-8].num)); } -#line 7979 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7591 "mrbgems/mruby-compiler/core/y.tab.c" break; case 311: -#line 2583 "mrbgems/mruby-compiler/core/parse.y" +#line 2596 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "class definition in method body"); (yyval.nd) = local_switch(p); nvars_block(p); } -#line 7990 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7602 "mrbgems/mruby-compiler/core/y.tab.c" break; case 312: -#line 2591 "mrbgems/mruby-compiler/core/parse.y" +#line 2604 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_class(p, (yyvsp[-4].nd), (yyvsp[-3].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-5].num)); local_resume(p, (yyvsp[-2].nd)); nvars_unnest(p); } -#line 8001 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7613 "mrbgems/mruby-compiler/core/y.tab.c" break; case 313: -#line 2599 "mrbgems/mruby-compiler/core/parse.y" +#line 2612 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = p->in_def; p->in_def = 0; } -#line 8010 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7622 "mrbgems/mruby-compiler/core/y.tab.c" break; case 314: -#line 2604 "mrbgems/mruby-compiler/core/parse.y" +#line 2617 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(local_switch(p), nint(p->in_single)); nvars_block(p); p->in_single = 0; } -#line 8020 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7632 "mrbgems/mruby-compiler/core/y.tab.c" break; case 315: -#line 2611 "mrbgems/mruby-compiler/core/parse.y" +#line 2624 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sclass(p, (yyvsp[-5].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-7].num)); @@ -8029,52 +7641,52 @@ yyreduce: p->in_def = (yyvsp[-4].num); p->in_single = intn((yyvsp[-2].nd)->cdr); } -#line 8033 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7645 "mrbgems/mruby-compiler/core/y.tab.c" break; case 316: -#line 2621 "mrbgems/mruby-compiler/core/parse.y" +#line 2634 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "module definition in method body"); (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8044 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7656 "mrbgems/mruby-compiler/core/y.tab.c" break; case 317: -#line 2629 "mrbgems/mruby-compiler/core/parse.y" +#line 2642 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_module(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-4].num)); local_resume(p, (yyvsp[-2].nd)); nvars_unnest(p); } -#line 8055 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7667 "mrbgems/mruby-compiler/core/y.tab.c" break; case 318: -#line 2636 "mrbgems/mruby-compiler/core/parse.y" +#line 2649 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 8064 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7676 "mrbgems/mruby-compiler/core/y.tab.c" break; case 319: -#line 2640 "mrbgems/mruby-compiler/core/parse.y" +#line 2653 "mrbgems/mruby-compiler/core/parse.y" { p->in_def++; (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8074 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7686 "mrbgems/mruby-compiler/core/y.tab.c" break; case 320: -#line 2648 "mrbgems/mruby-compiler/core/parse.y" +#line 2661 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_def(p, (yyvsp[-5].id), (yyvsp[-2].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-6].num)); @@ -8083,32 +7695,32 @@ yyreduce: p->in_def--; p->cmdarg_stack = (yyvsp[-4].stack); } -#line 8087 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7699 "mrbgems/mruby-compiler/core/y.tab.c" break; case 321: -#line 2657 "mrbgems/mruby-compiler/core/parse.y" +#line 2670 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_FNAME; (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 8097 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7709 "mrbgems/mruby-compiler/core/y.tab.c" break; case 322: -#line 2663 "mrbgems/mruby-compiler/core/parse.y" +#line 2676 "mrbgems/mruby-compiler/core/parse.y" { p->in_single++; p->lstate = EXPR_ENDFN; /* force for args */ (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8108 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7720 "mrbgems/mruby-compiler/core/y.tab.c" break; case 323: -#line 2672 "mrbgems/mruby-compiler/core/parse.y" +#line 2685 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sdef(p, (yyvsp[-7].nd), (yyvsp[-4].id), (yyvsp[-2].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-8].num)); @@ -8117,451 +7729,451 @@ yyreduce: p->in_single--; p->cmdarg_stack = (yyvsp[-5].stack); } -#line 8121 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7733 "mrbgems/mruby-compiler/core/y.tab.c" break; case 324: -#line 2681 "mrbgems/mruby-compiler/core/parse.y" +#line 2694 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_break(p, 0); } -#line 8129 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7741 "mrbgems/mruby-compiler/core/y.tab.c" break; case 325: -#line 2685 "mrbgems/mruby-compiler/core/parse.y" +#line 2698 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_next(p, 0); } -#line 8137 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7749 "mrbgems/mruby-compiler/core/y.tab.c" break; case 326: -#line 2689 "mrbgems/mruby-compiler/core/parse.y" +#line 2702 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_redo(p); } -#line 8145 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7757 "mrbgems/mruby-compiler/core/y.tab.c" break; case 327: -#line 2693 "mrbgems/mruby-compiler/core/parse.y" +#line 2706 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_retry(p); } -#line 8153 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7765 "mrbgems/mruby-compiler/core/y.tab.c" break; case 328: -#line 2699 "mrbgems/mruby-compiler/core/parse.y" +#line 2712 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); if (!(yyval.nd)) (yyval.nd) = new_nil(p); } -#line 8162 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7774 "mrbgems/mruby-compiler/core/y.tab.c" break; case 335: -#line 2718 "mrbgems/mruby-compiler/core/parse.y" +#line 2731 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-3].nd)), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8170 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7782 "mrbgems/mruby-compiler/core/y.tab.c" break; case 337: -#line 2725 "mrbgems/mruby-compiler/core/parse.y" +#line 2738 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8178 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7790 "mrbgems/mruby-compiler/core/y.tab.c" break; case 338: -#line 2731 "mrbgems/mruby-compiler/core/parse.y" +#line 2744 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(list1((yyvsp[0].nd))); } -#line 8186 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7798 "mrbgems/mruby-compiler/core/y.tab.c" break; case 340: -#line 2738 "mrbgems/mruby-compiler/core/parse.y" +#line 2751 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[0].nd),0,0); } -#line 8194 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7806 "mrbgems/mruby-compiler/core/y.tab.c" break; case 341: -#line 2742 "mrbgems/mruby-compiler/core/parse.y" +#line 2755 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-3].nd), new_arg(p, (yyvsp[0].id)), 0); } -#line 8202 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7814 "mrbgems/mruby-compiler/core/y.tab.c" break; case 342: -#line 2746 "mrbgems/mruby-compiler/core/parse.y" +#line 2759 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-5].nd), new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 8210 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7822 "mrbgems/mruby-compiler/core/y.tab.c" break; case 343: -#line 2750 "mrbgems/mruby-compiler/core/parse.y" +#line 2763 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, 0); (yyval.nd) = list3((yyvsp[-2].nd), (node*)-1, 0); } -#line 8219 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7831 "mrbgems/mruby-compiler/core/y.tab.c" break; case 344: -#line 2755 "mrbgems/mruby-compiler/core/parse.y" +#line 2768 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3((yyvsp[-4].nd), (node*)-1, (yyvsp[0].nd)); } -#line 8227 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7839 "mrbgems/mruby-compiler/core/y.tab.c" break; case 345: -#line 2759 "mrbgems/mruby-compiler/core/parse.y" +#line 2772 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_arg(p, (yyvsp[0].id)), 0); } -#line 8235 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7847 "mrbgems/mruby-compiler/core/y.tab.c" break; case 346: -#line 2763 "mrbgems/mruby-compiler/core/parse.y" +#line 2776 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 8243 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7855 "mrbgems/mruby-compiler/core/y.tab.c" break; case 347: -#line 2767 "mrbgems/mruby-compiler/core/parse.y" +#line 2780 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, 0); (yyval.nd) = list3(0, (node*)-1, 0); } -#line 8252 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7864 "mrbgems/mruby-compiler/core/y.tab.c" break; case 348: -#line 2772 "mrbgems/mruby-compiler/core/parse.y" +#line 2785 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, 0); } -#line 8260 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7872 "mrbgems/mruby-compiler/core/y.tab.c" break; case 349: -#line 2776 "mrbgems/mruby-compiler/core/parse.y" +#line 2789 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list3(0, (node*)-1, (yyvsp[0].nd)); } -#line 8268 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7880 "mrbgems/mruby-compiler/core/y.tab.c" break; case 350: -#line 2782 "mrbgems/mruby-compiler/core/parse.y" +#line 2795 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); } -#line 8276 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7888 "mrbgems/mruby-compiler/core/y.tab.c" break; case 351: -#line 2786 "mrbgems/mruby-compiler/core/parse.y" +#line 2799 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); } -#line 8284 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7896 "mrbgems/mruby-compiler/core/y.tab.c" break; case 352: -#line 2790 "mrbgems/mruby-compiler/core/parse.y" +#line 2803 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); } -#line 8292 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7904 "mrbgems/mruby-compiler/core/y.tab.c" break; case 353: -#line 2794 "mrbgems/mruby-compiler/core/parse.y" +#line 2807 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } -#line 8300 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7912 "mrbgems/mruby-compiler/core/y.tab.c" break; case 354: -#line 2800 "mrbgems/mruby-compiler/core/parse.y" +#line 2813 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8308 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7920 "mrbgems/mruby-compiler/core/y.tab.c" break; case 355: -#line 2804 "mrbgems/mruby-compiler/core/parse.y" +#line 2817 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, 0, 0); } -#line 8316 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7928 "mrbgems/mruby-compiler/core/y.tab.c" break; case 356: -#line 2810 "mrbgems/mruby-compiler/core/parse.y" +#line 2823 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 8324 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7936 "mrbgems/mruby-compiler/core/y.tab.c" break; case 357: -#line 2814 "mrbgems/mruby-compiler/core/parse.y" +#line 2827 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8332 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7944 "mrbgems/mruby-compiler/core/y.tab.c" break; case 358: -#line 2818 "mrbgems/mruby-compiler/core/parse.y" +#line 2831 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } -#line 8340 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7952 "mrbgems/mruby-compiler/core/y.tab.c" break; case 359: -#line 2822 "mrbgems/mruby-compiler/core/parse.y" +#line 2835 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8348 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7960 "mrbgems/mruby-compiler/core/y.tab.c" break; case 360: -#line 2826 "mrbgems/mruby-compiler/core/parse.y" +#line 2839 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 8356 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7968 "mrbgems/mruby-compiler/core/y.tab.c" break; case 361: -#line 2830 "mrbgems/mruby-compiler/core/parse.y" +#line 2843 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd)); } -#line 8364 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7976 "mrbgems/mruby-compiler/core/y.tab.c" break; case 362: -#line 2834 "mrbgems/mruby-compiler/core/parse.y" +#line 2847 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8372 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7984 "mrbgems/mruby-compiler/core/y.tab.c" break; case 363: -#line 2838 "mrbgems/mruby-compiler/core/parse.y" +#line 2851 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } -#line 8380 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7992 "mrbgems/mruby-compiler/core/y.tab.c" break; case 364: -#line 2842 "mrbgems/mruby-compiler/core/parse.y" +#line 2855 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 8388 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8000 "mrbgems/mruby-compiler/core/y.tab.c" break; case 365: -#line 2846 "mrbgems/mruby-compiler/core/parse.y" +#line 2859 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8396 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8008 "mrbgems/mruby-compiler/core/y.tab.c" break; case 366: -#line 2850 "mrbgems/mruby-compiler/core/parse.y" +#line 2863 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } -#line 8404 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8016 "mrbgems/mruby-compiler/core/y.tab.c" break; case 367: -#line 2854 "mrbgems/mruby-compiler/core/parse.y" +#line 2867 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8412 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8024 "mrbgems/mruby-compiler/core/y.tab.c" break; case 368: -#line 2858 "mrbgems/mruby-compiler/core/parse.y" +#line 2871 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 8420 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8032 "mrbgems/mruby-compiler/core/y.tab.c" break; case 369: -#line 2862 "mrbgems/mruby-compiler/core/parse.y" +#line 2875 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8428 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8040 "mrbgems/mruby-compiler/core/y.tab.c" break; case 370: -#line 2866 "mrbgems/mruby-compiler/core/parse.y" +#line 2879 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); } -#line 8436 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8048 "mrbgems/mruby-compiler/core/y.tab.c" break; case 371: -#line 2872 "mrbgems/mruby-compiler/core/parse.y" +#line 2885 "mrbgems/mruby-compiler/core/parse.y" { local_add_blk(p, 0); (yyval.nd) = 0; } -#line 8445 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8057 "mrbgems/mruby-compiler/core/y.tab.c" break; case 372: -#line 2877 "mrbgems/mruby-compiler/core/parse.y" +#line 2890 "mrbgems/mruby-compiler/core/parse.y" { p->cmd_start = TRUE; (yyval.nd) = (yyvsp[0].nd); } -#line 8454 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8066 "mrbgems/mruby-compiler/core/y.tab.c" break; case 373: -#line 2883 "mrbgems/mruby-compiler/core/parse.y" +#line 2896 "mrbgems/mruby-compiler/core/parse.y" {local_add_blk(p, 0);} -#line 8460 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8072 "mrbgems/mruby-compiler/core/y.tab.c" break; case 374: -#line 2884 "mrbgems/mruby-compiler/core/parse.y" +#line 2897 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 8468 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8080 "mrbgems/mruby-compiler/core/y.tab.c" break; case 375: -#line 2888 "mrbgems/mruby-compiler/core/parse.y" +#line 2901 "mrbgems/mruby-compiler/core/parse.y" { local_add_blk(p, 0); (yyval.nd) = 0; } -#line 8477 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8089 "mrbgems/mruby-compiler/core/y.tab.c" break; case 376: -#line 2893 "mrbgems/mruby-compiler/core/parse.y" +#line 2906 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-2].nd); } -#line 8485 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8097 "mrbgems/mruby-compiler/core/y.tab.c" break; case 377: -#line 2900 "mrbgems/mruby-compiler/core/parse.y" +#line 2913 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 8493 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8105 "mrbgems/mruby-compiler/core/y.tab.c" break; case 378: -#line 2904 "mrbgems/mruby-compiler/core/parse.y" +#line 2917 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 8501 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8113 "mrbgems/mruby-compiler/core/y.tab.c" break; case 381: -#line 2914 "mrbgems/mruby-compiler/core/parse.y" +#line 2927 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); new_bv(p, (yyvsp[0].id)); } -#line 8510 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8122 "mrbgems/mruby-compiler/core/y.tab.c" break; case 383: -#line 2922 "mrbgems/mruby-compiler/core/parse.y" +#line 2935 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-2].nd); } -#line 8518 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8130 "mrbgems/mruby-compiler/core/y.tab.c" break; case 384: -#line 2926 "mrbgems/mruby-compiler/core/parse.y" +#line 2939 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8526 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8138 "mrbgems/mruby-compiler/core/y.tab.c" break; case 385: -#line 2932 "mrbgems/mruby-compiler/core/parse.y" +#line 2945 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 8534 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8146 "mrbgems/mruby-compiler/core/y.tab.c" break; case 386: -#line 2936 "mrbgems/mruby-compiler/core/parse.y" +#line 2949 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 8542 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8154 "mrbgems/mruby-compiler/core/y.tab.c" break; case 387: -#line 2942 "mrbgems/mruby-compiler/core/parse.y" +#line 2955 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); } -#line 8551 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8163 "mrbgems/mruby-compiler/core/y.tab.c" break; case 388: -#line 2949 "mrbgems/mruby-compiler/core/parse.y" +#line 2962 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); local_unnest(p); nvars_unnest(p); } -#line 8561 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8173 "mrbgems/mruby-compiler/core/y.tab.c" break; case 389: -#line 2957 "mrbgems/mruby-compiler/core/parse.y" +#line 2970 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-1].nd)->car == (node*)NODE_YIELD) { yyerror(p, "block given to yield"); @@ -8571,159 +8183,159 @@ yyreduce: } (yyval.nd) = (yyvsp[-1].nd); } -#line 8575 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8187 "mrbgems/mruby-compiler/core/y.tab.c" break; case 390: -#line 2967 "mrbgems/mruby-compiler/core/parse.y" +#line 2980 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 8583 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8195 "mrbgems/mruby-compiler/core/y.tab.c" break; case 391: -#line 2971 "mrbgems/mruby-compiler/core/parse.y" +#line 2984 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num)); call_with_block(p, (yyval.nd), (yyvsp[0].nd)); } -#line 8592 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8204 "mrbgems/mruby-compiler/core/y.tab.c" break; case 392: -#line 2976 "mrbgems/mruby-compiler/core/parse.y" +#line 2989 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num)); call_with_block(p, (yyval.nd), (yyvsp[0].nd)); } -#line 8601 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8213 "mrbgems/mruby-compiler/core/y.tab.c" break; case 393: -#line 2983 "mrbgems/mruby-compiler/core/parse.y" +#line 2996 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); } -#line 8609 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8221 "mrbgems/mruby-compiler/core/y.tab.c" break; case 394: -#line 2987 "mrbgems/mruby-compiler/core/parse.y" +#line 3000 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 8617 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8229 "mrbgems/mruby-compiler/core/y.tab.c" break; case 395: -#line 2991 "mrbgems/mruby-compiler/core/parse.y" +#line 3004 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); } -#line 8625 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8237 "mrbgems/mruby-compiler/core/y.tab.c" break; case 396: -#line 2995 "mrbgems/mruby-compiler/core/parse.y" +#line 3008 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } -#line 8633 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8245 "mrbgems/mruby-compiler/core/y.tab.c" break; case 397: -#line 2999 "mrbgems/mruby-compiler/core/parse.y" +#line 3012 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), intern_lit("call"), (yyvsp[0].nd), (yyvsp[-1].num)); } -#line 8641 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8253 "mrbgems/mruby-compiler/core/y.tab.c" break; case 398: -#line 3003 "mrbgems/mruby-compiler/core/parse.y" +#line 3016 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-2].nd), intern_lit("call"), (yyvsp[0].nd), tCOLON2); } -#line 8649 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8261 "mrbgems/mruby-compiler/core/y.tab.c" break; case 399: -#line 3007 "mrbgems/mruby-compiler/core/parse.y" +#line 3020 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_super(p, (yyvsp[0].nd)); } -#line 8657 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8269 "mrbgems/mruby-compiler/core/y.tab.c" break; case 400: -#line 3011 "mrbgems/mruby-compiler/core/parse.y" +#line 3024 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_zsuper(p); } -#line 8665 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8277 "mrbgems/mruby-compiler/core/y.tab.c" break; case 401: -#line 3015 "mrbgems/mruby-compiler/core/parse.y" +#line 3028 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_lit("[]"), (yyvsp[-1].nd), '.'); } -#line 8673 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8285 "mrbgems/mruby-compiler/core/y.tab.c" break; case 402: -#line 3021 "mrbgems/mruby-compiler/core/parse.y" +#line 3034 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 8683 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8295 "mrbgems/mruby-compiler/core/y.tab.c" break; case 403: -#line 3028 "mrbgems/mruby-compiler/core/parse.y" +#line 3041 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-3].num)); local_unnest(p); nvars_unnest(p); } -#line 8694 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8306 "mrbgems/mruby-compiler/core/y.tab.c" break; case 404: -#line 3035 "mrbgems/mruby-compiler/core/parse.y" +#line 3048 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 8704 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8316 "mrbgems/mruby-compiler/core/y.tab.c" break; case 405: -#line 3042 "mrbgems/mruby-compiler/core/parse.y" +#line 3055 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-3].num)); local_unnest(p); nvars_unnest(p); } -#line 8715 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8327 "mrbgems/mruby-compiler/core/y.tab.c" break; case 406: -#line 3053 "mrbgems/mruby-compiler/core/parse.y" +#line 3066 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(cons((yyvsp[-3].nd), (yyvsp[-1].nd)), (yyvsp[0].nd)); } -#line 8723 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8335 "mrbgems/mruby-compiler/core/y.tab.c" break; case 407: -#line 3059 "mrbgems/mruby-compiler/core/parse.y" +#line 3072 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[0].nd)) { (yyval.nd) = cons(cons(0, (yyvsp[0].nd)), 0); @@ -8732,383 +8344,383 @@ yyreduce: (yyval.nd) = 0; } } -#line 8736 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8348 "mrbgems/mruby-compiler/core/y.tab.c" break; case 409: -#line 3073 "mrbgems/mruby-compiler/core/parse.y" +#line 3086 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(list3((yyvsp[-4].nd), (yyvsp[-3].nd), (yyvsp[-1].nd))); if ((yyvsp[0].nd)) (yyval.nd) = append((yyval.nd), (yyvsp[0].nd)); } -#line 8745 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8357 "mrbgems/mruby-compiler/core/y.tab.c" break; case 411: -#line 3081 "mrbgems/mruby-compiler/core/parse.y" +#line 3094 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 8753 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8365 "mrbgems/mruby-compiler/core/y.tab.c" break; case 414: -#line 3089 "mrbgems/mruby-compiler/core/parse.y" +#line 3102 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8761 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8373 "mrbgems/mruby-compiler/core/y.tab.c" break; case 416: -#line 3096 "mrbgems/mruby-compiler/core/parse.y" +#line 3109 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8769 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8381 "mrbgems/mruby-compiler/core/y.tab.c" break; case 423: -#line 3110 "mrbgems/mruby-compiler/core/parse.y" +#line 3123 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = concat_string(p, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8777 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8389 "mrbgems/mruby-compiler/core/y.tab.c" break; case 426: -#line 3118 "mrbgems/mruby-compiler/core/parse.y" +#line 3131 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8785 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8397 "mrbgems/mruby-compiler/core/y.tab.c" break; case 427: -#line 3122 "mrbgems/mruby-compiler/core/parse.y" +#line 3135 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dstr(p, push((yyvsp[-1].nd), (yyvsp[0].nd))); } -#line 8793 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8405 "mrbgems/mruby-compiler/core/y.tab.c" break; case 429: -#line 3129 "mrbgems/mruby-compiler/core/parse.y" +#line 3142 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8801 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8413 "mrbgems/mruby-compiler/core/y.tab.c" break; case 430: -#line 3135 "mrbgems/mruby-compiler/core/parse.y" +#line 3148 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 8809 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8421 "mrbgems/mruby-compiler/core/y.tab.c" break; case 431: -#line 3139 "mrbgems/mruby-compiler/core/parse.y" +#line 3152 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = p->lex_strterm; p->lex_strterm = NULL; } -#line 8818 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8430 "mrbgems/mruby-compiler/core/y.tab.c" break; case 432: -#line 3145 "mrbgems/mruby-compiler/core/parse.y" +#line 3158 "mrbgems/mruby-compiler/core/parse.y" { p->lex_strterm = (yyvsp[-2].nd); (yyval.nd) = list2((yyvsp[-3].nd), (yyvsp[-1].nd)); } -#line 8827 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8439 "mrbgems/mruby-compiler/core/y.tab.c" break; case 433: -#line 3150 "mrbgems/mruby-compiler/core/parse.y" +#line 3163 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_literal_delim(p)); } -#line 8835 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8447 "mrbgems/mruby-compiler/core/y.tab.c" break; case 434: -#line 3154 "mrbgems/mruby-compiler/core/parse.y" +#line 3167 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(new_literal_delim(p)); } -#line 8843 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8455 "mrbgems/mruby-compiler/core/y.tab.c" break; case 435: -#line 3160 "mrbgems/mruby-compiler/core/parse.y" +#line 3173 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8851 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8463 "mrbgems/mruby-compiler/core/y.tab.c" break; case 436: -#line 3164 "mrbgems/mruby-compiler/core/parse.y" +#line 3177 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dxstr(p, push((yyvsp[-1].nd), (yyvsp[0].nd))); } -#line 8859 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8471 "mrbgems/mruby-compiler/core/y.tab.c" break; case 437: -#line 3170 "mrbgems/mruby-compiler/core/parse.y" +#line 3183 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 8867 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8479 "mrbgems/mruby-compiler/core/y.tab.c" break; case 438: -#line 3174 "mrbgems/mruby-compiler/core/parse.y" +#line 3187 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_dregx(p, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 8875 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8487 "mrbgems/mruby-compiler/core/y.tab.c" break; case 442: -#line 3187 "mrbgems/mruby-compiler/core/parse.y" +#line 3200 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info * inf = parsing_heredoc_inf(p); inf->doc = push(inf->doc, new_str(p, "", 0)); heredoc_end(p); } -#line 8885 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8497 "mrbgems/mruby-compiler/core/y.tab.c" break; case 443: -#line 3193 "mrbgems/mruby-compiler/core/parse.y" +#line 3206 "mrbgems/mruby-compiler/core/parse.y" { heredoc_end(p); } -#line 8893 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8505 "mrbgems/mruby-compiler/core/y.tab.c" break; case 446: -#line 3203 "mrbgems/mruby-compiler/core/parse.y" +#line 3216 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info * inf = parsing_heredoc_inf(p); inf->doc = push(inf->doc, (yyvsp[0].nd)); heredoc_treat_nextline(p); } -#line 8903 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8515 "mrbgems/mruby-compiler/core/y.tab.c" break; case 447: -#line 3209 "mrbgems/mruby-compiler/core/parse.y" +#line 3222 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = p->lex_strterm; p->lex_strterm = NULL; } -#line 8912 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8524 "mrbgems/mruby-compiler/core/y.tab.c" break; case 448: -#line 3215 "mrbgems/mruby-compiler/core/parse.y" +#line 3228 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info * inf = parsing_heredoc_inf(p); p->lex_strterm = (yyvsp[-2].nd); inf->doc = push(push(inf->doc, (yyvsp[-3].nd)), (yyvsp[-1].nd)); } -#line 8922 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8534 "mrbgems/mruby-compiler/core/y.tab.c" break; case 449: -#line 3223 "mrbgems/mruby-compiler/core/parse.y" +#line 3236 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_words(p, list1((yyvsp[0].nd))); } -#line 8930 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8542 "mrbgems/mruby-compiler/core/y.tab.c" break; case 450: -#line 3227 "mrbgems/mruby-compiler/core/parse.y" +#line 3240 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_words(p, push((yyvsp[-1].nd), (yyvsp[0].nd))); } -#line 8938 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8550 "mrbgems/mruby-compiler/core/y.tab.c" break; case 451: -#line 3234 "mrbgems/mruby-compiler/core/parse.y" +#line 3247 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDARG; (yyval.nd) = new_sym(p, (yyvsp[0].id)); } -#line 8947 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8559 "mrbgems/mruby-compiler/core/y.tab.c" break; case 452: -#line 3239 "mrbgems/mruby-compiler/core/parse.y" +#line 3252 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDARG; (yyval.nd) = new_dsym(p, new_dstr(p, push((yyvsp[-1].nd), (yyvsp[0].nd)))); } -#line 8956 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8568 "mrbgems/mruby-compiler/core/y.tab.c" break; case 453: -#line 3246 "mrbgems/mruby-compiler/core/parse.y" +#line 3259 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 8964 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8576 "mrbgems/mruby-compiler/core/y.tab.c" break; case 458: -#line 3256 "mrbgems/mruby-compiler/core/parse.y" +#line 3269 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } -#line 8972 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8584 "mrbgems/mruby-compiler/core/y.tab.c" break; case 459: -#line 3260 "mrbgems/mruby-compiler/core/parse.y" +#line 3273 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } -#line 8980 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8592 "mrbgems/mruby-compiler/core/y.tab.c" break; case 460: -#line 3266 "mrbgems/mruby-compiler/core/parse.y" +#line 3279 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_symbols(p, list1((yyvsp[0].nd))); } -#line 8988 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8600 "mrbgems/mruby-compiler/core/y.tab.c" break; case 461: -#line 3270 "mrbgems/mruby-compiler/core/parse.y" +#line 3283 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_symbols(p, push((yyvsp[-1].nd), (yyvsp[0].nd))); } -#line 8996 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8608 "mrbgems/mruby-compiler/core/y.tab.c" break; case 464: -#line 3278 "mrbgems/mruby-compiler/core/parse.y" +#line 3291 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = negate_lit(p, (yyvsp[0].nd)); } -#line 9004 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8616 "mrbgems/mruby-compiler/core/y.tab.c" break; case 465: -#line 3282 "mrbgems/mruby-compiler/core/parse.y" +#line 3295 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = negate_lit(p, (yyvsp[0].nd)); } -#line 9012 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8624 "mrbgems/mruby-compiler/core/y.tab.c" break; case 466: -#line 3288 "mrbgems/mruby-compiler/core/parse.y" +#line 3301 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_lvar(p, (yyvsp[0].id)); } -#line 9020 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8632 "mrbgems/mruby-compiler/core/y.tab.c" break; case 467: -#line 3292 "mrbgems/mruby-compiler/core/parse.y" +#line 3305 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_ivar(p, (yyvsp[0].id)); } -#line 9028 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8640 "mrbgems/mruby-compiler/core/y.tab.c" break; case 468: -#line 3296 "mrbgems/mruby-compiler/core/parse.y" +#line 3309 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_gvar(p, (yyvsp[0].id)); } -#line 9036 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8648 "mrbgems/mruby-compiler/core/y.tab.c" break; case 469: -#line 3300 "mrbgems/mruby-compiler/core/parse.y" +#line 3313 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_cvar(p, (yyvsp[0].id)); } -#line 9044 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8656 "mrbgems/mruby-compiler/core/y.tab.c" break; case 470: -#line 3304 "mrbgems/mruby-compiler/core/parse.y" +#line 3317 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_const(p, (yyvsp[0].id)); } -#line 9052 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8664 "mrbgems/mruby-compiler/core/y.tab.c" break; case 471: -#line 3310 "mrbgems/mruby-compiler/core/parse.y" +#line 3323 "mrbgems/mruby-compiler/core/parse.y" { assignable(p, (yyvsp[0].nd)); } -#line 9060 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8672 "mrbgems/mruby-compiler/core/y.tab.c" break; case 472: -#line 3314 "mrbgems/mruby-compiler/core/parse.y" +#line 3327 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "can't assign to numbered parameter"); } -#line 9068 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8680 "mrbgems/mruby-compiler/core/y.tab.c" break; case 473: -#line 3320 "mrbgems/mruby-compiler/core/parse.y" +#line 3333 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = var_reference(p, (yyvsp[0].nd)); } -#line 9076 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8688 "mrbgems/mruby-compiler/core/y.tab.c" break; case 474: -#line 3324 "mrbgems/mruby-compiler/core/parse.y" +#line 3337 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_nil(p); } -#line 9084 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8696 "mrbgems/mruby-compiler/core/y.tab.c" break; case 475: -#line 3328 "mrbgems/mruby-compiler/core/parse.y" +#line 3341 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_self(p); } -#line 9092 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8704 "mrbgems/mruby-compiler/core/y.tab.c" break; case 476: -#line 3332 "mrbgems/mruby-compiler/core/parse.y" +#line 3345 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_true(p); } -#line 9100 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8712 "mrbgems/mruby-compiler/core/y.tab.c" break; case 477: -#line 3336 "mrbgems/mruby-compiler/core/parse.y" +#line 3349 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_false(p); } -#line 9108 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8720 "mrbgems/mruby-compiler/core/y.tab.c" break; case 478: -#line 3340 "mrbgems/mruby-compiler/core/parse.y" +#line 3353 "mrbgems/mruby-compiler/core/parse.y" { const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL); if (!fn) { @@ -9116,22 +8728,22 @@ yyreduce: } (yyval.nd) = new_str(p, fn, strlen(fn)); } -#line 9120 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8732 "mrbgems/mruby-compiler/core/y.tab.c" break; case 479: -#line 3348 "mrbgems/mruby-compiler/core/parse.y" +#line 3361 "mrbgems/mruby-compiler/core/parse.y" { char buf[16]; dump_int(p->lineno, buf); (yyval.nd) = new_int(p, buf, 10, 0); } -#line 9131 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8743 "mrbgems/mruby-compiler/core/y.tab.c" break; case 480: -#line 3355 "mrbgems/mruby-compiler/core/parse.y" +#line 3368 "mrbgems/mruby-compiler/core/parse.y" { #ifdef MRB_UTF8_STRING const char *enc = "UTF-8"; @@ -9140,46 +8752,46 @@ yyreduce: #endif (yyval.nd) = new_str(p, enc, strlen(enc)); } -#line 9144 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8756 "mrbgems/mruby-compiler/core/y.tab.c" break; case 483: -#line 3370 "mrbgems/mruby-compiler/core/parse.y" +#line 3383 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 9152 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8764 "mrbgems/mruby-compiler/core/y.tab.c" break; case 484: -#line 3374 "mrbgems/mruby-compiler/core/parse.y" +#line 3387 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_BEG; p->cmd_start = TRUE; } -#line 9161 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8773 "mrbgems/mruby-compiler/core/y.tab.c" break; case 485: -#line 3379 "mrbgems/mruby-compiler/core/parse.y" +#line 3392 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 9169 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8781 "mrbgems/mruby-compiler/core/y.tab.c" break; case 486: -#line 3390 "mrbgems/mruby-compiler/core/parse.y" +#line 3403 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); p->lstate = EXPR_BEG; p->cmd_start = TRUE; } -#line 9179 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8791 "mrbgems/mruby-compiler/core/y.tab.c" break; case 487: -#line 3396 "mrbgems/mruby-compiler/core/parse.y" +#line 3409 "mrbgems/mruby-compiler/core/parse.y" { #if 1 /* til real keyword args implemented */ @@ -9197,504 +8809,504 @@ yyreduce: new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b)); #endif } -#line 9201 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8813 "mrbgems/mruby-compiler/core/y.tab.c" break; case 488: -#line 3414 "mrbgems/mruby-compiler/core/parse.y" +#line 3427 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 9209 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8821 "mrbgems/mruby-compiler/core/y.tab.c" break; case 489: -#line 3420 "mrbgems/mruby-compiler/core/parse.y" +#line 3433 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); } -#line 9217 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8829 "mrbgems/mruby-compiler/core/y.tab.c" break; case 490: -#line 3426 "mrbgems/mruby-compiler/core/parse.y" +#line 3439 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 9227 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8839 "mrbgems/mruby-compiler/core/y.tab.c" break; case 491: -#line 3432 "mrbgems/mruby-compiler/core/parse.y" +#line 3445 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); local_unnest(p); } -#line 9236 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8848 "mrbgems/mruby-compiler/core/y.tab.c" break; case 492: -#line 3439 "mrbgems/mruby-compiler/core/parse.y" +#line 3452 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 9245 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8857 "mrbgems/mruby-compiler/core/y.tab.c" break; case 493: -#line 3444 "mrbgems/mruby-compiler/core/parse.y" +#line 3457 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); local_unnest(p); } -#line 9254 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8866 "mrbgems/mruby-compiler/core/y.tab.c" break; case 494: -#line 3451 "mrbgems/mruby-compiler/core/parse.y" +#line 3464 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9262 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8874 "mrbgems/mruby-compiler/core/y.tab.c" break; case 495: -#line 3455 "mrbgems/mruby-compiler/core/parse.y" +#line 3468 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9270 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8882 "mrbgems/mruby-compiler/core/y.tab.c" break; case 496: -#line 3461 "mrbgems/mruby-compiler/core/parse.y" +#line 3474 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9278 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8890 "mrbgems/mruby-compiler/core/y.tab.c" break; case 497: -#line 3465 "mrbgems/mruby-compiler/core/parse.y" +#line 3478 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9286 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8898 "mrbgems/mruby-compiler/core/y.tab.c" break; case 500: -#line 3475 "mrbgems/mruby-compiler/core/parse.y" +#line 3488 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_rest_args(p, nsym((yyvsp[0].id))); } -#line 9294 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8906 "mrbgems/mruby-compiler/core/y.tab.c" break; case 501: -#line 3479 "mrbgems/mruby-compiler/core/parse.y" +#line 3492 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_rest_args(p, 0); } -#line 9302 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8914 "mrbgems/mruby-compiler/core/y.tab.c" break; case 502: -#line 3485 "mrbgems/mruby-compiler/core/parse.y" +#line 3498 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); } -#line 9310 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8922 "mrbgems/mruby-compiler/core/y.tab.c" break; case 503: -#line 3489 "mrbgems/mruby-compiler/core/parse.y" +#line 3502 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); } -#line 9318 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8930 "mrbgems/mruby-compiler/core/y.tab.c" break; case 504: -#line 3493 "mrbgems/mruby-compiler/core/parse.y" +#line 3506 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); } -#line 9326 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8938 "mrbgems/mruby-compiler/core/y.tab.c" break; case 505: -#line 3497 "mrbgems/mruby-compiler/core/parse.y" +#line 3510 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } -#line 9334 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8946 "mrbgems/mruby-compiler/core/y.tab.c" break; case 506: -#line 3503 "mrbgems/mruby-compiler/core/parse.y" +#line 3516 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } -#line 9342 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8954 "mrbgems/mruby-compiler/core/y.tab.c" break; case 507: -#line 3507 "mrbgems/mruby-compiler/core/parse.y" +#line 3520 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args_tail(p, 0, 0, 0); } -#line 9350 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8962 "mrbgems/mruby-compiler/core/y.tab.c" break; case 508: -#line 3513 "mrbgems/mruby-compiler/core/parse.y" +#line 3526 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9358 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8970 "mrbgems/mruby-compiler/core/y.tab.c" break; case 509: -#line 3517 "mrbgems/mruby-compiler/core/parse.y" +#line 3530 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9366 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8978 "mrbgems/mruby-compiler/core/y.tab.c" break; case 510: -#line 3521 "mrbgems/mruby-compiler/core/parse.y" +#line 3534 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } -#line 9374 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8986 "mrbgems/mruby-compiler/core/y.tab.c" break; case 511: -#line 3525 "mrbgems/mruby-compiler/core/parse.y" +#line 3538 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9382 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8994 "mrbgems/mruby-compiler/core/y.tab.c" break; case 512: -#line 3529 "mrbgems/mruby-compiler/core/parse.y" +#line 3542 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9390 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9002 "mrbgems/mruby-compiler/core/y.tab.c" break; case 513: -#line 3533 "mrbgems/mruby-compiler/core/parse.y" +#line 3546 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9398 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9010 "mrbgems/mruby-compiler/core/y.tab.c" break; case 514: -#line 3537 "mrbgems/mruby-compiler/core/parse.y" +#line 3550 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } -#line 9406 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9018 "mrbgems/mruby-compiler/core/y.tab.c" break; case 515: -#line 3541 "mrbgems/mruby-compiler/core/parse.y" +#line 3554 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9414 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9026 "mrbgems/mruby-compiler/core/y.tab.c" break; case 516: -#line 3545 "mrbgems/mruby-compiler/core/parse.y" +#line 3558 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9422 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9034 "mrbgems/mruby-compiler/core/y.tab.c" break; case 517: -#line 3549 "mrbgems/mruby-compiler/core/parse.y" +#line 3562 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } -#line 9430 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9042 "mrbgems/mruby-compiler/core/y.tab.c" break; case 518: -#line 3553 "mrbgems/mruby-compiler/core/parse.y" +#line 3566 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9438 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9050 "mrbgems/mruby-compiler/core/y.tab.c" break; case 519: -#line 3557 "mrbgems/mruby-compiler/core/parse.y" +#line 3570 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } -#line 9446 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9058 "mrbgems/mruby-compiler/core/y.tab.c" break; case 520: -#line 3561 "mrbgems/mruby-compiler/core/parse.y" +#line 3574 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } -#line 9454 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9066 "mrbgems/mruby-compiler/core/y.tab.c" break; case 521: -#line 3565 "mrbgems/mruby-compiler/core/parse.y" +#line 3578 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); } -#line 9462 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9074 "mrbgems/mruby-compiler/core/y.tab.c" break; case 522: -#line 3569 "mrbgems/mruby-compiler/core/parse.y" +#line 3582 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, mrb_intern_lit(p->mrb, "&")); (yyval.nd) = new_args(p, 0, 0, 0, 0, 0); } -#line 9471 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9083 "mrbgems/mruby-compiler/core/y.tab.c" break; case 523: -#line 3576 "mrbgems/mruby-compiler/core/parse.y" +#line 3589 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a constant"); (yyval.nd) = 0; } -#line 9480 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9092 "mrbgems/mruby-compiler/core/y.tab.c" break; case 524: -#line 3581 "mrbgems/mruby-compiler/core/parse.y" +#line 3594 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be an instance variable"); (yyval.nd) = 0; } -#line 9489 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9101 "mrbgems/mruby-compiler/core/y.tab.c" break; case 525: -#line 3586 "mrbgems/mruby-compiler/core/parse.y" +#line 3599 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a global variable"); (yyval.nd) = 0; } -#line 9498 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9110 "mrbgems/mruby-compiler/core/y.tab.c" break; case 526: -#line 3591 "mrbgems/mruby-compiler/core/parse.y" +#line 3604 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a class variable"); (yyval.nd) = 0; } -#line 9507 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9119 "mrbgems/mruby-compiler/core/y.tab.c" break; case 527: -#line 3596 "mrbgems/mruby-compiler/core/parse.y" +#line 3609 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a numbered parameter"); (yyval.nd) = 0; } -#line 9516 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9128 "mrbgems/mruby-compiler/core/y.tab.c" break; case 528: -#line 3603 "mrbgems/mruby-compiler/core/parse.y" +#line 3616 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = 0; } -#line 9524 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9136 "mrbgems/mruby-compiler/core/y.tab.c" break; case 529: -#line 3607 "mrbgems/mruby-compiler/core/parse.y" +#line 3620 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 9533 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9145 "mrbgems/mruby-compiler/core/y.tab.c" break; case 530: -#line 3614 "mrbgems/mruby-compiler/core/parse.y" +#line 3627 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_arg(p, (yyvsp[0].id)); } -#line 9541 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9153 "mrbgems/mruby-compiler/core/y.tab.c" break; case 531: -#line 3618 "mrbgems/mruby-compiler/core/parse.y" +#line 3631 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = local_switch(p); } -#line 9549 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9161 "mrbgems/mruby-compiler/core/y.tab.c" break; case 532: -#line 3622 "mrbgems/mruby-compiler/core/parse.y" +#line 3635 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_masgn_param(p, (yyvsp[-1].nd), p->locals->car); local_resume(p, (yyvsp[-2].nd)); local_add_f(p, 0); } -#line 9559 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9171 "mrbgems/mruby-compiler/core/y.tab.c" break; case 533: -#line 3630 "mrbgems/mruby-compiler/core/parse.y" +#line 3643 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9567 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9179 "mrbgems/mruby-compiler/core/y.tab.c" break; case 534: -#line 3634 "mrbgems/mruby-compiler/core/parse.y" +#line 3647 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9575 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9187 "mrbgems/mruby-compiler/core/y.tab.c" break; case 535: -#line 3640 "mrbgems/mruby-compiler/core/parse.y" +#line 3653 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[-1].id)); local_nest(p); (yyval.id) = (yyvsp[-1].id); } -#line 9585 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9197 "mrbgems/mruby-compiler/core/y.tab.c" break; case 536: -#line 3648 "mrbgems/mruby-compiler/core/parse.y" +#line 3661 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 9595 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9207 "mrbgems/mruby-compiler/core/y.tab.c" break; case 537: -#line 3656 "mrbgems/mruby-compiler/core/parse.y" +#line 3669 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 9605 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9217 "mrbgems/mruby-compiler/core/y.tab.c" break; case 538: -#line 3664 "mrbgems/mruby-compiler/core/parse.y" +#line 3677 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9613 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9225 "mrbgems/mruby-compiler/core/y.tab.c" break; case 539: -#line 3668 "mrbgems/mruby-compiler/core/parse.y" +#line 3681 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9621 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9233 "mrbgems/mruby-compiler/core/y.tab.c" break; case 540: -#line 3674 "mrbgems/mruby-compiler/core/parse.y" +#line 3687 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9629 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9241 "mrbgems/mruby-compiler/core/y.tab.c" break; case 541: -#line 3678 "mrbgems/mruby-compiler/core/parse.y" +#line 3691 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9637 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9249 "mrbgems/mruby-compiler/core/y.tab.c" break; case 544: -#line 3688 "mrbgems/mruby-compiler/core/parse.y" +#line 3701 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 9646 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9258 "mrbgems/mruby-compiler/core/y.tab.c" break; case 545: -#line 3693 "mrbgems/mruby-compiler/core/parse.y" +#line 3706 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, mrb_intern_lit(p->mrb, "*")); (yyval.id) = -1; } -#line 9655 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9267 "mrbgems/mruby-compiler/core/y.tab.c" break; case 548: -#line 3704 "mrbgems/mruby-compiler/core/parse.y" +#line 3717 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 9663 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9275 "mrbgems/mruby-compiler/core/y.tab.c" break; case 549: -#line 3710 "mrbgems/mruby-compiler/core/parse.y" +#line 3723 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = (yyvsp[0].id); } -#line 9671 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9283 "mrbgems/mruby-compiler/core/y.tab.c" break; case 550: -#line 3714 "mrbgems/mruby-compiler/core/parse.y" +#line 3727 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = 0; } -#line 9679 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9291 "mrbgems/mruby-compiler/core/y.tab.c" break; case 551: -#line 3720 "mrbgems/mruby-compiler/core/parse.y" +#line 3733 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); if (!(yyval.nd)) (yyval.nd) = new_nil(p); } -#line 9688 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9300 "mrbgems/mruby-compiler/core/y.tab.c" break; case 552: -#line 3724 "mrbgems/mruby-compiler/core/parse.y" +#line 3737 "mrbgems/mruby-compiler/core/parse.y" {p->lstate = EXPR_BEG;} -#line 9694 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9306 "mrbgems/mruby-compiler/core/y.tab.c" break; case 553: -#line 3725 "mrbgems/mruby-compiler/core/parse.y" +#line 3738 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-1].nd) == 0) { yyerror(p, "can't define singleton method for ()."); @@ -9717,55 +9329,55 @@ yyreduce: } (yyval.nd) = (yyvsp[-1].nd); } -#line 9721 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9333 "mrbgems/mruby-compiler/core/y.tab.c" break; case 555: -#line 3751 "mrbgems/mruby-compiler/core/parse.y" +#line 3764 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); } -#line 9729 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9341 "mrbgems/mruby-compiler/core/y.tab.c" break; case 556: -#line 3757 "mrbgems/mruby-compiler/core/parse.y" +#line 3770 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1((yyvsp[0].nd)); NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 9738 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9350 "mrbgems/mruby-compiler/core/y.tab.c" break; case 557: -#line 3762 "mrbgems/mruby-compiler/core/parse.y" +#line 3775 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9746 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9358 "mrbgems/mruby-compiler/core/y.tab.c" break; case 560: -#line 3772 "mrbgems/mruby-compiler/core/parse.y" +#line 3785 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[-2].nd)); void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 9756 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9368 "mrbgems/mruby-compiler/core/y.tab.c" break; case 561: -#line 3778 "mrbgems/mruby-compiler/core/parse.y" +#line 3791 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(new_sym(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 9765 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9377 "mrbgems/mruby-compiler/core/y.tab.c" break; case 562: -#line 3783 "mrbgems/mruby-compiler/core/parse.y" +#line 3796 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); if ((yyvsp[-2].nd)->car == (node*)NODE_DSTR) { @@ -9775,67 +9387,67 @@ yyreduce: (yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp[-2].nd))), (yyvsp[0].nd)); } } -#line 9779 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9391 "mrbgems/mruby-compiler/core/y.tab.c" break; case 563: -#line 3793 "mrbgems/mruby-compiler/core/parse.y" +#line 3806 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(new_kw_rest_args(p, 0), (yyvsp[0].nd)); } -#line 9788 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9400 "mrbgems/mruby-compiler/core/y.tab.c" break; case 576: -#line 3820 "mrbgems/mruby-compiler/core/parse.y" +#line 3833 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = '.'; } -#line 9796 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9408 "mrbgems/mruby-compiler/core/y.tab.c" break; case 577: -#line 3824 "mrbgems/mruby-compiler/core/parse.y" +#line 3837 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = 0; } -#line 9804 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9416 "mrbgems/mruby-compiler/core/y.tab.c" break; case 579: -#line 3831 "mrbgems/mruby-compiler/core/parse.y" +#line 3844 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = tCOLON2; } -#line 9812 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9424 "mrbgems/mruby-compiler/core/y.tab.c" break; case 588: -#line 3852 "mrbgems/mruby-compiler/core/parse.y" +#line 3865 "mrbgems/mruby-compiler/core/parse.y" {yyerrok;} -#line 9818 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9430 "mrbgems/mruby-compiler/core/y.tab.c" break; case 591: -#line 3858 "mrbgems/mruby-compiler/core/parse.y" +#line 3871 "mrbgems/mruby-compiler/core/parse.y" { p->lineno += (yyvsp[0].num); p->column = 0; } -#line 9827 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9439 "mrbgems/mruby-compiler/core/y.tab.c" break; case 594: -#line 3869 "mrbgems/mruby-compiler/core/parse.y" +#line 3882 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 9835 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9447 "mrbgems/mruby-compiler/core/y.tab.c" break; -#line 9839 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9451 "mrbgems/mruby-compiler/core/y.tab.c" default: break; } @@ -9850,10 +9462,11 @@ yyreduce: case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -9877,44 +9490,50 @@ yyreduce: yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; +#if ! YYERROR_VERBOSE + yyerror (p, YY_("syntax error")); +#else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - yypcontext_t yyctx - = {yyssp, yytoken}; char const *yymsgp = YY_("syntax error"); int yysyntax_error_status; - yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); + yysyntax_error_status = YYSYNTAX_ERROR; if (yysyntax_error_status == 0) yymsgp = yymsg; - else if (yysyntax_error_status == -1) + else if (yysyntax_error_status == 1) { if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); - yymsg = YY_CAST (char *, - YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); - if (yymsg) + yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); + if (!yymsg) { - yysyntax_error_status - = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); - yymsgp = yymsg; + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; } else { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = YYENOMEM; + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; } } yyerror (p, yymsgp); - if (yysyntax_error_status == YYENOMEM) + if (yysyntax_error_status == 2) goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR +#endif } + + if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an @@ -9963,14 +9582,13 @@ yyerrorlab: yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ - /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { - yyn += YYSYMBOL_YYerror; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) { yyn = yytable[yyn]; if (0 < yyn) @@ -9984,7 +9602,7 @@ yyerrlab1: yydestruct ("Error: popping", - YY_ACCESSING_SYMBOL (yystate), yyvsp, p); + yystos[yystate], yyvsp, p); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -9996,7 +9614,7 @@ yyerrlab1: /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -10018,7 +9636,7 @@ yyabortlab: goto yyreturn; -#if 1 +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -10048,19 +9666,20 @@ yyreturn: while (yyssp != yyss) { yydestruct ("Cleanup: popping", - YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, p); + yystos[+*yyssp], yyvsp, p); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif +#if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); +#endif return yyresult; } - -#line 3873 "mrbgems/mruby-compiler/core/parse.y" +#line 3886 "mrbgems/mruby-compiler/core/parse.y" #define pylval (*((YYSTYPE*)(p->ylval))) @@ -12383,7 +12002,7 @@ parser_init_cxt(parser_state *p, mrbc_context *cxt) } p->capture_errors = cxt->capture_errors; p->no_optimize = cxt->no_optimize; - p->on_eval = cxt->on_eval; + p->upper = cxt->upper; if (cxt->partial_hook) { p->cxt = cxt; } diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c index ca046d88e..73e23392b 100644 --- a/mrbgems/mruby-eval/src/eval.c +++ b/mrbgems/mruby-eval/src/eval.c @@ -9,217 +9,6 @@ mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p); mrb_value mrb_obj_instance_eval(mrb_state *mrb, mrb_value self); -static struct mrb_irep * -get_closure_irep(mrb_state *mrb, int level) -{ - struct RProc *proc = mrb->c->ci[-1].proc; - - while (level--) { - if (!proc) return NULL; - proc = proc->upper; - } - if (!proc) return NULL; - if (MRB_PROC_CFUNC_P(proc)) { - return NULL; - } - return proc->body.irep; -} - -/* search for irep lev above the bottom */ -static mrb_irep* -search_irep(mrb_irep *top, int bnest, int lev, mrb_irep *bottom) -{ - int i; - - for (i=0; irlen; i++) { - mrb_irep* tmp = top->reps[i]; - - if (tmp == bottom) return top; - tmp = search_irep(tmp, bnest-1, lev, bottom); - if (tmp) { - if (bnest == lev) return top; - return tmp; - } - } - return NULL; -} - -static uint16_t -search_variable(mrb_state *mrb, mrb_sym vsym, int bnest) -{ - mrb_irep *virep; - int level; - int pos; - - for (level = 0; (virep = get_closure_irep(mrb, level)); level++) { - if (virep->lv == NULL) { - continue; - } - for (pos = 0; pos < virep->nlocals - 1; pos++) { - if (vsym == virep->lv[pos].name) { - return (pos+1)<<8 | (level+bnest); - } - } - } - - return 0; -} - -static int -irep_argc(mrb_irep *irep) -{ - mrb_code c; - - c = irep->iseq[0]; - if (c == OP_ENTER) { - mrb_aspec ax = PEEK_W(irep->iseq+1); - /* extra 1 means a slot for block */ - return MRB_ASPEC_REQ(ax)+MRB_ASPEC_OPT(ax)+MRB_ASPEC_REST(ax)+MRB_ASPEC_POST(ax)+1; - } - return 0; -} - -static mrb_bool -potential_upvar_p(struct mrb_locals *lv, uint16_t v, int argc, uint16_t nlocals) -{ - if (v >= nlocals) return FALSE; - /* skip arguments */ - if (v < argc+1) return FALSE; - return TRUE; -} - -extern uint8_t mrb_insn_size[]; -extern uint8_t mrb_insn_size1[]; -extern uint8_t mrb_insn_size2[]; -extern uint8_t mrb_insn_size3[]; - -static void -patch_irep(mrb_state *mrb, mrb_irep *irep, int bnest, mrb_irep *top) -{ - int i; - uint32_t a; - uint16_t b; - uint8_t c; - mrb_code insn; - int argc = irep_argc(irep); - mrb_code *iseq = (mrb_code *)irep->iseq; - - mrb_assert((irep->flags & MRB_ISEQ_NO_FREE) == 0); - - for (i = 0; i < irep->ilen; ) { - insn = iseq[i]; - switch(insn){ - case OP_EPUSH: - a = PEEK_B(iseq+i+1); - patch_irep(mrb, irep->reps[a], bnest + 1, top); - break; - - case OP_LAMBDA: - case OP_BLOCK: - a = PEEK_B(iseq+i+1); - b = PEEK_B(iseq+i+2); - patch_irep(mrb, irep->reps[b], bnest + 1, top); - break; - - case OP_SEND: - b = PEEK_B(iseq+i+2); - c = PEEK_B(iseq+i+3); - if (c != 0) { - break; - } - else { - uint16_t arg = search_variable(mrb, irep->syms[b], bnest); - if (arg != 0) { - /* must replace */ - iseq[i] = OP_GETUPVAR; - iseq[i+2] = arg >> 8; - iseq[i+3] = arg & 0xff; - } - } - break; - - case OP_MOVE: - a = PEEK_B(iseq+i+1); - b = PEEK_B(iseq+i+2); - /* src part */ - if (potential_upvar_p(irep->lv, b, argc, irep->nlocals)) { - uint16_t arg = search_variable(mrb, irep->lv[b - 1].name, bnest); - if (arg != 0) { - /* must replace */ - iseq[i] = insn = OP_GETUPVAR; - iseq[i+2] = arg >> 8; - iseq[i+3] = arg & 0xff; - } - } - /* dst part */ - if (potential_upvar_p(irep->lv, a, argc, irep->nlocals)) { - uint16_t arg = search_variable(mrb, irep->lv[a - 1].name, bnest); - if (arg != 0) { - /* must replace */ - iseq[i] = insn = OP_SETUPVAR; - iseq[i+1] = (mrb_code)b; - iseq[i+2] = arg >> 8; - iseq[i+3] = arg & 0xff; - } - } - break; - - case OP_GETUPVAR: - a = PEEK_B(iseq+i+1); - b = PEEK_B(iseq+i+2); - c = PEEK_B(iseq+i+3); - { - int lev = c+1; - mrb_irep *tmp = search_irep(top, bnest, lev, irep); - if (potential_upvar_p(tmp->lv, b, irep_argc(tmp), tmp->nlocals)) { - uint16_t arg = search_variable(mrb, tmp->lv[b-1].name, bnest); - if (arg != 0) { - /* must replace */ - iseq[i] = OP_GETUPVAR; - iseq[i+2] = arg >> 8; - iseq[i+3] = arg & 0xff; - } - } - } - break; - - case OP_SETUPVAR: - a = PEEK_B(iseq+i+1); - b = PEEK_B(iseq+i+2); - c = PEEK_B(iseq+i+3); - { - int lev = c+1; - mrb_irep *tmp = search_irep(top, bnest, lev, irep); - if (potential_upvar_p(tmp->lv, b, irep_argc(tmp), tmp->nlocals)) { - uint16_t arg = search_variable(mrb, tmp->lv[b-1].name, bnest); - if (arg != 0) { - /* must replace */ - iseq[i] = OP_SETUPVAR; - iseq[i+1] = a; - iseq[i+2] = arg >> 8; - iseq[i+3] = arg & 0xff; - } - } - } - break; - - case OP_EXT1: - insn = PEEK_B(iseq+i+1); - i += mrb_insn_size1[insn]+1; - continue; - case OP_EXT2: - insn = PEEK_B(iseq+i+1); - i += mrb_insn_size2[insn]+1; - continue; - case OP_EXT3: - insn = PEEK_B(iseq+i+1); - i += mrb_insn_size3[insn]+1; - continue; - } - i+=mrb_insn_size[insn]; - } -} - void mrb_codedump_all(mrb_state*, struct RProc*); static struct RProc* @@ -243,7 +32,8 @@ create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding, mrbc_filename(mrb, cxt, file ? file : "(eval)"); cxt->capture_errors = TRUE; cxt->no_optimize = TRUE; - cxt->on_eval = TRUE; + ci = (mrb->c->ci > mrb->c->cibase) ? mrb->c->ci - 1 : mrb->c->cibase; + cxt->upper = ci->proc && MRB_PROC_CFUNC_P(ci->proc) ? NULL : ci->proc; p = mrb_parse_nstring(mrb, s, len, cxt); @@ -311,7 +101,6 @@ create_proc_from_string(mrb_state *mrb, char *s, mrb_int len, mrb_value binding, } proc->upper = ci->proc; mrb->c->ci->target_class = target_class; - patch_irep(mrb, proc->body.irep, 0, proc->body.irep); /* mrb_codedump_all(mrb, proc); */ mrb_parser_free(p); diff --git a/mrbgems/mruby-eval/test/eval.rb b/mrbgems/mruby-eval/test/eval.rb index 4930259c1..639ed68f9 100644 --- a/mrbgems/mruby-eval/test/eval.rb +++ b/mrbgems/mruby-eval/test/eval.rb @@ -130,3 +130,24 @@ Proc.new { foo } EOS } end + +assert('Calling the same method as the variable name') do + hoge = Object.new + def hoge.fuga + "Hit!" + end + assert_equal("Hit!") { fuga = "Miss!"; eval "hoge.fuga" } + assert_equal("Hit!") { fuga = "Miss!"; -> { eval "hoge.fuga" }.call } + assert_equal("Hit!") { -> { fuga = "Miss!"; eval "hoge.fuga" }.call } + assert_equal("Hit!") { fuga = "Miss!"; eval("-> { hoge.fuga }").call } +end + +assert('Access numbered parameter from eval') do + hoge = Object.new + def hoge.fuga(a, &b) + b.call(a) + end + assert_equal(6) { + hoge.fuga(3) { _1 + eval("_1") } + } +end -- cgit v1.2.3