summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-05-25 12:14:42 -0700
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-05-25 12:14:42 -0700
commitaaf01481aa5ded82a4706770f235c490649437bf (patch)
tree130bfc60bd0fcf5121245e708236949c88763fc9 /lib
parent32a4eb2c532e29957d8187d7c06ee95dc500489a (diff)
Change the approach for input so that its not included in every single build. Put it next to readline instead.
Diffstat (limited to 'lib')
-rw-r--r--lib/mp-readline/builtin_input.c44
1 files changed, 44 insertions, 0 deletions
diff --git a/lib/mp-readline/builtin_input.c b/lib/mp-readline/builtin_input.c
new file mode 100644
index 000000000..07e7ba35c
--- /dev/null
+++ b/lib/mp-readline/builtin_input.c
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "readline.h"
+
+STATIC mp_obj_t mp_builtin_input(uint n_args, const mp_obj_t *args) {
+ if (n_args == 1) {
+ mp_obj_print(args[0], PRINT_STR);
+ }
+ vstr_t line;
+ vstr_init(&line, 16);
+ int ret = readline(&line, "");
+ if (line.len == 0 && ret == CHAR_CTRL_D) {
+ nlr_raise(mp_obj_new_exception(&mp_type_EOFError));
+ }
+ return mp_obj_new_str_from_vstr(&mp_type_str, &line);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input);