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
d96b2c9a
Commit
d96b2c9a
authored
Dec 12, 2017
by
Yusuke Endoh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support MRB_WITHOUT_FLOAT to mruby-io and mruby-pack
parent
85fc9b88
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
mrbgems/mruby-io/src/io.c
mrbgems/mruby-io/src/io.c
+6
-0
mrbgems/mruby-pack/src/pack.c
mrbgems/mruby-pack/src/pack.c
+12
-0
No files found.
mrbgems/mruby-io/src/io.c
View file @
d96b2c9a
...
...
@@ -682,7 +682,11 @@ mrb_io_sysseek(mrb_state *mrb, mrb_value io)
mrb_sys_fail
(
mrb
,
"sysseek"
);
}
if
(
pos
>
MRB_INT_MAX
)
{
#ifndef MRB_WITHOUT_FLOAT
return
mrb_float_value
(
mrb
,
(
mrb_float
)
pos
);
#else
mrb_raise
(
mrb
,
E_IO_ERROR
,
"sysseek reached too far for MRB_WITHOUT_FLOAT"
);
#endif
}
else
{
return
mrb_fixnum_value
(
pos
);
}
...
...
@@ -765,10 +769,12 @@ time2timeval(mrb_state *mrb, mrb_value time)
t
.
tv_usec
=
0
;
break
;
#ifndef MRB_WITHOUT_FLOAT
case
MRB_TT_FLOAT
:
t
.
tv_sec
=
(
time_t
)
mrb_float
(
time
);
t
.
tv_usec
=
(
mrb_float
(
time
)
-
t
.
tv_sec
)
*
1000000
.
0
;
break
;
#endif
default:
mrb_raise
(
mrb
,
E_TYPE_ERROR
,
"wrong argument class"
);
...
...
mrbgems/mruby-pack/src/pack.c
View file @
d96b2c9a
...
...
@@ -293,6 +293,7 @@ unpack_q(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, un
return
8
;
}
#ifndef MRB_WITHOUT_FLOAT
static
int
pack_double
(
mrb_state
*
mrb
,
mrb_value
o
,
mrb_value
str
,
mrb_int
sidx
,
unsigned
int
flags
)
{
...
...
@@ -410,6 +411,7 @@ unpack_float(mrb_state *mrb, const unsigned char * src, int srclen, mrb_value ar
return
4
;
}
#endif
static
int
pack_utf8
(
mrb_state
*
mrb
,
mrb_value
o
,
mrb_value
str
,
mrb_int
sidx
,
long
count
,
unsigned
int
flags
)
...
...
@@ -418,9 +420,11 @@ pack_utf8(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, long count,
int
len
=
0
;
uint32_t
c
=
0
;
#ifndef MRB_WITHOUT_FLOAT
if
(
mrb_float_p
(
o
))
{
goto
range_error
;
}
#endif
c
=
(
uint32_t
)
mrb_fixnum
(
o
);
/* Unicode character */
...
...
@@ -448,7 +452,9 @@ pack_utf8(mrb_state *mrb, mrb_value o, mrb_value str, mrb_int sidx, long count,
len
=
4
;
}
else
{
#ifndef MRB_WITHOUT_FLOAT
range_error:
#endif
mrb_raise
(
mrb
,
E_RANGE_ERROR
,
"pack(U): value out of range"
);
}
...
...
@@ -1103,10 +1109,12 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
o
=
mrb_ary_ref
(
mrb
,
ary
,
aidx
);
if
(
type
==
PACK_TYPE_INTEGER
)
{
o
=
mrb_to_int
(
mrb
,
o
);
#ifndef MRB_WITHOUT_FLOAT
}
else
if
(
type
==
PACK_TYPE_FLOAT
)
{
if
(
!
mrb_float_p
(
o
))
{
o
=
mrb_funcall
(
mrb
,
o
,
"to_f"
,
0
);
}
#endif
}
else
if
(
type
==
PACK_TYPE_STRING
)
{
if
(
!
mrb_string_p
(
o
))
{
mrb_raisef
(
mrb
,
E_TYPE_ERROR
,
"can't convert %S into String"
,
mrb_class_path
(
mrb
,
mrb_obj_class
(
mrb
,
o
)));
...
...
@@ -1135,12 +1143,14 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
case
PACK_DIR_STR
:
ridx
+=
pack_a
(
mrb
,
o
,
result
,
ridx
,
count
,
flags
);
break
;
#ifndef MRB_WITHOUT_FLOAT
case
PACK_DIR_DOUBLE
:
ridx
+=
pack_double
(
mrb
,
o
,
result
,
ridx
,
flags
);
break
;
case
PACK_DIR_FLOAT
:
ridx
+=
pack_float
(
mrb
,
o
,
result
,
ridx
,
flags
);
break
;
#endif
case
PACK_DIR_UTF8
:
ridx
+=
pack_utf8
(
mrb
,
o
,
result
,
ridx
,
count
,
flags
);
break
;
...
...
@@ -1226,12 +1236,14 @@ mrb_pack_unpack(mrb_state *mrb, mrb_value str)
case
PACK_DIR_BASE64
:
srcidx
+=
unpack_m
(
mrb
,
sptr
,
srclen
-
srcidx
,
result
,
flags
);
break
;
#ifndef MRB_WITHOUT_FLOAT
case
PACK_DIR_FLOAT
:
srcidx
+=
unpack_float
(
mrb
,
sptr
,
srclen
-
srcidx
,
result
,
flags
);
break
;
case
PACK_DIR_DOUBLE
:
srcidx
+=
unpack_double
(
mrb
,
sptr
,
srclen
-
srcidx
,
result
,
flags
);
break
;
#endif
case
PACK_DIR_UTF8
:
srcidx
+=
unpack_utf8
(
mrb
,
sptr
,
srclen
-
srcidx
,
result
,
flags
);
break
;
...
...
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