summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-02-06 08:54:47 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-02-06 08:54:47 +0900
commit7ba46129561f5fa3a4b1599d6f31fec1cbba6f04 (patch)
treee3aa42219d4cc41b4a4283624d997eff5cb66b17
parented1bf9aa809acfaa42deba222968224e6e9d7b3c (diff)
downloadmruby-7ba46129561f5fa3a4b1599d6f31fec1cbba6f04.tar.gz
mruby-7ba46129561f5fa3a4b1599d6f31fec1cbba6f04.zip
use mrb_str_new_lit() more widely
-rw-r--r--src/array.c4
-rw-r--r--src/class.c6
-rw-r--r--src/hash.c6
-rw-r--r--src/numeric.c6
-rw-r--r--src/object.c6
-rw-r--r--src/print.c4
-rw-r--r--src/state.c2
7 files changed, 17 insertions, 17 deletions
diff --git a/src/array.c b/src/array.c
index dbd6b4263..ffb76f88e 100644
--- a/src/array.c
+++ b/src/array.c
@@ -995,7 +995,7 @@ inspect_ary(mrb_state *mrb, mrb_value ary, mrb_value list)
/* check recursive */
for(i=0; i<RARRAY_LEN(list); i++) {
if (mrb_obj_equal(mrb, ary, RARRAY_PTR(list)[i])) {
- return mrb_str_new(mrb, "[...]", 5);
+ return mrb_str_new_lit(mrb, "[...]");
}
}
@@ -1038,7 +1038,7 @@ inspect_ary(mrb_state *mrb, mrb_value ary, mrb_value list)
static mrb_value
mrb_ary_inspect(mrb_state *mrb, mrb_value ary)
{
- if (RARRAY_LEN(ary) == 0) return mrb_str_new(mrb, "[]", 2);
+ if (RARRAY_LEN(ary) == 0) return mrb_str_new_lit(mrb, "[]");
return inspect_ary(mrb, ary, mrb_ary_new(mrb));
}
diff --git a/src/class.c b/src/class.c
index 612098548..4b5a014d9 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1226,7 +1226,7 @@ mrb_class_path(mrb_state *mrb, struct RClass *c)
}
else if (outer && outer != mrb->object_class) {
mrb_value base = mrb_class_path(mrb, outer);
- path = mrb_str_plus(mrb, base, mrb_str_new(mrb, "::", 2));
+ path = mrb_str_plus(mrb, base, mrb_str_new_lit(mrb, "::"));
name = mrb_sym2name_len(mrb, sym, &len);
mrb_str_concat(mrb, path, mrb_str_new(mrb, name, len));
}
@@ -1253,7 +1253,7 @@ mrb_class_name(mrb_state *mrb, struct RClass* c)
{
mrb_value path = mrb_class_path(mrb, c);
if (mrb_nil_p(path)) {
- path = mrb_str_new(mrb, "#<Class:", 8);
+ path = mrb_str_new_lit(mrb, "#<Class:");
mrb_str_concat(mrb, path, mrb_ptr_to_str(mrb, c));
mrb_str_cat(mrb, path, ">", 1);
}
@@ -1378,7 +1378,7 @@ mrb_mod_to_s(mrb_state *mrb, mrb_value klass)
if (mrb_type(klass) == MRB_TT_SCLASS) {
mrb_value v = mrb_iv_get(mrb, klass, mrb_intern_lit(mrb, "__attached__"));
- str = mrb_str_new(mrb, "#<Class:", 8);
+ str = mrb_str_new_lit(mrb, "#<Class:");
switch (mrb_type(v)) {
case MRB_TT_CLASS:
diff --git a/src/hash.c b/src/hash.c
index d1e2aa538..3bfffc0f7 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -788,9 +788,9 @@ inspect_hash(mrb_state *mrb, mrb_value hash, int recur)
khash_t(ht) *h = RHASH_TBL(hash);
khiter_t k;
- if (recur) return mrb_str_new(mrb, "{...}", 5);
+ if (recur) return mrb_str_new_lit(mrb, "{...}");
- str = mrb_str_new(mrb, "{", 1);
+ str = mrb_str_new_lit(mrb, "{");
if (h && kh_size(h) > 0) {
for (k = kh_begin(h); k != kh_end(h); k++) {
int ai;
@@ -833,7 +833,7 @@ mrb_hash_inspect(mrb_state *mrb, mrb_value hash)
khash_t(ht) *h = RHASH_TBL(hash);
if (!h || kh_size(h) == 0)
- return mrb_str_new(mrb, "{}", 2);
+ return mrb_str_new_lit(mrb, "{}");
return inspect_hash(mrb, hash, 0);
}
diff --git a/src/numeric.c b/src/numeric.c
index 8f9d1ba25..eb6a4d8ec 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -118,14 +118,14 @@ mrb_flo_to_str(mrb_state *mrb, mrb_value flo, int max_digit)
n = mrb_float(flo);
if (isnan(n)) {
- result = mrb_str_new(mrb, "NaN", 3);
+ result = mrb_str_new_lit(mrb, "NaN");
}
else if (isinf(n)) {
if (n < 0) {
- result = mrb_str_new(mrb, "-inf", 4);
+ result = mrb_str_new_lit(mrb, "-inf");
}
else {
- result = mrb_str_new(mrb, "inf", 3);
+ result = mrb_str_new_lit(mrb, "inf");
}
}
else {
diff --git a/src/object.c b/src/object.c
index ce7489070..18524e958 100644
--- a/src/object.c
+++ b/src/object.c
@@ -86,7 +86,7 @@ nil_to_s(mrb_state *mrb, mrb_value obj)
static mrb_value
nil_inspect(mrb_state *mrb, mrb_value obj)
{
- return mrb_str_new(mrb, "nil", 3);
+ return mrb_str_new_lit(mrb, "nil");
}
/***********************************************************************
@@ -147,7 +147,7 @@ true_xor(mrb_state *mrb, mrb_value obj)
static mrb_value
true_to_s(mrb_state *mrb, mrb_value obj)
{
- return mrb_str_new(mrb, "true", 4);
+ return mrb_str_new_lit(mrb, "true");
}
/* 15.2.5.3.4 */
@@ -254,7 +254,7 @@ false_or(mrb_state *mrb, mrb_value obj)
static mrb_value
false_to_s(mrb_state *mrb, mrb_value obj)
{
- return mrb_str_new(mrb, "false", 5);
+ return mrb_str_new_lit(mrb, "false");
}
void
diff --git a/src/print.c b/src/print.c
index 0be9a028f..94250ddce 100644
--- a/src/print.c
+++ b/src/print.c
@@ -62,7 +62,7 @@ mrb_show_version(mrb_state *mrb)
msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n"));
}
else {
- msg = mrb_str_new(mrb, version_msg, sizeof(version_msg) - 1);
+ msg = mrb_str_new_lit(mrb, version_msg);
}
printstr(mrb, msg);
}
@@ -78,7 +78,7 @@ mrb_show_copyright(mrb_state *mrb)
msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n"));
}
else {
- msg = mrb_str_new(mrb, copyright_msg, sizeof(copyright_msg) - 1);
+ msg = mrb_str_new_lit(mrb, copyright_msg);
}
printstr(mrb, msg);
}
diff --git a/src/state.c b/src/state.c
index a8853fe72..620ed7d77 100644
--- a/src/state.c
+++ b/src/state.c
@@ -19,7 +19,7 @@ void mrb_final_core(mrb_state*);
static mrb_value
inspect_main(mrb_state *mrb, mrb_value mod)
{
- return mrb_str_new(mrb, "main", 4);
+ return mrb_str_new_lit(mrb, "main");
}
mrb_state*