Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
e7cd1699
Commit
e7cd1699
authored
Mar 14, 2016
by
Damien George
Browse files
py/argcheck: Use size_t instead of mp_uint_t to count number of args.
parent
dddb98db
Changes
2
Hide whitespace changes
Inline
Side-by-side
py/argcheck.c
View file @
e7cd1699
...
...
@@ -30,7 +30,7 @@
#include
"py/nlr.h"
#include
"py/runtime.h"
void
mp_arg_check_num
(
mp_uint
_t
n_args
,
mp_uint
_t
n_kw
,
mp_uint
_t
n_args_min
,
mp_uint
_t
n_args_max
,
bool
takes_kw
)
{
void
mp_arg_check_num
(
size
_t
n_args
,
size
_t
n_kw
,
size
_t
n_args_min
,
size
_t
n_args_max
,
bool
takes_kw
)
{
// TODO maybe take the function name as an argument so we can print nicer error messages
if
(
n_kw
&&
!
takes_kw
)
{
...
...
@@ -73,9 +73,9 @@ void mp_arg_check_num(mp_uint_t n_args, mp_uint_t n_kw, mp_uint_t n_args_min, mp
}
}
void
mp_arg_parse_all
(
mp_uint
_t
n_pos
,
const
mp_obj_t
*
pos
,
mp_map_t
*
kws
,
mp_uint
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
)
{
mp_uint
_t
pos_found
=
0
,
kws_found
=
0
;
for
(
mp_uint
_t
i
=
0
;
i
<
n_allowed
;
i
++
)
{
void
mp_arg_parse_all
(
size
_t
n_pos
,
const
mp_obj_t
*
pos
,
mp_map_t
*
kws
,
size
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
)
{
size
_t
pos_found
=
0
,
kws_found
=
0
;
for
(
size
_t
i
=
0
;
i
<
n_allowed
;
i
++
)
{
mp_obj_t
given_arg
;
if
(
i
<
n_pos
)
{
if
(
allowed
[
i
].
flags
&
MP_ARG_KW_ONLY
)
{
...
...
@@ -132,7 +132,7 @@ void mp_arg_parse_all(mp_uint_t n_pos, const mp_obj_t *pos, mp_map_t *kws, mp_ui
}
}
void
mp_arg_parse_all_kw_array
(
mp_uint
_t
n_pos
,
mp_uint
_t
n_kw
,
const
mp_obj_t
*
args
,
mp_uint
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
)
{
void
mp_arg_parse_all_kw_array
(
size
_t
n_pos
,
size
_t
n_kw
,
const
mp_obj_t
*
args
,
size
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
)
{
mp_map_t
kw_args
;
mp_map_init_fixed_table
(
&
kw_args
,
n_kw
,
args
+
n_pos
);
mp_arg_parse_all
(
n_pos
,
args
,
&
kw_args
,
n_allowed
,
allowed
,
out_vals
);
...
...
py/runtime.h
View file @
e7cd1699
...
...
@@ -67,9 +67,9 @@ void mp_deinit(void);
// extra printing method specifically for mp_obj_t's which are integral type
int
mp_print_mp_int
(
const
mp_print_t
*
print
,
mp_obj_t
x
,
int
base
,
int
base_char
,
int
flags
,
char
fill
,
int
width
,
int
prec
);
void
mp_arg_check_num
(
mp_uint
_t
n_args
,
mp_uint
_t
n_kw
,
mp_uint
_t
n_args_min
,
mp_uint
_t
n_args_max
,
bool
takes_kw
);
void
mp_arg_parse_all
(
mp_uint
_t
n_pos
,
const
mp_obj_t
*
pos
,
mp_map_t
*
kws
,
mp_uint
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
);
void
mp_arg_parse_all_kw_array
(
mp_uint
_t
n_pos
,
mp_uint
_t
n_kw
,
const
mp_obj_t
*
args
,
mp_uint
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
);
void
mp_arg_check_num
(
size
_t
n_args
,
size
_t
n_kw
,
size
_t
n_args_min
,
size
_t
n_args_max
,
bool
takes_kw
);
void
mp_arg_parse_all
(
size
_t
n_pos
,
const
mp_obj_t
*
pos
,
mp_map_t
*
kws
,
size
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
);
void
mp_arg_parse_all_kw_array
(
size
_t
n_pos
,
size
_t
n_kw
,
const
mp_obj_t
*
args
,
size
_t
n_allowed
,
const
mp_arg_t
*
allowed
,
mp_arg_val_t
*
out_vals
);
NORETURN
void
mp_arg_error_terse_mismatch
(
void
);
NORETURN
void
mp_arg_error_unimpl_kw
(
void
);
...
...
Write
Preview
Supports
Markdown
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