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
a10dba75
Commit
a10dba75
authored
Jan 06, 2014
by
John R. Lenton
Browse files
Merge remote-tracking branch 'upstream/master' into list_reverse
parents
ba3f87c9
8137b004
Changes
33
Hide whitespace changes
Inline
Side-by-side
.gitignore
0 → 100644
View file @
a10dba75
# Compiled Sources
###################
*.o
*.a
*.elf
*.bin
*.map
*.hex
*.dis
# Packages
############
# Logs and Databases
######################
*.log
# VIM Swap Files
######################
*.swp
py/objbool.c
View file @
a10dba75
...
...
@@ -41,7 +41,7 @@ const mp_obj_type_t bool_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
static
const
mp_obj_bool_t
false_obj
=
{{
&
bool_type
},
false
};
...
...
py/objboundmeth.c
View file @
a10dba75
...
...
@@ -43,7 +43,7 @@ const mp_obj_type_t bound_meth_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_bound_meth
(
mp_obj_t
self
,
mp_obj_t
meth
)
{
...
...
py/objcell.c
View file @
a10dba75
...
...
@@ -33,7 +33,7 @@ const mp_obj_type_t cell_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_cell
(
mp_obj_t
obj
)
{
...
...
py/objclass.c
View file @
a10dba75
...
...
@@ -70,7 +70,7 @@ const mp_obj_type_t class_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_class
(
mp_map_t
*
class_locals
)
{
...
...
py/objclosure.c
View file @
a10dba75
...
...
@@ -42,7 +42,7 @@ const mp_obj_type_t closure_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_closure
(
mp_obj_t
fun
,
mp_obj_t
closure_tuple
)
{
...
...
py/objcomplex.c
View file @
a10dba75
...
...
@@ -125,7 +125,7 @@ const mp_obj_type_t complex_type = {
complex_binary_op
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
{
NULL
,
NULL
},
},
// method list
.
methods
=
{
{
NULL
,
NULL
},
},
};
mp_obj_t
mp_obj_new_complex
(
mp_float_t
real
,
mp_float_t
imag
)
{
...
...
py/objdict.c
View file @
a10dba75
...
...
@@ -63,14 +63,11 @@ static mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
const
mp_obj_type_t
dict_type
=
{
{
&
mp_const_type
},
"dict"
,
dict_print
,
// print
dict_make_new
,
// make_new
NULL
,
// call_n
NULL
,
// unary_op
dict_binary_op
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
print
=
dict_print
,
.
make_new
=
dict_make_new
,
.
binary_op
=
dict_binary_op
,
.
getiter
=
NULL
,
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_dict
(
int
n_args
)
{
...
...
py/objexcept.c
View file @
a10dba75
...
...
@@ -45,7 +45,7 @@ const mp_obj_type_t exception_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_exception
(
qstr
id
)
{
...
...
py/objfloat.c
View file @
a10dba75
...
...
@@ -79,14 +79,11 @@ static mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
const
mp_obj_type_t
float_type
=
{
{
&
mp_const_type
},
"float"
,
float_print
,
float_make_new
,
// make_new
NULL
,
// call_n
float_unary_op
,
float_binary_op
,
NULL
,
// getiter
NULL
,
// iternext
{
{
NULL
,
NULL
},
},
// method list
.
print
=
float_print
,
.
make_new
=
float_make_new
,
.
unary_op
=
float_unary_op
,
.
binary_op
=
float_binary_op
,
.
methods
=
{
{
NULL
,
NULL
},
},
};
mp_obj_t
mp_obj_new_float
(
mp_float_t
value
)
{
...
...
py/objfun.c
View file @
a10dba75
...
...
@@ -79,7 +79,7 @@ const mp_obj_type_t fun_native_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
//
method
list
.
method
s
=
{
{
NULL
,
NULL
},
// end-of-list sentinel
},
};
...
...
@@ -181,7 +181,7 @@ const mp_obj_type_t fun_bc_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
//
method
list
.
method
s
=
{
{
NULL
,
NULL
},
// end-of-list sentinel
},
};
...
...
@@ -295,7 +295,7 @@ static const mp_obj_type_t fun_asm_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
//
method
list
.
method
s
=
{
{
NULL
,
NULL
},
// end-of-list sentinel
},
};
...
...
py/objgenerator.c
View file @
a10dba75
...
...
@@ -46,7 +46,7 @@ const mp_obj_type_t gen_wrap_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_gen_wrap
(
uint
n_locals
,
uint
n_stack
,
mp_obj_t
fun
)
{
...
...
@@ -101,7 +101,7 @@ const mp_obj_type_t gen_instance_type = {
NULL
,
// binary_op
gen_instance_getiter
,
// getiter
gen_instance_iternext
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
// args are in reverse order in the array
...
...
py/objinstance.c
View file @
a10dba75
...
...
@@ -99,7 +99,7 @@ const mp_obj_type_t instance_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_instance
(
mp_obj_t
class
)
{
...
...
py/objint.c
View file @
a10dba75
...
...
@@ -33,14 +33,8 @@ static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args)
const
mp_obj_type_t
int_type
=
{
{
&
mp_const_type
},
"int"
,
NULL
,
int_make_new
,
// make_new
NULL
,
// call_n
NULL
,
// unary_op
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
{
NULL
,
NULL
},
},
// method list
.
make_new
=
int_make_new
,
.
methods
=
{
{
NULL
,
NULL
},
},
};
mp_obj_t
mp_obj_new_int
(
machine_int_t
value
)
{
...
...
py/objlist.c
View file @
a10dba75
...
...
@@ -182,13 +182,17 @@ static mp_obj_t list_index(int n_args, const mp_obj_t *args) {
assert
(
MP_OBJ_IS_TYPE
(
args
[
0
],
&
list_type
));
mp_obj_list_t
*
self
=
args
[
0
];
mp_obj_t
*
value
=
args
[
1
];
uint
start
=
0
;
uint
stop
=
self
->
len
;
uint
start
=
mp_get_index
(
self
->
base
.
type
,
self
->
len
,
n_args
>=
3
?
args
[
2
]
:
mp_obj_new_int
(
0
));
uint
stop
=
mp_get_index
(
self
->
base
.
type
,
self
->
len
,
n_args
>=
4
?
args
[
3
]
:
mp_obj_new_int
(
-
1
));
if
(
n_args
>=
3
)
{
start
=
mp_get_index
(
self
->
base
.
type
,
self
->
len
,
args
[
2
]);
if
(
n_args
>=
4
)
{
stop
=
mp_get_index
(
self
->
base
.
type
,
self
->
len
,
args
[
3
]);
}
}
for
(
uint
i
=
start
;
i
<
=
stop
;
i
++
)
{
for
(
uint
i
=
start
;
i
<
stop
;
i
++
)
{
if
(
mp_obj_equal
(
self
->
items
[
i
],
value
))
{
return
mp_obj_new_int
(
i
);
}
...
...
@@ -259,14 +263,12 @@ static MP_DEFINE_CONST_FUN_OBJ_2(list_sort_obj, list_sort);
const
mp_obj_type_t
list_type
=
{
{
&
mp_const_type
},
"list"
,
list_print
,
// print
list_make_new
,
// make_new
NULL
,
// call_n
NULL
,
// unary_op
list_binary_op
,
// binary_op
list_getiter
,
// getiter
NULL
,
// iternext
{
// method list
.
print
=
list_print
,
.
make_new
=
list_make_new
,
.
unary_op
=
NULL
,
.
binary_op
=
list_binary_op
,
.
getiter
=
list_getiter
,
.
methods
=
{
{
"append"
,
&
list_append_obj
},
{
"clear"
,
&
list_clear_obj
},
{
"copy"
,
&
list_copy_obj
},
...
...
@@ -341,14 +343,8 @@ mp_obj_t list_it_iternext(mp_obj_t self_in) {
static
const
mp_obj_type_t
list_it_type
=
{
{
&
mp_const_type
},
"list_iterator"
,
NULL
,
// print
NULL
,
// make_new
NULL
,
// call_n
NULL
,
// unary_op
NULL
,
// binary_op
NULL
,
// getiter
list_it_iternext
,
// iternext
{
{
NULL
,
NULL
},
},
// method list
.
iternext
=
list_it_iternext
,
.
methods
=
{
{
NULL
,
NULL
},
},
};
mp_obj_t
mp_obj_new_list_iterator
(
mp_obj_list_t
*
list
,
int
cur
)
{
...
...
py/objmodule.c
View file @
a10dba75
...
...
@@ -31,7 +31,7 @@ const mp_obj_type_t module_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_module
(
qstr
module_name
)
{
...
...
py/objnone.c
View file @
a10dba75
...
...
@@ -17,14 +17,8 @@ void none_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_ob
const
mp_obj_type_t
none_type
=
{
{
&
mp_const_type
},
"NoneType"
,
none_print
,
// print
NULL
,
// make_new
NULL
,
// call_n
NULL
,
// unary_op
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
print
=
none_print
,
.
methods
=
{{
NULL
,
NULL
},},
};
static
const
mp_obj_none_t
none_obj
=
{{
&
none_type
}};
...
...
py/objrange.c
View file @
a10dba75
...
...
@@ -32,7 +32,7 @@ static const mp_obj_type_t range_type = {
NULL
,
// binary_op
range_getiter
,
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
// range is a class and instances are immutable sequence objects
...
...
@@ -77,7 +77,7 @@ static const mp_obj_type_t range_it_type = {
NULL
,
// binary_op
NULL
,
// getiter
range_it_iternext
,
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
mp_obj_t
mp_obj_new_range_iterator
(
int
cur
,
int
stop
,
int
step
)
{
...
...
py/objset.c
View file @
a10dba75
...
...
@@ -64,7 +64,7 @@ const mp_obj_type_t set_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
{
NULL
,
NULL
},
},
// method list
.
methods
=
{
{
NULL
,
NULL
},
},
};
mp_obj_t
mp_obj_new_set
(
int
n_args
,
mp_obj_t
*
items
)
{
...
...
py/objslice.c
View file @
a10dba75
...
...
@@ -30,7 +30,7 @@ const mp_obj_type_t ellipsis_type = {
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{{
NULL
,
NULL
},},
// method list
.
methods
=
{{
NULL
,
NULL
},},
};
static
const
mp_obj_ellipsis_t
ellipsis_obj
=
{{
&
ellipsis_type
}};
...
...
@@ -57,14 +57,8 @@ void slice_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_o
const
mp_obj_type_t
slice_type
=
{
{
&
mp_const_type
},
"slice"
,
slice_print
,
NULL
,
// call_n
NULL
,
// make_new
NULL
,
// unary_op
NULL
,
// binary_op
NULL
,
// getiter
NULL
,
// iternext
{
{
NULL
,
NULL
},
},
// method list
.
print
=
slice_print
,
.
methods
=
{
{
NULL
,
NULL
},
},
};
// TODO: Make sure to handle "empty" values, which are signified by None in CPython
...
...
Prev
1
2
Next
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