Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
ab7bf284
Commit
ab7bf284
authored
May 17, 2014
by
Paul Sokolovsky
Browse files
py: More const usage.
parent
c18ef2a9
Changes
7
Hide whitespace changes
Inline
Side-by-side
py/obj.c
View file @
ab7bf284
...
...
@@ -222,7 +222,7 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2) {
return
false
;
}
machine_int_t
mp_obj_get_int
(
mp_obj_t
arg
)
{
machine_int_t
mp_obj_get_int
(
mp_
const_
obj_t
arg
)
{
// This function essentially performs implicit type conversion to int
// Note that Python does NOT provide implicit type conversion from
// float to int in the core expression language, try some_list[1.0].
...
...
@@ -242,7 +242,7 @@ machine_int_t mp_obj_get_int(mp_obj_t arg) {
// returns false if arg is not of integral type
// returns true and sets *value if it is of integral type
// can throw OverflowError if arg is of integral type, but doesn't fit in a machine_int_t
bool
mp_obj_get_int_maybe
(
mp_obj_t
arg
,
machine_int_t
*
value
)
{
bool
mp_obj_get_int_maybe
(
mp_
const_
obj_t
arg
,
machine_int_t
*
value
)
{
if
(
arg
==
mp_const_false
)
{
*
value
=
0
;
}
else
if
(
arg
==
mp_const_true
)
{
...
...
py/obj.h
View file @
ab7bf284
...
...
@@ -158,7 +158,7 @@ typedef enum _mp_map_lookup_kind_t {
MP_MAP_LOOKUP_REMOVE_IF_FOUND
,
// 2
}
mp_map_lookup_kind_t
;
static
inline
bool
MP_MAP_SLOT_IS_FILLED
(
mp_map_t
*
map
,
machine_uint_t
pos
)
{
return
((
map
)
->
table
[
pos
].
key
!=
MP_OBJ_NULL
&&
(
map
)
->
table
[
pos
].
key
!=
MP_OBJ_SENTINEL
);
}
static
inline
bool
MP_MAP_SLOT_IS_FILLED
(
const
mp_map_t
*
map
,
machine_uint_t
pos
)
{
return
((
map
)
->
table
[
pos
].
key
!=
MP_OBJ_NULL
&&
(
map
)
->
table
[
pos
].
key
!=
MP_OBJ_SENTINEL
);
}
void
mp_map_init
(
mp_map_t
*
map
,
int
n
);
void
mp_map_init_fixed_table
(
mp_map_t
*
map
,
int
n
,
const
mp_obj_t
*
table
);
...
...
@@ -177,7 +177,7 @@ typedef struct _mp_set_t {
mp_obj_t
*
table
;
}
mp_set_t
;
static
inline
bool
MP_SET_SLOT_IS_FILLED
(
mp_set_t
*
set
,
machine_uint_t
pos
)
{
return
((
set
)
->
table
[
pos
]
!=
MP_OBJ_NULL
&&
(
set
)
->
table
[
pos
]
!=
MP_OBJ_SENTINEL
);
}
static
inline
bool
MP_SET_SLOT_IS_FILLED
(
const
mp_set_t
*
set
,
machine_uint_t
pos
)
{
return
((
set
)
->
table
[
pos
]
!=
MP_OBJ_NULL
&&
(
set
)
->
table
[
pos
]
!=
MP_OBJ_SENTINEL
);
}
void
mp_set_init
(
mp_set_t
*
set
,
int
n
);
mp_obj_t
mp_set_lookup
(
mp_set_t
*
set
,
mp_obj_t
index
,
mp_map_lookup_kind_t
lookup_kind
);
...
...
@@ -424,8 +424,8 @@ bool mp_obj_is_callable(mp_obj_t o_in);
machine_int_t
mp_obj_hash
(
mp_obj_t
o_in
);
bool
mp_obj_equal
(
mp_obj_t
o1
,
mp_obj_t
o2
);
machine_int_t
mp_obj_get_int
(
mp_obj_t
arg
);
bool
mp_obj_get_int_maybe
(
mp_obj_t
arg
,
machine_int_t
*
value
);
machine_int_t
mp_obj_get_int
(
mp_
const_
obj_t
arg
);
bool
mp_obj_get_int_maybe
(
mp_
const_
obj_t
arg
,
machine_int_t
*
value
);
#if MICROPY_ENABLE_FLOAT
mp_float_t
mp_obj_get_float
(
mp_obj_t
self_in
);
void
mp_obj_get_complex
(
mp_obj_t
self_in
,
mp_float_t
*
real
,
mp_float_t
*
imag
);
...
...
@@ -452,7 +452,7 @@ machine_int_t mp_obj_int_get(mp_obj_t self_in);
mp_float_t
mp_obj_int_as_float
(
mp_obj_t
self_in
);
#endif
// Will raise exception if value doesn't fit into machine_int_t
machine_int_t
mp_obj_int_get_checked
(
mp_obj_t
self_in
);
machine_int_t
mp_obj_int_get_checked
(
mp_
const_
obj_t
self_in
);
// exception
#define mp_obj_is_native_exception_instance(o) (mp_obj_get_type(o)->make_new == mp_obj_exception_make_new)
...
...
@@ -540,7 +540,7 @@ typedef struct _mp_obj_fun_native_t { // need this so we can define const object
bool
mp_obj_fun_prepare_simple_args
(
mp_obj_t
self_in
,
uint
n_args
,
uint
n_kw
,
const
mp_obj_t
*
args
,
uint
*
out_args1_len
,
const
mp_obj_t
**
out_args1
,
uint
*
out_args2_len
,
const
mp_obj_t
**
out_args2
);
const
char
*
mp_obj_fun_get_name
(
mp_obj_t
fun
);
const
char
*
mp_obj_fun_get_name
(
mp_
const_
obj_t
fun
);
const
char
*
mp_obj_code_get_name
(
const
byte
*
code_info
);
mp_obj_t
mp_identity
(
mp_obj_t
self
);
...
...
py/objfun.c
View file @
ab7bf284
...
...
@@ -154,8 +154,8 @@ const char *mp_obj_code_get_name(const byte *code_info) {
return
qstr_str
(
block_name
);
}
const
char
*
mp_obj_fun_get_name
(
mp_obj_t
fun_in
)
{
mp_obj_fun_bc_t
*
fun
=
fun_in
;
const
char
*
mp_obj_fun_get_name
(
mp_
const_
obj_t
fun_in
)
{
const
mp_obj_fun_bc_t
*
fun
=
fun_in
;
const
byte
*
code_info
=
fun
->
bytecode
;
return
mp_obj_code_get_name
(
code_info
);
}
...
...
py/objint.c
View file @
ab7bf284
...
...
@@ -129,7 +129,7 @@ STATIC uint int_as_str_size_formatted(uint base, const char *prefix, char comma)
//
// The resulting formatted string will be returned from this function and the
// formatted size will be in *fmt_size.
char
*
mp_obj_int_formatted
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_obj_t
self_in
,
char
*
mp_obj_int_formatted
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_
const_
obj_t
self_in
,
int
base
,
const
char
*
prefix
,
char
base_char
,
char
comma
)
{
fmt_int_t
num
;
if
(
MP_OBJ_IS_SMALL_INT
(
self_in
))
{
...
...
py/objint.h
View file @
ab7bf284
...
...
@@ -34,9 +34,9 @@ typedef struct _mp_obj_int_t {
}
mp_obj_int_t
;
void
mp_obj_int_print
(
void
(
*
print
)(
void
*
env
,
const
char
*
fmt
,
...),
void
*
env
,
mp_obj_t
self_in
,
mp_print_kind_t
kind
);
char
*
mp_obj_int_formatted
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_obj_t
self_in
,
char
*
mp_obj_int_formatted
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_
const_
obj_t
self_in
,
int
base
,
const
char
*
prefix
,
char
base_char
,
char
comma
);
char
*
mp_obj_int_formatted_impl
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_obj_t
self_in
,
char
*
mp_obj_int_formatted_impl
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_
const_
obj_t
self_in
,
int
base
,
const
char
*
prefix
,
char
base_char
,
char
comma
);
bool
mp_obj_int_is_positive
(
mp_obj_t
self_in
);
mp_obj_t
mp_obj_int_unary_op
(
int
op
,
mp_obj_t
o_in
);
...
...
py/objint_longlong.c
View file @
ab7bf284
...
...
@@ -186,7 +186,7 @@ machine_int_t mp_obj_int_get(mp_obj_t self_in) {
}
}
machine_int_t
mp_obj_int_get_checked
(
mp_obj_t
self_in
)
{
machine_int_t
mp_obj_int_get_checked
(
mp_
const_
obj_t
self_in
)
{
// TODO: Check overflow
return
mp_obj_int_get
(
self_in
);
}
...
...
py/objint_mpz.c
View file @
ab7bf284
...
...
@@ -58,10 +58,10 @@ STATIC mp_obj_int_t *mp_obj_int_new_mpz(void) {
// formatted size will be in *fmt_size.
//
// This particular routine should only be called for the mpz representation of the int.
char
*
mp_obj_int_formatted_impl
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_obj_t
self_in
,
char
*
mp_obj_int_formatted_impl
(
char
**
buf
,
int
*
buf_size
,
int
*
fmt_size
,
mp_
const_
obj_t
self_in
,
int
base
,
const
char
*
prefix
,
char
base_char
,
char
comma
)
{
assert
(
MP_OBJ_IS_TYPE
(
self_in
,
&
mp_type_int
));
mp_obj_int_t
*
self
=
self_in
;
const
mp_obj_int_t
*
self
=
self_in
;
uint
needed_size
=
mpz_as_str_size_formatted
(
&
self
->
mpz
,
base
,
prefix
,
comma
);
if
(
needed_size
>
*
buf_size
)
{
...
...
@@ -284,11 +284,11 @@ machine_int_t mp_obj_int_get(mp_obj_t self_in) {
}
}
machine_int_t
mp_obj_int_get_checked
(
mp_obj_t
self_in
)
{
machine_int_t
mp_obj_int_get_checked
(
mp_
const_
obj_t
self_in
)
{
if
(
MP_OBJ_IS_SMALL_INT
(
self_in
))
{
return
MP_OBJ_SMALL_INT_VALUE
(
self_in
);
}
else
{
mp_obj_int_t
*
self
=
self_in
;
const
mp_obj_int_t
*
self
=
self_in
;
machine_int_t
value
;
if
(
mpz_as_int_checked
(
&
self
->
mpz
,
&
value
))
{
return
value
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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