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
b60d6c42
Unverified
Commit
b60d6c42
authored
Nov 16, 2016
by
Clayton Smith
Committed by
Bouke van der Bijl
Nov 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't allow array parameter in Struct.new
parent
a630c4f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
18 deletions
+14
-18
mrbgems/mruby-struct/src/struct.c
mrbgems/mruby-struct/src/struct.c
+8
-18
mrbgems/mruby-struct/test/struct.rb
mrbgems/mruby-struct/test/struct.rb
+6
-0
No files found.
mrbgems/mruby-struct/src/struct.c
View file @
b60d6c42
...
...
@@ -273,25 +273,15 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
}
else
{
if
(
argc
>
0
)
name
=
argv
[
0
];
if
(
argc
>
1
)
rest
=
argv
[
1
];
if
(
mrb_array_p
(
rest
))
{
if
(
!
mrb_nil_p
(
name
)
&&
mrb_symbol_p
(
name
))
{
/* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */
mrb_ary_unshift
(
mrb
,
rest
,
name
);
name
=
mrb_nil_value
();
}
}
else
{
pargv
=
&
argv
[
1
];
argcnt
=
argc
-
1
;
if
(
!
mrb_nil_p
(
name
)
&&
mrb_symbol_p
(
name
))
{
/* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */
name
=
mrb_nil_value
();
pargv
=
&
argv
[
0
];
argcnt
++
;
}
rest
=
mrb_ary_new_from_values
(
mrb
,
argcnt
,
pargv
);
pargv
=
&
argv
[
1
];
argcnt
=
argc
-
1
;
if
(
!
mrb_nil_p
(
name
)
&&
mrb_symbol_p
(
name
))
{
/* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */
name
=
mrb_nil_value
();
pargv
=
&
argv
[
0
];
argcnt
++
;
}
rest
=
mrb_ary_new_from_values
(
mrb
,
argcnt
,
pargv
);
for
(
i
=
0
;
i
<
RARRAY_LEN
(
rest
);
i
++
)
{
id
=
mrb_obj_to_sym
(
mrb
,
RARRAY_PTR
(
rest
)[
i
]);
mrb_ary_set
(
mrb
,
rest
,
i
,
mrb_symbol_value
(
id
));
...
...
mrbgems/mruby-struct/test/struct.rb
View file @
b60d6c42
...
...
@@ -158,3 +158,9 @@ assert("Struct#dig") do
assert_equal
1
,
a
.
dig
(
:purple
,
:red
)
assert_equal
1
,
a
.
dig
(
1
,
0
)
end
assert
(
"Struct.new does not allow array"
)
do
assert_raise
(
TypeError
)
do
Struct
.
new
(
"Test"
,
[
:a
])
end
end
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