diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-03 22:55:16 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-03 22:55:16 +0000 |
| commit | 97334c85d0b53ef1648eb76ec6e9e2b1efab1f97 (patch) | |
| tree | d10f6b6b7ca3394e6f7dc31ca55e0df2b39abe02 /unix-cpy | |
| parent | 25f417c08c2cdb5c4a7564d1e69766c0448d7984 (diff) | |
| parent | b7aa72710ee6798c6d2bc2632be24206e526fc1e (diff) | |
| download | micropython-97334c85d0b53ef1648eb76ec6e9e2b1efab1f97.tar.gz micropython-97334c85d0b53ef1648eb76ec6e9e2b1efab1f97.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'unix-cpy')
| -rw-r--r-- | unix-cpy/Makefile | 5 | ||||
| -rw-r--r-- | unix-cpy/main.c | 6 | ||||
| -rw-r--r-- | unix-cpy/mpconfigport.h (renamed from unix-cpy/mpconfig.h) | 0 |
3 files changed, 6 insertions, 5 deletions
diff --git a/unix-cpy/Makefile b/unix-cpy/Makefile index 9399a765c3..48c3179460 100644 --- a/unix-cpy/Makefile +++ b/unix-cpy/Makefile @@ -47,6 +47,7 @@ PY_O = \ objtuple.o \ objtype.o \ builtin.o \ + builtinimport.o \ vm.o \ showbc.o \ repl.o \ @@ -67,7 +68,7 @@ $(BUILD)/%.o: %.c $(BUILD)/%.o: $(PYSRC)/%.S $(CC) $(CFLAGS) -c -o $@ $< -$(BUILD)/%.o: $(PYSRC)/%.c mpconfig.h +$(BUILD)/%.o: $(PYSRC)/%.c mpconfigport.h $(CC) $(CFLAGS) -c -o $@ $< $(BUILD)/emitnx64.o: $(PYSRC)/emitnative.c $(PYSRC)/emit.h @@ -80,7 +81,7 @@ $(BUILD)/emitnthumb.o: $(PYSRC)/emitnative.c $(PYSRC)/emit.h $(BUILD)/vm.o: $(PYSRC)/vm.c $(CC) $(CFLAGS) -O3 -c -o $@ $< -$(BUILD)/main.o: mpconfig.h +$(BUILD)/main.o: mpconfigport.h $(BUILD)/parse.o: $(PYSRC)/grammar.h $(BUILD)/compile.o: $(PYSRC)/grammar.h $(BUILD)/emitcpy.o: $(PYSRC)/emit.h diff --git a/unix-cpy/main.c b/unix-cpy/main.c index 2b59df4f37..eba97f527b 100644 --- a/unix-cpy/main.c +++ b/unix-cpy/main.c @@ -8,8 +8,8 @@ #include "lexer.h" #include "lexerunix.h" #include "parse.h" -#include "compile.h" #include "obj.h" +#include "compile.h" #include "runtime0.h" #include "runtime.h" @@ -37,10 +37,10 @@ void do_file(const char *file) { //printf("----------------\n"); //parse_node_show(pn, 0); //printf("----------------\n"); - bool comp_ok = mp_compile(pn, false); + mp_obj_t module_fun = mp_compile(pn, false); //printf("----------------\n"); - if (!comp_ok) { + if (module_fun == mp_const_none) { printf("compile error\n"); } } diff --git a/unix-cpy/mpconfig.h b/unix-cpy/mpconfigport.h index db72b31455..db72b31455 100644 --- a/unix-cpy/mpconfig.h +++ b/unix-cpy/mpconfigport.h |