Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
ca476798
Commit
ca476798
authored
Feb 3, 2014
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
py: Implement builtin exec.
parent
4acb2452
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
py/builtin.h
+1
-0
1 addition, 0 deletions
py/builtin.h
py/builtinevex.c
+12
-2
12 additions, 2 deletions
py/builtinevex.c
py/py.mk
+1
-1
1 addition, 1 deletion
py/py.mk
py/qstrdefs.h
+1
-0
1 addition, 0 deletions
py/qstrdefs.h
py/runtime.c
+1
-0
1 addition, 0 deletions
py/runtime.c
with
16 additions
and
3 deletions
py/builtin.h
+
1
−
0
View file @
ca476798
...
@@ -11,6 +11,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_chr_obj);
...
@@ -11,6 +11,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_chr_obj);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_dir_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_dir_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_divmod_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_divmod_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_eval_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_eval_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_exec_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_hash_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_hash_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_id_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_id_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_isinstance_obj
);
MP_DECLARE_CONST_FUN_OBJ
(
mp_builtin_isinstance_obj
);
...
...
This diff is collapsed.
Click to expand it.
py/builtinev
al
.c
→
py/builtinev
ex
.c
+
12
−
2
View file @
ca476798
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#include
"map.h"
#include
"map.h"
#include
"builtin.h"
#include
"builtin.h"
static
mp_obj_t
mp_builtin_eval
(
mp_obj_t
o_in
)
{
static
mp_obj_t
parse_compile_execute
(
mp_obj_t
o_in
,
mp_parse_input_kind_t
parse_input_kind
)
{
uint
str_len
;
uint
str_len
;
const
byte
*
str
=
mp_obj_str_get_data
(
o_in
,
&
str_len
);
const
byte
*
str
=
mp_obj_str_get_data
(
o_in
,
&
str_len
);
...
@@ -30,7 +30,7 @@ static mp_obj_t mp_builtin_eval(mp_obj_t o_in) {
...
@@ -30,7 +30,7 @@ static mp_obj_t mp_builtin_eval(mp_obj_t o_in) {
// parse the string
// parse the string
qstr
parse_exc_id
;
qstr
parse_exc_id
;
const
char
*
parse_exc_msg
;
const
char
*
parse_exc_msg
;
mp_parse_node_t
pn
=
mp_parse
(
lex
,
MP_PARSE_EVAL_INPUT
,
&
parse_exc_id
,
&
parse_exc_msg
);
mp_parse_node_t
pn
=
mp_parse
(
lex
,
parse_input_kind
,
&
parse_exc_id
,
&
parse_exc_msg
);
mp_lexer_free
(
lex
);
mp_lexer_free
(
lex
);
if
(
pn
==
MP_PARSE_NODE_NULL
)
{
if
(
pn
==
MP_PARSE_NODE_NULL
)
{
...
@@ -51,4 +51,14 @@ static mp_obj_t mp_builtin_eval(mp_obj_t o_in) {
...
@@ -51,4 +51,14 @@ static mp_obj_t mp_builtin_eval(mp_obj_t o_in) {
return
rt_call_function_0
(
module_fun
);
return
rt_call_function_0
(
module_fun
);
}
}
static
mp_obj_t
mp_builtin_eval
(
mp_obj_t
o_in
)
{
return
parse_compile_execute
(
o_in
,
MP_PARSE_EVAL_INPUT
);
}
MP_DEFINE_CONST_FUN_OBJ_1
(
mp_builtin_eval_obj
,
mp_builtin_eval
);
MP_DEFINE_CONST_FUN_OBJ_1
(
mp_builtin_eval_obj
,
mp_builtin_eval
);
static
mp_obj_t
mp_builtin_exec
(
mp_obj_t
o_in
)
{
return
parse_compile_execute
(
o_in
,
MP_PARSE_FILE_INPUT
);
}
MP_DEFINE_CONST_FUN_OBJ_1
(
mp_builtin_exec_obj
,
mp_builtin_exec
);
This diff is collapsed.
Click to expand it.
py/py.mk
+
1
−
1
View file @
ca476798
...
@@ -65,7 +65,7 @@ PY_O_BASENAME = \
...
@@ -65,7 +65,7 @@ PY_O_BASENAME = \
stream.o
\
stream.o
\
builtin.o
\
builtin.o
\
builtinimport.o
\
builtinimport.o
\
builtinev
al
.o
\
builtinev
ex
.o
\
builtinmp.o
\
builtinmp.o
\
vm.o
\
vm.o
\
showbc.o
\
showbc.o
\
...
...
This diff is collapsed.
Click to expand it.
py/qstrdefs.h
+
1
−
0
View file @
ca476798
...
@@ -55,6 +55,7 @@ Q(dir)
...
@@ -55,6 +55,7 @@ Q(dir)
Q
(
divmod
)
Q
(
divmod
)
Q
(
enumerate
)
Q
(
enumerate
)
Q
(
eval
)
Q
(
eval
)
Q
(
exec
)
Q
(
filter
)
Q
(
filter
)
Q
(
float
)
Q
(
float
)
Q
(
hash
)
Q
(
hash
)
...
...
This diff is collapsed.
Click to expand it.
py/runtime.c
+
1
−
0
View file @
ca476798
...
@@ -144,6 +144,7 @@ void rt_init(void) {
...
@@ -144,6 +144,7 @@ void rt_init(void) {
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_dir
,
(
mp_obj_t
)
&
mp_builtin_dir_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_dir
,
(
mp_obj_t
)
&
mp_builtin_dir_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_divmod
,
(
mp_obj_t
)
&
mp_builtin_divmod_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_divmod
,
(
mp_obj_t
)
&
mp_builtin_divmod_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_eval
,
(
mp_obj_t
)
&
mp_builtin_eval_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_eval
,
(
mp_obj_t
)
&
mp_builtin_eval_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_exec
,
(
mp_obj_t
)
&
mp_builtin_exec_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_hash
,
(
mp_obj_t
)
&
mp_builtin_hash_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_hash
,
(
mp_obj_t
)
&
mp_builtin_hash_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_id
,
(
mp_obj_t
)
&
mp_builtin_id_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_id
,
(
mp_obj_t
)
&
mp_builtin_id_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_isinstance
,
(
mp_obj_t
)
&
mp_builtin_isinstance_obj
);
mp_map_add_qstr
(
&
map_builtins
,
MP_QSTR_isinstance
,
(
mp_obj_t
)
&
mp_builtin_isinstance_obj
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment