Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
7a25b533
Commit
7a25b533
authored
Aug 27, 2014
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2567 from cubicdaiya/issues/space_after_comma2
Add a missing space after ",".
parents
0d400477
32029380
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
22 deletions
+22
-22
src/codegen.c
src/codegen.c
+1
-1
src/error.c
src/error.c
+1
-1
src/gc.c
src/gc.c
+3
-3
src/hash.c
src/hash.c
+13
-13
src/kernel.c
src/kernel.c
+3
-3
src/string.c
src/string.c
+1
-1
No files found.
src/codegen.c
View file @
7a25b533
...
...
@@ -2299,7 +2299,7 @@ codegen(codegen_scope *s, node *tree, int val)
{
int
a
=
new_msym
(
s
,
sym
(
tree
->
car
));
int
b
=
new_msym
(
s
,
sym
(
tree
->
cdr
));
int
c
=
new_msym
(
s
,
mrb_intern_lit
(
s
->
mrb
,
"alias_method"
));
int
c
=
new_msym
(
s
,
mrb_intern_lit
(
s
->
mrb
,
"alias_method"
));
genop
(
s
,
MKOP_A
(
OP_TCLASS
,
cursp
()));
push
();
...
...
src/error.c
View file @
7a25b533
...
...
@@ -261,7 +261,7 @@ mrb_vformat(mrb_state *mrb, const char *format, va_list ap)
else
{
size
=
p
-
b
;
mrb_ary_push
(
mrb
,
ary
,
mrb_str_new
(
mrb
,
b
,
size
));
return
mrb_ary_join
(
mrb
,
ary
,
mrb_str_new
(
mrb
,
NULL
,
0
));
return
mrb_ary_join
(
mrb
,
ary
,
mrb_str_new
(
mrb
,
NULL
,
0
));
}
}
...
...
src/gc.c
View file @
7a25b533
...
...
@@ -1366,7 +1366,7 @@ test_mrb_field_write_barrier(void)
obj
=
mrb_basic_ptr
(
mrb_ary_new
(
mrb
));
value
=
mrb_basic_ptr
(
mrb_str_new_lit
(
mrb
,
"value"
));
paint_black
(
obj
);
paint_partial_white
(
mrb
,
value
);
paint_partial_white
(
mrb
,
value
);
puts
(
" in GC_STATE_MARK"
);
...
...
@@ -1377,7 +1377,7 @@ test_mrb_field_write_barrier(void)
puts
(
" in GC_STATE_SWEEP"
);
paint_partial_white
(
mrb
,
value
);
paint_partial_white
(
mrb
,
value
);
mrb
->
gc_state
=
GC_STATE_SWEEP
;
mrb_field_write_barrier
(
mrb
,
obj
,
value
);
...
...
@@ -1388,7 +1388,7 @@ test_mrb_field_write_barrier(void)
puts
(
" fail with black"
);
mrb
->
gc_state
=
GC_STATE_MARK
;
paint_white
(
obj
);
paint_partial_white
(
mrb
,
value
);
paint_partial_white
(
mrb
,
value
);
mrb_field_write_barrier
(
mrb
,
obj
,
value
);
mrb_assert
(
obj
->
color
&
mrb
->
current_white_part
);
...
...
src/hash.c
View file @
7a25b533
...
...
@@ -36,20 +36,20 @@ mrb_hash_ht_hash_func(mrb_state *mrb, mrb_value key)
case
MRB_TT_SYMBOL
:
h
=
(
khint_t
)
mrb_symbol
(
key
);
return
kh_int_hash_func
(
mrb
,
h
);
return
kh_int_hash_func
(
mrb
,
h
);
case
MRB_TT_FIXNUM
:
h
=
(
khint_t
)
mrb_float_id
((
mrb_float
)
mrb_fixnum
(
key
));
return
kh_int_hash_func
(
mrb
,
h
);
return
kh_int_hash_func
(
mrb
,
h
);
case
MRB_TT_FLOAT
:
h
=
(
khint_t
)
mrb_float_id
(
mrb_float
(
key
));
return
kh_int_hash_func
(
mrb
,
h
);
return
kh_int_hash_func
(
mrb
,
h
);
default:
hv
=
mrb_funcall
(
mrb
,
key
,
"hash"
,
0
);
h
=
(
khint_t
)
t
^
mrb_fixnum
(
hv
);
return
kh_int_hash_func
(
mrb
,
h
);
return
kh_int_hash_func
(
mrb
,
h
);
}
}
...
...
@@ -241,11 +241,11 @@ mrb_hash_dup(mrb_state *mrb, mrb_value hash)
ret_h
=
ret
->
ht
;
for
(
k
=
kh_begin
(
h
);
k
!=
kh_end
(
h
);
k
++
)
{
if
(
kh_exist
(
h
,
k
))
{
if
(
kh_exist
(
h
,
k
))
{
int
ai
=
mrb_gc_arena_save
(
mrb
);
ret_k
=
kh_put
(
ht
,
mrb
,
ret_h
,
KEY
(
kh_key
(
h
,
k
)));
ret_k
=
kh_put
(
ht
,
mrb
,
ret_h
,
KEY
(
kh_key
(
h
,
k
)));
mrb_gc_arena_restore
(
mrb
,
ai
);
kh_val
(
ret_h
,
ret_k
)
=
kh_val
(
h
,
k
);
kh_val
(
ret_h
,
ret_k
)
=
kh_val
(
h
,
k
);
}
}
}
...
...
@@ -555,9 +555,9 @@ mrb_hash_shift(mrb_state *mrb, mrb_value hash)
mrb_hash_modify
(
mrb
,
hash
);
if
(
h
&&
kh_size
(
h
)
>
0
)
{
for
(
k
=
kh_begin
(
h
);
k
!=
kh_end
(
h
);
k
++
)
{
if
(
!
kh_exist
(
h
,
k
))
continue
;
if
(
!
kh_exist
(
h
,
k
))
continue
;
delKey
=
kh_key
(
h
,
k
);
delKey
=
kh_key
(
h
,
k
);
mrb_gc_protect
(
mrb
,
delKey
);
delVal
=
mrb_hash_delete_key
(
mrb
,
hash
,
delKey
);
mrb_gc_protect
(
mrb
,
delVal
);
...
...
@@ -706,8 +706,8 @@ mrb_hash_keys(mrb_state *mrb, mrb_value hash)
p
=
RARRAY_PTR
(
ary
);
for
(
k
=
kh_begin
(
h
);
k
!=
kh_end
(
h
);
k
++
)
{
if
(
kh_exist
(
h
,
k
))
{
mrb_value
kv
=
kh_key
(
h
,
k
);
mrb_hash_value
hv
=
kh_value
(
h
,
k
);
mrb_value
kv
=
kh_key
(
h
,
k
);
mrb_hash_value
hv
=
kh_value
(
h
,
k
);
p
[
hv
.
n
]
=
kv
;
}
...
...
@@ -739,7 +739,7 @@ mrb_hash_values(mrb_state *mrb, mrb_value hash)
ary
=
mrb_ary_new_capa
(
mrb
,
kh_size
(
h
));
for
(
k
=
kh_begin
(
h
);
k
!=
kh_end
(
h
);
k
++
)
{
if
(
kh_exist
(
h
,
k
))
{
mrb_hash_value
hv
=
kh_value
(
h
,
k
);
mrb_hash_value
hv
=
kh_value
(
h
,
k
);
mrb_ary_set
(
mrb
,
ary
,
hv
.
n
,
hv
.
v
);
}
...
...
@@ -812,7 +812,7 @@ mrb_hash_has_value(mrb_state *mrb, mrb_value hash)
for
(
k
=
kh_begin
(
h
);
k
!=
kh_end
(
h
);
k
++
)
{
if
(
!
kh_exist
(
h
,
k
))
continue
;
if
(
mrb_equal
(
mrb
,
kh_value
(
h
,
k
).
v
,
val
))
{
if
(
mrb_equal
(
mrb
,
kh_value
(
h
,
k
).
v
,
val
))
{
return
mrb_true_value
();
}
}
...
...
src/kernel.c
View file @
7a25b533
...
...
@@ -665,7 +665,7 @@ method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set)
if
(
!
h
)
return
;
for
(
i
=
0
;
i
<
kh_end
(
h
);
i
++
)
{
if
(
kh_exist
(
h
,
i
))
{
kh_put
(
st
,
mrb
,
set
,
kh_key
(
h
,
i
));
kh_put
(
st
,
mrb
,
set
,
kh_key
(
h
,
i
));
}
}
}
...
...
@@ -694,7 +694,7 @@ mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* kl
ary
=
mrb_ary_new
(
mrb
);
for
(
i
=
0
;
i
<
kh_end
(
set
);
i
++
)
{
if
(
kh_exist
(
set
,
i
))
{
mrb_ary_push
(
mrb
,
ary
,
mrb_symbol_value
(
kh_key
(
set
,
i
)));
mrb_ary_push
(
mrb
,
ary
,
mrb_symbol_value
(
kh_key
(
set
,
i
)));
}
}
kh_destroy
(
st
,
mrb
,
set
);
...
...
@@ -726,7 +726,7 @@ mrb_obj_singleton_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj)
ary
=
mrb_ary_new
(
mrb
);
for
(
i
=
0
;
i
<
kh_end
(
set
);
i
++
)
{
if
(
kh_exist
(
set
,
i
))
{
mrb_ary_push
(
mrb
,
ary
,
mrb_symbol_value
(
kh_key
(
set
,
i
)));
mrb_ary_push
(
mrb
,
ary
,
mrb_symbol_value
(
kh_key
(
set
,
i
)));
}
}
kh_destroy
(
st
,
mrb
,
set
);
...
...
src/string.c
View file @
7a25b533
...
...
@@ -148,7 +148,7 @@ str_new(mrb_state *mrb, const char *p, size_t len)
s
=
mrb_obj_alloc_string
(
mrb
);
if
(
len
<
RSTRING_EMBED_LEN_MAX
)
{
RSTR_SET_EMBED_FLAG
(
s
);
RSTR_SET_EMBED_LEN
(
s
,
len
);
RSTR_SET_EMBED_LEN
(
s
,
len
);
if
(
p
)
{
memcpy
(
s
->
as
.
ary
,
p
,
len
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment