diff options
author | Mike Pall <mike> | 2013-04-23 02:20:03 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-04-23 02:20:03 +0200 |
commit | 255326afb6fd428d62cf66e4e90a459b917a76a1 (patch) | |
tree | 6fa5e70d1baa3df57f1e976fbc07f2c47174ee13 /src/lj_opt_fold.c | |
parent | 557391c3b7110cdb431a26351e87010e7f1a41e9 (diff) | |
download | luajit-255326afb6fd428d62cf66e4e90a459b917a76a1.tar.gz luajit-255326afb6fd428d62cf66e4e90a459b917a76a1.tar.bz2 luajit-255326afb6fd428d62cf66e4e90a459b917a76a1.zip |
Use explicit conversion type for IR_TOSTR. Add char conversion.
Diffstat (limited to 'src/lj_opt_fold.c')
-rw-r--r-- | src/lj_opt_fold.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index e3194f76..06e0e783 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
@@ -759,16 +759,18 @@ LJFOLDF(kfold_conv_knum_u64_num) | |||
759 | return INT64FOLD(lj_num2u64(knumleft)); | 759 | return INT64FOLD(lj_num2u64(knumleft)); |
760 | } | 760 | } |
761 | 761 | ||
762 | LJFOLD(TOSTR KNUM) | 762 | LJFOLD(TOSTR KNUM any) |
763 | LJFOLDF(kfold_tostr_knum) | 763 | LJFOLDF(kfold_tostr_knum) |
764 | { | 764 | { |
765 | return lj_ir_kstr(J, lj_str_fromnum(J->L, &knumleft)); | 765 | return lj_ir_kstr(J, lj_str_fromnum(J->L, &knumleft)); |
766 | } | 766 | } |
767 | 767 | ||
768 | LJFOLD(TOSTR KINT) | 768 | LJFOLD(TOSTR KINT any) |
769 | LJFOLDF(kfold_tostr_kint) | 769 | LJFOLDF(kfold_tostr_kint) |
770 | { | 770 | { |
771 | return lj_ir_kstr(J, lj_str_fromint(J->L, fleft->i)); | 771 | return lj_ir_kstr(J, fins->op2 == IRTOSTR_INT ? |
772 | lj_str_fromint(J->L, fleft->i) : | ||
773 | lj_str_fromchar(J->L, fleft->i)); | ||
772 | } | 774 | } |
773 | 775 | ||
774 | LJFOLD(STRTO KGC) | 776 | LJFOLD(STRTO KGC) |