diff options
| author | S-H-GAMELINKS <[email protected]> | 2024-01-05 12:03:11 +0900 |
|---|---|---|
| committer | Yuichiro Kaneko <[email protected]> | 2024-01-07 09:24:34 +0900 |
| commit | 1b8d01136c3ff6c60325c7609d61e19ac42acd9f (patch) | |
| tree | 99e027e7711867464c30a72d20f9e56a96e87a83 /compile.c | |
| parent | 76afbda5b566148b9e73939e0ff9b8464d59806c (diff) | |
Introduce Numeric Node's
Diffstat (limited to 'compile.c')
| -rw-r--r-- | compile.c | 109 |
1 files changed, 100 insertions, 9 deletions
@@ -1944,6 +1944,17 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, break; case NODE_LINE: dv = rb_node_line_lineno_val(val_node);; + case NODE_INTEGER: + dv = rb_node_integer_literal_val(RNODE_INTEGER(val_node)); + break; + case NODE_FLOAT: + dv = rb_node_float_literal_val(RNODE_FLOAT(val_node)); + break; + case NODE_RATIONAL: + dv = rb_node_rational_literal_val(RNODE_RATIONAL(val_node)); + break; + case NODE_IMAGINARY: + dv = rb_node_imaginary_literal_val(RNODE_IMAGINARY(val_node)); break; case NODE_NIL: dv = Qnil; @@ -4506,6 +4517,10 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *cond, case NODE_LIT: /* NODE_LIT is always true */ case NODE_LINE: case NODE_FILE: + case NODE_INTEGER: /* NODE_INTEGER is always true */ + case NODE_FLOAT: /* NODE_FLOAT is always true */ + case NODE_RATIONAL: /* NODE_RATIONAL is always true */ + case NODE_IMAGINARY: /* NODE_IMAGINARY is always true */ case NODE_TRUE: case NODE_STR: case NODE_ZLIST: @@ -4666,6 +4681,10 @@ static_literal_node_p(const NODE *node, const rb_iseq_t *iseq) switch (nd_type(node)) { case NODE_LIT: case NODE_LINE: + case NODE_INTEGER: + case NODE_FLOAT: + case NODE_RATIONAL: + case NODE_IMAGINARY: case NODE_NIL: case NODE_TRUE: case NODE_FALSE: @@ -4682,6 +4701,14 @@ static inline VALUE static_literal_value(const NODE *node, rb_iseq_t *iseq) { switch (nd_type(node)) { + case NODE_INTEGER: + return rb_node_integer_literal_val(RNODE_INTEGER(node)); + case NODE_FLOAT: + return rb_node_float_literal_val(RNODE_FLOAT(node)); + case NODE_RATIONAL: + return rb_node_rational_literal_val(RNODE_RATIONAL(node)); + case NODE_IMAGINARY: + return rb_node_imaginary_literal_val(RNODE_IMAGINARY(node)); case NODE_NIL: return Qnil; case NODE_TRUE: @@ -5059,19 +5086,25 @@ rb_node_case_when_optimizable_literal(const NODE *const node) switch (nd_type(node)) { case NODE_LIT: { VALUE v = RNODE_LIT(node)->nd_lit; - double ival; - if (RB_FLOAT_TYPE_P(v) && - modf(RFLOAT_VALUE(v), &ival) == 0.0) { - return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival); - } - if (RB_TYPE_P(v, T_RATIONAL) || RB_TYPE_P(v, T_COMPLEX)) { - return Qundef; - } - if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) { + if (SYMBOL_P(v)) { return v; } break; } + case NODE_INTEGER: + return rb_node_integer_literal_val(RNODE_INTEGER(node)); + case NODE_FLOAT: { + VALUE v = rb_node_float_literal_val(RNODE_FLOAT(node)); + double ival; + + if (modf(RFLOAT_VALUE(v), &ival) == 0.0) { + return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival); + } + return v; + } + case NODE_RATIONAL: + case NODE_IMAGINARY: + return Qundef; case NODE_NIL: return Qnil; case NODE_TRUE: @@ -5710,6 +5743,10 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, case NODE_LIT: case NODE_LINE: case NODE_FILE: + case NODE_INTEGER: + case NODE_FLOAT: + case NODE_RATIONAL: + case NODE_IMAGINARY: case NODE_ZLIST: case NODE_AND: case NODE_OR: @@ -6286,6 +6323,8 @@ optimizable_range_item_p(const NODE *n) return RB_INTEGER_TYPE_P(RNODE_LIT(n)->nd_lit); case NODE_LINE: return TRUE; + case NODE_INTEGER: + return TRUE; case NODE_NIL: return TRUE; default: @@ -6301,6 +6340,14 @@ optimized_range_item(const NODE *n) return RNODE_LIT(n)->nd_lit; case NODE_LINE: return rb_node_line_lineno_val(n); + case NODE_INTEGER: + return rb_node_integer_literal_val(RNODE_INTEGER(n)); + case NODE_FLOAT: + return rb_node_float_literal_val(RNODE_FLOAT(n)); + case NODE_RATIONAL: + return rb_node_rational_literal_val(RNODE_RATIONAL(n)); + case NODE_IMAGINARY: + return rb_node_imaginary_literal_val(RNODE_IMAGINARY(n)); case NODE_NIL: return Qnil; default: @@ -7123,6 +7170,10 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c } case NODE_LIT: case NODE_LINE: + case NODE_INTEGER: + case NODE_FLOAT: + case NODE_RATIONAL: + case NODE_IMAGINARY: case NODE_FILE: case NODE_STR: case NODE_XSTR: @@ -9679,6 +9730,10 @@ compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, } else if (nd_type_p(default_value, NODE_LIT) || nd_type_p(default_value, NODE_LINE) || + nd_type_p(default_value, NODE_INTEGER) || + nd_type_p(default_value, NODE_FLOAT) || + nd_type_p(default_value, NODE_RATIONAL) || + nd_type_p(default_value, NODE_IMAGINARY) || nd_type_p(default_value, NODE_NIL) || nd_type_p(default_value, NODE_TRUE) || nd_type_p(default_value, NODE_FALSE)) { @@ -10154,6 +10209,42 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no } break; } + case NODE_INTEGER:{ + VALUE lit = rb_node_integer_literal_val(RNODE_INTEGER(node)); + debugp_param("integer", lit); + if (!popped) { + ADD_INSN1(ret, node, putobject, lit); + RB_OBJ_WRITTEN(iseq, Qundef, lit); + } + break; + } + case NODE_FLOAT:{ + VALUE lit = rb_node_float_literal_val(RNODE_FLOAT(node)); + debugp_param("float", lit); + if (!popped) { + ADD_INSN1(ret, node, putobject, lit); + RB_OBJ_WRITTEN(iseq, Qundef, lit); + } + break; + } + case NODE_RATIONAL:{ + VALUE lit = rb_node_rational_literal_val(RNODE_RATIONAL(node)); + debugp_param("rational", lit); + if (!popped) { + ADD_INSN1(ret, node, putobject, lit); + RB_OBJ_WRITTEN(iseq, Qundef, lit); + } + break; + } + case NODE_IMAGINARY:{ + VALUE lit = rb_node_imaginary_literal_val(RNODE_IMAGINARY(node)); + debugp_param("imaginary", lit); + if (!popped) { + ADD_INSN1(ret, node, putobject, lit); + RB_OBJ_WRITTEN(iseq, Qundef, lit); + } + break; + } case NODE_FILE: case NODE_STR:{ debugp_param("nd_lit", get_string_value(node)); |